bri-components 1.3.96 → 1.3.98

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

@@ -96,48 +96,6 @@ export default {
             isEnlarge: false,
             isEnlargeFlag: true, // 为重渲染膜态框内容而用
 
-            topOperationMap: {
-                canHideOrShow: {
-                    name: "显示/隐藏字段",
-                    type: "canHideOrShow",
-                    // icon: "md-share-alt",
-                    size: "small",
-                    btnType: "text",
-                    event: "toggleHideOrShow"
-                },
-                canQuote: {
-                    name: "引用",
-                    type: "canQuote",
-                    icon: "ios-copy",
-                    size: "small",
-                    btnType: "text",
-                    event: "clickQuote"
-                },
-                canImport: {
-                    name: "导入",
-                    type: "canImport",
-                    icon: "ios-create-outline",
-                    size: "small",
-                    btnType: "text",
-                    event: "clickImport"
-                },
-                canExport: {
-                    name: "导出",
-                    type: "canExport",
-                    icon: "md-share-alt",
-                    size: "small",
-                    btnType: "text",
-                    event: "clickExport"
-                },
-                canEnlarge: {
-                    name: "全屏展示",
-                    type: "canEnlarge",
-                    icon: "md-expand",
-                    size: "small",
-                    btnType: "text",
-                    event: "clickEnlarge"
-                }
-            },
             baseOperationMap: {
                 canCreate: {
                     name: "添加一行",
@@ -179,12 +137,56 @@ export default {
                     color: "#E83636",
                     disabled: false,
                     event: "clickDeleteChilds"
-                },
+                }
+            },
+            otherOperationMap: {
                 changeVal: {
                     name: "改变输入框值",
                     type: "changeVal",
                     event: "changeVal"
                 }
+            },
+            topOperationMap: {
+                canHideOrShow: {
+                    name: "显示/隐藏字段",
+                    type: "canHideOrShow",
+                    // icon: "md-share-alt",
+                    size: "small",
+                    btnType: "text",
+                    event: "toggleHideOrShow"
+                },
+                canQuote: {
+                    name: "引用",
+                    type: "canQuote",
+                    icon: "ios-copy",
+                    size: "small",
+                    btnType: "text",
+                    event: "clickQuote"
+                },
+                canImport: {
+                    name: "导入",
+                    type: "canImport",
+                    icon: "ios-create-outline",
+                    size: "small",
+                    btnType: "text",
+                    event: "clickImport"
+                },
+                canExport: {
+                    name: "导出",
+                    type: "canExport",
+                    icon: "md-share-alt",
+                    size: "small",
+                    btnType: "text",
+                    event: "clickExport"
+                },
+                canEnlarge: {
+                    name: "全屏展示",
+                    type: "canEnlarge",
+                    icon: "md-expand",
+                    size: "small",
+                    btnType: "text",
+                    event: "clickEnlarge"
+                }
             }
         };
     },
