n20-common-lib 3.2.0 → 3.2.1

package/package.json

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

package/src/components/Descriptions/index.vue

@@ -14,11 +14,17 @@ export default {
     column: {
       type: Number,
       default: 2
+    },
+    autoResize: {
+      type: Boolean,
+      default: true
     }
   },
   created() {
-    this.resize()
-    window.addEventListener('resize', this.resize)
+    if (this.autoResize) {
+      this.resize()
+      window.addEventListener('resize', this.resize)
+    }
   },
   beforeDestroy() {
     window.removeEventListener('resize', this.resize)

package/src/components/ProFilterView/index.vue

@@ -325,20 +325,32 @@ export default {
       return obj
     },
     filterObj() {
-      // 合并 slot 类型筛选器的值（来自 initialValue）到 searchValue 中
-      const slotValues = {}
-      this.filterList
-        .filter((item) => item.type === 'slot' && item.value)
-        .forEach((item) => {
-          if (this.initialValue && this.initialValue[item.value] !== undefined) {
-            slotValues[item.value] = this.initialValue[item.value]
-          }
+      const filterKeys = new Set()
+      this.filterList.forEach((item) => {
+        ;[
+          item.value,
+          item.startDate,
+          item.endDate,
+          item.startValue,
+          item.endValue,
+          ...(item.slotFields || [])
+        ].forEach((key) => {
+          if (key) filterKeys.add(key)
         })
+      })
+
+      const extraInitialValues = {}
+      Object.keys(this.initialValue || {}).forEach((key) => {
+        if (!filterKeys.has(key)) {
+          extraInitialValues[key] = this.initialValue[key]
+        }
+      })
+
       return {
         // 高级查询组合
         conditionGroups: this.conditionGroups,
-        // 筛选条件（合并 slot 类型的值）
-        searchValue: { ...this.searchValue, ...slotValues },
+        // 筛选条件：保留 initialValue 中的额外业务参数，但不覆盖视图自身的筛选字段
+        searchValue: { ...extraInitialValues, ...this.searchValue },
         // 视图id
         viewId: this.selectItem ? this.selectItem.viewId : null,
         // 视图类型
@@ -706,13 +718,13 @@ export default {
       this.selectedItem = item.viewName
       if (item.viewName === '无视图') {
         this.selectItem = ''
-        this.searchValue = {}
+        this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
         this.conditionGroups = []
       }
       if (item.viewType === VIEW_TYPE.ADVANCED) {
         const config = this.safeParse(item.viewConfig)
         this.searchForm = config
-        this.searchValue = config
+        this.searchValue = { ...this.getInitialSearchValue, ...config }
       } else if (item.viewType === VIEW_TYPE.BASIC) {
         this.conditionGroups = this.safeParse(item.viewConfig).conditionGroups || []
         this.searchValue = { ...this.getInitialSearchValue }

package/src/components/v3/UploadList/index.vue

@@ -494,6 +494,7 @@ export default {
         // sessionStorage 不可用时忽略
       }
       const row = {
+        ...item,
         [this.keys.type]: item.type || item.attno,
         [this.keys.user]: uname
       }