bri-components 1.3.49 → 1.3.51

package/package.json

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

package/src/components/controls/base/DshDate/DshDaterange.vue

@@ -291,8 +291,8 @@
                 this.change();
             },
             getOptions (index) {
-                const val = this[`val${index === 0 ? 1 : 0}`];
-                const config = { _operator: index === 0 ? "ltAet" : "gtAet", _fieldKey: this.controlKey };
+                const compareDateStr = this[`val${index === 0 ? 1 : 0}`];
+                const compareOperator = index === 0 ? "ltAet" : "gtAet";
 
                 return {
                     shortcuts: this.useShortcuts
@@ -304,16 +304,12 @@
                             }))
                         : [],
                     disabledDate: (date) => {
-                        return val
-                            ? this.isDynDateKey(val)
+                        const curDateStr = this.$transformDate(date, "/", this.subType);
+
+                        return compareDateStr
+                            ? this.isDynDateKey(compareDateStr)
                                 ? true
-                                : !this.$isComparedAccord({
-                                    ...this.selfPropsObj,
-                                    _type: "date"
-                                }, {
-                                    ...this.selfPropsObj,
-                                    _type: "date"
-                                }, date, val, config).bool
+                                : !this.$isComparedAccord(curDateStr, compareDateStr, compareOperator, "date", this.subType, this.subType).bool
                             : false;
                     }
                 };

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/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

@@ -362,7 +362,7 @@ export default {
                 filter: undefined,
                 sortBy: undefined,
                 renderBodyCell: ({ column, row, rowIndex }, h) => {
-                    column = this.$transformFieldProperty(column, row, this.parentObj);
+                    column = this.$transformDynamicProperty(column, row, this.parentObj);
                     column = this.resetCol(column, row);
                     const unitCanEdit = this.getUnitCanEdit(column, row);
 
@@ -425,7 +425,7 @@ export default {
                     ];
                 },
                 renderHeaderCell: ({ column }, h) => {
-                    column = this.$transformFieldProperty(column, undefined, this.parentObj);
+                    column = this.$transformDynamicProperty(column, undefined, this.parentObj);
 
                     return this.$getHeadRender(h, column, {
                         showRequired: this.showRequired,
@@ -686,7 +686,7 @@ export default {
         },
         // 单元格校验结果
         getColRuleResult (col, row, rowIndex) {
-            col = this.$transformFieldProperty(col, row, this.parentObj);
+            col = this.$transformDynamicProperty(col, row, this.parentObj);
 
             if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                 return this.$getFieldRuleResult(col, row);
@@ -699,8 +699,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 +727,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) {