@sy-common/organize-select-help 1.0.0-beta.53 → 1.0.0-beta.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sy-common/organize-select-help",
-  "version": "1.0.0-beta.53",
+  "version": "1.0.0-beta.54",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/index.vue

@@ -701,11 +701,10 @@ export default {
       }
     },
     async loadMore(){
-      let nowTime = Date.now()
-      if (this.loadingStaff || this.staffEnding || (nowTime - this.lastLoadingTime < 1000)) return
+      if (this.loadingStaff || this.staffEnding) return
       this.loadingStaff = true
       try {
-        console.log("--触底加载---")
+        console.log("--触底加载/强制加载---", new Date().getTime()); // 调试日志，确认方法执行
         let res = await this.queryAllStaffList()
         let list = res.rows;
         list.map((item)=>item.checked=false)
@@ -944,27 +943,57 @@ export default {
     },
     visibleChange(val) {
       this.$emit('input', val);
-      // val 为 true 时表示帮助框打开，此时发起请求
       if (val) {
-        this.initStaffList() // 新增初始化方法，统一处理打开后的请求逻辑
+        this.resetStaffTreeChecked();
+        this.staffEnding = false;
+        this.offset = 0;
+        this.staffAllList = [];
+        this.loadingStaff = false;
+        if (this.tabName === 'staff') {
+          this.loadMore().catch(err => console.log("弹窗打开加载失败：", err));
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.loadMore();
+            }, 100);
+          });
+        }
       } else {
-        // 可选：关闭帮助框时重置人员列表相关状态，避免下次打开残留旧数据
         this.staffEnding = false;
         this.offset = 0;
         this.staffAllList = [];
-        // 关闭时重置选中状态
         this.$set(this, 'selectedStaffOrgId', '');
+        if (this.$refs.staffTree) {
+          this.$refs.staffTree.clearAllChecked(this.$refs.staffTree.data);
+          this.$refs.staffTree.$emit('handleChange', []);
+        }
+      }
+    },
+    resetStaffTreeChecked() {
+      this.$set(this, 'selectedStaffOrgId', '');
+      this.proStaffOrgList = [];
+      if (this.$refs.staffTree) {
+        this.$refs.staffTree.clearAllChecked(this.$refs.staffTree.data);
+        this.$refs.staffTree.$emit('handleChange', []);
+        if (this.$refs.staffTree.initData) {
+          this.$refs.staffTree.initData();
+        }
+      }
+      if (this.tabName === 'staff') {
+        this.$nextTick(() => {
+          this.loadMore();
+        });
       }
     },
     initStaffList() {
       this.staffEnding = false;
       this.offset = 0;
       this.staffAllList = [];
-      // 初始化时确保selectedStaffOrgId状态正确
-      if (this.tabName === 'staff' && (!this.selectedStaffOrgId || this.selectedStaffOrgId.trim())) {
-        this.$set(this, 'selectedStaffOrgId', '');
-      }
-      this.loadMore(); // 打开帮助框后，再发起第一次请求
+      // 小幅延迟，确保树重置完成后再发起查询（避免时序差）
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.loadMore();
+        }, 50); // 50ms足够，可根据实际情况调整
+      });
     },
     // 处理Tab切换，同步更新tabName
     handleTabChange(tabName) {
@@ -972,16 +1001,20 @@ export default {
 
       // 仅修改人员Tab相关逻辑，不影响其他Tab
       if (tabName === 'staff') {
-        // 重置人员选择相关状态
-        this.$set(this, 'selectedStaffOrgId', '');
-        this.proStaffOrgList = [];
-        // 清空树组件选中状态
-        if (this.$refs.staffTree) {
-          this.$refs.staffTree.clearAllChecked(this.$refs.staffTree.data);
-          this.$refs.staffTree.$emit('handleChange', []);
-        }
-        // 切换到人员tab时，立即触发一次搜索，确保orgUnitId参数正确
-        this.$nextTick(() => this.searchStaff());
+        this.resetStaffTreeChecked();
+        // 第一步：同步重置查询参数（确保参数干净）
+        this.staffEnding = false;
+        this.offset = 0;
+        this.staffAllList = [];
+        this.loadingStaff = false; // 强制解除加载中状态
+        // 第二步：立即同步调用（优先执行）
+        this.loadMore().catch(err => console.log("同步加载失败：", err));
+        // 第三步：异步兜底调用（防止同步调用被阻塞）
+        this.$nextTick(() => {
+          setTimeout(() => {
+            this.loadMore();
+          }, 100);
+        });
       } else if (tabName === 'post' && this.$refs.postTree && this.proPostList.length === 0) {
         // 保留原有岗位Tab逻辑，不修改
         this.proPostList = [];