bri-components 1.6.12 → 1.6.14

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

@@ -442,9 +442,17 @@ export default {
             };
         },
 
+        // 新增数据状态
+        isCreateStatus () {
+            return this.parentObj.__isCreate__ === true;
+        },
+        // 表格行可增删状态
+        isRowCDStatus () {
+            return this.isCreateStatus;
+        },
         // 是否筛选状态
         isSearching () {
-            return this.parentObj.__isCreate__ === true
+            return this.isRowCDStatus
                 ? false
                 : this.$isAdvSearching(this.finalTableAdvSearch);
         },
@@ -692,7 +700,7 @@ export default {
                             : dftVal
                         : dftInRowVal
                 });
-            }, {});
+            }, this.$deepCopy(this.rowDefault));
         },
         parentDataId () {
             return this.parentObj._id;
@@ -761,8 +769,7 @@ export default {
                     ...(
                         this.canEdit
                             ? [
-                                ...(this.disabledBtns ? [] : this.baseOperationBtns.filter(btn => !["canMoveUp", "canMoveDown"].includes(btn))),
-                                ...(this.useMoveBtns ? ["canMoveUp", "canMoveDown"] : []),
+                                ...(this.disabledBtns ? [] : this.baseOperationBtns.filter(btn => ["canMoveUp", "canMoveDown"].includes(btn) ? this.useMoveBtns : true)),
                                 ...this.otherOperationBtns,
                                 ...(this.isQuote ? ["canQuote"] : []),
                                 ...(this.isImport ? ["canImport"] : [])
@@ -852,7 +859,7 @@ export default {
 
         // 筛选回调
         searchCb (conditions) {
-            if (this.parentObj.__isCreate__ !== true) {
+            if (!this.isRowCDStatus) {
                 this.isExpandAction = false;
                 this.dftAdvSearch.conditions = conditions;
 
@@ -868,11 +875,13 @@ export default {
         // 输入框失去焦点
         controlBlur (operationItem, row, rowIndex, column, params) {
             this.dealRuleRecord(row, column);
+            this.dealOtherColRuleRecord(row, column);
         },
         // 输入框值改变立即
         quickChangeVal (operationItem, row, rowIndex, column, params) {
             if (["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
                 this.dealRuleRecord(row, column);
+                this.dealOtherColRuleRecord(row, column);
                 this.change("quickChangeVal", row, rowIndex, column, ...params);
             }
         },
@@ -880,6 +889,7 @@ export default {
         changeVal (operationItem, row, rowIndex, column, params) {
             if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._type)) {
                 this.dealRuleRecord(row, column);
+                this.dealOtherColRuleRecord(row, column);
                 this.change("changeVal", row, rowIndex, column, ...params);
             }
         },
@@ -1132,7 +1142,7 @@ export default {
             };
         },
         topSummaryRender (h) {
-            return this.searchFormList.length
+            return this.searchFormList.length && !this.isRowCDStatus
                 ? h("div", {
                     style: {
                         "display": "flex",
@@ -1199,7 +1209,7 @@ export default {
             });
         },
         topSearchRender (h) {
-            return this.searchFormList.length
+            return this.searchFormList.length && !this.isRowCDStatus
                 ? h("dsh-default-search", {
                     props: {
                         formList: this.searchFormList,
@@ -1323,9 +1333,9 @@ export default {
             const operationList = this.rowOperationList.map(btnItem => ({
                 ...btnItem,
                 disabled: btnItem.type === "canMoveUp"
-                    ? !(this.getRowDelBtnCanEdit(row, rowIndex) && ["last", "center"].includes(row.__position__))
+                    ? !(this.getRowMoveBtnCanEdit(row, rowIndex) && ["last", "center"].includes(row.__position__))
                     : btnItem.type === "canMoveDown"
-                        ? !(this.getRowDelBtnCanEdit(row, rowIndex) && ["first", "center"].includes(row.__position__))
+                        ? !(this.getRowMoveBtnCanEdit(row, rowIndex) && ["first", "center"].includes(row.__position__))
                         : btnItem.type === "canDelete"
                             ? !this.getRowDelBtnCanEdit(row, rowIndex)
                             : btnItem.disabled
@@ -1352,76 +1362,76 @@ export default {
 
             return [
                 // 插入一行图标
-                baseBool
-                    ? this.getOperationIconRender(h, { row, rowIndex, column }, "canInsert", iconSize, ++sortNum)
+                baseBool && this.operationMap.canInsert && this.operationMap.canInsert.disabled !== true
+                    ? this.getOperationIconRender(h, { row, rowIndex, column }, this.operationMap.canInsert, iconSize, ++sortNum)
                     : h("span", ""),
 
-                // 添加一行下级图标
-                baseBool && ["treeTable"].includes(this.inTableType) && row.level < this.maxLevel // 只有层级表格要“添加下级”图标
-                    ? this.getOperationIconRender(h, { row, rowIndex, column }, "canCreateChild", iconSize, ++sortNum)
+                // 添加一行下级图标 (只有层级表格要“添加下级”图标)
+                baseBool && this.operationMap.canCreateChild && this.operationMap.canCreateChild.disabled !== true &&
+                    ["treeTable"].includes(this.inTableType) && row.level < this.maxLevel
+                    ? this.getOperationIconRender(h, { row, rowIndex, column }, this.operationMap.canCreateChild, iconSize, ++sortNum)
                     : h("span", ""),
 
-                // 删除该行图标
-                baseBool && ["cascaderTable"].includes(this.inTableType) && this.getRowDelBtnCanEdit(row, rowIndex)
-                    ? this.getOperationIconRender(h, { row, rowIndex, column }, "canDelete", iconSize, ++sortNum)
+                // 删除该行图标（得有删除能力）
+                baseBool && this.operationMap.canDelete && this.operationMap.canDelete.disabled !== true &&
+                    ["cascaderTable"].includes(this.inTableType) && this.getRowDelBtnCanEdit(row, rowIndex)
+                    ? this.getOperationIconRender(h, { row, rowIndex, column }, this.operationMap.canDelete, iconSize, ++sortNum)
                     : h("span", ""),
 
                 // 下移图标
-                baseBool && !this.useMoveInOperationCol && this.getRowDelBtnCanEdit(row, rowIndex) && ["first", "center"].includes(row.__position__)
-                    ? this.getOperationIconRender(h, { row, rowIndex, column }, "canMoveDown", iconSize, ++sortNum)
+                baseBool && this.operationMap.canMoveDown && this.operationMap.canMoveDown.disabled !== true &&
+                    !this.useMoveInOperationCol && this.getRowMoveBtnCanEdit(row, rowIndex) && ["first", "center"].includes(row.__position__)
+                    ? this.getOperationIconRender(h, { row, rowIndex, column }, this.operationMap.canMoveDown, iconSize, ++sortNum)
                     : h("span", ""),
 
                 // 上移图标
-                baseBool && !this.useMoveInOperationCol && this.getRowDelBtnCanEdit(row, rowIndex) && ["last", "center"].includes(row.__position__)
-                    ? this.getOperationIconRender(h, { row, rowIndex, column }, "canMoveUp", iconSize, ++sortNum)
+                baseBool && this.operationMap.canMoveUp && this.operationMap.canMoveUp.disabled !== true &&
+                    !this.useMoveInOperationCol && this.getRowMoveBtnCanEdit(row, rowIndex) && ["last", "center"].includes(row.__position__)
+                    ? this.getOperationIconRender(h, { row, rowIndex, column }, this.operationMap.canMoveUp, iconSize, ++sortNum)
                     : h("span", "")
             ];
         },
-        getOperationIconRender (h, { row, rowIndex, column }, operationType, iconSize = 14, sortNum = 0) {
-            const operationItem = this.operationMap[operationType];
-
-            return operationItem && operationItem.disabled !== true
-                ? h("div", {
-                    class: `dsh-color-border-${operationItem.btnType.includes("error") ? "error" : "primary"}${operationItem.triggerType === "hover" ? " dsh-tr-hover-show" : ""}`,
-                    style: {
-                        position: "absolute",
-                        bottom: "0px",
-                        right: `${(iconSize + 3) * sortNum}px`,
-                        width: `${iconSize + 2}px`,
-                        height: `${iconSize + 2}px`,
-                        borderRadius: "2px",
-                        backgroundColor: "#ffffff",
-                        lineHeight: `${iconSize - 2}px`,
-                        cursor: "pointer",
-                        verticalAlign: "middle",
-                        transition: "color .2s ease-in-out,border-color .2s ease-in-out"
+        getOperationIconRender (h, { row, rowIndex, column }, operationItem, iconSize = 14, sortNum = 0) {
+            return h("div", {
+                class: `dsh-color-border-${operationItem.btnType.includes("error") ? "error" : "primary"}${operationItem.triggerType === "hover" ? " dsh-tr-hover-show" : ""}`,
+                style: {
+                    position: "absolute",
+                    bottom: "0px",
+                    right: `${(iconSize + 3) * sortNum}px`,
+                    width: `${iconSize + 2}px`,
+                    height: `${iconSize + 2}px`,
+                    borderRadius: "2px",
+                    backgroundColor: "#ffffff",
+                    lineHeight: `${iconSize - 2}px`,
+                    cursor: "pointer",
+                    verticalAlign: "middle",
+                    transition: "color .2s ease-in-out,border-color .2s ease-in-out"
+                }
+            }, [
+                h("Tooltip", {
+                    props: {
+                        content: operationItem.tip,
+                        maxWidth: "250",
+                        transfer: true
                     }
                 }, [
-                    h("Tooltip", {
+                    h("Icon", {
+                        class: `dsh-color-${operationItem.btnType.includes("error") ? "error" : "primary"}`,
+                        style: {
+                            fontWeight: "500"
+                        },
                         props: {
-                            content: operationItem.tip,
-                            maxWidth: "250",
-                            transfer: true
-                        }
-                    }, [
-                        h("Icon", {
-                            class: `dsh-color-${operationItem.btnType.includes("error") ? "error" : "primary"}`,
-                            style: {
-                                fontWeight: "500"
-                            },
-                            props: {
-                                type: operationItem.icon,
-                                size: iconSize
-                            },
-                            on: {
-                                click: () => {
-                                    this.$dispatchEvent(operationItem, row, rowIndex, column);
-                                }
+                            type: operationItem.icon,
+                            size: iconSize
+                        },
+                        on: {
+                            click: () => {
+                                this.$dispatchEvent(operationItem, row, rowIndex, column);
                             }
-                        })
-                    ])
+                        }
+                    })
                 ])
-                : h("span", "");
+            ]);
         },
         bodyCellClass ({ row, rowIndex, column }) {
             return "bri-table-td" +
@@ -1465,7 +1475,7 @@ export default {
         },
 
         /* ----------- 方法 ---------- */
-        // 整行校验结果
+        // 校验-整行结果
         getRowRuleResult (row, rowIndex) {
             // return this.usedColumns.every(column => this.getColRuleResult({ row, rowIndex, column }).bool);
 
@@ -1482,36 +1492,7 @@ export default {
 
             return bool;
         },
-        getRowFormList (row, rowIndex) {
-            return this.selfColumns.map(column => {
-                column = this.$transformDynamicProperty(column, row, this.parentObj);
-                const unitCanEdit = this.getColCanEdit({ row, rowIndex, column });
-
-                return {
-                    ...column,
-                    canEdit: unitCanEdit
-                };
-            });
-        },
-        // 是否默认行
-        getIsDftRow (row, rowIndex) {
-            return this.isDftSet ? false : row.__isDefault__;
-        },
-        // 行按钮是否可操作（删除按钮可编辑 不代表行内容是可编辑的）
-        getRowDelBtnCanEdit (row, rowIndex) {
-            return row.__readonly__ !== true && // 不能为只读数据
-                (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
-        },
-        // 行内容是否可编辑
-        getRowCanEdit (row, rowIndex) {
-            return this.canEdit && // 是编辑状态
-                (this.getIsDftRow(row) ? !this.dftReadonly : true) && // 默认数据可编辑
-                (row.__old__ === true ? !this.oldReadonly : true) && // 老数据可编辑
-                row.__readonly__ !== true; // 不能为只读数据
-        },
-
-        // 单元格校验结果
+        // 校验-单元格结果
         getColRuleResult ({ row, rowIndex, column }) {
             column = this.$transformDynamicProperty(column, row, this.parentObj);
 
@@ -1524,7 +1505,7 @@ export default {
                     message: "未触发校验，通过!"
             };
         },
-        // 获取单元格校验对象
+        // 校验-获取单元格校验对象
         getColRuleResultObj ({ row, rowIndex, column }) {
             // 校验必填不通过 => 校验对比
             const resultObj = {};
@@ -1534,7 +1515,32 @@ export default {
 
             return resultObj;
         },
-        // 加工单元格对应的配置
+
+        // 行-是否是默认行
+        getIsDftRow (row, rowIndex) {
+            return this.isDftSet ? false : row.__isDefault__;
+        },
+        // 行-删除按钮是否可操作（删除按钮可编辑 不代表行内容是可编辑的）
+        getRowDelBtnCanEdit (row, rowIndex) {
+            return row.__readonly__ !== true && // 只读数据不可删除
+                (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据不可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据不可删除
+        },
+        // 行-移动按钮是否可操作
+        getRowMoveBtnCanEdit (row, rowIndex) {
+            return row.__readonly__ !== true && // 只读数据不可删除
+                (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据不可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据不可删除
+        },
+        // 行-内容是否可编辑
+        getRowCanEdit (row, rowIndex) {
+            return this.canEdit && // 是编辑状态
+                (this.getIsDftRow(row) ? !this.dftReadonly : true) && // 默认数据可编辑
+                (row.__old__ === true ? !this.oldReadonly : true) && // 老数据可编辑
+                row.__readonly__ !== true; // 不能为只读数据
+        },
+
+        // 单元格-对应的配置
         getResetCol ({ row, rowIndex, column }) {
             return {
                 // isShare: this.isShare,
@@ -1552,13 +1558,13 @@ export default {
                 )
             };
         },
-        // 单元格最终是否可编辑性
+        // 单元格-最终是否可编辑性
         getUnitCanEdit ({ row, rowIndex, column }) {
             return this.getRowCanEdit(row, rowIndex) &&
                 this.getColCanEdit({ row, rowIndex, column }) &&
                 this.$isAdvRelyShow(column, row, this.parentObj, true);
         },
-        // 单元格本身是否可编辑性
+        // 单元格-本身是否可编辑性
         getColCanEdit ({ row, rowIndex, column }) {
             return (this.getIsDftRow(row) ? !this.dftReadonlyColKeys.includes(column._key) : true) && // 默认行的某列是否可编辑
                 (row.__old__ === true ? !this.oldReadonlyColKeys.includes(column._key) : true) && // 老数据行里某些列不可编辑
@@ -1603,7 +1609,7 @@ export default {
                     row._id = this.$ObjectID().str;
                 }
 
-                row.__old__ = this.isDftSet ? false : this.parentObj.__isCreate__ !== true; // 标记老数据
+                row.__old__ = this.isDftSet ? false : !this.isCreateStatus; // 标记老数据
                 row.__isDefault__ = this.isDftSet ? true : !!row.__isDefault__; // 标记默认数据（配置端默认值）
 
                 // 初次进来 把关于展示的状态值全部清除（只有层级表在用，按理说应放在DshTreeTableMixin.js，但为了清除三大表格的老数据，才放在这）
@@ -1651,10 +1657,24 @@ export default {
         getMixKey (row, column, splitStr = "--") {
             return `${row._id}${splitStr}${column._key}`;
         },
-        // 更新校验显示的标记
+        // 校验显示映射上 添加上某单元格的
         dealRuleRecord (row, column) {
-            // this.$set(this.ruleRecordMap, this.getMixKey(row, column), true);
-            this.ruleRecordMap[this.getMixKey(row, column)] = true;
+            this.$set(this.ruleRecordMap, this.getMixKey(row, column), true);
+            // this.ruleRecordMap[this.getMixKey(row, column)] = true;
+        },
+        // 校验显示映射上 添加上某单元格有牵扯的单元格s
+        dealOtherColRuleRecord (row, column) {
+            this.usedColumns.forEach(otherCol => {
+                if (
+                    // (otherCol._saveRuleConfigs && otherCol._saveRuleConfigs.length) ||
+                    (otherCol._saveRuleConfigs && otherCol._saveRuleConfigs.some(item => item._fieldKey === column._key)) ||
+                    (otherCol._dynamicRules && otherCol._dynamicRules.some(item => this.$getConditionFields(item._advRely).includes(column._key))) ||
+                    (otherCol._dynamicRule && otherCol._dynamicRule.some(item => this.$getConditionFields(item._advRely).includes(column._key)))
+                ) {
+                    // this.$set(this.ruleRecordMap, this.getMixKey(row, otherCol), true);
+                    this.ruleRecordMap[this.getMixKey(row, otherCol)] = true;
+                }
+            });
         }
     }
 };

package/src/styles/components/DshModal.less

@@ -62,6 +62,13 @@
     &-default {
         .ivu-modal-wrap {
             .ivu-modal {
+                margin: 0px auto;
+                position: absolute;
+                top: 160px;
+                bottom: 0px;
+                left: 0px;
+                right: 0px;
+
                 width: 750px !important;
                 height: 550px !important;
                 max-height: 100%;
@@ -190,26 +197,26 @@
                     height: 100%;
                     display: flex;
                     flex-direction: column;
-    
+
                     .DshModal-close,
                     .ivu-modal-close {
                         top: 20px;
                         right: 24px;
                         color: @contentColor;
                         font-size: @smallTitleSize;
-    
+
                         .ivu-icon-ios-close {
                             font-size: 22px;
                             color: @contentColor;
                         }
                     }
-    
+
                     .ivu-modal-header {
                         width: 100%;
                         height: 48px;
                         padding: 16px 24px 8px 24px;
                         // border-bottom: none;
-    
+
                         &-inner {
                             color: rgba(0, 0, 0, 0.9);
                             font-size: 16px;
@@ -218,7 +225,7 @@
                             height: 24px;
                         }
                     }
-    
+
                     .ivu-modal-body {
                         flex: 1;
                         overflow: auto;
@@ -228,13 +235,13 @@
             }
         }
     }
-    
+
     #bri-modal-common();
 
     // 小框 无固定高度，上下居中
     &-center {
         #bri-modal-common();
-    
+
         .ivu-modal-wrap {
             width: 100%;
             height: 100%;
@@ -242,16 +249,16 @@
             flex-direction: column;
             align-items: center;
             justify-content: center;
-    
+
             .ivu-modal {
                 top: 0px;
             }
         }
     }
-    
+
     // modal内部公用样式
     &-footer {
         text-align: right;
         margin-top: 16px;
     }
-}
+}