bri-components 1.3.96 → 1.3.97

package/package.json

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

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -1,7 +1,8 @@
 <template>
     <div :class="{
         uploadList: true,
-        [`uploadList-${showMode}`]: true
+        [`uploadList-${showMode}`]: true,
+        [`uploadList-${propsObj._fileType}`]: true
     }">
         <!-- 普通文本模式 -->
         <template v-if="showMode ==='old'">
@@ -9,38 +10,57 @@
             <div
                 v-if="files.length"
                 ref="viewerImage"
-                class="uploadList-list"
+                :class="['uploadList-list', `uploadList-list-${propsObj._fileType}`]"
             >
                 <div
                     v-for="(fileItem, fileIndex) in files"
                     :key="fileItem._key || fileItem._id"
-                    class="item"
+                    :class="{
+                        'item': propsObj._fileType === 'image',
+                        [`item-${propsObj._fileType}`]: true
+                    }"
                 >
                     <!-- 展示图 -->
-                    <div class="item-show">
-                        <img
-                            v-if="fileItem.mimetype.includes('image')"
-                            :data-original="fileItem.url"
-                            :src="$imageResize(fileItem.url, imageResizeConfig)"
-                            :alt="fileItem.name"
-                        >
-                        <img
-                            v-else
-                            :src="getFileImage(fileItem)"
-                            :alt="fileItem.name"
-                        >
-                    </div>
-
-                    <!-- 展示名称 -->
-                    <p class="item-name-title">{{ fileItem.name }}</p>
-
-                    <!-- 图标 -->
-                    <dsh-icons
-                        class="item-action"
-                        item-class="item-action-icon"
-                        :list="$getOperationList(getBtns(fileItem))"
-                        @click="$dispatchEvent($event, fileItem, fileIndex)"
-                    ></dsh-icons>
+                    <template v-if="propsObj._fileType === 'image'">
+                        <div class="item-show">
+                            <img
+                                v-if="fileItem.mimetype.includes('image')"
+                                :data-original="fileItem.url"
+                                :src="$imageResize(fileItem.url, imageResizeConfig)"
+                                :alt="fileItem.name"
+                            >
+                            <img
+                                v-else
+                                :src="getFileImage(fileItem)"
+                                :alt="fileItem.name"
+                            >
+                        </div>
+
+                        <!-- 展示名称 -->
+                        <p class="item-name-title">{{ fileItem.name }}</p>
+
+                        <!-- 图标 -->
+                        <dsh-icons
+                            class="item-action"
+                            item-class="item-action-icon"
+                            :list="$getOperationList(getBtns(fileItem))"
+                            @click="$dispatchEvent($event, fileItem, fileIndex)"
+                        ></dsh-icons>
+                    </template>
+
+                    <template v-else>
+                        <a
+                            :href="fileItem.downloadUrl"
+                            target="black"
+                        >{{ fileItem.name }}</a>
+
+                        <dsh-icons
+                            class="item-file-action"
+                            item-class="item-file-action-icon"
+                            :list="$getOperationList(getBtns(fileItem))"
+                            @click="$dispatchEvent($event, fileItem, fileIndex)"
+                        ></dsh-icons>
+                    </template>
                 </div>
             </div>
 
@@ -352,6 +372,36 @@
                     }
                 }
             }
