n20-common-lib 3.2.33 → 3.2.34

package/package.json

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

package/src/components/AdvancedFilter/index.vue

@@ -5,7 +5,7 @@
       <el-form-item
         v-for="item in GroupData"
         :key="getOnlyKey(item)"
-        :class="[prefixCls + '-item', activeClassMap[item.value || item[onlyKey]] || '',{notStyle: item.notStyle}]"
+        :class="[prefixCls + '-item', activeClassMap[item.value || item[onlyKey]] || '', { notStyle: item.notStyle }]"
         :label="item.label"
         :required="!!item.required"
         :disabled="item.props && item.props.disabled"
@@ -249,7 +249,7 @@ export default {
       this.GroupData.forEach((item) => {
         const key = item.value || item[this.onlyKey]
         let isActive = false
-        if(!item.notActive) {
+        if (!item.notActive) {
           if (item.type === 'numberrange') {
             isActive = hasRange(item.startValue, item.endValue)
           } else if (rangeTypes.includes(item.type)) {
@@ -372,9 +372,7 @@ export default {
       // 找出 filterList 中 static 但不在 GroupData 的项
       const staticItemsInFilterList = this.filterList.filter((item) => item.static)
       const existingIds = this.GroupData.map((item) => item[this.onlyKey])
-      const missingStaticItems = staticItemsInFilterList.filter(
-        (item) => !existingIds.includes(item[this.onlyKey])
-      )
+      const missingStaticItems = staticItemsInFilterList.filter((item) => !existingIds.includes(item[this.onlyKey]))
       // 缺失的 static 项浅拷贝后补到 GroupData 开头
       if (missingStaticItems.length > 0) {
         const staticItemsToAdd = missingStaticItems.map((item) => ({ ...item }))
@@ -636,7 +634,13 @@ export default {
             {
               userNo: this.userNo,
               pageId: this.filterId,
-              showStructure: JSON.stringify(data)
+              showStructure: JSON.stringify(
+                data.map((item) => {
+                  const { options, ...result } = item
+                  console.log('drop options', options)
+                  return result
+                })
+              )
             },
             { loading: false }
           )
@@ -705,11 +709,7 @@ export default {
         // 如果过滤后没有有效数据，使用默认逻辑
         if (_data.length === 0) {
           if (this.removeLoad) {
-            this.GroupData = this.filterList.filter((item) => {
-              if (item.isDefault) {
-                return item
-              }
-            })
+            this.GroupData = this.filterList.filter((item) => item.isDefault)
           } else {
             this.GroupData = []
           }