n20-common-lib 3.0.55 → 3.0.57

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.0.55",
+  "version": "3.0.57",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/AdvancedFilter/index.vue

@@ -1,11 +1,6 @@
 <template>
   <div :class="prefixCls">
-    <el-form
-      v-show="visible"
-      ref="advancedFilter"
-      :class="prefixCls + '-body'"
-      @submit.native.prevent="() => {}"
-    >
+    <el-form v-show="visible" ref="advancedFilter" :class="prefixCls + '-body'" @submit.native.prevent="() => {}">
       <slot name="prefix"></slot>
       <el-form-item
         v-for="item in GroupData"
@@ -45,7 +40,7 @@
           <el-input v-model="keyword" clearable class="input-w m-b-s" :placeholder="$lc('搜索筛选条件')" />
           <div class="flex-box flex-lr">
             <el-button type="text" @click="allCheck">{{
-              checkList.length === filterListS.length ? $lc('取消全选') : $lc('全选')
+              isAllNonFixedChecked ? $lc('取消全选') : $lc('全选')
             }}</el-button>
             <el-button v-if="filterId" type="text" @click="defaultCheck">{{ $lc('恢复默认') }}</el-button>
           </div>
@@ -215,6 +210,14 @@ export default {
       set(v) {
         return v
       }
+    },
+    // 判断所有非固定（非static、非isNotClose）项目是否都已选中
+    isAllNonFixedChecked() {
+      const nonFixedItems = this.filterListS.filter((res) => !res.static && !res.isNotClose)
+      if (nonFixedItems.length === 0) return false
+
+      const nonFixedItemIds = nonFixedItems.map((item) => item[this.onlyKey])
+      return nonFixedItemIds.every((id) => this.checkList.includes(id))
     }
   },
   watch: {
@@ -398,15 +401,23 @@ export default {
       }
     },
     allCheck() {
-      if (this.checkList.length === this.filterListS.length) {
-        this.checkList = this.filterListS
-          ?.filter((res) => {
-            if (res.static || res.isNotClose) {
-              return res[this.onlyKey]
-            }
-          })
-          ?.map((item) => item[this.onlyKey])
+      // 获取非固定（非static、非isNotClose）的项目
+      const nonFixedItems = this.filterListS.filter((res) => !res.static && !res.isNotClose)
+      const nonFixedItemIds = nonFixedItems.map((item) => item[this.onlyKey])
+
+      // 检查所有非固定项目是否都已选中
+      const allNonFixedChecked = nonFixedItemIds.length > 0 && nonFixedItemIds.every((id) => this.checkList.includes(id))
+
+      // 获取固定项目的ID
+      const fixedItemIds = this.filterListS
+        .filter((res) => res.static || res.isNotClose)
+        .map((item) => item[this.onlyKey])
+
+      if (allNonFixedChecked) {
+        // 取消全选：只保留固定项目
+        this.checkList = [...fixedItemIds]
       } else {
+        // 全选：选中所有项目
         if (this.maxLength) {
           this.checkList = this.filterListS.slice(0, this.maxLength)?.map((res) => res[this.onlyKey])
         } else {
@@ -521,18 +532,35 @@ export default {
     mackData(data) {
       let _data = data
       if (_data && _data.length > 0) {
-        this.GroupData = _data.map((item) => {
-          for (let i = 0; i < this.filterList.length; i++) {
-            const originItem = this.filterList[i]
-            if (originItem[this.onlyKey] === item[this.onlyKey]) {
+        // 先过滤出在 filterList 中存在的项目，避免使用已删除的筛选条件
+        _data = _data.filter((item) => {
+          return this.filterList.some((filterItem) => filterItem[this.onlyKey] === item[this.onlyKey])
+        })
+
+        // 如果过滤后没有有效数据，使用默认逻辑
+        if (_data.length === 0) {
+          if (this.removeLoad) {
+            this.GroupData = this.filterList.filter((item) => {
+              if (item.isDefault) {
+                return item
+              }
+            })
+          } else {
+            this.GroupData = []
+          }
+        } else {
+          // 更新有效数据的 label 和 options
+          this.GroupData = _data.map((item) => {
+            const originItem = this.filterList.find((filter) => filter[this.onlyKey] === item[this.onlyKey])
+            if (originItem) {
               item.label = originItem.label
-              if (item.options && originItem.options) {
+              if (originItem.options) {
                 item.options = originItem.options
               }
             }
-          }
-          return item
-        })
+            return item
+          })
+        }
       } else {
         if (this.removeLoad) {
           this.GroupData = this.filterList.filter((item) => {
@@ -544,6 +572,27 @@ export default {
           this.GroupData = []
         }
       }
+
+      // ✨ 确保 static: true 的项目自动添加并勾选
+      const staticItemsInFilterList = this.filterList.filter((item) => item.static)
+      const existingIds = this.GroupData.map((item) => item[this.onlyKey])
+
+      // 找出不在 GroupData 中的 static 项目
+      const missingStaticItems = staticItemsInFilterList.filter((item) => !existingIds.includes(item[this.onlyKey]))
+
+      // 将缺失的 static 项目添加到 GroupData 开头
+      if (missingStaticItems.length > 0) {
+        const staticItemsToAdd = missingStaticItems.map((item) => ({ ...item }))
+        this.GroupData = [...staticItemsToAdd, ...this.GroupData]
+      }
+
+      // ✨ 强制将所有 static: true 的项目移到最前面
+      if (this.GroupData && this.GroupData.length > 0) {
+        const staticItems = this.GroupData.filter((item) => item.static)
+        const otherItems = this.GroupData.filter((item) => !item.static)
+        this.GroupData = [...staticItems, ...otherItems]
+      }
+
       this.checkList = this.GroupData.map((res) => res.id)
       console.log(this.checkList)
       this.cancelCheck = XEUtils.clone(this.checkList, true)