Merge branch 'zth' into dev

src/views/system/user/UserPermissionModal.vue

@@ -96,12 +96,17 @@
     })
     if (type) {
       permissionId.value = checkedKeys[0]
+      InfoId.value = ''
+      RefdataruleInfo.value.resetFields()
+      RefdataruleInfo.value.setFieldsValue({ permissionId: permissionId.value })
     }
   }
   const RefdataruleIndex = ref()
   const RefdataruleInfo = ref()
   // 新增
   function Create() {
+    console.log(permissionId.value)
+
     RefdataruleIndex.value.clearSelectedRowKeys()
     RefdataruleInfo.value.resetFields()
     RefdataruleInfo.value.setFieldsValue({ permissionId: permissionId.value })
@@ -113,7 +118,6 @@
   const InfoId = ref('')
   // 改变选中
   function ChangeSelect(data) {
-    console.log(data[0])
     InfoId.value = data[0]
   }
   /**
@@ -121,12 +125,18 @@
    */
   function reset() {
     treeData.value = []
+    permissionId.value = ''
+    selectedKeys.value = []
+    expandedKeys.value = []
   }
   /**
    * 提交
    */
   async function handleSubmit(exit) {
     RefdataruleInfo.value.handleSave()
+    if (exit) {
+      closeModal()
+    }
   }
 </script>
 

src/views/system/user/columns.tsx

@@ -35,7 +35,6 @@ const ClientPermissionData = []
 let ClientPermissionList = []
 const res2: API.DataResult = await getClientPermissionList()
 if (res2.succeeded) {
-  console.log(res2)
   ClientPermissionList = res2.data
   res2.data.forEach((item) => {
     ClientPermissionData.push({
@@ -164,9 +163,9 @@ export const searchFormSchema: FormSchema[] = [
         showSearch: true,
         filterOption: (input: string, option: any) => {
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
+        },
       }
-    }
+    },
   },
   {
     field: 'deptId',
@@ -180,7 +179,7 @@ export const searchFormSchema: FormSchema[] = [
         labelField: 'orgName',
         valueField: 'id',
         resultField: 'data',
-        immediate: false
+        immediate: false,
       }
     },
   },
@@ -720,12 +719,9 @@ export const infoformSchema: FormSchema[] = [
           return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
         },
         onChange: async (e: ChangeEvent, a) => {
-          console.log(e, a)
-
           const res: API.DataResult = await getColumns({ tableViewName: e })
           fields.value = []
           if (res.succeeded) {
-            console.log(res)
             const Arr = [
               {
                 dbColumnName: '{loginRole}',
@@ -766,8 +762,6 @@ export const infoformSchema: FormSchema[] = [
                 conditions: [],
               }
             }
-
-            console.log(fields.value, 'fields.value')
           }
         },
       }
@@ -805,10 +799,8 @@ export const infoformSchema: FormSchema[] = [
         },
         // xxxx props
         onChange: (e) => {
-          console.log(e)
           ClientPermissionList.forEach((item) => {
             if (item.id == e) {
-              console.log(item)
               formModel.permissionEntity = item.permissionEntity
             }
           })
@@ -882,16 +874,7 @@ export const infoformSchema: FormSchema[] = [
       return h(ConditionFilter, {
         modelValue: model[field],
         filterFields: fields.value,
-        // onChange: (e: ChangeEvent) => {
-        //   console.log(e);
-        //   model[field] = e.target.value;
-        // },
       })
     },
-    // componentProps: {
-    //   onChange: (e: ChangeEvent) => {
-    //     console.log('change', e);
-    //   },
-    // },
   },
 ]

src/views/system/user/dataruleIndex.vue

@@ -62,7 +62,6 @@
     },
   })
   function handleCreate() {
-    console.log('新增')
     emit('Create')
   }
   defineExpose({

src/views/system/user/dataruleInfo.vue

@@ -22,8 +22,15 @@
   watch(
     () => props.InfoId,
     (Nval) => {
-      rowId.value = Nval
-      GetData()
+      if (Nval) {
+        rowId.value = Nval
+        GetData()
+      } else {
+        resetFields()
+        setFieldsValue({
+          permissionId: props.permissionId,
+        })
+      }
     },
   )
   // 声明Emits

src/views/system/user/index.vue

@@ -65,7 +65,6 @@
   const [registerTable, { reload, getForm, getPaginationRef }] = useTable({
     api: async (p) => {
       const res: API.DataResult = await getUserList(p)
-      // console.log(items);
       return new Promise((resolve) => {
         resolve({ data: [...res.data], total: res.count })
       })