n20-common-lib 3.0.52 → 3.0.54

package/package.json

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

package/src/assets/css/advanced-filter.scss

@@ -207,4 +207,8 @@
     display: inline-block;
     vertical-align: middle;
   }
+}
+
+.popover-check-box .el-checkbox.is-checked .el-checkbox__label {
+  color: inherit !important;
 }

package/src/components/ProFilterView/index.vue

@@ -215,15 +215,10 @@ export default {
       type: Array,
       default: () => []
     },
-    // 初始筛选值，用于设置默认筛选条件
+    // 初始筛选值，用于设置默认筛选条件，同时也用于同步 slot 类型筛选器的值
     initialValue: {
       type: Object,
       default: () => ({})
-    },
-    // 外部表单对象，用于同步 slot 类型筛选器的值
-    outerForm: {
-      type: Object,
-      default: () => ({})
     }
   },
   data() {
@@ -275,13 +270,13 @@ export default {
       return obj
     },
     filterObj() {
-      // 合并 slot 类型筛选器的值（来自外部 form）到 searchValue 中
+      // 合并 slot 类型筛选器的值（来自 initialValue）到 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]
+          if (this.initialValue && this.initialValue[item.value] !== undefined) {
+            slotValues[item.value] = this.initialValue[item.value]
           }
         })
       return {