bri-components 1.3.40 → 1.3.41

package/package.json

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

package/src/components/controls/base/DshDate/DshDate.vue

@@ -98,7 +98,7 @@
                     return this.$transformDateCompatible(val, this.subType);
                 },
                 set (val) {
-                    this.value[this.controlKey] = this.$transformDate(val, "-", this.subType);
+                    this.$set(this.value, this.controlKey, this.$transformDate(val, "-", this.subType));
                 }
             },
             subType () {

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

@@ -32,9 +32,10 @@
                     <dsh-cascader-table
                         v-else
                         :canEdit="finalCanEdit"
+                        :rowDefault="curVal.rowDefault"
+                        :columns="subForm"
                         :data="curVal"
                         :treeColumns="treeForm"
-                        :subColumns="subForm"
                         :propsObj="propsObj"
                         :parentFormList="allFormList"
                         :parentObj="value"
@@ -64,9 +65,10 @@
                     v-else
                     ref="table"
                     :canEdit="finalCanEdit"
+                    :rowDefault="curVal.rowDefault"
+                    :columns="subForm"
                     :data="curVal"
                     :treeColumns="treeForm"
-                    :subColumns="subForm"
                     :propsObj="propsObj"
                     :parentFormList="allFormList"
                     :parentObj="value"

package/src/components/form/DshForm.vue

@@ -204,7 +204,7 @@
         },
         computed: {
             showFormList () {
-                return this.formList.filter(formItem => this.isShow(formItem, this.formData));
+                return this.formList.filter(formItem => this.isShow(formItem, this.formData, this.parentObj));
             }
         },
         watch: {
@@ -326,7 +326,7 @@
             },
 
             /* -------- 工具类 -------- */
-            isShow (formItem, formData) {
+            isShow (formItem, formData, parentObj) {
                 // 寻找循环项
                 if (formItem._loop === true) {
                     Object.entries({
@@ -339,7 +339,7 @@
                     });
                 }
 
-                return this.$isAdvRelyShow(formItem, formData);
+                return this.$isAdvRelyShow(formItem, formData, parentObj);
             },
             getRules (formItem) {
                 let rules = [];

package/src/components/list/DshCascaderTable.vue

@@ -32,7 +32,7 @@
                             <tbody>
                                 <tr>
                                     <th
-                                        v-for="(column, colIndex) in columns"
+                                        v-for="(column, colIndex) in showColumns"
                                         :key="column._id"
                                         class="table-th bri-table-th"
                                         :style="getThStyle(column, 'th')"
@@ -51,7 +51,7 @@
                                             menuClass="table-th-dropdown-list"
                                             trigger="hover"
                                             :list="$getOperationList(getTreeThBtns(column))"
-                                            @click="$dispatchEvent($event, column, colIndex, columns)"
+                                            @click="$dispatchEvent($event, column, colIndex, showColumns)"
                                             @click.native.stop="0"
                                         >
                                             <a href="javascript:void(0)">
@@ -92,8 +92,7 @@
                                                 :class="{
                                                     [`table-td-${column.colType}`]: true,
                                                     'bri-table-td': true , // 可以不要，为了position: relative，上面有
-                                                    'bri-table-td-edit': canEdit,
-                                                    'bri-table-td-show': !canEdit,
+                                                    'bri-table-td-edit': canEdit
                                                 }"
                                                 :style="getTdStyle(column, row[column.nodeKey])"
                                                 :rowspan="getTdRowSpan(column, row[column.nodeKey || column._key])"
@@ -167,7 +166,7 @@
                                     v-else
                                     class="table-nodata"
                                 >
-                                    <td :colspan="columns.length">暂无数据…</td>
+                                    <td :colspan="showColumns.length">暂无数据…</td>
                                 </tr>
                             </tbody>
                         </table>
@@ -205,7 +204,7 @@
                                 <tbody>
                                     <tr>
                                         <th
-                                            v-for="(column, colIndex) in columns"
+                                            v-for="(column, colIndex) in showColumns"
                                             :key="column._id"
                                             class="table-th bri-table-th"
                                             :style="getThStyle(column, 'th')"
@@ -224,7 +223,7 @@
                                                 menuClass="table-th-dropdown-list"
                                                 trigger="hover"
                                                 :list="$getOperationList(getTreeThBtns(column))"
-                                                @click="$dispatchEvent($event, column, colIndex, columns)"
+                                                @click="$dispatchEvent($event, column, colIndex, showColumns)"
                                                 @click.native.stop="0"
                                             >
                                                 <a href="javascript:void(0)">
@@ -265,8 +264,7 @@
                                                     :class="{
                                                         [`table-td-${column.colType}`]: true,
                                                         'bri-table-td': true , // 可以不要，为了position: relative，上面有
-                                                        'bri-table-td-edit': canEdit,
-                                                        'bri-table-td-show': !canEdit,
+                                                        'bri-table-td-edit': canEdit
                                                     }"
                                                     :style="getTdStyle(column, row[column.nodeKey])"
                                                     :rowspan="getTdRowSpan(column, row[column.nodeKey || column._key])"