+
+            // file 模式
+            &-file {
+                flex-direction: column;
+                .item-file {
+                    flex: 0 0 100%;
+                    height: auto;
+                    display: flex;
+                    flex-direction: row;
+                    justify-content: space-between;
+                    align-items: center;
+                    border-radius: 0px;
+                    margin: 0px;
+                    background: transparent;
+                    line-height: 22px;
+                    height: 22px !important;
+                    &:hover {
+                        background: #f4f5fa;
+                    }
+                    a {
+                        text-overflow: ellipsis;
+                        overflow: hidden;
+                    }
+                    .DshIcons {
+                        margin-left: 5px;
+                        color: @textColor;
+                        white-space: nowrap;
+                    }
+                }
+            }
         }
 
         &-inline {

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

@@ -75,6 +75,17 @@ export default {
         // 值为不是[]类型用的
         curVal: {
             get () {
+                // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
+                if (!this.isInTable) {
+                    if (["select"].includes(this.controlType)) {
+                        if (!this.$dataType(this.propsObj._filterFunc, "function")) {
+                            this.value[this.controlKey] = this.listData.some(item => item[this.saveKey] === this.value[this.controlKey])
+                                ? this.value[this.controlKey]
+                                : "";
+                        }
+                    }
+                }
+
                 return this.value[this.controlKey];
             },
             set (val) {
@@ -90,6 +101,26 @@ export default {
         // 值为[]类型用的
         curValList: {
             get () {
+                // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
+                if (!this.isInTable) {
+                    const valList = this.value[this.controlKey] || [];
+                    if ((["select"].includes(this.controlType) && this.multipleMode) || ["checkbox"].includes(this.controlType)) {
+                        this.value[this.controlKey] = valList.some(valKey => !this.listDataKeys.includes(valKey))
+                            ? valList.filter(valKey => this.listDataKeys.includes(valKey))
+                            : valList;
+                    }
+                    // else if (["region", "cascader"].includes(this.controlType)) {
+                    //     this.value[this.controlKey] = this.$getTreeLinealDatas(valList, this.cascaderAllData, undefined, this.saveKey).length
+                    //         ? valList
+                    //         : [];
+                    // }
+                    // else if (["regions", "cascaders"].includes(this.controlType)) {
+                    //     this.value[this.controlKey] = valList.filter(valListItem =>
+                    //         this.$getTreeLinealDatas(valListItem, this.cascaderAllData, undefined, this.saveKey).length
+                    //     );
+                    // }
+                }
+
                 return this.value[this.controlKey] || [];
             },
             set (valList) {
@@ -115,7 +146,7 @@ export default {
         },
         // 字段的真实key
         fieldKey () {
-            return this.controlKey === "_default"
+            return this.isDftSet
                 ? this.value._key
                 : (this.propsObj.__realKey__ || this.controlKey);
         },
@@ -192,6 +223,10 @@ export default {
         // isShare () {
         //     return !!this.propsObj.isShare;
         // },
+        // 是否在设置默认值下
+        isDftSet () {
+            return this.controlKey === "_default";
+        },
         // 在单元格内
         isInTable () {
             return !!this.propsObj.inTable;

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

@@ -26,6 +26,7 @@ export default {
                 _customData: [],
                 _reverseFilter: false, // 是否反向过滤，默认正向过滤
                 _selectFilterVals: [], // 过滤的数据
+                _selectFilterKey: undefined, // 用作过滤的属性，默认用_saveKey对应的属性
 
                 ...this.propsObj,
                 ...this.commonDealPropsObj
@@ -53,20 +54,27 @@ export default {
         selectFilterVals () {
             return this.selfPropsObj._selectFilterVals;
         },
+        selectFilterKey () {
+            return this.selfPropsObj._selectFilterKey;
+        },
 
         listData () {
             let listData = this.selfPropsObj._data.concat(this.initListData);
-            if (this.selectFilterVals.length) {
-                listData = listData.filter(item =>
+            listData = this.selectFilterVals.length
+                ? listData.filter(item =>
                     this.reverseFilter
-                        ? !this.selectFilterVals.includes(item[this.saveKey])
-                        : this.selectFilterVals.includes(item[this.saveKey])
-                );
-            }
-
-            return this.$dataType(this.selfPropsObj._filterFunc, "function")
+                        ? !this.selectFilterVals.includes(item[this.selectFilterKey || this.saveKey])
+                        : this.selectFilterVals.includes(item[this.selectFilterKey || this.saveKey])
+                )
+                : listData;
+            listData = this.$dataType(this.selfPropsObj._filterFunc, "function")
                 ? this.selfPropsObj._filterFunc(listData, this.selfPropsObj, this.value)
                 : listData;
+
+            return listData;
+        },
+        listDataKeys () {
+            return this.listData.map(item => item[this.saveKey]);
         },
         curValObj () {
             return this.getItemObj(this.curVal);

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

@@ -164,7 +164,7 @@
             clickInput () {
                 if (this.finalCanEdit) {
                     if (!this.renderList) {
-                        if (this.controlKey === "_default") {
+                        if (this.isDftSet) {
                             this.listData = this.originLabels.map(item => {
                                 return {
                                     ...item,

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

@@ -306,11 +306,10 @@
                     callback: data => {
                         this.loading = false;
                         this.departmentList = this.listFilterVals.length
-                            ? data.list.filter(
-                                item =>
-                                    this.reverseFilter
-                                        ? !this.listFilterVals.includes(item._key)
-                                        : this.listFilterVals.includes(item._key)
+                            ? data.list.filter(item =>
+                                this.reverseFilter
+                                    ? !this.listFilterVals.includes(item._key)
+                                    : this.listFilterVals.includes(item._key)
                             )
                             : data.list;
                     }

package/src/components/form/DshForm.vue

@@ -348,8 +348,8 @@
                 let rules = [];
                 let ruleConfig = this.$getFieldRuleConfig(formItem);
 
-                // 数据格式校验
-                if (ruleConfig.type) {
+                // 数据格式校验 -关联表格类型的会被过滤掉
+                if (ruleConfig.type && (!ruleConfig.fields || Object.entries(ruleConfig.fields).every(arr => !arr[1].transform))) {
                     rules.push({
                         message: `${formItem._name}数据格式有错!`,
                         trigger: "blur, change",

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

@@ -36,8 +36,9 @@ export default {
                     icon: "md-trash",
                     color: "red",
                     event: "clickDeleteCol"
-                },
-
+                }
+            },
+            otherOperationMap: {
                 clickNode: {
                     name: "点击节点",
                     type: "clickNode",
@@ -53,7 +54,6 @@ export default {
                     type: "changeNode",
                     event: "changeNode"
                 }
-
                 // canClearNode: {
                 //     name: "清除内容",
                 //     type: "canClearNode",
@@ -71,6 +71,19 @@ export default {
         };
     },
     computed: {
+        typePropsObj () {
+            return {
+                _dftReadonlyTreeColKeys: [], // 默认的数据只读的表头列
+                _oldReadonlyTreeColKeys: [] // 保存的数据只读的表头列
+            };
+        },
+        dftReadonlyTreeColKeys () {
+            return this.isDftSet ? [] : this.selfPropsObj._dftReadonlyTreeColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
+        },
+        oldReadonlyTreeColKeys () {
+            return this.isDftSet ? [] : this.selfPropsObj._oldReadonlyTreeColKeys || []; // 配置端有问题，高级以依赖时候值成undefined了
+        },
+
         allTreeData () {
             return this.getCalcuedTree(this.data, this.treeColumns, this.selfColumns);
         },
@@ -82,11 +95,11 @@ export default {
         },
 
         showColumns () {
-            return this.mergeColumns(this.treeColumns, this.contentColumns);
+            return this.mergeColumns(this.treeColumns);
         },
         // 供表格渲染行使用的columns的数组集合, 每一行columns不一样，组成二重数组
         rowColumnsArr () {
-            return this.transformRowColumnsArr(this.allTreeData, this.treeColumns, this.contentColumns);
+            return this.transformRowColumnsArr(this.allTreeData, this.treeColumns);
         }
     },
     created () {
@@ -141,7 +154,10 @@ export default {
         // 树形、汇总节点操作 -点击
         clickNode (operationItem, col, row, rowIndex) {
             if (col.colType === "tree") {
-                if (!this.getRowIsDftDisabled(row) || col._readonlyOnDftRow !== true) {
+                if (
+                    (this.getIsDftRow(row) ? !this.dftReadonlyTreeColKeys.includes(col._key) : true) && // 默认行的某列是否可编辑
+                    (row.__old__ === true ? !this.oldReadonlyTreeColKeys.includes(col._key) : true) // 老数据行里某些列不可编辑
+                ) {
                     row.isEdit = true;
                     this.$nextTick(() => {
                         this.$refs[`${col._id}${row._id}`][0] && this.$refs[`${col._id}${row._id}`][0].focus();
@@ -402,11 +418,16 @@ export default {
                         ...(column.level < this.maxLevel ? ["canCreateCol"] : []), // 限制最大添加到几级
                         ...(column.level > 1 && column.canDelete === true ? ["canDeleteCol"] : []) // 只有一级和最后两级节点数不一致时，不能删
                     ]
-                    : this.getRowIsDftDisabled(row)
-                        ? []
-                        : row.isLeaf === true
-                            ? ["canCreate", "canDelete"]
-                            : ["canCreate", "canCreateChild", "canDelete", "canDeleteChilds"]
+                    : row.isLeaf === true
+                        ? [
+                            "canCreate",
+                            ...(this.getRowBtnCanEdit(row, rowIndex) ? ["canDelete"] : [])
+                        ]
+                        : [
+                            "canCreate",
+                            "canCreateChild",
+                            ...(this.getRowBtnCanEdit(row, rowIndex) ? ["canDelete", "canDeleteChilds"] : [])
+                        ]
             );
 
             return !this.isSearching &&
@@ -537,7 +558,7 @@ export default {
 
         /* ----------- 工具方法 ---------- */
         // 合并表头
-        mergeColumns (treeForm = [], subForm = []) {
+        mergeColumns (treeForm = [], subForm = this.showContentColumns) {
             return treeForm
                 .reduce((arr, treeFormItem, treeFormIndex) => {
                     return arr.concat(
@@ -555,11 +576,7 @@ export default {
                     );
                 }, [])
                 .concat(
-                    subForm.filter(subFormItem =>
-                        this.hideStatus === true
-                            ? !this.hideColKeys.includes(subFormItem._key)
-                            : true
-                    ).map(subFormItem => (
+                    subForm.map(subFormItem => (
                         {
                             ...subFormItem,
                             nodeKey: treeForm[treeForm.length - 1]._key,
@@ -640,14 +657,14 @@ export default {
             return nodes;
         },
         // 转化渲染使用的columns数组
-        transformRowColumnsArr (nodes = [], treeForm = [], subForm = []) {
+        transformRowColumnsArr (nodes = [], treeForm = []) {
             let loop = (nodes, rowColumnsArr) => {
                 nodes = this.getFilteredNodes(nodes);
 
                 return nodes.reduce((rowColumnsArr, node, nodeIndex) => {
                     if (nodeIndex !== 0 || rowColumnsArr.length === 0) {
                         rowColumnsArr.push(
-                            this.mergeColumns(treeForm.slice(node.level - 1), subForm)
+                            this.mergeColumns(treeForm.slice(node.level - 1))
                         );
                     }
 
@@ -695,15 +712,7 @@ export default {
                         const children = loop(rowItem.children);
                         return !!children.length;
                     } else {
-                        const bool = this.$isAdvRelyAccord(this.finalTableAdvSearch, rowItem);
-                        // 重置
-                        rowItem.__isSearchShow__ = false;
-                        if (bool) {
-                            rowItem.__isRendered__ = true;
-                            rowItem.__isSearchShow__ = true;
-                        }
-
-                        return bool;
+                        return this.dealSearchShow(rowItem);
                     }
                 });
             };

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

@@ -80,12 +80,16 @@ export default {
             const list = this.data;
             const newRow = this.getNewRowData();
 
-            // 处理单元格合并相关（当前列是合并列，则该列之前的合并列，要复制这一行对应列的值；当前列是普通列，按最后合并列的操作处理）
+            // 处理单元格合并相关（当前列是合并列，则该列之前的合并列，要复制这一行对应列的值；当前列是普通列，按该列前的最后合并列的操作处理）
             if (col) {
-                if (col._mergeRow === true) {
+                if (this.mergeRowColKeys.includes(col._key)) {
                     const newList = this.allListData.slice(rowIndex); // 从该行开始截取
-                    const nextRowIndex = newList.findIndex(rowItem => rowItem[col._key] !== row[col._key]); // 寻找该单元格值开始不一样的行(特殊情况是最后一行，nextRowIndex为-1)
-                    row = nextRowIndex < 0 ? newList[newList.length - 1] : newList[nextRowIndex - 1]; // 取该单元格值一样的最后一行
+                    const nextRowIndex = this.$isEmptyData(row[col._key])
+                        ? 1
+                        : newList.findIndex(rowItem => rowItem[col._key] !== row[col._key]); // 寻找该单元格值开始不一样的行(特殊情况是最后一行，nextRowIndex为-1)
+                    row = nextRowIndex < 0
+                        ? newList[newList.length - 1]
+                        : newList[nextRowIndex - 1]; // 取该单元格值一样的最后一行
 
                     const colIndex = this.mergeRowColumns.findIndex(column => column._key === col._key);
                     this.mergeRowColumns.reduce((obj, column, columnIndex) => {
@@ -98,7 +102,7 @@ export default {
                 }
                 else {
                     const colIndex = this.selfColumns.findIndex(column => column._key === col._key);
-                    const mergeRowColumns = this.selfColumns.filter((column, columnIndex) => columnIndex < colIndex && column._mergeRow === true);
+                    const mergeRowColumns = this.selfColumns.filter((column, columnIndex) => columnIndex < colIndex && this.mergeRowColKeys.includes(column._key));
                     mergeRowColumns.slice(0, mergeRowColumns.length - 1).reduce((obj, column) => {
                         return Object.assign(obj, {
                             [column._key]: this.$deepCopy(row[column._key])

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

@@ -198,7 +198,7 @@ export default {
                         }, rowItem);
                     }
 
-                    this.fixRowItem(rowItem);
+                    this.fixRowItem(rowItem, levelNum);
                 });
             loop(treeData);
 

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,10 @@ export default {
                     logic: "and",
                     conditions: []
                 }, // 引用列表筛选条件
-                ...this.propsObj,
+                _isImport: false, // 导入
+                _isExport: false, // 导出
 
+                ...this.propsObj,
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
             };
         },
@@ -312,26 +314,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 +423,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,102 +463,15 @@ export default {
             return !!this.compareListData.length;
         },
 
-        tablePropsObj () {
-            return {
-                // rowStyleOption: {
-                //     hoverHighlight: true,
-                //     clickHighlight: true,
-                //     stripe: true // 斑马纹
-                // },
-                maxHeight: this.contentHeight,
-                // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
-                columnHiddenOption: {
-                    defaultHiddenColumnKeys: [...this.hideColKeys] // 必须这么写，不解构，切换一次隐藏／显示后，hideColKeys会变成空数组
-                },
-                cellStyleOption: this.cellStyleOption,
-                cellSpanOption: {
-                    bodyCellSpan: ({ row, rowIndex, column }) => {
-                        // 合并单元格（单元格值为空时不合并）
-                        if (column._mergeRow === true) {
-                            if (this.$isEmptyData(row[column._key])) {
-                                return {
-                                    rowspan: 1,
-                                    colspan: 1
-                                };
-                            } else {
-                                if (
-                                    rowIndex !== 0 &&
-                                    row[column._key] === this.showListData[rowIndex - 1][column._key]
-                                ) {
-                                    return {
-                                        rowspan: 0,
-                                        colspan: 0
-                                    };
-                                } else {
-                                    const newList = this.showListData.slice(rowIndex);
-                                    const newIndex = newList.findIndex(rowItem => row[column._key] !== rowItem[column._key]);
-                                    return {
-                                        rowspan: newIndex === -1 ? newList.length : newIndex,
-                                        colspan: 1
-                                    };
-                                }
-                            }
-                        }
-                    }
-                },
-                eventCustomOption: {
-                    bodyCellEvents: ({ row, rowIndex, column }) => {
-                        return {
-                            click: (event) => {
-                                // console.log("click::", row, rowIndex, column, event);
-                            },
-                            dblclick: (event) => {
-                                // console.log("dblclick::", row, rowIndex, column, event);
-                            },
-                            contextmenu: (event) => {
-                                // console.log("contextmenu::", row, rowIndex, column, event);
-                            },
-                            mouseenter: (event) => {
-                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, true);
-                            },
-                            mouseleave: (event) => {
-                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, false);
-                            }
-                        };
-                    }
-                }
-            };
+        /* 列 */
+        selfColumns () {
+            return this.columns;
         },
-        cellStyleOption () {
-            return {
-                bodyCellClass: ({ row, rowIndex, column }) => {
-                    return "bri-table-td" +
-                        `${column._mergeRow
-                            ? " bri-table-td-merge"
-                            : ""
-                        }` +
-                        `${this.getRowCanEdit(row, rowIndex)
-                            ? " bri-table-td-edit"
-                            : ""
-                        }` +
-                        `${this.isSearching
-                            ? row.__isSearchShow__ === false
-                                ? " bri-table-td-hide"
-                                : ""
-                            : row.__isShow__ === true
-                                ? this.isExpandAction
-                                    ? " bri-table-td-visible"
-                                    : ""
-                                : " bri-table-td-hide"
-                        }` +
-                        `${["__isExpand__"].includes(column._key)
-                            ? " bri-table-td-expand"
-                            : ["__index__"].includes(column._key)
-                                ? " bri-table-td-index"
-                                : ""
-                        }`;
-                }
-            };
+        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 => ({
@@ -641,6 +558,13 @@ export default {
                 ...colItem
             }));
         },
+        showContentColumns () {
+            return this.contentColumns.filter(colItem =>
+                this.hideStatus === true
+                    ? !this.hideColKeys.includes(colItem._key)
+                    : true
+            );
+        },
         selectionColumn () {
             return {
                 _key: "__selection__",
@@ -668,8 +592,7 @@ export default {
                         props: {
                             list: operationList.map(btnItem => ({
                                 ...btnItem,
-                                disabled: !this.getRowBtnCanEdit(row, rowIndex) ||
-                                    (this.disabledDeleteDftRow ? this.getRowIsDftDisabled(row, rowIndex) : false)
+                                disabled: !this.getRowBtnCanEdit(row, rowIndex)
                             }))
                         },
                         on: {
@@ -682,31 +605,112 @@ export default {
             };
         },
 
-        isImport () {
-            return this.selfPropsObj._isImport;
-        },
-        importParams () {
+        tablePropsObj () {
             return {
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                importType: this.inTableType
+                // rowStyleOption: {
+                //     hoverHighlight: true,
+                //     clickHighlight: true,
+                //     stripe: true // 斑马纹
+                // },
+                maxHeight: this.contentHeight,
+                // 通过实例方法 hideColumnsByKeys(keys)将列隐藏，通过实例方法 showColumnsByKeys(keys)将隐藏的列显示
+                columnHiddenOption: {
+                    defaultHiddenColumnKeys: [...this.hideColKeys] // 必须这么写，不解构，切换一次隐藏／显示后，hideColKeys会变成空数组
+                },
+                cellStyleOption: this.cellStyleOption,
+                cellSpanOption: {
+                    bodyCellSpan: ({ row, rowIndex, column }) => {
+                        // 合并单元格（单元格值为空时不合并）
+                        if (this.mergeRowColKeys.includes(column._key)) {
+                            if (this.$isEmptyData(row[column._key])) {
+                                return {
+                                    rowspan: 1,
+                                    colspan: 1
+                                };
+                            }
+                            else {
+                                if (
+                                    rowIndex !== 0 &&
+                                    row[column._key] === this.showListData[rowIndex - 1][column._key]
+                                ) {
+                                    return {
+                                        rowspan: 0,
+                                        colspan: 0
+                                    };
+                                } else {
+                                    const newList = this.showListData.slice(rowIndex);
+                                    const newIndex = newList.findIndex(rowItem => row[column._key] !== rowItem[column._key]);
+                                    return {
+                                        rowspan: newIndex === -1 ? newList.length : newIndex,
+                                        colspan: 1
+                                    };
+                                }
+                            }
+                        }
+                    }
+                },
+                eventCustomOption: {
+                    bodyCellEvents: ({ row, rowIndex, column }) => {
+                        return {
+                            click: (event) => {
+                                // console.log("click::", row, rowIndex, column, event);
+                            },
+                            dblclick: (event) => {
+                                // console.log("dblclick::", row, rowIndex, column, event);
+                            },
+                            contextmenu: (event) => {
+                                // console.log("contextmenu::", row, rowIndex, column, event);
+                            },
+                            mouseenter: (event) => {
+                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, true);
+                            },
+                            mouseleave: (event) => {
+                                this.$set(this.hoverRecordMap, `${row._id}dsh${column._key}`, false);
+                            }
+                        };
+                    }
+                }
             };
         },
-        isExport () {
-            return this.selfPropsObj._isExport;
-        },
-        exportParams () {
+        cellStyleOption () {
             return {
-                screenKey: this.screenKey,
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                advSearch: this.finalTableAdvSearch
+                bodyCellClass: ({ row, rowIndex, column }) => {
+                    return "bri-table-td" +
+                        `${this.mergeRowColKeys.includes(column._key)
+                            ? " bri-table-td-merge"
+                            : ""
+                        }` +
+                        `${this.getRowCanEdit(row, rowIndex)
+                            ? " bri-table-td-edit"
+                            : ""
+                        }` +
+                        `${this.isSearching
+                            ? row.__isSearchShow__ === false
+                                ? " bri-table-td-hide"
+                                : ""
+                            : row.__isShow__ === true
+                                ? this.isExpandAction
+                                    ? " bri-table-td-visible"
+                                    : ""
+                                : " bri-table-td-hide"
+                        }` +
+                        `${["__isExpand__"].includes(column._key)
+                            ? " bri-table-td-expand"
+                            : ["__index__"].includes(column._key)
+                                ? " bri-table-td-index"
+                                : ""
+                        }`;
+                }
             };
         },
+
+        hideColKeys () {
+            return this.selfPropsObj._hideColKeys;
+        },
         isQuote () {
             return this.selfPropsObj._isQuote;
         },
-        quoteDisabledColKeys () {
+        quoteReadonlyColKeys () {
             return this.selfPropsObj._quoteDisabledColKeys;
         },
         quoteListFields () {
@@ -736,6 +740,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 +768,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 +796,10 @@ export default {
                         ? this.baseOperationMap.canCreateChild.name.replace("行", "条")
                         : this.baseOperationMap.canCreateChild.name
                         // disabled: !!this.disabledCreateBtn
+                },
+                canHideOrShow: {
+                    ...this.topOperationMap.canHideOrShow,
+                    name: this.hideStatus ? "显示字段" : "隐藏字段"
                 }
             };
         },
@@ -781,16 +810,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"
                     ]
             );
@@ -862,9 +893,9 @@ export default {
                 } else {
                     this.$refs.briTable.hideColumnsByKeys(this.hideColKeys);
                 }
-
-                this.hideStatus = !this.hideStatus;
             }
+
+            this.hideStatus = !this.hideStatus;
         },
 
         /* ----------- 引用 ---------- */
@@ -1269,7 +1300,7 @@ export default {
                             }
                     ),
                     // __old__: false,
-                    __isDefault__: this.controlKey === "_default",
+                    __isDefault__: this.isDftSet,
                     __isRendered__: true,
                     __isShow__: true,
                     __isTmpShow__: true,
@@ -1281,7 +1312,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,32 +1323,36 @@ export default {
         },
         // 整行校验结果
         getRowRuleResult (row, rowIndex) {
-            return this.filterColumns.every(column => this.getColRuleResult(column, row, rowIndex).bool);
+            return this.filterColumns.every(colItem => this.getColRuleResult(colItem, row, rowIndex).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(colItem, row, rowIndex);
 
                 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; // 不能为只读数据
         },
 
         // 单元格校验结果
@@ -1385,11 +1420,12 @@ 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时候
         },
         // 单元格最终编辑状态
@@ -1426,13 +1462,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 +1481,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 +1509,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;
+            }
         }
     }
 };

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

@@ -13,6 +13,7 @@ export default {
         selfPropsObj () {
             return {
                 _treeForm: [],
+                ...(this.typePropsObj || {}),
                 ...this.commonPropsObj,
 
                 _maxLevel: this.commonPropsObj._maxLevel || 3 // 最大级数
@@ -88,7 +89,7 @@ export default {
         clickDeleteChilds (operationItem, row, rowIndex, col) {
             this.$Modal.confirm({
                 title: "警告",
-                content: "确定删除该行及其所有下级吗？",
+                content: "确定删除所有下级吗？",
                 onOk: () => {
                     row.children.splice(0);
 

package/src/components/unit/DshListUnit.vue

@@ -1,15 +1,15 @@
 <template>
     <div class="DshListUnit">
-        <template v-if="formItem._type === 'index'">
+        <template v-if="selfFormItem._type === 'index'">
             <span>{{ indexStr || rowIndex + 1 }}</span>
         </template>
 
-        <template v-else-if="formItem.render">
+        <template v-else-if="selfFormItem.render">
             <dsh-list-render
-                :column="formItem"
+                :column="selfFormItem"
                 :row="formData"
                 :index="rowIndex"
-                :render="formItem.render"
+                :render="selfFormItem.render"
             ></dsh-list-render>
         </template>
 
@@ -19,7 +19,7 @@
                 :canEdit="canEdit"
                 :value="formData"
                 :propsObj="{
-                    ...formItem,
+                    ...selfFormItem,
                     size: 'default',
                     inTable: true
                 }"

package/src/components/unit/unitMixin.js

@@ -59,6 +59,10 @@ export default {
     computed: {
         curComponentName () {
             return componentNameMap[this.formItem._type] || "DshUndeveloped";
+        },
+
+        selfFormItem () {
+            return this.$transformDynamicProperty(this.formItem, this.formData, this.parentObj);
         }
     },
     created () { },