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

package/package.json

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

package/src/index.vue

@@ -1,5 +1,6 @@
 <template>
   <Modal
+      v-if="isNameValid"
       title=""
       v-model="modal"
       @on-ok="confirm"
@@ -11,7 +12,7 @@
     <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">
+        <div class="tab-content-pro">`
           <Tabs v-if="computedTabName" v-model="activeTabName"  @input="handleTabChange" >
             <TabPane label="组织选择" name="org" v-if="name.includes('org')">
               <div class="tab">
@@ -297,30 +298,32 @@ export default {
     }
   },
   created() {
-    console.log("this.name", this.name);
-    this.activeTabName = this.computedTabName;
-    console.log("this.activeTabName", this.activeTabName);
-    // 新增：初始化时强制触发一次Tab更新，确保DOM渲染
-    this.$nextTick(() => {
-      this.$forceUpdate();
-    });
+    if (this.isNameValid) {
+      console.log("this.name", this.name);
+      this.activeTabName = this.computedTabName;
+      console.log("this.activeTabName", this.activeTabName);
+      this.$nextTick(() => {
+        this.$forceUpdate();
+      });
+    }
   },
   mounted() {
-    this.queryTagList()
-    this.queryPositionList()
-    this.initStaffOrgTree()
+    // 优化：仅当name有效时才执行初始化逻辑
+    if (this.isNameValid) {
+      this.queryTagList()
+      this.queryPositionList()
+      this.initStaffOrgTree()
 
-    // 新增：mounted阶段再次确认activeTabName，确保Tab激活
-    this.$nextTick(() => {
-      this.activeTabName = this.computedTabName;
-      // 如果是staff Tab，主动触发初始化
-      if (this.activeTabName === 'staff') {
-        this.handleTabChange('staff');
-      }
-    });
-    console.log("传入的 name 数组：", this.name);
-    console.log("是否包含 staff：", this.name.includes('staff'));
-    console.log("最终激活的 Tab：", this.activeTabName);
+      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);
+    }
   },
   methods:{
     async initStaffOrgTree() {
@@ -954,22 +957,26 @@ export default {
       this.staffList.splice(index,1)
     },
     confirm(){
-      const v = {
-        orgList:this.orgList,
-        postList:this.postList,
-        staffList:this.staffList
+      if (this.isNameValid) {
+        const v = {
+          orgList:this.orgList,
+          postList:this.postList,
+          staffList:this.staffList
+        }
+        this.$emit('confirm',deepCopy(v))
       }
-      this.$emit('confirm',deepCopy(v))
     },
     visibleChange(val) {
-      this.$emit('input', val);
-      if (val) {
-        this.initStaffList()
-      } else {
-        this.staffEnding = false;
-        this.offset = 0;
-        this.staffAllList = [];
-        this.$set(this, 'selectedStaffOrgId', '');
+      if (this.isNameValid) {
+        this.$emit('input', val);
+        if (val) {
+          this.initStaffList()
+        } else {
+          this.staffEnding = false;
+          this.offset = 0;
+          this.staffAllList = [];
+          this.$set(this, 'selectedStaffOrgId', '');
+        }
       }
     },
     initStaffList() {
@@ -1527,8 +1534,13 @@ export default {
 
   },
   computed:{
+    isNameValid() {
+      return Array.isArray(this.name) && this.name.length > 0;
+    },
     computedTabName() {
-      const validTabNames = Array.isArray(this.name) ? this.name : [];
+      // 优化：基于isNameValid做边界判断
+      if (!this.isNameValid) return '';
+      const validTabNames = this.name.filter(name => ['org', 'post', 'staff'].includes(name));
       return validTabNames.length > 0 ? validTabNames[0] : '';
     },
     getCheckedStaff(){
@@ -1543,10 +1555,10 @@ export default {
   },
   watch:{
     computedTabName(newVal) {
-      if (newVal && this.name.includes(newVal)) {
+      // 优化：增加name有效性判断
+      if (this.isNameValid && newVal && this.name.includes(newVal)) {
         this.activeTabName = newVal;
         this.$nextTick(() => {
-          // 确保 Tab 组件已渲染后再强制更新
           if (this.$refs.tabs) {
             this.$refs.tabs.$forceUpdate();
           }
@@ -1556,12 +1568,31 @@ export default {
         });
       }
     },
+    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){
-      this.modal = val
+      if (this.isNameValid) {
+        this.modal = val
+      }
     },
     data:{
       handler(val){
-        if(!val) return
+        // 优化：增加边界判断
+        if(!this.isNameValid || !val) return
+        // 原有逻辑保持不变
         let map = deepCopy(val)
         let orgList = map.orgList || []
         orgList.forEach(item=>{
@@ -1874,7 +1905,7 @@ export default {
       flex:1;
       text-align: center;
     }
-    .tab-content{
+    .tab-content-pro{
       width: 720px;
       border-radius: 8px;
       border: 1px solid #EAECF0;