@@ -340,7 +338,7 @@
                                         v-else
                                         class="table-nodata"
                                     >
-                                        <td :colspan="columns.length">暂无数据…</td>
+                                        <td :colspan="showColumns.length">暂无数据…</td>
                                     </tr>
                                 </tbody>
                             </table>
@@ -368,7 +366,6 @@
                     return {
                         tree: [],
                         list: [],
-                        rowDefault: {},
                         _treeForm: []
                     };
                 }
@@ -378,17 +375,10 @@
                 default () {
                     return [];
                 }
-            },
-            subColumns: {
-                type: Array,
-                default () {
-                    return [];
-                }
             }
         },
         data () {
             return {
-                widthMap: this.$getModFieldPropertyMap("width"),
                 boxWidth: 0,
 
                 baseOperationMap: {
@@ -490,10 +480,7 @@
                 };
             },
 
-            filterColumns () {
-                return this.subColumns.filter(column => this.$isAdvRelyShow(column, this.listData, this.parentObj, true));
-            },
-            columns () {
+            showColumns () {
                 return this.transformColumns(this.treeColumns);
             },
             // 供表格渲染行使用的columns的数组集合, 每一行columns不一样，组成二重数组
@@ -527,7 +514,7 @@
                             loop(node.children);
                         } else {
                             // 根节点下所有表格字段加上监测，注入到节点对象中，必须$set，牵扯_rely值再出现并没有检测
-                            this.subColumns.forEach(subFormItem => {
+                            this.columns.forEach(subFormItem => {
                                 this.$set(node, subFormItem._key, node[subFormItem._key]);
                             });
                         }
@@ -682,7 +669,7 @@
                 );
             },
             // 转化树数据
-            transforBriTreeData (treeForm = this.treeColumns, subForm = this.subColumns) {
+            transforBriTreeData (treeForm = this.treeColumns, subForm = this.columns) {
                 treeForm.forEach((treeFormItem, treeFormIndex) => {
                     treeFormItem.canDelete = true; // 每次计算，重置一下
                     treeFormItem.level = treeFormIndex + 1; // treeColumns更新,缺少level
@@ -829,26 +816,19 @@
             },
             // 获取节点数据
             getNewNode (level, list) {
-                // 新增行里的输入框，第一次输入会失去光标的bug，需要$set
-                const rowDefault = this.$deepCopy(this.data.rowDefault);
-                this.subColumns.forEach(subFormItem => {
-                    // 用$set也可以
-                    rowDefault[subFormItem._key] = rowDefault[subFormItem._key];
-                });
-
-                const levelText = this.$numToChinese(level);
                 return {
+                    ...this.$deepCopy(this.selfRowDefault),
                     _id: this.$ObjectID().str,
-                    name: `${levelText}级节点${list.length + 1}`,
+                    name: `${this.$numToChinese(level)}级节点${list.length + 1}`,
                     level: level,
-                    children: [],
-                    ...rowDefault
+                    // isLeaf: true,
+                    children: []
                 };
             },
 
             /* ----- 模板获值方法 ---- */
             getThStyle (col, position) {
-                const boxColWidth = this.boxWidth / this.columns.length;
+                const boxColWidth = this.boxWidth / this.showColumns.length;
                 const defaultWidth = Math.max(boxColWidth, this.widthMap[col._type], (col._name ? col._name.length * 14 : 36) + (col._type === "reference" ? 200 : 26));
                 const width = col._width || defaultWidth;
 
@@ -899,7 +879,6 @@
             getTdRender (col, row, rowIndex) {
                 return (h) => {
                     row = row[col.nodeKey];
-                    console.log(row);
 
                     return h(
                         "td",
@@ -913,7 +892,7 @@
             },
             getSummaryVal (col, row) {
                 if (col._calField && col._operator) {
-                    const calFieldFormItem = this.subColumns.find(item => item._key === col._calField);
+                    const calFieldFormItem = this.columns.find(item => item._key === col._calField);
 
                     if (calFieldFormItem) {
                         let loop = (nodes, arr) => {

package/src/components/list/DshTreeTable.vue

@@ -95,7 +95,7 @@
         props: {},
         data () {
             return {
-                deleteProperties: ["__treeIndex__", "__old__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchingShow__"], // 除了__readonly__和__isQuote__不处理
+                deleteProperties: ["__treeIndex__", "__old__", "__isExpand__", "__isRendered__", "__isShow__", "__isTmpShow__", "__isSearchShow__"], // 除了__readonly__和__isQuote__不处理
                 isExpandAction: false,
 
                 searchMode: "flat", // "flat", "tree"
@@ -121,13 +121,13 @@
             listData () {
                 return this.allListData.filter(row => {
                     if (this.isSearching) {
-                        // 重置__isSearchingShow__为false
-                        row.__isSearchingShow__ = false;
-
                         const bool = this.$isAdvRelyAccord(this.advSearchObj, row);
+
+                        // 重置
+                        row.__isSearchShow__ = false;
                         if (bool) {
                             row.__isRendered__ = true;
-                            row.__isSearchingShow__ = true;
+                            row.__isSearchShow__ = true;
                         }
 
                         return bool || row.__isRendered__;
@@ -138,7 +138,7 @@
             },
             showListData () {
                 return this.listData.filter(row =>
-                    this.isSearching ? !!row.__isSearchingShow__ : !!row.__isShow__
+                    this.isSearching ? !!row.__isSearchShow__ : !!row.__isShow__
                 );
             },
             rowsNum () {
@@ -219,11 +219,11 @@
                                 `${
                                     this.getRowCanEdit(row)
                                         ? " bri-table-td-edit"
-                                        : " bri-table-td-show"
+                                        : ""
                                 }` +
                                 `${
                                     this.isSearching
-                                        ? !row.__isSearchingShow__
+                                        ? !row.__isSearchShow__
                                             ? " bri-table-td-hide"
                                             : ""
                                         : !row.__isShow__
@@ -378,6 +378,7 @@
             // 展开／隐藏节点
             toggleExpand (row, bool = true) {
                 this.isExpandAction = true;
+                // row.__isExpand__ = bool;
                 this.$set(row, "__isExpand__", bool);
 
                 this.toggleDescendantsShow(row, bool);
@@ -385,24 +386,29 @@
 
             // 点击 -添加一行
             clickCreate (operationItem, row, rowIndex) {
+                const newRow = {
+                    ...this.$deepCopy(this.selfRowDefault),
+                    _id: this.$ObjectID().str,
+                    isLeaf: true,
+                    children: [],
+                    // __old__: false,
+                    __isExpand__: false,
+                    __isRendered__: true,
+                    __isShow__: true,
+                    __isTmpShow__: false,
+                    __isSearchShow__: false
+                };
+
                 // !row代表最上级节点
                 if (!row) {
                     this.data.push({
-                        _id: this.$ObjectID().str,
-                        ...this.$deepCopy(this.rowDefault),
-                        level: 1,
-                        isLeaf: true,
-                        children: [],
-                        __isRendered__: true,
-                        __isShow__: true
+                        ...newRow,
+                        level: 1
                     });
                 } else {
                     row.children.push({
-                        _id: this.$ObjectID().str,
-                        ...this.$deepCopy(this.rowDefault),
-                        level: row.level + 1,
-                        isLeaf: true,
-                        children: []
+                        ...newRow,
+                        level: row.level + 1
                     });
 
                     this.toggleExpand(row, true);
@@ -424,54 +430,91 @@
             /* ------ 工具方法 ------- */
             // 加工树形数据
             getCalcuedTree (treeData = [], columns) {
-                const loop = (list = []) =>
-                    list.forEach((node) => {
-                        if (node.children && node.children.length) {
-                            node.isLeaf = false;
-                            loop(node.children);
-
-                            columns.reduce((newNode, col) => {
-                                if (col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)) {
-                                    newNode[col._key] = col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                const loop = (list = [], parentRow) =>
+                    list.forEach((row) => {
+                        // 递归到叶子节点前 从上往下要处理的
+                        columns.reduce((newRow, col) => {
+                            const isNumberSummary = col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType);
+                            const isDateSummary = col._type === "date" && ![undefined, null, ""].includes(col._writeSort);
+
+                            if (isNumberSummary || isDateSummary) {
+                                const val = isNumberSummary
+                                    ? newRow[col._key]
+                                    : ["downToUp"].includes(col._writeSort)
+                                        ? newRow[col._key]
+                                        : !parentRow || parentRow[col._key]
+                                            ? newRow[col._key]
+                                            : undefined;
+
+                                this.$set(newRow, col._key, val);
+                            }
+
+                            return newRow;
+                        }, row);
+
+                        if (row.children && row.children.length) {
+                            row.isLeaf = false;
+                            loop(row.children, row);
+
+                            // 递归到叶子节点后 从下往上要处理的
+                            columns.reduce((newRow, col) => {
+                                const isNumberSummary = col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType);
+                                const isDateSummary = col._type === "date" && ![undefined, null, ""].includes(col._writeSort);
+
+                                if (isNumberSummary || isDateSummary) {
+                                    const val = isNumberSummary
                                         ? this.$calNumList(
-                                            node.children.map(subNode => subNode[col._key]),
+                                            newRow.children.map(subRow => subRow[col._key]),
                                             col._summaryType,
                                             { ...col, _defaultDigit: 2 },
                                             false
                                         )
-                                        : newNode[col._key];
+                                        : ["downToUp"].includes(col._writeSort)
+                                            ? this.$calDateList(
+                                                newRow.children.map(subRow => subRow[col._key]),
+                                                col._compareOperator,
+                                                col._dateType
+                                            )
+                                            : newRow[col._key];
+
+                                    this.$set(newRow, col._key, val);
                                 }
 
-                                return newNode;
-                            }, node);
+                                return newRow;
+                            }, row);
                         } else {
-                            node.isLeaf = true;
+                            row.isLeaf = true;
                         }
 
                         // 初次进来把前端存的状态值全部清除（除了__readonly__）
                         if (this.initFlag) {
                             this.deleteProperties.forEach(property => {
-                                delete node[property];
+                                delete row[property];
                             });
 
-                            node.__old__ = true; // 老的数据都打上标记 尽管不一定会用
+                            row.__old__ = true; // 老的数据都打上标记 尽管不一定会用
+                            // row.__isExpand__ = false;
+                            // row.__isSearchShow__ = false;
                             // 第一级的需要显示出来
-                            if (node.level == 1) {
-                                node.__isRendered__ = true;
-                                node.__isShow__ = true;
-                                node.__isTmpShow__ = true;
+                            if (row.level == 1) {
+                                row.__isRendered__ = true;
+                                row.__isShow__ = true;
+                                row.__isTmpShow__ = true;
+                            } else {
+                                // row.__isRendered__ = false;
+                                // row.__isShow__ = false;
+                                // row.__isTmpShow__ = false;
                             }
                         }
                     });
-
                 loop(treeData);
-                console.log("treeee");
+
                 this.initFlag = false;
                 return treeData;
             },
             // 获取父节点
-            getParentNode (curNode, tree = []) {
-                if (curNode.level === 1) {
+            getParentNode (curRow, tree = []) {
+                if (curRow.level === 1) {
                     return {
                         children: tree
                     };
@@ -479,13 +522,13 @@
                     let parentNode;
 
                     const loop = (list = []) => {
-                        return list.some(node => {
-                            if (node.level === curNode.level - 1) {
-                                const isExist = node.children.some(childNode => childNode._id === curNode._id);
-                                parentNode = node;
+                        return list.some(row => {
+                            if (row.level === curRow.level - 1) {
+                                const isExist = row.children.some(childNode => childNode._id === curRow._id);
+                                parentNode = row;
                                 return isExist;
                             } else {
-                                return loop(node.children);
+                                return loop(row.children);
                             }
                         });
                     };
@@ -495,28 +538,33 @@
                 }
             },
             // 切换子孙后代的显示／隐藏
-            toggleDescendantsShow (node, bool) {
-                const loop = (node, isFirstSon) => {
-                    if (node.children && node.children.length) {
-                        node.children.forEach(subNode => {
+            toggleDescendantsShow (row, bool) {
+                const loop = (row, isFirstSon) => {
+                    if (row.children && row.children.length) {
+                        row.children.forEach(subRow => {
                             if (isFirstSon) {
-                                this.$set(subNode, "__isRendered__", true);
-                                this.$set(subNode, "__isShow__", bool);
-                                this.$set(subNode, "__isTmpShow__", bool);
+                                // subRow.__isRendered__ = true;
+                                // subRow.__isShow__ = bool;
+                                // subRow.__isTmpShow__ = bool;
+                                this.$set(subRow, "__isRendered__", true);
+                                this.$set(subRow, "__isShow__", bool);
+                                this.$set(subRow, "__isTmpShow__", bool);
                             } else {
                                 if (bool) {
-                                    this.$set(subNode, "__isShow__", subNode.__isTmpShow__);
+                                    // subRow.__isShow__ = subRow.__isTmpShow__;
+                                    this.$set(subRow, "__isShow__", subRow.__isTmpShow__);
                                 } else {
-                                    this.$set(subNode, "__isShow__", false);
+                                    // subRow.__isShow__ = false;
+                                    this.$set(subRow, "__isShow__", false);
                                 }
                             }
 
-                            loop(subNode);
+                            loop(subRow);
                         });
                     }
                 };
 
-                loop(node, true);
+                loop(row, true);
             }
         }
     };

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

@@ -2,12 +2,6 @@ export default {
     mixins: [],
     components: {},
     props: {
-        columns: {
-            type: Array,
-            default () {
-                return [];
-            }
-        },
         data: {
             type: Array,
             default () {
@@ -64,9 +58,6 @@ export default {
             };
         },
 
-        filterColumns () {
-            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
-        },
         showColumns () {
             return [
                 ...(this.useSelection === true ? [this.selectionColumn] : []),

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

@@ -12,24 +12,30 @@ export default {
             type: Boolean,
             default: true
         },
-        rowDefault: {
-            type: Object,
+        oldData: {
+            type: Array,
             default () {
-                return {};
+                return [];
             }
         },
-        propsObj: {
+        rowDefault: {
             type: Object,
             default () {
                 return {};
             }
         },
-        oldData: {
+        columns: {
             type: Array,
             default () {
                 return [];
             }
         },
+        propsObj: {
+            type: Object,
+            default () {
+                return {};
+            }
+        },
 
         parentFormList: {
             type: Array,
@@ -46,6 +52,9 @@ export default {
     },
     data () {
         return {
+            widthMap: this.$getModFieldPropertyMap("width"),
+            initDftValMap: this.$getModFieldPropertyMap("initDefaultVal"),
+
             initFlag: true,
             showRuleMessage: false, // 进行全体校验
             ruleRecordMap: {}, // 单元格是否发生校验的记录映射
@@ -126,7 +135,16 @@ export default {
             return this.parentObj._id;
         },
         selfRowDefault () {
-            return this.$filterObj(this.filterColumns, this.rowDefault);
+            return this.filterColumns.reduce((obj, column) => {
+                const defaultVal = this.rowDefault[column._key];
+                const initDftVal = this.initDftValMap[column._type];
+
+                return Object.assign(obj, {
+                    [column._key]: this.$isEmptyData(defaultVal)
+                        ? initDftVal
+                        : defaultVal
+                });
+            }, {});
         },
         oldListData () {
             this.oldData.forEach(item => {
@@ -173,6 +191,7 @@ export default {
                 _isImport: false, // 导入
                 _isExport: false, // 导出
                 _isQuote: false, // 引用
+                _quoteDataCanEdit: false, // 引用的数据是否能编辑
                 _quoteListFields: [], // 引用列表的显示字段
                 _quoteAdvSearch: {
                     logic: "and",
@@ -228,6 +247,9 @@ export default {
         isQuote () {
             return this.selfPropsObj._isQuote;
         },
+        quoteDataCanEdit () {
+            return this.selfPropsObj._quoteDataCanEdit;
+        },
         quoteListFields () {
             return this.selfPropsObj._quoteListFields;
         },
@@ -243,7 +265,7 @@ export default {
                         return "bri-table-td" +
                             `${this.getRowCanEdit(row)
                                 ? " bri-table-td-edit"
-                                : " bri-table-td-show"
+                                : ""
                             }`;
                     }
                 }
@@ -278,6 +300,10 @@ export default {
                 _key: this.controlKey
             };
         },
+
+        filterColumns () {
+            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
+        },
         contentColumns () {
             return this.filterColumns.map(colItem => ({
                 filter: undefined,
@@ -479,7 +505,7 @@ export default {
                             }))
                         };
                     } else if (["cascaderTable"].includes(this.controlType)) {
-                        const transformData = (data = []) => {
+                        const transformData = (list = []) => {
                             const loop = (list = []) =>
                                 list.map(item => ({
                                     ...item,
@@ -487,7 +513,7 @@ export default {
                                     __isQuote__: true
                                 }));
 
-                            return loop(data);
+                            return loop(list);
                         };
 
                         this.parentObj[this.controlKey] = {
@@ -519,8 +545,8 @@ export default {
             }
         },
         // 导入回调
-        importCb (data) {
-            this.parentObj[this.controlKey] = data;
+        importCb (dataObj) {
+            this.parentObj[this.controlKey] = dataObj;
             this.change("import");
         },
         // 接口 -导出
@@ -567,7 +593,7 @@ export default {
                         });
                     }
                 },
-                error: data => {
+                error: res => {
                     operationItem.disabled = false;
                     this.exportTimer = null;
                 }
@@ -620,13 +646,31 @@ export default {
         },
         // 行内容是否可编辑
         getRowCanEdit (row) {
-            return this.getRowBtnCanEdit(row) &&
-                !row.__isQuote__; // 不能为引用过来的数据，引用的可以
+            return this.getRowBtnCanEdit(row);
         },
         // 列本身是否可编辑
         getColCanEdit (col, row) {
-            return (col._oldReadonly ? !row.__old__ : true) && // 老数据行里某些列不可编辑
-                (["number"].includes(col._type) && ![undefined, null, "", "no"].includes(col._summaryType) ? row.isLeaf !== false : true) && // 级联表格 -“需要计的数字列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
+            return !(
+                ["cascaderTable"].includes(this.controlType)
+                    ? (
+                        // 树形表格 -“需要计算的数字列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
+                        ["number"].includes(col._type) && ![undefined, null, "", "no"].includes(col._summaryType)
+                            ? row.isLeaf !== false
+                            : true
+                    ) && (
+                        // 树形表格 -“需要限制的日期列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
+                        ["date"].includes(col._type)
+                            ? ["downToUp"].includes(col._writeSort)
+                                ? row.isLeaf !== false
+                                : ["upToDown"].includes(col._writeSort)
+                                    ? row.level === 1 || !!this.getParentNode(row, this.allTreeData)[col._key]
+                                    : true
+                            : true
+                    )
+                    : true
+            ) &&
+                (col._oldReadonly ? !row.__old__ : true) && // 老数据行里某些列不可编辑
+                (row.__isQuote__ ? this.quoteDataCanEdit : true) && // 引用过来的数据是否可编辑
                 col._enterType !== "calculate" && // 计算的不可编辑
                 col._readonly !== true; // 不能为只读
         },

package/src/styles/components/list/BriTable.less

@@ -123,18 +123,16 @@
     }
 
     &-td {
+        height: 40px;
+        padding: 4px 16px;
         position: relative;
         
-        &-tip {
-            padding: 0px 0px 0px 16px;
-            font-size: 12px;
-            line-height: 1;
-            color: #ed4014;
-            position: absolute;
-            top: calc(100% - 12px);
-            left: 0px;
-        }
+        &-expand {
 
+        }
+        &-index {
+            padding: 4px 16px 4px 12px!important;
+        }
         &-operation {
             .DshButtons-dropdown-more {
                 padding: 0px;
@@ -151,10 +149,16 @@
             }
         }
         
-        &-show { // 级联表格会生效 自己写的table
-            height: 40px;
-            padding: 4px 16px;
+        &-tip {
+            padding: 0px 0px 0px 16px;
+            font-size: 12px;
+            line-height: 1;
+            color: #ed4014;
+            position: absolute;
+            top: calc(100% - 12px);
+            left: 0px;
         }
+
         &-edit {
             padding: 4px 16px 12px 16px!important;
         }
@@ -174,16 +178,10 @@
 
             animation: slideDown .2s linear;
         }
+
         &-hide {
             display: none!important;
         }
-
-        &-index {
-            padding: 4px 16px 4px 12px!important;
-        }
-        &-expand {
-
-        }
     }
 }