bri-components 1.3.82 → 1.3.84

package/package.json

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

package/src/components/form/DshDefaultSearch.vue

@@ -109,7 +109,9 @@
         },
         computed: {
             canSearchFormList () {
-                return this.formList.filter(formItem => this.$formHasAbility(formItem, "canDefaultSearch"));
+                return this.formList.filter(formItem =>
+                    this.$formHasAbility(formItem, "canDefaultSearch") && formItem._displayType !== "hide"
+                );
             },
 
             // 总span

package/src/components/form/DshForm.vue

@@ -184,7 +184,6 @@
             formControlClass: String,
 
             /* 本组件使用 -不传递子组件的 */
-            monitorFormList: Array,
             showRules: {
                 type: Boolean,
                 default: true
@@ -199,7 +198,7 @@
 
                 forceValidateTypes: [
                     "select", "region", "cascader", "regions", "cascaders", "file", "coordinates", "editor",
-                    "users", "departments", "labels", "flatTable", "reference", "referenceBy"
+                    "users", "departments", "labels", "flatTable", "cascaderTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
                     "_name", "_key", "_default", "_required", "_regStr", "_regMessage", "_span", "_br", "_line", "_noLabel", "_clearable",
@@ -229,7 +228,7 @@
             },
             // 初始化监测 -监测所有字段
             initMonitor () {
-                (this.monitorFormList || this.formList).forEach(formItem => {
+                (this.allFormList || this.formList).forEach(formItem => {
                     this.$set(this.formData, formItem._key, this.formData[formItem._key]);
                 });
             },

package/src/components/form/searchMixin.js

@@ -60,7 +60,10 @@ export default {
     },
     computed: {
         canSearchFormList () {
-            return this.formList.filter(formItem => this.$formHasAbility(formItem, "canSearch"));
+            return this.formList.filter(formItem =>
+                this.$formHasAbility(formItem, "canSearch") &&
+                (this.mode === "set" ? true : formItem._displayType !== "hide")
+            );
         },
         dynamicFieldsMap () {
             return this.$arrToCategoryArr(this.dynamicFormList);
@@ -220,15 +223,15 @@ export default {
                     return {
                         _id: this.$ObjectID().str,
                         logic: "field",
-                        fieldKey: fieldKey,
-                        fieldType: fieldType,
-                        fieldOperator: fieldOperator,
+                        fieldKey,
+                        fieldType,
+                        fieldOperator,
                         fieldValue: [],
                         fieldSearch: {
                             logic: "and",
                             conditions: []
                         },
-                        parameterType: parameterType,
+                        parameterType,
                         fieldParams: [],
                         chainFieldKey: "",
                         ...initContion,
@@ -236,11 +239,11 @@ export default {
                         // 下面的是前端所用
                         dynamicList: dynamicList,
                         parameterTypeName: parameterTypeName,
-                        operators: operators,
+                        operators,
                         fieldOperatorName: fieldOperatorName,
                         formItem: this.getFormItem(curFormItem),
                         subFormList: curFormItem._subForm || [],
-                        finished: false // 标记 reference类型请求form数据 是否完成状态
+                        finished: !operators.some(operator => ["subSearch"].includes(operator._key)) // 子集条件的 请求form数据 是否完成状态
                     };
                 } else {
                     return {
@@ -315,13 +318,12 @@ export default {
                     this.getModData(conditionItem.formItem, data => {
                         conditionItem.finished = true;
                         conditionItem.subFormList = (data.screens.find(screenItem =>
-                            this.mode === "set" ? screenItem.screenType === "all" : screenItem._key === conditionItem.formItem._screen
+                            this.mode === "set"
+                                ? screenItem.screenType === "all"
+                                : screenItem._key === conditionItem.formItem._screen
                         ) || { form: [] }).form;
                     });
                 }
-            } else if (["subTableSearch", "cascaderTableSearch", "treeTableSearch"].includes(conditionItem.fieldOperator)) {
-                conditionItem.finished = true;
-                conditionItem.subFormList = conditionItem.formItem._subForm;
             }
         },
         // 加载 reference数据

package/src/components/list/BriTable.vue

@@ -187,13 +187,11 @@
         },
         mounted () {},
         methods: {
-            // hidden columns
             hideColumnsByKeys (keys = []) {
-                this.$refs["briTable"].hideColumnsByKeys(keys);
+                this.$refs.briTable.hideColumnsByKeys(keys);
             },
-            // show cloumns
             showColumnsByKeys (keys = []) {
-                this.$refs["briTable"].showColumnsByKeys(keys);
+                this.$refs.briTable.showColumnsByKeys(keys);
             }
         }
     };

package/src/components/list/DshFlatTable.vue

@@ -9,29 +9,62 @@
             :render="topSearchRender"
         ></dsh-render>
 
-        <!-- 表格 -->
-        <bri-table
-            v-show="showListData.length"
-            ref="briTable"
-            class="DshFlatTable-main"
-            :columns="showColumns"
-            :data="renderedListData"
-            :footer-data="footerData"
-            :propsObj="tablePropsObj"
-            @changeSelect="changeSelect"
-            @selectAll="changeSelect"
-        ></bri-table>
-        <bri-table
-            v-show="!showListData.length"
-            ref="briTable"
-            class="DshFlatTable-main"
-            :columns="showColumns"
-            :data="showListData"
-            :footer-data="footerData"
-            :propsObj="tablePropsObj"
-            @changeSelect="changeSelect"
-            @selectAll="changeSelect"
-        ></bri-table>
+        <!-- 表单展示模式 -->
+        <div
+            v-if="showMode === 'form'"
+            class="DshFlatTable-form"
+        >
+            <div
+                v-for="(row, rowIndex) in showListData"
+                :key="row._id"
+                class="item"
+            >
+                <dsh-form
+                    :canEdit="getRowCanEdit(row)"
+                    :formData="row"
+                    :formList="getRowFormList(row)"
+                    :allFormList="getRowFormList(row)"
+                    :inTableType="inTableType"
+                    :allListRows="allListData"
+                    :rowIndex="rowIndex"
+                    :parentFormList="allFormList"
+                    :parentObj="parentObj"
+                ></dsh-form>
+
+                <dsh-icons
+                    v-if="$getOperationList(['canCreate', 'canDelete']).length"
+                    class="item-icons"
+                    itemClass="item-icons-item"
+                    :list="$getOperationList(['canCreate', 'canDelete'])"
+                    @click="$dispatchEvent($event, row, rowIndex)"
+                ></dsh-icons>
+            </div>
+        </div>
+
+        <!-- 表格展示模式 -->
+        <template v-else>
+            <bri-table
+                v-show="showListData.length"
+                ref="briTable"
+                class="DshFlatTable-main"
+                :columns="showColumns"
+                :data="renderedListData"
+                :footer-data="footerData"
+                :propsObj="tablePropsObj"
+                @changeSelect="changeSelect"
+                @selectAll="changeSelect"
+            ></bri-table>
+            <bri-table
+                v-show="!showListData.length"
+                class="DshFlatTable-main"
+                :columns="showColumns"
+                :data="showListData"
+                :footer-data="footerData"
+                :propsObj="tablePropsObj"
+                @changeSelect="changeSelect"
+                @selectAll="changeSelect"
+            ></bri-table>
+        </template>
 
         <!-- 添加行 -->
         <dsh-render :render="createOperationRender"></dsh-render>
@@ -58,6 +91,7 @@
 
                 <!-- 表格 -->
                 <bri-table
+                    v-show="showListData.length"
                     class="DshFlatTable-main"
                     :columns="showColumns"
                     :data="renderedListData"
@@ -66,6 +100,16 @@
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
+                <bri-table
+                    v-show="!showListData.length"
+                    class="DshFlatTable-main"
+                    :columns="showColumns"
+                    :data="showListData"
+                    :footer-data="footerData"
+                    :propsObj="tablePropsObj"
+                    @changeSelect="changeSelect"
+                    @selectAll="changeSelect"
+                ></bri-table>
 
                 <!-- 添加行 -->
                 <dsh-render :render="createOperationRender"></dsh-render>
@@ -97,6 +141,13 @@
 
 <style lang="less" scoped>
     .DshFlatTable {
+        &-form {
+            .item {
+                border: 1px solid #E5E5E6;
+                margin-bottom: 5px;
+                position: relative;
+            }
+        }
 
         &-main {
             width: 100%;
@@ -110,3 +161,25 @@
         }
     }
 </style>
+<style lang="less">
+    .DshFlatTable {
+        &-form {
+            .item {
+                &-icons {
+                    position: absolute;
+                    top: -10px;
+                    right: -10px;
+                    line-height: 18px;
+                    z-index: 2;
+                    display: none;
+                }
+
+                &:hover {
+                    .item-icons {
+                        display: block !important;
+                    }
+                }
+            }
+        }
+    }
+</style>

package/src/components/list/DshTreeTable.vue

@@ -23,10 +23,9 @@
         ></bri-table>
         <bri-table
             v-show="!showListData.length"
-            ref="briTable"
             class="DshTreeTable-main"
             :columns="showColumns"
-            :data="renderedListData"
+            :data="showListData"
             :footer-data="footerData"
             :propsObj="tablePropsObj"
             @changeSelect="changeSelect"
@@ -58,6 +57,7 @@
 
                 <!-- 表格 -->
                 <bri-table
+                    v-show="showListData.length"
                     class="DshTreeTable-main"
                     :columns="showColumns"
                     :data="renderedListData"
@@ -66,6 +66,16 @@
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
+                <bri-table
+                    v-show="!showListData.length"
+                    class="DshTreeTable-main"
+                    :columns="showColumns"
+                    :data="showListData"
+                    :footer-data="footerData"
+                    :propsObj="tablePropsObj"
+                    @changeSelect="changeSelect"
+                    @selectAll="changeSelect"
+                ></bri-table>
 
                 <!-- 添加行 -->
                 <dsh-render :render="createOperationRender"></dsh-render>

package/src/components/list/common/quoteListModal.vue

@@ -9,7 +9,7 @@
             :closable="true"
             :draggable="true"
         >
-            <div class="quoteListModal-drawer-body">
+            <div class="quoteListModal-body">
                 <div class="list">
                     <template v-if="listData.length">
                         <div
@@ -34,8 +34,8 @@
                 </div>
 
                 <dsh-buttons
-                    class="quoteListModal-drawer-body-btns"
-                    itemClass="quoteListModal-drawer-body-btns-item"
+                    class="quoteListModal-body-btns"
+                    itemClass="btns-item"
                     :list="$getOperationList()"
                     @click="$dispatchEvent($event)"
                 ></dsh-buttons>
@@ -74,12 +74,6 @@
                 curDataItem: undefined,
 
                 operationMap: {
-                    canReset: {
-                        name: "重 置",
-                        type: "canReset",
-                        size: "small",
-                        event: "clickReset"
-                    },
                     confirm: {
                         name: "确 认",
                         type: "confirm",
@@ -123,10 +117,6 @@
                 } else {
                     this.curDataItem = dataItem;
                 }
-            },
-            // 点击重置
-            clickReset () {
-
             },
             // 点击确认
             clickConfirm () {
@@ -155,47 +145,6 @@
 <style lang="less">
     .quoteListModal {
         &-drawer {
-            &-body {
-                width: 100%;
-                height: 100%;
-                padding: 20px;
-                overflow: auto;
-
-                .list {
-                    &-item {
-                        padding: 8px 12px;
-                        margin-bottom: 8px;
-                        border-radius: 4px;
-                        cursor: pointer;
-
-                        &-active {
-                            color: #ffffff;
-                            background-color: @theme-hover;
-                        }
-                    }
-
-                    &-nodata {
-                        #dsh-nodata();
-                    }
-                }
-
-                &-btns {
-                    position: absolute;
-                    bottom: 0px;
-                    left: 0px;
-                    .dsh-flex-row-start-stretch();
-                    width: calc(100% - 48px);
-                    height: 51px;
-                    margin: 25px 20px 25px 28px;
-
-                    &-item {
-                        flex: 1;
-                        margin: 5px;
-                        height: 40px;
-                    }
-                }
-            }
-
             .ivu-drawer-mask,
             .ivu-drawer-wrap {
                 z-index: 88888888;
@@ -212,5 +161,46 @@
                 font-weight: bold;
             }
         }
+
+        &-body {
+            width: 100%;
+            height: 100%;
+            padding: 20px;
+            overflow: auto;
+
+            .list {
+                &-item {
+                    padding: 8px 12px;
+                    margin-bottom: 8px;
+                    border-radius: 4px;
+                    cursor: pointer;
+
+                    &-active {
+                        color: #ffffff;
+                        background-color: @theme-hover;
+                    }
+                }
+
+                &-nodata {
+                    #dsh-nodata();
+                }
+            }
+
+            &-btns {
+                position: absolute;
+                bottom: 0px;
+                left: 0px;
+                .dsh-flex-row-start-stretch();
+                width: calc(100% - 48px);
+                height: 51px;
+                margin: 25px 20px 25px 28px;
+
+                .btns-item {
+                    flex: 1;
+                    min-width: 0px;
+                    height: 40px;
+                }
+            }
+        }
     }
 </style>

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

@@ -105,6 +105,7 @@ export default {
     computed: {
         selfPropsObj () {
             return {
+                _treeForm: [],
                 ...this.commonPropsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 400 // 表格最大高度
@@ -113,7 +114,7 @@ export default {
 
         allTreeData () {
             // console.log("allTreeData");
-            return this.getCalcuedTree(this.data, this.treeColumns, this.columns);
+            return this.getCalcuedTree(this.data, this.treeColumns, this.selfColumns);
         },
         allListData () {
             return this.$getTreeFlatArr(this.data, node => !(node.children && node.children.length));
@@ -156,7 +157,7 @@ export default {
                         loop(node.children);
                     } else {
                         // 根节点下所有表格字段加上监测，注入到节点对象中，必须$set，牵扯_rely值再出现并没有检测
-                        this.columns.forEach(subFormItem => {
+                        this.selfColumns.forEach(subFormItem => {
                             this.$set(node, subFormItem._key, node[subFormItem._key]);
                         });
                     }
@@ -812,7 +813,7 @@ export default {
         },
         getSummaryVal (col, row) {
             if (col._calField && col._operator) {
-                const calFieldFormItem = this.columns.find(item => item._key === col._calField);
+                const calFieldFormItem = this.selfColumns.find(item => item._key === col._calField);
 
                 if (calFieldFormItem) {
                     let loop = (nodes, arr) => {

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

@@ -1,3 +1,5 @@
+import { resourceData } from "bri-datas";
+
 export default {
     mixins: [],
     components: {},
@@ -11,19 +13,36 @@ export default {
         };
     },
     computed: {
+        selfColumns () {
+            return this.columns.map(column => {
+                // 层级表格类型，level字段的进行特殊处理（_treeForm加工成_data）
+                return column._key === "level"
+                    ? {
+                        ...column,
+                        _data: this.selfPropsObj._treeForm.map((treeFormItem, treeFormIndex) => ({
+                            name: treeFormItem._name,
+                            _key: (treeFormIndex + 1),
+                            color: Object.keys(resourceData.colorMap)[treeFormIndex + 1]
+                        }))
+                    }
+                    : column;
+            });
+        },
         selfPropsObj () {
             return {
-                _maxLevel: 3, // 最大级数
-                ...this.commonPropsObj
+                _treeForm: [],
+                ...this.commonPropsObj,
+
+                _maxLevel: this.commonPropsObj._maxLevel || 3 // 最大级数
             };
         },
         maxLevel () {
-            return this.selfPropsObj._maxLevel || 3;
+            return this.selfPropsObj._maxLevel;
         },
 
         allTreeData () {
             // console.log("allTreeData");
-            return this.getCalcuedTree(this.data, this.columns);
+            return this.getCalcuedTree(this.data, this.selfColumns);
         },
         allListData () {
             // console.log("allListData");
@@ -186,7 +205,7 @@ export default {
                                         color: "#3DB8C5"
                                     },
                                     props: {
-                                        type: "md-add-circle", // "ios-add"
+                                        type: "md-add-circle",
                                         size: "14"
                                     },
                                     on: {
@@ -224,7 +243,7 @@ export default {
                                         color: "#3DB8C5"
                                     },
                                     props: {
-                                        type: "ios-add", // "md-add-circle"
+                                        type: "ios-add",
                                         size: "14"
                                     },
                                     on: {
@@ -322,11 +341,11 @@ export default {
 
         /* ------ 工具方法 ------- */
         // 加工树形数据
-        getCalcuedTree (treeData = [], columns = []) {
+        getCalcuedTree (treeData = [], cols = []) {
             const loop = (list = [], parentRow) =>
                 list.forEach((row) => {
                     // 递归到叶子节点前 从上往下执行 要处理的
-                    columns.reduce((newRow, column) => {
+                    cols.reduce((newRow, column) => {
                         if (["number", "date"].includes(column._type)) {
                             if (![undefined, null, "", "no"].includes(column._summaryType)) {
                                 // 不做处理，_summaryType和_writeSort互反，更安全的判断
@@ -349,7 +368,7 @@ export default {
                         loop(row.children, row);
 
                         // 递归到叶子节点后到 从下往上执行 要处理的（非叶子节点）
-                        columns.reduce((newRow, column) => {
+                        cols.reduce((newRow, column) => {
                             if (["number", "date"].includes(column._type)) {
                                 if (![undefined, null, "", "no"].includes(column._summaryType)) {
                                     const val = ["number"].includes(column._type)
@@ -383,7 +402,7 @@ export default {
                         row.isLeaf = true;
 
                         // 递归到叶子节点后到 从下往上执行 要处理的（叶子节点）
-                        columns.reduce((newRow, column) => {
+                        cols.reduce((newRow, column) => {
                             if (["number", "date"].includes(column._type)) {
                                 if (![undefined, null, "", "no"].includes(column._summaryType)) {
                                     this.$set(newRow, column._key, newRow[column._key]);

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

@@ -137,6 +137,7 @@ export default {
                     name: "添加一行",
                     type: "canCreate",
                     btnType: "default",
+                    icon: "md-add-circle",
                     size: "default",
                     long: true,
                     disabled: false,
@@ -190,6 +191,13 @@ export default {
         allScreenKey () {
             return this.propsObj.allScreenKey;
         },
+        selfColumns () {
+            return this.columns;
+        },
+        filterColumns () {
+            // console.log("filterColumns");
+            return this.selfColumns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
+        },
 
         commonPropsObj () {
             return {
@@ -276,29 +284,10 @@ export default {
         disabledOldDataRow () {
             return this.selfPropsObj._disabledOldDataRow;
         },
-
-        isImport () {
-            return this.selfPropsObj._isImport;
-        },
-        isExport () {
-            return this.selfPropsObj._isExport;
-        },
-        isQuote () {
-            return this.selfPropsObj._isQuote;
-        },
-        quoteDisabledColKeys () {
-            return this.selfPropsObj._quoteDisabledColKeys;
-        },
-        quoteListFields () {
-            return this.selfPropsObj._quoteListFields;
-        },
-        quoteAdvSearch () {
-            return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.allFormList, this.parentObj);
-        },
-
         hideColKeys () {
             return this.selfPropsObj._hideColKeys || [];
         },
+
         searchLabelWidth () {
             return this.selfPropsObj._searchLabelWidth;
         },
@@ -312,13 +301,12 @@ export default {
             return this.searchList.map(searchItem => searchItem._key);
         },
         searchFormList () {
-            return this.$filterList(this.searchListFields, this.columns).map(formItem => ({
+            return this.$filterList(this.searchListFields, this.selfColumns).map(formItem => ({
                 ...formItem,
                 ...this.searchListMap[formItem._key],
                 _name: formItem._name
             }));
         },
-
         tableAdvSearch () {
             return this.$transformAdvSearch(this.selfPropsObj._tableAdvSearch, this.allFormList, this.parentObj);
         },
@@ -382,7 +370,7 @@ export default {
             return this.parentObj._id;
         },
         selfRowDefault () {
-            return this.columns.reduce((obj, column) => {
+            return this.selfColumns.reduce((obj, column) => {
                 const defaultVal = this.rowDefault[column._key];
                 const initDftVal = this.initDftValMap[column._type];
 
@@ -432,53 +420,6 @@ export default {
                 }
             };
         },
-        modalPropsObj () {
-            return {
-                mode: "fullscreen",
-                title: this.controlName
-            };
-        },
-        quoteParams () {
-            return {
-                screenKey: this.allScreenKey,
-                fields: [
-                    ...this.quoteListFields,
-                    this.controlKey,
-                    "createdAt"
-                ],
-                advSearch: {
-                    logic: "and",
-                    conditions: [
-                        {
-                            fieldKey: "_id",
-                            fieldOperator: "ne",
-                            fieldValue: [this.parentDataId]
-                        },
-                        this.quoteAdvSearch
-                    ]
-                }
-            };
-        },
-        importParams () {
-            return {
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                importType: this.inTableType
-            };
-        },
-        exportParams () {
-            return {
-                screenKey: this.screenKey,
-                _id: this.parentDataId,
-                _key: this.controlKey,
-                advSearch: this.finalTableAdvSearch
-            };
-        },
-
-        filterColumns () {
-            // console.log("filterColumns");
-            return this.columns.filter(col => this.$isAdvRelyShow(col, this.allListData, this.parentObj, true));
-        },
         contentColumns () {
             // console.log("contentColumns");
             return this.filterColumns.map(colItem => ({
@@ -510,7 +451,7 @@ export default {
                                             canEdit: unitCanEdit,
                                             formData: row,
                                             formItem: column,
-                                            allFormList: this.columns,
+                                            allFormList: this.selfColumns,
                                             inTableType: this.inTableType,
                                             allListRows: this.allListData,
                                             rowIndex: rowIndex,
@@ -529,7 +470,7 @@ export default {
                                     canEdit: unitCanEdit,
                                     formData: row,
                                     formItem: column,
-                                    allFormList: this.columns,
+                                    allFormList: this.selfColumns,
                                     inTableType: this.inTableType,
                                     allListRows: this.allListData,
                                     rowIndex: rowIndex,
@@ -602,6 +543,67 @@ 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
+            };
+        },
+        isQuote () {
+            return this.selfPropsObj._isQuote;
+        },
+        quoteDisabledColKeys () {
+            return this.selfPropsObj._quoteDisabledColKeys;
+        },
+        quoteListFields () {
+            return this.selfPropsObj._quoteListFields;
+        },
+        quoteAdvSearch () {
+            return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.allFormList, this.parentObj);
+        },
+        quoteParams () {
+            return {
+                screenKey: this.allScreenKey,
+                fields: [
+                    ...this.quoteListFields,
+                    this.controlKey,
+                    "createdAt"
+                ],
+                advSearch: {
+                    logic: "and",
+                    conditions: [
+                        {
+                            fieldKey: "_id",
+                            fieldOperator: "ne",
+                            fieldValue: [this.parentDataId]
+                        },
+                        this.quoteAdvSearch
+                    ]
+                }
+            };
+        },
+        modalPropsObj () {
+            return {
+                mode: "fullscreen",
+                title: this.controlName
+            };
+        },
+
         topOperationBtns () {
             return Object.keys(this.topOperationMap);
         },
@@ -673,6 +675,7 @@ export default {
             this.initFlag = true;
             this.showRuleMessage = false;
             this.ruleRecordMap = {};
+            this.selfReset && this.selfReset();
         },
         // 共外部使用
         validate () {
@@ -704,15 +707,15 @@ export default {
 
         /* ----------- 隐藏／显示字段 ---------- */
         toggleHideOrShow () {
-            if (this.$refs["briTable"]) {
+            if (this.$refs.briTable) {
                 if (this.hideStatus === true) {
-                    this.$refs["briTable"].showColumnsByKeys(this.hideColKeys);
+                    this.$refs.briTable.showColumnsByKeys(this.hideColKeys);
                 } else {
-                    this.$refs["briTable"].hideColumnsByKeys(this.hideColKeys);
+                    this.$refs.briTable.hideColumnsByKeys(this.hideColKeys);
                 }
-            }
 
-            this.hideStatus = !this.hideStatus;
+                this.hideStatus = !this.hideStatus;
+            }
         },
 
         /* ----------- 全屏 ---------- */
@@ -769,7 +772,8 @@ export default {
                             ...fieldVal,
                             list: fieldVal.list.map(item => ({
                                 ...item,
-                                __isQuote__: true
+                                __isQuote__: true,
+                                __old__: false
                             }))
                         };
                     } else if (["cascaderTable"].includes(this.controlType)) {
@@ -778,7 +782,8 @@ export default {
                                 list.map(item => ({
                                     ...item,
                                     children: item.children ? loop(item.children) : item.children,
-                                    __isQuote__: true
+                                    __isQuote__: true,
+                                    __old__: false
                                 }));
 
                             return loop(list);
@@ -792,7 +797,6 @@ export default {
 
                     this.$Message.success("引用成功！");
                     this.reset();
-                    this.selfReset && this.selfReset();
                     this.change("quote");
                 }
             } else {
@@ -1028,7 +1032,7 @@ export default {
                 // 校验必填不通过 => 校验对比
                 const resultObj = {};
                 this.$getFieldRuleResult(col, row, resultObj) &&
-                    this.$normalComparedFunc(col, row, this.columns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
+                    this.$normalComparedFunc(col, row, this.selfColumns, this.parentObj, this.allFormList, this.inTableType, resultObj) &&
                     this.$levelComparedFunc(col, row, this.allListData, this.inTableType, resultObj);
 
                 return resultObj;
@@ -1065,6 +1069,7 @@ export default {
                             : true
                     : 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._enterType !== "calculate" && // 计算的不可编辑
@@ -1076,6 +1081,17 @@ export default {
             return this.getRowCanEdit(row) &&
                 this.getColCanEdit(col, row) &&
                 this.$isAdvRelyShow(col, row, this.parentObj, true);
+        },
+        getRowFormList (row) {
+            return this.selfColumns.map(column => {
+                column = this.$transformDynamicProperty(column, row, this.parentObj);
+                const unitCanEdit = this.getColCanEdit(column, row);
+
+                return {
+                    ...column,
+                    canEdit: unitCanEdit
+                };
+            });
         }
     }
 };

package/src/utils/table.js

@@ -161,7 +161,7 @@ const transformToColumns = function (form, {
 
                 ...col
             };
-        });
+    });
 };
 
 export default {