bri-components 1.3.51 → 1.3.52

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.51",
+    "version": "1.3.52",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

package/src/components/form/DshAdvSearch.vue

@@ -281,7 +281,7 @@
                     _key: "logic",
                     _optionKind: "flat",
                     _clearable: false,
-                    _disabled: this.isSimpleSearch,
+                    // _disabled: this.isSimpleSearch,
                     _data: [
                         { _key: "and", name: "且" },
                         { _key: "or", name: "或" }

package/src/components/list/mixins/tableBaseMixin.js

@@ -59,6 +59,7 @@ export default {
             showRuleMessage: false, // 进行全体校验
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
 
+            dftLogic: "and",
             dftConditions: [],
 
             dshRenderName: undefined,
@@ -265,10 +266,13 @@ export default {
         // 过滤行数据的 最终的筛选条件
         finalTableAdvSearch () {
             return {
-                logic: "and",
+                logic: ["and", "or"].includes(this.tableAdvSearch.logic) ? this.tableAdvSearch.logic : "and",
                 conditions: [
-                    ...this.dftConditions,
-                    ...this.hideConditions
+                    ...this.hideConditions,
+                    {
+                        logic: this.dftLogic,
+                        conditions: this.dftConditions
+                    }
                 ]
             };
         },
@@ -280,9 +284,7 @@ export default {
             }));
         },
         isSearching () {
-            return this.searchFormList.length && this.finalTableAdvSearch.conditions.some(conditionItem =>
-                conditionItem.fieldValue.length && conditionItem.fieldValue.some(valItem => !this.$isEmptyData(valItem))
-            );
+            return this.$isAdvSearching(this.finalTableAdvSearch);
         },
 
         parentDataId () {
@@ -486,7 +488,9 @@ export default {
     },
     methods: {
         baseInit () {
-            this.dftConditions = this.tableAdvSearch.conditions;
+            this.dftConditions = this.tableAdvSearch.conditions.filter(conditionItem =>
+                this.searchListFields.includes(conditionItem.fieldKey)
+            );
         },
         // 重置
         reset () {
@@ -501,6 +505,11 @@ export default {
             return this.allListData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
         },
 
+        // 筛选回调
+        searchCb (conditions) {
+            this.isExpandAction = false;
+            this.dftConditions = conditions;
+        },
         // 表单控件失去焦点
         controlBlur (operationItem, col, row, rowIndex, params) {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });