n20-common-lib 3.0.49 → 3.0.51

package/package.json

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

package/src/components/ProFilterView/index.vue

@@ -219,6 +219,11 @@ export default {
     initialValue: {
       type: Object,
       default: () => ({})
+    },
+    // 外部表单对象，用于同步 slot 类型筛选器的值
+    outerForm: {
+      type: Object,
+      default: () => ({})
     }
   },
   data() {
@@ -270,11 +275,20 @@ export default {
       return obj
     },
     filterObj() {
+      // 合并 slot 类型筛选器的值（来自外部 form）到 searchValue 中
+      const slotValues = {}
+      this.filterList
+        .filter((item) => item.type === 'slot' && item.value)
+        .forEach((item) => {
+          if (this.outerForm && this.outerForm[item.value] !== undefined) {
+            slotValues[item.value] = this.outerForm[item.value]
+          }
+        })
       return {
         // 高级查询组合
         conditionGroups: this.conditionGroups,
-        // 筛选条件
-        searchValue: this.searchValue,
+        // 筛选条件（合并 slot 类型的值）
+        searchValue: { ...this.searchValue, ...slotValues },
         // 视图id
         viewId: this.selectItem ? this.selectItem.viewId : null,
         // 视图类型
@@ -287,6 +301,7 @@ export default {
       handler(newVal) {
         // 当 initialValue 发生变化时，更新 searchValue
         // 保留 slot 类型的字段默认值，合并新的 initialValue 值
+
         this.searchValue = { ...this.getInitialSearchValue, ...newVal }
       },
       deep: true,
@@ -319,7 +334,21 @@ export default {
       })
     },
     changeFn(value) {
-      this.$emit('changeFn', value)
+      let obj = value
+      const filter = this.filterList.find((item) => item.value === value.field)
+      if (filter?.type === 'daterange') {
+        obj.value = {
+          [filter.startDate]: this.filterObj.searchValue?.[filter.startDate],
+          [filter.endDate]: this.filterObj.searchValue?.[filter.endDate]
+        }
+      }
+      if (filter?.type === 'numberrange') {
+        obj.value = {
+          [filter.startValue]: this.filterObj.searchValue?.[filter.startValue],
+          [filter.endValue]: this.filterObj.searchValue?.[filter.endValue]
+        }
+      }
+      this.$emit('changeFn', obj)
     },
     filterFn() {
       this.$emit('filter', this.filterObj, 'filter')