@sy-common/organize-select-help 1.0.0-beta.46 → 1.0.0-beta.49

package/package.json

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

package/src/index.vue

@@ -1,6 +1,5 @@
 <template>
   <Modal
-      v-if="isNameValid"
       title=""
       v-model="modal"
       @on-ok="confirm"
@@ -12,8 +11,8 @@
     <div slot="header" class="header-text"><Icon type="md-information" class="icon-tip" />人员选择</div>
     <div class="content-container">
       <div class="tree-orig">
-        <div class="tab-content-pro">`
-          <Tabs v-if="computedTabName" v-model="activeTabName"  @input="handleTabChange" >
+        <div class="tab-content-pro">
+          <Tabs :value="tabName"  @input="handleTabChange">
             <TabPane label="组织选择" name="org" v-if="name.includes('org')">
               <div class="tab">
                 <span>组织搜索：</span>
@@ -89,21 +88,21 @@
                           clearable
                           @on-change="handlePostTagSelect"
                           @on-clear="handlePostTagClear"
-                      style="width: 365px;"
-                      :disabled="!postTagList.length"
+                          style="width: 365px;"
+                          :disabled="!postTagList.length"
                       >
-                      <Option
-                          v-for="item in postTagList"
-                          :value="item.quickPickKey"
-                          :key="item.quickPickKey"
-                          :class="{ 'active-option': item.checked }"
-                      >
-                        {{ item.quickPickName }}
-                      </Option>
-                      <!-- 无数据提示 -->
-                      <Option value="" v-if="!postTagList.length" disabled>
-                        暂无快捷标签
-                      </Option>
+                        <Option
+                            v-for="item in postTagList"
+                            :value="item.quickPickKey"
+                            :key="item.quickPickKey"
+                            :class="{ 'active-option': item.checked }"
+                        >
+                          {{ item.quickPickName }}
+                        </Option>
+                        <!-- 无数据提示 -->
+                        <Option value="" v-if="!postTagList.length" disabled>
+                          暂无快捷标签
+                        </Option>
                       </Select>
                     </div>
                   </div>
@@ -157,7 +156,7 @@
                           <p>{{item.name}}</p>
                           <p>{{item.orgNodeName || item.orgUnitName}}</p>
                         </div>
-<!--                        <div class="checked-icon" v-show="item.checked">✔</div>-->
+                        <!--                        <div class="checked-icon" v-show="item.checked">✔</div>-->
                       </div>
                       <p v-if="staffEnding" style="color:#CCCCCC;text-align: center">---我也是有底线的---</p>
                     </div>
@@ -253,8 +252,7 @@ export default {
   },
   data(){
     return {
-      activeTabName: '',
-      tabName: '',
+      tabName:this.name[0],
       modal:false,
       dialogOpen:false,
       orgSearch:'',
@@ -297,33 +295,11 @@ export default {
       proStaffOrgList: [] // 新增：暂存选中的组织节点
     }
   },
-  created() {
-    if (this.isNameValid) {
-      console.log("this.name", this.name);
-      this.activeTabName = this.computedTabName;
-      console.log("this.activeTabName", this.activeTabName);
-      this.$nextTick(() => {
-        this.$forceUpdate();
-      });
-    }
-  },
   mounted() {
-    // 优化：仅当name有效时才执行初始化逻辑
-    if (this.isNameValid) {
-      this.queryTagList()
-      this.queryPositionList()
-      this.initStaffOrgTree()
-
-      this.$nextTick(() => {
-        this.activeTabName = this.computedTabName;
-        if (this.activeTabName === 'org' || this.activeTabName === 'post' || this.activeTabName === 'staff') {
-          this.handleTabChange(this.activeTabName);
-        }
-      });
-      console.log("传入的 name 数组：", this.name);
-      console.log("是否包含 staff：", this.name.includes('staff'));
-      console.log("最终激活的 Tab：", this.activeTabName);
-    }
+    this.queryTagList()
+    this.queryPositionList()
+    // this.loadMore()
+    this.initStaffOrgTree()
   },
   methods:{
     async initStaffOrgTree() {
@@ -957,26 +933,25 @@ export default {
       this.staffList.splice(index,1)
     },
     confirm(){
-      if (this.isNameValid) {
-        const v = {
-          orgList:this.orgList,
-          postList:this.postList,
-          staffList:this.staffList
-        }
-        this.$emit('confirm',deepCopy(v))
+      const v = {
+        orgList:this.orgList,
+        postList:this.postList,
+        staffList:this.staffList
       }
+      this.$emit('confirm',deepCopy(v))
     },
     visibleChange(val) {
-      if (this.isNameValid) {
-        this.$emit('input', val);
-        if (val) {
-          this.initStaffList()
-        } else {
-          this.staffEnding = false;
-          this.offset = 0;
-          this.staffAllList = [];
-          this.$set(this, 'selectedStaffOrgId', '');
-        }
+      this.$emit('input', val);
+      // val 为 true 时表示帮助框打开，此时发起请求
+      if (val) {
+        this.initStaffList() // 新增初始化方法，统一处理打开后的请求逻辑
+      } else {
+        // 可选：关闭帮助框时重置人员列表相关状态，避免下次打开残留旧数据
+        this.staffEnding = false;
+        this.offset = 0;
+        this.staffAllList = [];
+        // 关闭时重置选中状态
+        this.$set(this, 'selectedStaffOrgId', '');
       }
     },
     initStaffList() {
@@ -991,23 +966,25 @@ export default {
     },
     // 处理Tab切换，同步更新tabName
     handleTabChange(tabName) {
-      // 修复：先强制更新activeTabName，再触发nextTick
-      this.$set(this, 'activeTabName', tabName);
-      this.$nextTick(() => {
-        this.$forceUpdate();
-        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', []);
-          }
-          this.$nextTick(() => this.searchStaff());
-        } else if (tabName === 'post' && this.$refs.postTree && this.proPostList.length === 0) {
-          this.proPostList = [];
-          this.$refs.postTree.initData();
+      this.tabName = tabName;
+
+      // 仅修改人员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());
+      } else if (tabName === 'post' && this.$refs.postTree && this.proPostList.length === 0) {
+        // 保留原有岗位Tab逻辑，不修改
+        this.proPostList = [];
+        this.$refs.postTree.initData();
+      }
     },
     async fastChedkOrg(item) {
       // 1. 改用组织 Tab 专属标签列表判断
@@ -1507,7 +1484,7 @@ export default {
 
 
     /**
-     * 手动更新树节点状态
+     * 手动更新树节点状态（如果树组件没有提供update方法）
      * @param {Array} nodeList - 节点列表
      * @param {Set} expandIds - 需要展开的节点ID集合
      * @param {Set} checkedIds - 需要选中的节点ID集合
@@ -1534,15 +1511,6 @@ export default {
 
   },
   computed:{
-    isNameValid() {
-      return Array.isArray(this.name) && this.name.length > 0;
-    },
-    computedTabName() {
-      // 优化：基于isNameValid做边界判断
-      if (!this.isNameValid) return '';
-      const validTabNames = this.name.filter(name => ['org', 'post', 'staff'].includes(name));
-      return validTabNames.length > 0 ? validTabNames[0] : '';
-    },
     getCheckedStaff(){
       return this.staffAllList.filter((item)=>item.checked===true).length
     },
@@ -1554,45 +1522,12 @@ export default {
     }
   },
   watch:{
-    computedTabName(newVal) {
-      // 优化：增加name有效性判断
-      if (this.isNameValid && newVal && this.name.includes(newVal)) {
-        this.activeTabName = newVal;
-        this.$nextTick(() => {
-          if (this.$refs.tabs) {
-            this.$refs.tabs.$forceUpdate();
-          }
-          if (newVal === 'org' || newVal === 'post' || newVal === 'staff') {
-            this.handleTabChange(newVal);
-          }
-        });
-      }
-    },
-    name: {
-      handler(newVal) {
-        if (this.isNameValid) {
-          this.activeTabName = this.computedTabName;
-          this.$nextTick(() => {
-            this.$forceUpdate();
-            if (newVal === 'org' || newVal === 'post' || newVal === 'staff') {
-              this.handleTabChange(newVal);
-            }
-          });
-        }
-      },
-      deep: true,
-      immediate: true
-    },
     value(val){
-      if (this.isNameValid) {
-        this.modal = val
-      }
+      this.modal = val
     },
     data:{
       handler(val){
-        // 优化：增加边界判断
-        if(!this.isNameValid || !val) return
-        // 原有逻辑保持不变
+        if(!val) return
         let map = deepCopy(val)
         let orgList = map.orgList || []
         orgList.forEach(item=>{