n20-project-component 1.0.5 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-project-component",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "PC 端 Vue 2 + Element UI 组件库",
   "main": "dist/n20-project-component.umd.min.js",
   "module": "dist/n20-project-component.common.js",

package/src/components/ProFilterView/AdvancedFilter/index.vue

@@ -529,7 +529,11 @@ export default {
           resolve({ code: 500 }) // 返回一个成功状态的 Promise
           return
         }
-
+        
+        let _data = JSON.parse(JSON.stringify(data))
+        _data.forEach((item) => {
+          if(this.optionsMap[item[this.onlyKey]]) item.options = []
+        })
         axios
           .post(
             `/bems/prod_1.0/user/pageHabit?t=${Date.now()}`,

package/src/components/ProFilterView/index.vue

@@ -143,7 +143,7 @@
               :name="filter.slotName"
               :model="model"
               :value="searchForm[filter.value]"
-              :input="val => (searchForm[filter.value] = val)"
+              :input="val => $set(searchForm, filter.value, val)"
             ></slot>
             <!-- 无 value 的 slot（如 startDate/endDate 多值绑定），传递 searchForm 让父组件自行管理 -->
             <slot
@@ -262,17 +262,18 @@ export default {
     },
     filterObj() {
       // 合并 slot 类型筛选器的值（来自 initialValue）到 searchValue 中
+      // 注意：searchValue 优先级高于 slotValues，避免用户已选值被初始值覆盖
       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];
+            slotValues[item.value] = JSON.parse(JSON.stringify(this.initialValue[item.value]));
           }
         });
       return {
-        // 筛选条件（合并 slot 类型的值）
-        searchValue: { ...this.searchValue, ...slotValues },
+        // 筛选条件：slotValues 兜底，searchValue 优先级更高
+        searchValue: { ...slotValues, ...this.searchValue },
         // 视图id
         viewId: this.selectItem ? this.selectItem.viewId : null,
       };
@@ -280,11 +281,13 @@ export default {
   },
   watch: {
     initialValue: {
-      handler(newVal) {
+      handler(newVal, oldVal) {
         if (!newVal) return;
-
+        // 深度比较，避免引用变化但值相同时误触发重置
+        if (JSON.stringify(newVal) === JSON.stringify(oldVal)) return;
+        
         // 浅拷贝，避免修改 searchValue 时污染外部 initialValue
-        this.searchValue = { ...newVal };
+        this.searchValue = JSON.parse(JSON.stringify(newVal));
       },
       deep: true,
       immediate: false,
@@ -306,17 +309,17 @@ export default {
       this.getFilterList();
     }
     // 合并初始筛选值：slot 字段使用默认值，其他字段使用 initialValue 传入的值
-    this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue };
+    this.searchValue = { ...this.getInitialSearchValue, ...JSON.parse(JSON.stringify(this.initialValue || {})) };
   },
   methods: {
-    // 处理 slot 类型字段的输入事件，同时更新 searchValue 和 initialValue
+    // 处理 slot 类型字段的输入事件，同时更新 searchValue
     handleSlotInput(fieldName, val) {
       // 防御性检查：如果 fieldName 无效，不执行任何操作
       if (!fieldName) return;
       // 更新 searchValue
-      this.searchValue[fieldName] = val;
-      // 同步更新 initialValue，确保双向绑定生效
-      this.$set(this.initialValue, fieldName, val);
+      this.$set(this.searchValue, fieldName, val);
+      // 值改变时实时同步到父组件（不刷新数据）
+      this.$emit('filter', this.filterObj, 'change');
     },
     handleCommand(command, item) {
       const commandMap = {
@@ -349,12 +352,15 @@ export default {
         };
       }
       this.$emit('changeFn', obj);
+      // 值改变时实时同步到父组件（不刷新数据）
+      this.$emit('filter', this.filterObj, 'change');
     },
     filterFn() {
       this.$emit('filter', this.filterObj, 'filter');
     },
     handleClean() {
-      this.$emit('filter', this.filterObj, 'clean');
+      // 统一走 change 类型，父组件无需单独处理 clean
+      this.$emit('filter', this.filterObj, 'change');
     },
     handleClear() {
       // 收集不需要清空的字段 key（required / isNotClose / initialValue 中的额外 key）
@@ -440,6 +446,8 @@ export default {
     },
     // 新增
     add() {
+      let keyIds = this.filterList.filter(v => v.required).map(v => v.id);
+      
       this.isRefresh = false;
       this.viewPopoverVisible = false;
       this.visible = true;
@@ -447,7 +455,7 @@ export default {
       this.form = {
         userNo: sessionStorage.getItem('userNo'),
         pageNo: this.filterId,
-        keyIds: [],
+        keyIds: keyIds || [],
       };
       this.viewId = undefined;
       this.searchForm = {
@@ -544,7 +552,7 @@ export default {
       this.selectedItem = item.viewName;
       if (item.viewName === '无视图') {
         this.selectItem = '';
-        this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue };
+        this.searchValue = { ...this.getInitialSearchValue, ...JSON.parse(JSON.stringify(this.initialValue || {})) };
         // 无视图时恢复原来的筛选逻辑
         this.$nextTick(() => {
           const filterRef = this.$refs.filter;
@@ -559,6 +567,7 @@ export default {
       } else {
         const config = this.safeParse(item.viewConfig);
         this.searchForm = config;
+        
         this.searchValue = config;
         // 按视图保存的 keyIds 更新展示字段
         this.$nextTick(() => {
@@ -610,7 +619,7 @@ export default {
       this.searchKeyword = '';
       this.selectedItem = '无视图';
       this.selectItem = '';
-      this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue };
+      this.searchValue = { ...this.getInitialSearchValue, ...JSON.parse(JSON.stringify(this.initialValue || {})) };
       this.searchForm = { ...this.getInitialSearchValue };
       this.filterExpanded = this.defaultExpanded;
       this.viewId = undefined;