@sy-common/organize-select-help 1.0.0-beta.67 → 1.0.0-beta.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sy-common/organize-select-help",
-  "version": "1.0.0-beta.67",
+  "version": "1.0.0-beta.69",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@lambo-design/core": "^4.7.1-beta.140",
-    "@sy-common/core": "^1.0.0-beta.39"
+    "@sy-common/core": "^1.0.0-beta.56"
   },
   "scripts": {
     "release": "pnpm release-beta && git push --follow-tags && pnpm re-publish",

package/src/index.vue

@@ -129,7 +129,7 @@
                 </div>
               </div>
             </TabPane>
-            <TabPane label="选择人员" name="staff" v-if="name.includes('staff')">
+            <TabPane label="直接选择人员" name="staff" v-if="name.includes('staff')">
               <div class="tab staff-left-right-layout">
                 <!-- 左侧：组织选择区域（限制高度） -->
                 <div class="staff-left-panel">
@@ -183,8 +183,8 @@
                 <div class="org-new-header">
                   <Input v-model="orgNewSearch" @on-enter="searchOrgNew" @on-search="searchOrgNew" search placeholder="搜索组织节点名称（如：办公室）" style="width: 100%;"/>
                   <div class="org-new-actions">
-                    <Button type="default" @click="expandAllOrgNew">展开全部</Button>
-                    <Button type="default" @click="collapseAllOrgNew">折叠全部</Button>
+                    <Button type="primary" ghost @click="expandAllOrgNew">展开全部</Button>
+                    <Button type="primary" ghost @click="collapseAllOrgNew">折叠全部</Button>
                     <!--                    <Button type="default" @click="clearOrgNew">清空</Button>-->
                   </div>
                 </div>
@@ -197,7 +197,7 @@
                       </div>
                       <div class="org-card-actions" v-if="province.children && province.children.length > 0">
                         <Button type="text" @click.stop="selectAllProvinceOrgNew(province)">全选（包含下级）</Button>
-                        <Icon :type="province.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
+                        <Icon size="20" :type="province.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
                       </div>
                     </div>
                     <div class="org-card-body" v-if="province.expand && province.children && province.children.length > 0">
@@ -210,7 +210,7 @@
                           <div class="city-card-actions" v-if="city.children && city.children.length > 0">
                             <Button type="text" @click.stop="selectAllCityOrgNew(city)">全选（包含下级）</Button>
                             <!--                            <Button type="text" @click.stop="selectAllCityLevelOrgNew(city)">全选市本级</Button>-->
-                            <Icon :type="city.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
+                            <Icon size="20" :type="city.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
                           </div>
                         </div>
                         <div class="city-card-body" v-if="city.expand && city.children && city.children.length > 0">
@@ -223,7 +223,7 @@
                                 </div>
                                 <div class="district-actions" v-if="district.children && district.children.length > 0">
                                   <Button type="text" @click.stop="selectAllDistrictOrgNew(district)">全选</Button>
-                                  <Icon :type="district.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
+                                  <Icon size="20" :type="district.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
                                 </div>
                               </div>
                               <div class="district-body" v-if="district.expand && district.children && district.children.length > 0">
@@ -279,7 +279,7 @@
             <!--              直接选择人员：-->
             <div v-if="name.includes('staff')">
               <div class="group-box flex-r-bt">
-                <div>选择人员：</div>
+                <div>已选择人员：</div>
                 <div class="clear-btn" @click="clearStaff">清除全部</div>
               </div>
               <div class="group-list-content">
@@ -293,7 +293,7 @@
             <!--              组织选择（新）：-->
             <div v-if="name.includes('orgNew')">
               <div class="group-box flex-r-bt">
-                <div>组织选择：</div>
+                <div>已选择组织：</div>
                 <div class="clear-btn" @click="clearOrgNewList">清除全部</div>
               </div>
               <div class="group-list-content">
@@ -1062,7 +1062,7 @@ export default {
       const params = {
         search: this.staffSearch,
         offset: this.offset,
-        limit: 10
+        limit: 20
       };
 
       if (this.selectedStaffOrgId && typeof this.selectedStaffOrgId === 'string' && this.selectedStaffOrgId.trim()) {
@@ -1105,7 +1105,7 @@ export default {
         let list = res.rows;
         // 移除这行：list.map((item)=>item.checked=false)
         this.staffAllList = this.staffAllList.concat(list)
-        this.offset += 10;
+        this.offset += 20;
         this.loadingStaff = false
         this.lastLoadingTime = Date.now()
         if(res.total===this.staffAllList.length){
@@ -2033,20 +2033,44 @@ export default {
       // 只有有子节点时才允许展开/折叠
       if (province.children && province.children.length > 0) {
         province.expand = !province.expand;
+        // 同步更新原始数据中的节点状态
+        this.updateOriginalNodeExpand(province);
       }
     },
     toggleCityExpand(city) {
       // 只有有子节点时才允许展开/折叠
       if (city.children && city.children.length > 0) {
         city.expand = !city.expand;
+        // 同步更新原始数据中的节点状态
+        this.updateOriginalNodeExpand(city);
       }
     },
     toggleDistrictExpand(district) {
       // 只有有子节点时才允许展开/折叠
       if (district.children && district.children.length > 0) {
         district.expand = !district.expand;
+        // 同步更新原始数据中的节点状态
+        this.updateOriginalNodeExpand(district);
       }
     },
+    updateOriginalNodeExpand(node) {
+      // 查找并更新原始数据中的节点状态
+      const findAndUpdate = (nodes) => {
+        for (let i = 0; i < nodes.length; i++) {
+          if (nodes[i].orgUnitId === node.orgUnitId) {
+            nodes[i].expand = node.expand;
+            return true;
+          }
+          if (nodes[i].children && nodes[i].children.length > 0) {
+            if (findAndUpdate(nodes[i].children)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      };
+      findAndUpdate(this.orgNewTree);
+    },
     selectAllProvinceOrgNew(province) {
       // 全选并添加到已选择条件框，包含下级节点
       this.addOrgNewItemWithChildren(province, true);
@@ -2238,9 +2262,9 @@ export default {
 
           // 如果当前节点匹配或有匹配的子节点，则保留该节点
           if (isMatch || filteredChildren.length > 0) {
+            // 创建一个新对象，保留原始节点的所有属性，包括expand状态
             return {
               ...node,
-              expand: true, // 自动展开匹配的节点
               children: filteredChildren
             };
           }
@@ -2250,6 +2274,7 @@ export default {
         }).filter(Boolean); // 过滤掉null值
       };
 
+      // 直接使用原始树数据，不需要深拷贝
       return filterTree(this.orgNewTree);
     }
   },
@@ -2710,7 +2735,6 @@ export default {
       align-items: center;
       padding: 12px 16px;
       background-color: #f9fafb;
-      cursor: pointer;
       border-bottom: 1px solid #EAECF0;
 
       &:hover {
@@ -2721,6 +2745,7 @@ export default {
         display: flex;
         align-items: center;
         font-weight: 500;
+        cursor: pointer;
       }
 
       .org-card-actions {
@@ -2732,6 +2757,7 @@ export default {
           color: #1890ff;
           font-weight: 500;
           transition: all 0.2s;
+          cursor: pointer;
 
           &:hover {
             color: #40a9ff;
@@ -2764,7 +2790,6 @@ export default {
       align-items: center;
       padding: 10px 14px;
       background-color: #f9fafb;
-      cursor: pointer;
       border-bottom: 1px solid #EAECF0;
 
       &:hover {
@@ -2775,6 +2800,7 @@ export default {
         display: flex;
         align-items: center;
         font-weight: 500;
+        cursor: pointer;
       }
 
       .city-card-actions {
@@ -2786,6 +2812,7 @@ export default {
           color: #1890ff;
           font-weight: 500;
           transition: all 0.2s;
+          cursor: pointer;
 
           &:hover {
             color: #40a9ff;
@@ -2823,7 +2850,6 @@ export default {
       align-items: center;
       padding: 8px 12px;
       background-color: #f9fafb;
-      cursor: pointer;
       border-bottom: 1px solid #EAECF0;
 
       &:hover {
@@ -2834,6 +2860,7 @@ export default {
         display: flex;
         align-items: center;
         font-weight: 500;
+        cursor: pointer;
       }
 
       .district-actions {
@@ -2845,6 +2872,7 @@ export default {
           color: #1890ff;
           font-weight: 500;
           transition: all 0.2s;
+          cursor: pointer;
 
           &:hover {
             color: #40a9ff;