bri-components 1.3.20 → 1.3.22

package/package.json

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

package/src/components/form/DshForm.vue

@@ -181,7 +181,6 @@
         computed: {
             showFormList () {
                 return this.formList.filter(formItem => this.isShow(formItem, this.formData));
-                // return this.$getNotEmptyFieldList(formList, this.formData, this.canEdit, this.notShowEmpty);
             }
         },
         watch: {

package/src/components/list/DshFlatTable.vue

@@ -124,7 +124,9 @@
                             filter: undefined,
                             sortBy: undefined,
                             renderBodyCell: ({ row, column, rowIndex }, h) => {
-                                column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
+                                column = this.$transformFieldProperty(column, row, this.parentObj);
+                                column = this.resetCol(column, row);
+                                const unitCanEdit = this.getUnitCanEdit(column, row);
 
                                 return [
                                     this.isShowCompare(column, row, this.oldListData[rowIndex])
@@ -143,9 +145,9 @@
                                             scopedSlots: {
                                                 default: props => h("dsh-list-unit", {
                                                     props: {
-                                                        canEdit: this.getUnitCanEdit(column, row),
+                                                        canEdit: unitCanEdit,
                                                         formData: row,
-                                                        formItem: this.resetCol(column, row),
+                                                        formItem: column,
                                                         rowIndex: rowIndex,
                                                         allFormList: this.columns,
                                                         parentListData: this.listData
@@ -159,9 +161,9 @@
                                         })
                                         : h("dsh-list-unit", {
                                             props: {
-                                                canEdit: this.getUnitCanEdit(column, row),
+                                                canEdit: unitCanEdit,
                                                 formData: row,
-                                                formItem: this.resetCol(column, row),
+                                                formItem: column,
                                                 rowIndex: rowIndex,
                                                 allFormList: this.columns,
                                                 parentListData: this.listData
@@ -180,7 +182,7 @@
                                 ];
                             },
                             renderHeaderCell: ({ column }, h) => {
-                                column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : {});
+                                column = this.$transformFieldProperty(column, undefined, this.parentObj);
 
                                 return this.$getHeadRender(h, column, {
                                     showRequired: this.showRequired,
@@ -283,6 +285,28 @@
             // 表单控件失去焦点
             controlBlur (operationItem, col, row, params) {
                 this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
+            },
+
+            resetCol (col, row) {
+                let resetMap = {
+                    select: {
+                        _optionKind: "dropdown"
+                    },
+                    checkbox: {
+                        _optionKind: "dropdown"
+                    }
+                };
+                return {
+                    ...col,
+                    ...(resetMap[col._type] || {}),
+                    // isShare: this.isShare,
+                    _heightAuto: this.heightAuto
+                };
+            },
+            getUnitCanEdit (col, row) {
+                return this.getRowCanEdit(row) &&
+                    this.getColCanEdit(col, row) &&
+                    this.$isAdvRelyShow(col, row, this.parentObj, true);
             }
         }
     };

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

@@ -115,11 +115,7 @@ export default {
         },
 
         filterColumns () {
-            return this.columns.filter(column =>
-                column._isRelyByParent
-                    ? this.$isAdvRelyShow(column, this.parentObj, true, true, this.listData)
-                    : !["hide"].includes(column._displayType)
-            );
+            return this.columns.filter(column => this.$isAdvRelyShow(column, undefined, this.parentObj, true));
         },
         selfRowDefault () {
             return this.$filterObj(this.filterColumns, this.rowDefault);
@@ -143,7 +139,7 @@ export default {
 
             return this.listData.every(row =>
                 this.filterColumns.every(column => {
-                    column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
+                    column = this.$transformFieldProperty(column, row, this.parentObj);
                     return this.getRuleResult(column, row).bool;
                 })
             );
@@ -176,33 +172,12 @@ export default {
         },
 
         /* --------------- 工具方法 ------------- */
-        resetCol (col, row) {
-            let resetMap = {
-                select: {
-                    _optionKind: "dropdown"
-                },
-                checkbox: {
-                    _optionKind: "dropdown"
-                }
-            };
-            return {
-                ...col,
-                ...(resetMap[col._type] || {}),
-                // isShare: this.isShare,
-                _heightAuto: this.heightAuto
-            };
-        },
-        getUnitCanEdit (col, row) {
-            return this.getRowCanEdit(row) && this.getColCanEdit(col, row);
-        },
         getRowCanEdit (row) {
             return this.canEdit && // 是否是编辑状态
-            // (!this.disabledOldDataRow || !!this.createRowMap[row._id]) && // 是否让老数据行置灰
             (!this.disabledOldDataRow || !!row.__isCreate__); // 是否让老数据行置灰
         },
         getColCanEdit (col, row) {
-            return (!col.dependRowCanEdit || row.canEdit !== false) &&
-            (col._isRelyByParent ? true : this.$isAdvRelyShow(col, row, true)); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
+            return (!col.dependRowCanEdit || row.canEdit !== false);// 在老数据行里某些列不可编辑
         },
         isShowCompare (col, row, oldRow = {}) {
             return this.useCampare && ["number"].includes(col._type) &&