Prechádzať zdrojové kódy

fix: BsUi-选人控件修改

hanxiaohui 5 mesiacov pred
rodič
commit
1b3c35b4ee

+ 1 - 9
src/components/BsUi/OrgUserSelector/components/ModalSelector.vue

@@ -129,15 +129,7 @@
     // setMVal('modalExtraProps.okButtonProps.disabled', true);
 
     nextTick(() => {
-      //  加载左侧树
-      // 加载右侧表格
-      // orgUserListRef.value.init(true, {
-      //   parentId: selectedTreeId.value
-      // }).then((res) => {
-      //   const selectedKeys = orgUserListRef.value.allSelectedKeys;
-      //   const selectedData = orgUserListRef.value.allSelectedData;
-      //   // setMVal('modalExtraProps.okButtonProps.disabled', selectedKeys.length === 0);
-      // });
+      keyWord.value = "";
     });
   };
 

+ 16 - 11
src/components/BsUi/OrgUserSelector/components/OrgUserList.vue

@@ -3,7 +3,7 @@
     <bs-empty v-if="searchData.length === 0" />
     <div v-else class="org-user-content">
       <div class="top">
-        <div class="top-left">
+        <div class="top-left"  v-if="isEmpty(keyWord)">
           <a-space>
             <a-checkbox
               @change="handleSelectAllChange"
@@ -14,7 +14,7 @@
             >
               全选
             </a-checkbox>
-            <a-checkbox v-model:checked="isInclude" :disabled="disabled"> 包含下级 </a-checkbox>
+            <a-checkbox v-model:checked="isInclude" :disabled="disabled" @change="changeInclude"> 包含下级 </a-checkbox>
           </a-space>
         </div>
         <div class="top-right">
@@ -262,15 +262,24 @@
     { deep: true }
   );
 
+  const changeInclude = (event) => {
+    const checked = event.target.checked;
+    init(false, {
+      keyword: "",
+      parentId: props.selectedTreeId,
+      include: checked
+    });
+  }
+
   watch(
     () => props.keyWord,
     (value) => {
       // 监听关键字变化
-      if (!isEmpty(value)) {
-        init(false, {
-          keyword: value,
-        });
-      }
+      isInclude.value = false;
+      init(false, {
+        keyword: value,
+        include: false
+      });
     }
   );
   watch(
@@ -330,10 +339,6 @@
       });
   });
 
-  // 是否开启下一级,监听
-  watch(isInclude, (val) => {
-    init(false);
-  });
 
   defineExpose({
     fetchData,