n20-common-lib 3.2.14 → 3.2.16

package/package.json

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

package/src/components/AdvancedFilter/index.vue

@@ -580,7 +580,11 @@ export default {
       }
     },
     defaultCheck() {
-      this.checkList = this.defineCheckList
+      // 恢复默认不应清除固定的筛选条件（static / isNotClose），始终保留
+      const fixedIds = this.filterList
+        .filter((item) => item.static || item.isNotClose)
+        .map((item) => item[this.onlyKey])
+      this.checkList = Array.from(new Set([...fixedIds, ...this.defineCheckList]))
     },
     cancel() {
       this.checkList = this.cancelCheck

package/src/components/ProFilterView/advancedQuery.vue

@@ -619,8 +619,7 @@ export default {
     },
     // 更新操作符对应的值
     updateOperatorOptions(field, condition) {
-      // if (condition.valueType === 'slot') return
-      this.$set(condition, 'valueType', field.type)
+      this.$set(condition, 'valueType', condition.valueType === 'slot' ? condition.valueType : field.type)
       this.$set(condition, 'value', '')
       if (field.type === 'dateRangePicker' || field.type === 'inputNumberRange') {
         this.$set(condition, 'value', {})