@@ -201,6 +203,10 @@ export default {
         controlKey () {
             return this.propsObj._key;
         },
+        // 是否在设置默认值下
+        isDftSet () {
+            return this.controlKey === "_default";
+        },
         controlType () {
             return this.propsObj._type;
         },
@@ -216,15 +222,6 @@ export default {
         allScreenKey () {
             return this.propsObj.allScreenKey;
         },
-        selfColumns () {
-            return this.columns;
-        },
-        mergeRowColumns () {
-            return this.selfColumns.filter(column => column._mergeRow === true);
-        },
-        filterColumns () {
-            return this.selfColumns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
-        },
 
         commonPropsObj () {
             return {
@@ -239,13 +236,17 @@ export default {
                 _useSelection: false, // 使用选择列 -配置端暂时用不到
                 _useIndex: true, // 使用序号列
                 _useSummary: false, // 使用汇总行
+                _mergeRowColKeys: [], // 合并行的列
+
                 _disabledBtns: false, // 禁用增删按钮
-                // _disabledCreateBtn: false, // 置灰新增按钮，目前只内部使用，comp_web数据表配置页那块
+                _showCreateBtnColKeys: [], // 显示添加图标的列
                 _disabledFootCreateBtn: false, // 禁用底部新增按钮
-                _disabledDeleteDftRow: false, // 默认数据行禁止删除
-                _disabledOldDataRow: false, // 置灰老数据行包含删除
-                _showCreateBtnColKeys: [], // 显示插入一行按钮的列
-                _hideColKeys: [], // 隐藏／查看列字段的keys
+                _disabledDeleteDftRow: false, // 默认的数据行禁止删除
+                _disabledDeleteOldRow: false, // 保存的数据行禁止删除
+                _dftReadonly: false, // 默认的数据只读
+                _dftReadonlyColKeys: [], // 默认的数据只读的列
+                _oldReadonly: false, // 保存的数据只读
+                _oldReadonlyColKeys: [], // 保存的数据只读的列
 
                 _searchList: [], // 作为搜索的字段
                 _searchLabelWidth: 100, // 搜索的label宽度
@@ -254,8 +255,7 @@ export default {
                     conditions: []
                 }, // 筛选默认值（cascaderTable和flatTable组件里默认值情使用时，以及modSetForm里，会重置_tableAdvSearch）
 
-                _isImport: false, // 导入
-                _isExport: false, // 导出
+                _hideColKeys: [], // 隐藏／查看列字段的keys
                 _isQuote: false, // 引用
                 _quoteDisabledColKeys: [], // 引用数据行不可编辑咧
                 _quoteListFields: [], // 引用列表的显示字段
@@ -263,8 +263,16 @@ export default {
                     logic: "and",
                     conditions: []
                 }, // 引用列表筛选条件
-                ...this.propsObj,
+                _isImport: false, // 导入
+                _isExport: false, // 导出
 
+                _default: {
+                    rowDefault: {},
+                    list: [],
+                    tree: []
+                },
+
+                ...this.propsObj,
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
             };
         },
@@ -312,26 +320,37 @@ export default {
         useSummary () {
             return this.selfPropsObj._useSummary;
         },
+        mergeRowColKeys () {
+            return this.selfPropsObj._mergeRowColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
+        },
+
         disabledBtns () {
-            return this.controlKey === "_default" ? false : this.selfPropsObj._disabledBtns;
+            return this.isDftSet ? false : this.selfPropsObj._disabledBtns;
+        },
+        showCreateBtnColKeys () {
+            return this.selfPropsObj._showCreateBtnColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
         },
-        // disabledCreateBtn () {
-        //     return this.selfPropsObj._disabledCreateBtn;
-        // },
         disabledFootCreateBtn () {
-            return this.selfPropsObj._disabledFootCreateBtn;
+            return this.isDftSet ? false : this.selfPropsObj._disabledFootCreateBtn;
         },
         disabledDeleteDftRow () {
-            return this.selfPropsObj._disabledDeleteDftRow;
+            return this.isDftSet ? false : this.selfPropsObj._disabledDeleteDftRow;
         },
-        disabledOldDataRow () {
-            return this.controlKey === "_default" ? false : this.selfPropsObj._disabledOldDataRow;
+        disabledDeleteOldRow () {
+            return this.isDftSet ? false : this.selfPropsObj._disabledDeleteOldRow;
         },
-        showCreateBtnColKeys () {
-            return this.selfPropsObj._showCreateBtnColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
+
+        dftReadonly () {
+            return this.isDftSet ? false : this.selfPropsObj._dftReadonly;
         },
-        hideColKeys () {
-            return this.selfPropsObj._hideColKeys;
+        dftReadonlyColKeys () {
+            return this.isDftSet ? [] : this.selfPropsObj._dftReadonlyColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
+        },
+        oldReadonly () {
+            return this.isDftSet ? false : this.selfPropsObj._oldReadonly;
+        },
+        oldReadonlyColKeys () {
+            return this.isDftSet ? [] : this.selfPropsObj._oldReadonlyColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
         },
 
         searchLabelWidth () {
@@ -410,16 +429,7 @@ export default {
         },
         renderedListData () {
             return this.allListData.filter(rowItem => {
-                if (this.isSearching) {
-                    const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, rowItem);
-
-                    // 重置
-                    rowItem.__isSearchShow__ = false;
-                    if (bool) {
-                        rowItem.__isRendered__ = true;
-                        rowItem.__isSearchShow__ = true;
-                    }
-                }
+                this.dealSearchShow(rowItem);
 
                 return rowItem.__isRendered__;
             });
@@ -459,6 +469,76 @@ export default {
             return !!this.compareListData.length;
         },
 
+        /* 列 */
+        selfColumns () {
+            return this.columns;
+        },
+        mergeRowColumns () {
+            return this.selfColumns.filter(colItem => this.mergeRowColKeys.includes(colItem._key));
+        },
+        filterColumns () {
+            return this.selfColumns.filter(colItem => this.$isAdvRelyShow(colItem, this.allListData, this.parentObj, true));
+        },
+        contentColumns () {
+            return this.filterColumns.map(colItem => ({
+                filter: undefined,
+                sortBy: undefined,
+                renderHeaderCell: ({ column }, h) => {
+                    return this.contentThCellRender(h, { column });
+                },
+                renderBodyCell: ({ row, rowIndex, column }, h) => {
+                    return this.contentTdCellRender(h, { row, rowIndex, column });
+                },
+                ...colItem
+            }));
+        },
+        showContentColumns () {
+            return this.contentColumns.filter(colItem =>
+                this.hideStatus === true
+                    ? !this.hideColKeys.includes(colItem._key)
+                    : true
+            );
+        },
+        selectionColumn () {
+            return {
+                _key: "__selection__",
+                key: "__selection__",
+                field: "__selection__",
+                type: "checkbox",
+                width: 66,
+                align: "center",
+                fixed: "left"
+            };
+        },
+        operationColumn () {
+            return {
+                title: "操作",
+                _key: "__operation__",
+                key: "__operation__",
+                field: "__operation__",
+                align: "center",
+                fixed: "right",
+                width: 100,
+                renderBodyCell: ({ row, rowIndex, column }, h) => {
+                    const operationList = this.$getOperationList(["canDelete"]);
+
+                    return h("dsh-buttons", {
+                        props: {
+                            list: operationList.map(btnItem => ({
+                                ...btnItem,
+                                disabled: !this.getRowBtnCanEdit(row, rowIndex)
+                            }))
+                        },
+                        on: {
+                            click: (operationItem) => {
+                                this.$dispatchEvent(operationItem, row, rowIndex);
+                            }
+                        }
+                    });
+                }
+            };
+        },
+
         tablePropsObj () {
             return {
                 // rowStyleOption: {
@@ -475,13 +555,14 @@ export default {
                 cellSpanOption: {
                     bodyCellSpan: ({ row, rowIndex, column }) => {
                         // 合并单元格（单元格值为空时不合并）
-                        if (column._mergeRow === true) {
+                        if (this.mergeRowColKeys.includes(column._key)) {
                             if (this.$isEmptyData(row[column._key])) {
                                 return {
                                     rowspan: 1,
                                     colspan: 1
                                 };
-                            } else {
+                            }
+                            else {
                                 if (
                                     rowIndex !== 0 &&
                                     row[column._key] === this.showListData[rowIndex - 1][column._key]
@@ -529,7 +610,7 @@ export default {
             return {
                 bodyCellClass: ({ row, rowIndex, column }) => {
                     return "bri-table-td" +
-                        `${column._mergeRow
+                        `${this.mergeRowColKeys.includes(column._key)
                             ? " bri-table-td-merge"
                             : ""
                         }` +
@@ -556,157 +637,14 @@ export default {
                 }
             };
         },
-        contentColumns () {
-            return this.filterColumns.map(colItem => ({
-                filter: undefined,
-                sortBy: undefined,
-                renderHeaderCell: ({ column }, h) => {
-                    column = this.$transformDynamicProperty(column, undefined, this.parentObj);
 
-                    return this.$getHeadRender(h, column, {
-                        showRequired: this.showRequired,
-                        showDescription: this.showDescription,
-                        headHeightAuto: this.headHeightAuto
-                    });
-                },
-                renderBodyCell: ({ row, rowIndex, column }, h) => {
-                    column = this.$transformDynamicProperty(column, row, this.parentObj);
-                    column = this.getResetCol(column, row, rowIndex);
-                    const unitCanEdit = this.getUnitCanEdit(column, row, rowIndex);
-                    const ruleResultObj = this.getColRuleResult(column, row, rowIndex);
-
-                    return [
-                        this.isShowCompare(column, row, rowIndex)
-                            ? h("Tooltip", {
-                                style: {
-                                    width: "100%"
-                                },
-                                props: {
-                                    content: this.$isEmptyData(this.compareListData[rowIndex][column._key])
-                                        ? ""
-                                        : this.compareListData[rowIndex][column._key],
-                                    transfer: true,
-                                    maxWidth: 200,
-                                    placement: "top"
-                                },
-                                scopedSlots: {
-                                    default: props => h("dsh-list-unit", {
-                                        props: {
-                                            canEdit: unitCanEdit,
-                                            formData: row,
-                                            formItem: column,
-                                            allFormList: this.selfColumns,
-                                            inTableType: this.inTableType,
-                                            allListRows: this.allListData,
-                                            rowIndex: rowIndex,
-                                            parentFormList: this.allFormList,
-                                            parentObj: this.parentObj
-                                        },
-                                        on: {
-                                            blur: () => this.controlBlur(null, column, row, rowIndex, arguments),
-                                            change: () => this.$dispatchEvent(this.operationMap.changeVal, column, row, rowIndex, arguments)
-                                        }
-                                    })
-                                }
-                            })
-                            : h("dsh-list-unit", {
-                                props: {
-                                    canEdit: unitCanEdit,
-                                    formData: row,
-                                    formItem: column,
-                                    allFormList: this.selfColumns,
-                                    inTableType: this.inTableType,
-                                    allListRows: this.allListData,
-                                    rowIndex: rowIndex,
-                                    parentFormList: this.allFormList,
-                                    parentObj: this.parentObj
-                                },
-                                on: {
-                                    blur: () => this.controlBlur(null, column, row, rowIndex, arguments),
-                                    change: () => this.$dispatchEvent(this.operationMap.changeVal, column, row, rowIndex, arguments)
-                                }
-                            }),
-
-                        // 校验文字
-                        !ruleResultObj.bool
-                            ? h("span", {
-                                class: "bri-table-td-tip"
-                            }, ruleResultObj.message)
-                            : undefined,
-
-                        // 添加符
-                        ...this.createIconRender(h, { row, rowIndex, column }, 12)
-                    ];
-                },
-                ...colItem
-            }));
-        },
-        selectionColumn () {
-            return {
-                _key: "__selection__",
-                key: "__selection__",
-                field: "__selection__",
-                type: "checkbox",
-                width: 66,
-                align: "center",
-                fixed: "left"
-            };
-        },
-        operationColumn () {
-            return {
-                title: "操作",
-                _key: "__operation__",
-                key: "__operation__",
-                field: "__operation__",
-                align: "center",
-                fixed: "right",
-                width: 100,
-                renderBodyCell: ({ row, rowIndex, column }, h) => {
-                    const operationList = this.$getOperationList(["canDelete"]);
-
-                    return h("dsh-buttons", {
-                        props: {
-                            list: operationList.map(btnItem => ({
-                                ...btnItem,
-                                disabled: !this.getRowBtnCanEdit(row, rowIndex) ||
-                                    (this.disabledDeleteDftRow ? this.getRowIsDftDisabled(row, rowIndex) : false)
-                            }))
-                        },
-                        on: {
-                            click: (operationItem) => {
-                                this.$dispatchEvent(operationItem, row, rowIndex);
-                            }
-                        }
-                    });
-                }
-            };
-        },
-
-        isImport () {
-            return this.selfPropsObj._isImport;
-        },
-        importParams () {
-            return {
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                importType: this.inTableType
-            };
-        },
-        isExport () {
-            return this.selfPropsObj._isExport;
-        },
-        exportParams () {
-            return {
-                screenKey: this.screenKey,
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                advSearch: this.finalTableAdvSearch
-            };
+        hideColKeys () {
+            return this.selfPropsObj._hideColKeys;
         },
         isQuote () {
             return this.selfPropsObj._isQuote;
         },
-        quoteDisabledColKeys () {
+        quoteReadonlyColKeys () {
             return this.selfPropsObj._quoteDisabledColKeys;
         },
         quoteListFields () {
@@ -736,6 +674,27 @@ export default {
                 }
             };
         },
+        isImport () {
+            return this.selfPropsObj._isImport;
+        },
+        importParams () {
+            return {
+                _id: this.parentDataId,
+                _key: this.controlKey,
+                importType: this.inTableType
+            };
+        },
+        isExport () {
+            return this.selfPropsObj._isExport;
+        },
+        exportParams () {
+            return {
+                screenKey: this.screenKey,
+                _id: this.parentDataId,
+                _key: this.controlKey,
+                advSearch: this.finalTableAdvSearch
+            };
+        },
         modalPropsObj () {
             return {
                 mode: "fullscreen",
@@ -743,21 +702,21 @@ export default {
             };
         },
 
-        topOperationBtns () {
-            return Object.keys(this.topOperationMap);
-        },
         baseOperationBtns () {
             return Object.keys(this.baseOperationMap);
         },
+        otherOperationBtns () {
+            return Object.keys(this.otherOperationMap);
+        },
+        topOperationBtns () {
+            return Object.keys(this.topOperationMap);
+        },
         allOperationMap () {
             return {
-                ...(this.topOperationMap || {}),
                 ...(this.baseOperationMap || {}),
+                ...(this.otherOperationMap || {}),
+                ...(this.topOperationMap || {}),
 
-                canHideOrShow: {
-                    ...this.topOperationMap.canHideOrShow,
-                    name: this.hideStatus ? "显示字段" : "隐藏字段"
-                },
                 canCreate: {
                     ...this.baseOperationMap.canCreate,
                     name: this.showMode === "form"
@@ -771,6 +730,10 @@ export default {
                         ? this.baseOperationMap.canCreateChild.name.replace("行", "条")
                         : this.baseOperationMap.canCreateChild.name
                         // disabled: !!this.disabledCreateBtn
+                },
+                canHideOrShow: {
+                    ...this.topOperationMap.canHideOrShow,
+                    name: this.hideStatus ? "显示字段" : "隐藏字段"
                 }
             };
         },
@@ -781,16 +744,18 @@ export default {
                 undefined,
                 this.canEdit
                     ? [
-                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
+                        ...(this.disabledBtns ? [] : this.baseOperationBtns),
+                        ...this.otherOperationBtns,
                         ...(this.isQuote ? ["canQuote"] : []),
                         ...(this.isImport ? ["canImport"] : []),
+
                         ...(this.isExport ? ["canExport"] : []),
-                        "canEnlarge",
-                        ...(this.disabledBtns ? ["changeVal"] : this.baseOperationBtns)
+                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
+                        "canEnlarge"
                     ]
                     : [
-                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
                         ...(this.isExport ? ["canExport"] : []),
+                        ...(this.hideColKeys.length ? ["canHideOrShow"] : []),
                         "canEnlarge"
                     ]
             );
@@ -844,14 +809,14 @@ export default {
         changeSelect (list) {
             this.$emit("changeSelect", list);
         },
-        // 表单控件失去焦点
-        controlBlur (operationItem, col, row, rowIndex, params) {
+        // 输入框失去焦点
+        controlBlur (operationItem, row, rowIndex, col, params) {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
         },
         // 输入框值改变
-        changeVal (operationItem, col, row, rowIndex, params) {
+        changeVal (operationItem, row, rowIndex, col, params) {
             this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
-            this.change("changeVal", col, row, rowIndex, ...params);
+            this.change("changeVal", row, rowIndex, col, ...params);
         },
 
         /* ----------- 隐藏／显示字段 ---------- */
@@ -862,9 +827,9 @@ export default {
                 } else {
                     this.$refs.briTable.hideColumnsByKeys(this.hideColKeys);
                 }
-
-                this.hideStatus = !this.hideStatus;
             }
+
+            this.hideStatus = !this.hideStatus;
         },
 
         /* ----------- 引用 ---------- */
@@ -1042,7 +1007,7 @@ export default {
             this.isEnlarge = true;
         },
 
-        /* ----------- 渲染函数 ---------- */
+        /* ----------- 渲染函数（声明：为了代码更加规范清晰，return的是h相关的函数，则函数名get开头；return的是h的直接调用，函数名不要get开头）---------- */
         getTableTopRender (isEnlarge = false) {
             return (h, params) => {
                 return h("div", {
@@ -1062,7 +1027,7 @@ export default {
                 ]);
             };
         },
-        topSearchRender (h, params) {
+        topSearchRender (h) {
             return this.searchFormList.length
                 ? h("dsh-default-search", {
                     props: {
@@ -1076,7 +1041,7 @@ export default {
                 })
                 : undefined;
         },
-        topSummaryRender (h, params) {
+        topSummaryRender (h) {
             return h("div", {
                 style: {
                     "display": "flex",
@@ -1118,7 +1083,7 @@ export default {
                     : undefined
             ]);
         },
-        topOperationRender (h, params) {
+        topOperationRender (h) {
             return h("dsh-buttons", {
                 style: {
                     "text-align": "right"
@@ -1131,10 +1096,93 @@ export default {
                     click: (event) => {
                         this.$dispatchEvent(event);
                     }
+                },
+                nativeOn: {
+                    click: (e) => {
+                        e.stopPropagation();
+                    }
                 }
             });
         },
-        createBtnRender (h, params) {
+        contentThCellRender (h, { column }) {
+            column = this.$transformDynamicProperty(column, undefined, this.parentObj);
+
+            return this.$getHeadRender(h, column, {
+                showRequired: this.showRequired,
+                showDescription: this.showDescription,
+                headHeightAuto: this.headHeightAuto
+            });
+        },
+        contentTdCellRender (h, { row, rowIndex, column }) {
+            column = this.$transformDynamicProperty(column, row, this.parentObj);
+            column = this.getResetCol(row, rowIndex, column);
+            const unitCanEdit = this.getUnitCanEdit(row, rowIndex, column);
+            const ruleResultObj = this.getColRuleResult(row, rowIndex, column);
+
+            return [
+                this.isShowCompare(row, rowIndex, column)
+                    ? h("Tooltip", {
+                        style: {
+                            width: "100%"
+                        },
+                        props: {
+                            content: this.$isEmptyData(this.compareListData[rowIndex][column._key])
+                                ? ""
+                                : this.compareListData[rowIndex][column._key],
+                            transfer: true,
+                            maxWidth: 200,
+                            placement: "top"
+                        },
+                        scopedSlots: {
+                            default: props => h("dsh-list-unit", {
+                                props: {
+                                    canEdit: unitCanEdit,
+                                    formData: row,
+                                    formItem: column,
+                                    allFormList: this.selfColumns,
+                                    inTableType: this.inTableType,
+                                    allListRows: this.allListData,
+                                    rowIndex: rowIndex,
+                                    parentFormList: this.allFormList,
+                                    parentObj: this.parentObj
+                                },
+                                on: {
+                                    blur: () => this.controlBlur(null, row, rowIndex, column, arguments),
+                                    change: () => this.$dispatchEvent(this.operationMap.changeVal, row, rowIndex, column, arguments)
+                                }
+                            })
+                        }
+                    })
+                    : h("dsh-list-unit", {
+                        props: {
+                            canEdit: unitCanEdit,
+                            formData: row,
+                            formItem: column,
+                            allFormList: this.selfColumns,
+                            inTableType: this.inTableType,
+                            allListRows: this.allListData,
+                            rowIndex: rowIndex,
+                            parentFormList: this.allFormList,
+                            parentObj: this.parentObj
+                        },
+                        on: {
+                            blur: () => this.controlBlur(null, row, rowIndex, column, arguments),
+                            change: () => this.$dispatchEvent(this.operationMap.changeVal, row, rowIndex, column, arguments)
+                        }
+                    }),
+
+                // 校验文字
+                !ruleResultObj.bool
+                    ? h("span", {
+                        class: "bri-table-td-tip"
+                    }, ruleResultObj.message)
+                    : undefined,
+
+                // 添加符
+                ...this.createIconRender(h, { row, rowIndex, column }, 12)
+            ];
+        },
+        createBtnRender (h) {
             return !this.isSearching && this.disabledFootCreateBtn !== true
                 ? h("dsh-buttons", {
                     style: {
@@ -1269,7 +1317,7 @@ export default {
                             }
                     ),
                     // __old__: false,
-                    __isDefault__: this.controlKey === "_default",
+                    __isDefault__: this.isDftSet,
                     __isRendered__: true,
                     __isShow__: true,
                     __isTmpShow__: true,
@@ -1281,7 +1329,7 @@ export default {
                     ...this.$deepCopy(this.selfRowDefault),
                     _id: this.$ObjectID().str,
                     // __old__: false,
-                    __isDefault__: this.controlKey === "_default",
+                    __isDefault__: this.isDftSet,
                     __isRendered__: true,
                     __isShow__: true,
                     __isTmpShow__: true,
@@ -1292,36 +1340,40 @@ export default {
         },
         // 整行校验结果
         getRowRuleResult (row, rowIndex) {
-            return this.filterColumns.every(column => this.getColRuleResult(column, row, rowIndex).bool);
+            return this.filterColumns.every(colItem => this.getColRuleResult(row, rowIndex, colItem).bool);
         },
         getRowFormList (row, rowIndex) {
-            return this.selfColumns.map(column => {
-                column = this.$transformDynamicProperty(column, row, this.parentObj);
-                const unitCanEdit = this.getColCanEdit(column, row, rowIndex);
+            return this.selfColumns.map(colItem => {
+                colItem = this.$transformDynamicProperty(colItem, row, this.parentObj);
+                const unitCanEdit = this.getColCanEdit(row, rowIndex, colItem);
 
                 return {
-                    ...column,
+                    ...colItem,
                     canEdit: unitCanEdit
                 };
             });
         },
-        // 是否禁止操作 在关于默认行方面
-        getRowIsDftDisabled (row, rowIndex) {
-            return this.controlKey === "_default" ? false : row.__isDefault__;
+        // 是否默认行
+        getIsDftRow (row, rowIndex) {
+            return this.isDftSet ? false : row.__isDefault__;
         },
-        // 行按钮是否可编辑（删除按钮可编辑 不代表行内容是可编辑的）
+        // 行按钮是否可操作（删除按钮可编辑 不代表行内容是可编辑的）
         getRowBtnCanEdit (row, rowIndex) {
             return this.canEdit && // 是编辑状态
-                (this.disabledOldDataRow ? row.__old__ !== true : true) && // 老数据行不置灰／置灰时是新增数据
+                (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
+                (this.disabledDeleteOldRow ? row.__old__ !== true : true) && // 老数据可删除
                 row.__readonly__ !== true; // 不能为只读数据
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {
-            return this.getRowBtnCanEdit(row, rowIndex);
+            return this.canEdit && // 是编辑状态
+                (this.getIsDftRow(row) ? !this.dftReadonly : true) && // 默认数据可编辑
+                (row.__old__ === true ? !this.oldReadonly : true) && // 老数据可编辑
+                row.__readonly__ !== true; // 不能为只读数据
         },
 
         // 单元格校验结果
-        getColRuleResult (col, row, rowIndex) {
+        getColRuleResult (row, rowIndex, col) {
             col = this.$transformDynamicProperty(col, row, this.parentObj);
 
             // 未触发校验时 不显示错误
@@ -1342,7 +1394,7 @@ export default {
             }
         },
         // 单元格是否显示对比
-        isShowCompare (col, row, rowIndex) {
+        isShowCompare (row, rowIndex, col) {
             const oldRow = this.compareListData[rowIndex] || {};
             const curVal = row[col._key];
             const oldVal = oldRow[col._key];
@@ -1353,7 +1405,7 @@ export default {
                 curVal !== oldVal;
         },
         // 加工单元格对应的配置
-        getResetCol (col, row, rowIndex) {
+        getResetCol (row, rowIndex, col) {
             let resetMap = {
                 select: {
                     _optionKind: "dropdown"
@@ -1370,7 +1422,7 @@ export default {
             };
         },
         // 列本身是否可编辑
-        getColCanEdit (col, row, rowIndex) {
+        getColCanEdit (row, rowIndex, col) {
             return (
                 ["treeTable"].includes(this.inTableType) && ["number", "date"].includes(col._type)
                     ? col._summaryType
@@ -1385,17 +1437,18 @@ export default {
                     : true
             ) &&
                 !(["cascaderTable"].includes(this.controlType) && ["level", "children"].includes(col._key)) && // 层级表格的固定字段不可编辑
-                (col._oldReadonly ? row.__old__ !== true : true) && // 老数据行里某些列不可编辑
-                (row.__isQuote__ ? !this.quoteDisabledColKeys.includes(col._key) : true) && // 引用过来的数据是否可编辑
+                (col._oldReadonly ? row.__old__ !== true : true) && // 某些列在老数据行里不可编辑
+                (this.getIsDftRow(row) ? !this.dftReadonlyColKeys.includes(col._key) : true) && // 默认行的某列是否可编辑
+                (row.__old__ === true ? !this.oldReadonlyColKeys.includes(col._key) : true) && // 老数据行里某些列不可编辑
+                (row.__isQuote__ ? !this.quoteReadonlyColKeys.includes(col._key) : true) && // 引用过来的数据是否可编辑
                 !["calculate"].includes(col._enterType) && // 计算的不可编辑
                 col._readonly !== true && // 只读
-                (!this.getRowIsDftDisabled(row) || col._readonlyOnDftRow !== true) && // 默认行的某列是否可编辑
                 col.canEdit !== false; // 字段本身编辑权限 考虑为undefined时候
         },
         // 单元格最终编辑状态
-        getUnitCanEdit (col, row, rowIndex) {
+        getUnitCanEdit (row, rowIndex, col) {
             return this.getRowCanEdit(row, rowIndex) &&
-                this.getColCanEdit(col, row, rowIndex) &&
+                this.getColCanEdit(row, rowIndex, col) &&
                 this.$isAdvRelyShow(col, row, this.parentObj, true);
         },
 
@@ -1426,13 +1479,14 @@ export default {
             }
         },
         // 初始化时 修复数据
-        fixRowItem (row) {
+        fixRowItem (row, levelNum) {
             if (this.initFlag) {
                 // TODO：修正数据level属性，后期可以删除
                 if (["cascaderTable"].includes(this.controlType)) {
                     row.level = row.level || levelNum;
                 }
 
+                // 配置端设置的地方，不会运行下面的，因为_default被过滤掉没值，defaultListDataIds就是空的
                 if (row._id) {
                     if (this.defaultListDataIds.includes(row._id)) {
                         row.__isDefault__ = true;
@@ -1444,8 +1498,8 @@ export default {
                     row._id = this.$ObjectID().str;
                 }
 
-                row.__old__ = this.controlKey === "_default" ? false : !this.parentObj.__isCreate__; // 标记老数据
-                row.__isDefault__ = this.controlKey === "_default" ? true : !!row.__isDefault__; // 标记默认数据（配置端默认值）
+                row.__old__ = this.isDftSet ? false : !this.parentObj.__isCreate__; // 标记老数据
+                row.__isDefault__ = this.isDftSet ? true : !!row.__isDefault__; // 标记默认数据（配置端默认值）
 
                 // 初次进来 把关于展示的状态值全部清除
                 this.resetProperties.forEach(property => {
@@ -1472,6 +1526,23 @@ export default {
                     row.__isExpand__ = false;
                 }
             }
+        },
+        dealSearchShow (rowItem) {
+            if (this.isSearching) {
+                const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, rowItem);
+
+                // 重置
+                rowItem.__isSearchShow__ = false;
+                if (bool) {
+                    rowItem.__isRendered__ = true;
+                    rowItem.__isSearchShow__ = true;
+                }
+
+                return bool;
+            }
+            else {
+                return true;
+            }
         }
     }
 };