bri-components 1.3.50 → 1.3.52

package/package.json

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

package/src/components/controls/senior/cascaderTable.vue

@@ -122,7 +122,7 @@
             },
 
             showVal () {
-                return `${this.curVal ? this.$getTreeLeafTotal(this.curVal.tree) : 0} 行`;
+                return `${this.curVal ? this.$getTreeLeafTotal(this.curVal.tree, this.showMode === "treeTable") : 0} 行`;
             }
         },
         created () {},

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/flatTableMixin.js

@@ -27,12 +27,12 @@ export default {
             this.data.forEach(item => {
                 !item._id && this.$set(item, "_id", this.$ObjectID().str);
 
-                if (!this.initFlag) {
+                if (this.initFlag) {
                     item.__old__ = true; // 标记老数据（initFlag不用在data中声明）
                 }
             });
 
-            this.initFlag = true;
+            this.initFlag = false;
             return this.data;
         },
         footerData () {

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 });
@@ -699,8 +708,8 @@ export default {
         // 行按钮是否可编辑（删除按钮可编辑 不代表行内容是可编辑的）
         getRowBtnCanEdit (row) {
             return this.canEdit && // 是编辑状态
-                (this.disabledOldDataRow ? !row.__old__ : true) && // 老数据行不置灰／置灰时是新增数据
-                !row.__readonly__; // 不能为只读数据
+                (this.disabledOldDataRow ? row.__old__ !== true : true) && // 老数据行不置灰／置灰时是新增数据
+                row.__readonly__ !== true; // 不能为只读数据
         },
         // 行内容是否可编辑
         getRowCanEdit (row) {
@@ -727,11 +736,11 @@ export default {
                     )
                     : true
             ) &&
-                (col._oldReadonly ? !row.__old__ : true) && // 老数据行里某些列不可编辑
-                (row.__isQuote__ ? this.quoteDataCanEdit : true) && // 引用过来的数据是否可编辑
+                (col._oldReadonly ? row.__old__ !== true : true) && // 老数据行里某些列不可编辑
+                (row.__isQuote__ ? this.quoteDataCanEdit === true : true) && // 引用过来的数据是否可编辑
                 col._enterType !== "calculate" && // 计算的不可编辑
                 col._readonly !== true && // 不能为只读
-                col.canEdit;
+                col.canEdit !== false; // 字段本身编辑权限 考虑为undefined时候
         },
         // 单元格最终编辑状态
         getUnitCanEdit (col, row) {