n20-common-lib 3.0.65 → 3.0.66

package/package.json

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

package/src/components/ProFilterView/advancedQuery.vue

@@ -459,6 +459,32 @@ export default {
     // 然后再发起异步请求获取更精确的字段配置
     this.getAdvancedQueryFields()
   },
+  watch: {
+    canSetFilter: {
+      handler(newVal) {
+        // 当 value 为空且 canSetFilter 有数据时，将 isDefault: true 的字段默认添加到条件列表中
+        if (this.value.length === 0 && newVal.length > 0) {
+          const defaultFields = newVal.filter((item) => item.isDefault === true)
+          if (defaultFields.length > 0) {
+            const conditions = defaultFields.map((field) => ({
+              field: field.value,
+              operator: '',
+              value: '',
+              advancedQueryType: field.advancedQueryType,
+              valueType: ''
+            }))
+            this.$emit('update:value', [
+              {
+                conditionLogic: 'and',
+                conditions
+              }
+            ])
+          }
+        }
+      },
+      immediate: true
+    }
+  },
   methods: {
     // 查询支持可配置高级查询的字段
     async getAdvancedQueryFields() {
@@ -476,7 +502,7 @@ export default {
       console.log(this.filterList, '10086')
 
       // 用 filterList 去匹配可搜索的字段，并设置 advancedQueryType
-      this.canSetFilter = this.filterList
+      let matchedFields = this.filterList
         .filter((item) => {
           return searchableFields.some((field) => field.fieldCode === item.fieldCode || field.fieldCode === item.value)
         })
@@ -492,6 +518,15 @@ export default {
           }
           return item
         })
+      // 根据 isDefault 排序：isDefault: true 的排在前面
+      matchedFields.sort((a, b) => {
+        const aHasDefault = a.isDefault === true
+        const bHasDefault = b.isDefault === true
+        if (aHasDefault && !bHasDefault) return -1
+        if (!aHasDefault && bHasDefault) return 1
+        return 0
+      })
+      this.canSetFilter = matchedFields
       // 再次过滤，确保数据正确
       this.filterInvalidConditions()
     },