Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

src/components/Dialog/src/Dialog.vue

 <script lang="ts" setup>
 <script lang="ts" setup>
 import { propTypes } from '@/utils/propTypes'
 import { propTypes } from '@/utils/propTypes'
 import { isNumber } from '@/utils/is'
 import { isNumber } from '@/utils/is'
+
 defineOptions({ name: 'Dialog' })
 defineOptions({ name: 'Dialog' })
 
 
 const slots = useSlots()
 const slots = useSlots()
+const emits = defineEmits(['update:modelValue'])
 
 
 const props = defineProps({
 const props = defineProps({
   modelValue: propTypes.bool.def(false),
   modelValue: propTypes.bool.def(false),
@@ -55,6 +57,17 @@ const dialogStyle = computed(() => {
     height: unref(dialogHeight)
     height: unref(dialogHeight)
   }
   }
 })
 })
+
+const closing = ref(false)
+
+function closeHandler() {
+  emits('update:modelValue', false)
+  closing.value = true
+}
+
+function closedHandler() {
+  closing.value = false
+}
 </script>
 </script>
 
 
 <template>
 <template>
@@ -68,7 +81,8 @@ const dialogStyle = computed(() => {
     draggable
     draggable
     class="com-dialog"
     class="com-dialog"
     :show-close="false"
     :show-close="false"
-    @close="$emit('update:modelValue', false)"
+    @close="closeHandler"
+    @closed="closedHandler"
   >
   >
     <template #header="{ close }">
     <template #header="{ close }">
       <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">
       <div class="relative h-54px flex items-center justify-between pl-15px pr-15px">
@@ -102,7 +116,9 @@ const dialogStyle = computed(() => {
     </ElScrollbar>
     </ElScrollbar>
     <slot v-else></slot>
     <slot v-else></slot>
     <template v-if="slots.footer" #footer>
     <template v-if="slots.footer" #footer>
-      <slot name="footer"></slot>
+      <div :style="{ 'pointer-events': closing ? 'none' : 'auto' }">
+        <slot name="footer"></slot>
+      </div>
     </template>
     </template>
   </ElDialog>
   </ElDialog>
 </template>
 </template>

src/views/system/user/DeptTree.vue

@@ -46,8 +46,24 @@ const filterNode = (name: string, data: Tree) => {
 }
 }
 
 
 /** 处理部门被点击 */
 /** 处理部门被点击 */
-const handleNodeClick = async (row: { [key: string]: any }) => {
-  emits('node-click', row)
+let currentNode: any = {}
+const handleNodeClick = async (row: { [key: string]: any }, treeNode: any) => {
+  // 判断选中状态
+  if (currentNode && currentNode.name === row.name) {
+    treeNode.checked = !treeNode.checked
+  } else {
+    treeNode.checked = true
+  }
+  if (treeNode.checked) {
+    // 选中
+    currentNode = row
+    emits('node-click', row)
+  } else {
+    // 取消选中
+    treeRef.value!.setCurrentKey(undefined)
+    emits('node-click', undefined)
+    currentNode = null
+  }
 }
 }
 const emits = defineEmits(['node-click'])
 const emits = defineEmits(['node-click'])
 
 

src/views/system/user/index.vue

@@ -255,9 +255,14 @@ const resetQuery = () => {
 }
 }
 
 
 /** 处理部门被点击 */
 /** 处理部门被点击 */
-const handleDeptNodeClick = async (row) => {
-  queryParams.deptId = row.id
-  await getList()
+const handleDeptNodeClick = async (row: any) => {
+  if (row === undefined) {
+    queryParams.deptId = undefined
+    await getList()
+  } else {
+    queryParams.deptId = row.id
+    await getList()
+  }
 }
 }
 
 
 /** 添加/修改操作 */
 /** 添加/修改操作 */