bri-components 1.3.25 → 1.3.27

package/package.json

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

package/src/components/controls/mixins/controlMixin.js

@@ -72,7 +72,7 @@ export default {
             },
             set (val) {
                 // 修复文本框clear后值为undefined，后端无法更新保存数据bug
-                if (["select"].includes(this.controlType) && this.value[this.controlKey] === undefined) {
+                if (["select"].includes(this.controlType) && val === undefined) {
                     val = "";
                 }
 

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

@@ -32,9 +32,12 @@
                         v-else
                         :canEdit="finalCanEdit"
                         :data="curVal"
-                        :treeColumns="treeColumns"
+                        :treeColumns="treeForm"
                         :subColumns="subForm"
-                        :propsObj="propsObj"
+                        :propsObj="{
+                            ...propsObj,
+                            _useCol: false
+                        }"
                         :parentFormList="allFormList"
                         :parentObj="value"
                         @change="change"
@@ -68,10 +71,9 @@
                     <dsh-cascader-table
                         v-else
                         ref="table"
-                        useCol
                         :canEdit="finalCanEdit"
                         :data="curVal"
-                        :treeColumns="treeColumns"
+                        :treeColumns="treeForm"
                         :subColumns="subForm"
                         :propsObj="propsObj"
                         :parentFormList="allFormList"
@@ -100,10 +102,9 @@
                         ></dsh-tree-table>
                         <dsh-cascader-table
                             v-else
-                            useCol
                             :canEdit="finalCanEdit"
                             :data="curVal"
-                            :treeColumns="treeColumns"
+                            :treeColumns="treeForm"
                             :subColumns="subForm"
                             :propsObj="propsObj"
                             :parentFormList="allFormList"
@@ -175,17 +176,18 @@
             subForm () {
                 return this.propsObj._subForm;
             },
-            treeForm () {
-                return this.propsObj._treeForm;
-            },
             // 用户态的每条数据的表头配置，都是存的自己的，不用通用配置_treeForm的
-            treeColumns () {
+            treeForm () {
                 return this.curVal && this.curVal._treeForm
                     ? this.curVal._treeForm
-                    : this.treeForm;
+                    : this.propsObj._treeForm;
+            },
+            isExport () {
+                return this.propsObj._isExport;
             },
+
             operationBtns () {
-                return this.propsObj._isExport
+                return this.isExport
                     ? ["canExport", "canEnlarge"]
                     : ["canEnlarge"];
             },

package/src/components/list/DshCascaderTable.vue

@@ -197,23 +197,15 @@
 </template>
 
 <script>
-    import DshListUnit from "../unit/DshListUnit.vue";
+    import tableBaseMixin from "./mixins/tableBaseMixin.js";
 
     export default {
         name: "DshCascaderTable",
-        components: {
-            DshListUnit
-        },
+        mixins: [
+            tableBaseMixin
+        ],
+        components: {},
         props: {
-            canEdit: {
-                type: Boolean,
-                default: true
-            },
-            useCol: {
-                type: Boolean,
-                default: false
-            },
-
             data: {
                 type: Object,
                 default () {
@@ -236,32 +228,10 @@
                 default () {
                     return [];
                 }
-            },
-            propsObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            },
-
-            parentFormList: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
-            parentObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
             }
         },
         data () {
             return {
-                showRuleMessage: false, // 显示校验文字
-                ruleRecordMap: {},
-
                 widthMap: this.$getModFieldPropertyMap("width"),
                 boxWidth: 0,
                 getColOperationNames (col) {
@@ -363,46 +333,28 @@
         computed: {
             selfPropsObj () {
                 return {
-                    // isShare: false, // 是否是分享页在用
-
-                    _showRequired: true, // 表头显示校验符号*
-                    _showDescription: true, // 表头显示提示
-                    _headHeightAuto: false, // 表头高度自适应
-                    _heightAuto: false, // 单元格高度自适应
-                    _disabledBtns: false, // 禁用增删按钮
-                    ...this.propsObj,
+                    _useCol: true,
+                    ...this.commonPropsObj,
 
                     _contentHeight: this.propsObj._contentHeight || 400 // 表格最大高度
                 };
             },
-            // isShare () {
-            //     return this.selfPropsObj.isShare;
-            // },
-            contentHeight () {
-                return this.selfPropsObj._contentHeight;
-            },
-            showRequired () {
-                return this.selfPropsObj._showRequired;
-            },
-            showDescription () {
-                return this.selfPropsObj._showDescription;
-            },
-            headHeightAuto () {
-                return this.selfPropsObj._headHeightAuto;
-            },
-            heightAuto () {
-                return this.selfPropsObj._heightAuto;
-            },
-            disabledBtns () {
-                return this.selfPropsObj._disabledBtns;
+            useCol () {
+                return this.selfPropsObj._useCol;
             },
 
             columns () {
                 return this.transformColumns(this.treeColumns);
             },
+            filterColumns () {
+                return this.columns.filter(col => col.colType === "data");
+            },
             treeData () {
                 return this.transforBriTreeData();
             },
+            listData () {
+                return this.rows;
+            },
             rows () {
                 return this.transformRows();
             },
@@ -456,16 +408,34 @@
                 };
                 loop(this.data.tree);
             },
-            // 共外部使用
-            validate () {
-                this.showRuleMessage = true;
-
-                const subColumns = this.columns.filter(col => col.colType === "data");
-                return this.rows.every((row, rowIndex) =>
-                    subColumns.every(col => this.getColRuleResult(col, row[col.nodeKey], rowIndex, true).bool)
-                );
+            // 整行校验结果
+            getRowRuleResult (row, rowIndex) {
+                this.filterColumns.every(col => this.getColRuleResult(col, row[col.nodeKey], rowIndex, true).bool);
+            },
+            // 单元格校验结果
+            getColRuleResult (col, row, rowIndex) {
+                if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
+                    return this.$getFieldRuleResult({
+                        ...col,
+                        _regStr: col._regStr && [";", "；"].some(symbol => col._regStr.includes(symbol))
+                            ? col._regStr
+                                .replace(/\n/g, "")
+                                .split(";")
+                                .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex]
+                            : col._regStr,
+                        _regMessage: col._regMessage && [";", "；"].some(symbol => col._regMessage.includes(symbol))
+                            ? col._regMessage
+                                .replace(/\n/g, "")
+                                .split(";")
+                                .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex]
+                            : col._regMessage
+                    }, row);
+                } else {
+                    return {
+                        bool: true
+                    };
+                }
             },
-
             // 点击表头
             clickTh (operationItem, col) {
                 this.$emit("clickTh", col);
@@ -586,30 +556,6 @@
             controlBlur (operationItem, col, row, params) {
                 this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
             },
-            // 是否显示 单元格校验提示文字
-            getColRuleResult (col, row, rowIndex, showRuleMessage = this.showRuleMessage) {
-                if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
-                    return this.$getFieldRuleResult({
-                        ...col,
-                        _regStr: col._regStr && [";", "；"].some(symbol => col._regStr.includes(symbol))
-                            ? col._regStr
-                                .replace(/\n/g, "")
-                                .split(";")
-                                .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex]
-                            : col._regStr,
-                        _regMessage: col._regMessage && [";", "；"].some(symbol => col._regMessage.includes(symbol))
-                            ? col._regMessage
-                                .replace(/\n/g, "")
-                                .split(";")
-                                .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex]
-                            : col._regMessage
-                    }, row);
-                } else {
-                    return {
-                        bool: true
-                    };
-                }
-            },
 
             /* ---- 工具方法 ---- */
             // 合并表头

package/src/components/list/DshFlatTable.vue

@@ -20,19 +20,16 @@
 </template>
 
 <script>
-    import DshFlatTableMixin from "./mixins/DshFlatTableMixin.js";
-    import tableMixin from "./mixins/tableMixin.js";
-    import DshListUnit from "../unit/DshListUnit.vue";
+    import tableBaseMixin from "./mixins/tableBaseMixin.js";
+    import flatTableMixin from "./mixins/flatTableMixin.js";
 
     export default {
         name: "DshFlatTable",
         mixins: [
-            DshFlatTableMixin,
-            tableMixin
+            tableBaseMixin,
+            flatTableMixin
         ],
-        components: {
-            DshListUnit
-        },
+        components: {},
         props: {},
         data () {
             return {};

package/src/components/list/DshTreeTable.vue

@@ -1,5 +1,16 @@
 <template>
     <div class="DshTreeTable">
+        <!-- 搜索条件 -->
+        <template v-if="searchFormList.length">
+            <dsh-default-search
+                :formList="searchFormList"
+                :initValue="[]"
+                :labelWidth="searchLabelWidth"
+                @change="searchCb"
+            ></dsh-default-search>
+        </template>
+
+        <!-- 表格 -->
         <bri-table
             class="DshTreeTable-main"
             :columns="showColumns"
@@ -13,30 +24,68 @@
 </template>
 
 <script>
-    import DshFlatTableMixin from "./mixins/DshFlatTableMixin.js";
-    import tableMixin from "./mixins/tableMixin.js";
-    import DshListUnit from "../unit/DshListUnit.vue";
+    import tableBaseMixin from "./mixins/tableBaseMixin.js";
+    import flatTableMixin from "./mixins/flatTableMixin.js";
 
     export default {
         name: "DshTreeTable",
         mixins: [
-            DshFlatTableMixin,
-            tableMixin
+            tableBaseMixin,
+            flatTableMixin
         ],
-        components: {
-            DshListUnit
-        },
+        components: {},
         props: {},
         data () {
-            return {};
+            return {
+                advSearchObj: {
+                    logic: "and",
+                    conditions: []
+                }
+            };
         },
         computed: {
+            isSearching () {
+                return this.searchFormList.length && this.advSearchObj.conditions.some(conditionItem => conditionItem.fieldValue.length);
+            },
             listData () {
-                return this.$getTreeFlatArr(this.data, "__isExpand__");
+                console.log("listData");
+                const treeData = this.getCalcuTree(this.data, this.filterColumns);
+                return this.$getTreeFlatArr(treeData, node =>
+                    (this.searchFormList.length ? this.$isAdvRelyAccord(this.advSearchObj, node) : true) &&
+                    (node.level === 1 || node.__isShow__)
+                );
+            },
+            footerData () {
+                console.log("footerData");
+                return this.useSummary && this.listData.length
+                    ? [
+                        this.filterColumns.reduce((obj, col) => {
+                            return {
+                                ...obj,
+                                [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                    ? this.$calNumList(
+                                        this.listData
+                                            .filter(item => item.level === 1)
+                                            .map(item => item[col._key]),
+                                        col._summaryType,
+                                        { ...col, _defaultDigit: 2 }
+                                    )
+                                    : (obj[col._key] || "--")
+                            };
+                        }, {
+                            _id: this.$ObjectID().str,
+                            __index__: "汇总",
+                            __isExpand__: "-",
+                            __operation__: "——"
+                        })
+                    ]
+                    : [];
             },
 
             selfPropsObj () {
                 return {
+                    _searchFields: [], // 作为搜索的字段
+                    _searchLabelWidth: 100, // 搜索的label宽度
                     ...this.commonPropsObj,
 
                     _maxLevel: this.commonPropsObj._maxLevel || 3
@@ -45,6 +94,21 @@
             maxLevel () {
                 return this.selfPropsObj._maxLevel;
             },
+            searchLabelWidth () {
+                return this.selfPropsObj._searchLabelWidth;
+            },
+            searchFormList () {
+                return this.selfPropsObj._searchFields
+                    .map(fieldKey => this.columns.find(column => column._key === fieldKey))
+                    .filter(column => !!column)
+                    .map(column => {
+                        return {
+                            ...column,
+                            _span: 6
+                        };
+                });
+            },
+
             tablePropsObj () {
                 return {
                     maxHeight: this.contentHeight,
@@ -76,6 +140,9 @@
                     }
                 };
             },
+            filterColumns () {
+                return this.columns;
+            },
             showColumns () {
                 return [
                     ...(this.useSelection === true ? [this.selectionColumn] : []),
@@ -137,7 +204,7 @@
                             }, row.__treeIndex__),
 
                             // 添加符
-                            row.level < this.maxLevel
+                            row.level < this.maxLevel && !this.isSearching
                                 ? h("div", {
                                     style: {
                                         position: "absolute",
@@ -164,21 +231,7 @@
                                         },
                                         on: {
                                             click: () => {
-                                                // 新增行里的输入框，第一次输入会失去光标的bug，需要$set
-                                                const rowDefault = this.$deepCopy(this.rowDefault);
-                                                this.columns.forEach(column => {
-                                                    // 用$set也可以
-                                                    rowDefault[column._key] = rowDefault[column._key];
-                                                });
-
-                                                row.children.push({
-                                                    _id: this.$ObjectID().str,
-                                                    level: row.level + 1,
-                                                    children: [],
-                                                    ...rowDefault
-                                                });
-
-                                                this.toggleExpand(row, true);
+                                                this.clickCreate(this.operationMap.canCreate, row, rowIndex);
                                             }
                                         }
                                     })
@@ -191,13 +244,115 @@
         },
         created () {},
         methods: {
+            // 默认筛选回调
+            searchCb (conditions) {
+                this.advSearchObj = {
+                    ...this.advSearchObj,
+                    conditions: conditions
+                };
+            },
             toggleExpand (row, bool = true) {
+                this.$set(row, "__isRendered__", true);
+
                 this.$set(row, "__isExpand__", bool);
+                row.children.forEach(subRow => {
+                    this.$set(subRow, "__isShow__", bool);
+                });
+            },
+            // 点击 -添加一行
+            clickCreate (operationItem, row, rowIndex) {
+                row.children.push({
+                    _id: this.$ObjectID().str,
+                    ...this.$deepCopy(this.rowDefault),
+                    level: row.level + 1,
+                    isLeaf: true,
+                    children: []
+                });
+
+                this.toggleExpand(row, true);
+            },
+            // 点击 -删除行
+            clickDelete (operationItem, row, rowIndex) {
+                const parentNode = this.getParentNode(this.data, row);
+                const index = parentNode.children.findIndex(childNode => childNode._id === row._id);
+                parentNode.children.splice(index, 1);
+                console.log(index);
+                console.log(parentNode);
+                // this.$Modal.confirm({
+                //     title: "警告",
+                //     content: "确定删除吗？",
+                //     onOk: () => {
 
-                // this.$set(row, "__isRendered__", true);
-                // row.children.forEach(subRow => {
-                //     this.$set(subRow, "__isShow__", bool);
+                //     }
                 // });
+            },
+
+            getCalcuTree (tree = [], columns) {
+                const loop = (list = []) =>
+                    list.reduce((newList, node) => {
+                        if (node.children && node.children.length) {
+                            node.isLeaf = false;
+
+                            node.children = loop(node.children);
+                            columns.reduce((newNode, col) => {
+                                newNode[col._key] = col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                    ? this.$calNumList(
+                                        node.children.map(subNode => subNode[col._key]),
+                                        col._summaryType,
+                                        { ...col, _defaultDigit: 2 },
+                                        false
+                                    )
+                                    : newNode[col._key];
+                                // this.$set(
+                                //     newNode,
+                                //     col._key,
+                                //     col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                //         ? this.$calNumList(
+                                //             node.children.map(subNode => subNode[col._key]),
+                                //             col._summaryType,
+                                //             { ...col, _defaultDigit: 2 },
+                                //             false
+                                //         )
+                                //         : newNode[col._key]
+                                // );
+
+                                return newNode;
+                            }, node);
+                        } else {
+                            node.isLeaf = true;
+                        }
+
+                        return [
+                            ...newList,
+                            node
+                        ];
+                    }, []);
+
+                return loop(tree);
+            },
+            getParentNode (tree = [], curNode) {
+                if (curNode.level === 1) {
+                    return {
+                        children: tree
+                    };
+                } else {
+                    let parentNode;
+
+                    const loop = (list = []) => {
+                        return list.some(node => {
+                            if (node.level === curNode.level - 1) {
+                                const isExist = node.children.some(childNode => childNode._id === curNode._id);
+                                parentNode = node;
+                                return isExist;
+                            } else {
+                                return loop(node.children);
+                            }
+                        });
+                    };
+
+                    loop(tree);
+                    return parentNode;
+                }
             }
         }
     };

package/src/components/list/mixins/{tableMixin.js → flatTableMixin.js}

@@ -1,31 +1,70 @@
 export default {
     mixins: [],
     components: {},
-    props: {},
+    props: {
+        columns: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        data: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        oldData: {
+            type: Array,
+            default () {
+                return [];
+            }
+        }
+    },
+    model: {
+        prop: "data",
+        event: "change"
+    },
     data () {
         return {};
     },
     computed: {
+        listData () {
+            this.data.forEach(item => {
+                !item._id && this.$set(item, "_id", this.$ObjectID().str);
+            });
+            return this.data;
+        },
+        oldListData () {
+            this.oldData.forEach(item => {
+                !item._id && this.$set(item, "_id", this.$ObjectID().str);
+            });
+            return this.oldData;
+        },
+        useCampare () {
+            return !!this.oldListData.length;
+        },
         footerData () {
-            if (this.useSummary && this.listData.length) {
-                return [
+            return this.useSummary && this.listData.length
+                ? [
                     this.filterColumns.reduce((obj, col) => {
                         return {
                             ...obj,
-                            [col._key]: col._type === "number"
-                                ? this.$calNumList(this.listData.map(item => item[col._key]), col._summaryType, { ...col, _defaultDigit: 2 })
+                            [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                ? this.$calNumList(
+                                    this.listData.map(item => item[col._key]),
+                                    col._summaryType,
+                                    { ...col, _defaultDigit: 2 }
+                                )
                                 : (obj[col._key] || "--")
                         };
                     }, {
                         _id: this.$ObjectID().str,
                         __index__: "汇总",
-                        __isExpand__: "-",
                         __operation__: "——"
                     })
-                ];
-            } else {
-                return [];
-            }
+                ]
+                : [];
         },
 
         tablePropsObj () {
@@ -47,19 +86,10 @@ export default {
                 ...this.commonPropsObj
             };
         },
-        showRequired () {
-            return this.selfPropsObj._showRequired;
-        },
-        showDescription () {
-            return this.selfPropsObj._showDescription;
-        },
-        headHeightAuto () {
-            return this.selfPropsObj._headHeightAuto;
-        },
-        heightAuto () {
-            return this.selfPropsObj._heightAuto;
-        },
 
+        filterColumns () {
+            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
+        },
         showColumns () {
             return [
                 ...(this.useSelection === true ? [this.selectionColumn] : []),
@@ -218,17 +248,21 @@ export default {
                     disabled: false,
                     event: "clickDelete"
                 },
-                // expand: {
-                //     name: "展开",
-                //     type: "expand",
-                //     event: "clickExpand"
-                // },
                 changeVal: {
                     name: "改变输入框值",
                     type: "changeVal",
                     event: "changeVal"
                 }
             };
+        },
+        operationMap () {
+            return this.canEdit
+                ? this.$categoryMapToMap(
+                    this.allOperationMap,
+                    null,
+                    this.disabledBtns ? ["canCreate", "canDelete"] : []
+                )
+                : {};
         }
     },
     created () { },
@@ -246,6 +280,18 @@ export default {
 
             this.change("createRow", null, newRow, newRowIndex);
         },
+        // 点击 -删除行
+        clickDelete (operationItem, row, rowIndex, list) {
+            this.$Modal.confirm({
+                title: "警告",
+                content: "确定删除吗？",
+                onOk: () => {
+                    list.splice(rowIndex, 1);
+
+                    this.change("deleteRow", null, row, rowIndex);
+                }
+            });
+        },
         changeSelect (list) {
             this.$emit("changeSelect", list);
         },
@@ -258,6 +304,9 @@ export default {
         controlBlur (operationItem, col, row, params) {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
         },
+        change (...params) {
+            this.$emit("change", { list: this.listData, rowDefault: this.rowDefault }, ...params);
+        },
 
         resetCol (col, row) {
             let resetMap = {
@@ -274,6 +323,11 @@ export default {
                 // isShare: this.isShare,
                 _heightAuto: this.heightAuto
             };
+        },
+        isShowCompare (col, row, oldRow = {}) {
+            return this.useCampare && ["number"].includes(col._type) &&
+                !(this.$isEmptyData(row[col._key]) && this.$isEmptyData(oldRow[col._key])) &&
+                row[col._key] !== oldRow[col._key];
         }
     }
 };

package/src/components/list/mixins/{DshFlatTableMixin.js → tableBaseMixin.js}

@@ -1,29 +1,15 @@
+import DshListUnit from "../../unit/DshListUnit.vue";
+
 export default {
     mixins: [],
-    components: {},
+    components: {
+        DshListUnit
+    },
     props: {
         canEdit: {
             type: Boolean,
             default: true
         },
-        columns: {
-            type: Array,
-            default () {
-                return [];
-            }
-        },
-        data: {
-            type: Array,
-            default () {
-                return [];
-            }
-        },
-        oldData: {
-            type: Array,
-            default () {
-                return [];
-            }
-        },
         rowDefault: {
             type: Object,
             default () {
@@ -50,10 +36,6 @@ export default {
             }
         }
     },
-    model: {
-        prop: "data",
-        event: "change"
-    },
     data () {
         return {
             showRuleMessage: false, // 显示校验文字
@@ -61,22 +43,6 @@ export default {
         };
     },
     computed: {
-        listData () {
-            this.data.forEach(item => {
-                !item._id && this.$set(item, "_id", this.$ObjectID().str);
-            });
-            return this.data;
-        },
-        oldListData () {
-            this.oldData.forEach(item => {
-                !item._id && this.$set(item, "_id", this.$ObjectID().str);
-            });
-            return this.oldData;
-        },
-        useCampare () {
-            return !!this.oldListData.length;
-        },
-
         commonPropsObj () {
             return {
                 // isShare: false, // 是否是分享页在用
@@ -102,6 +68,18 @@ export default {
         contentHeight () {
             return this.selfPropsObj._contentHeight;
         },
+        showRequired () {
+            return this.selfPropsObj._showRequired;
+        },
+        showDescription () {
+            return this.selfPropsObj._showDescription;
+        },
+        headHeightAuto () {
+            return this.selfPropsObj._headHeightAuto;
+        },
+        heightAuto () {
+            return this.selfPropsObj._heightAuto;
+        },
         useSelection () {
             return this.selfPropsObj._useSelection;
         },
@@ -121,22 +99,8 @@ export default {
             return this.selfPropsObj._disabledOldDataRow;
         },
 
-        filterColumns () {
-            console.log(this.listData);
-            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
-        },
         selfRowDefault () {
             return this.$filterObj(this.filterColumns, this.rowDefault);
-        },
-
-        operationMap () {
-            return this.canEdit
-                ? this.$categoryMapToMap(
-                    this.allOperationMap,
-                    null,
-                    this.disabledBtns ? ["canCreate", "canDelete"] : []
-                )
-                : {};
         }
     },
     created () { },
@@ -145,14 +109,14 @@ export default {
         validate () {
             this.showRuleMessage = true;
 
-            return this.listData.every(row => this.getRowRuleResult(row));
+            return this.listData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
         },
         // 整行校验结果
-        getRowRuleResult (row) {
-            return this.filterColumns.every(column => this.getColRuleResult(column, row).bool);
+        getRowRuleResult (row, rowIndex) {
+            return this.filterColumns.every(column => this.getColRuleResult(column, row, rowIndex).bool);
         },
         // 单元格校验结果
-        getColRuleResult (col, row) {
+        getColRuleResult (col, row, rowIndex) {
             col = this.$transformFieldProperty(col, row, this.parentObj);
             if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                 return this.$getFieldRuleResult(col, row);
@@ -163,39 +127,21 @@ export default {
             }
         },
 
-        // 点击 -删除行
-        clickDelete (operationItem, row, rowIndex, list) {
-            this.$Modal.confirm({
-                title: "警告",
-                content: "确定删除吗？",
-                onOk: () => {
-                    list.splice(rowIndex, 1);
-
-                    this.change("deleteRow", null, row, rowIndex);
-                }
-            });
-        },
-        change (...params) {
-            this.$emit("change", { list: this.listData, rowDefault: this.rowDefault }, ...params);
-        },
-
         /* --------------- 工具方法 ------------- */
         getRowCanEdit (row) {
-            return this.canEdit && // 是否是编辑状态
-            (this.disabledOldDataRow ? !!row.__isCreate__ : true); // 是否让老数据行置灰
+            return this.canEdit && ( // 是否是编辑状态
+                this.disabledOldDataRow ? !!row.__isCreate__ : true); // 是否让老数据行置灰
         },
         getColCanEdit (col, row) {
-            return col.dependRowCanEdit ? row.canEdit !== false : true;// 在老数据行里某些列不可编辑
+            return (col.dependRowCanEdit ? row.canEdit !== false : true) && // 在老数据行里某些列不可编辑
+                col._enterType !== "calculate" && // 计算的不可编辑
+                col._readonly !== true && // 不能为只读
+            (["number"].includes(col._type) && ![undefined, null, "", "no"].includes(col._summaryType) ? row.isLeaf !== false : true); // 级联表格 -“需要计的数字列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
         },
         getUnitCanEdit (col, row) {
             return this.getRowCanEdit(row) &&
                 this.getColCanEdit(col, row) &&
                 this.$isAdvRelyShow(col, row, this.parentObj, true);
-        },
-        isShowCompare (col, row, oldRow = {}) {
-            return this.useCampare && ["number"].includes(col._type) &&
-                !(this.$isEmptyData(row[col._key]) && this.$isEmptyData(oldRow[col._key])) &&
-                row[col._key] !== oldRow[col._key];
         }
     }
 };

package/src/styles/reset-iview-other.less

@@ -38,8 +38,4 @@
 .ivu-select-dropdown:not(.ivu-cascader-transfer) {
     max-width: 420px;
     max-height: 300px;
-}
-
-.ivu-cascader-menu {
-    max-width: 350px;
 }