bri-components 1.3.18 → 1.3.20

package/package.json

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

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

@@ -300,19 +300,19 @@
                 border: 1px @borderColor dashed;
                 border-radius: @borderRadius;
                 color: @themeColor;
-                
+
                 &:hover {
                     border-color: @themeColor;
                     background-color: @theme-focus;
                 }
             }
-            
+
             &-circle {
                 width: 50px!important;
                 height: 50px!important;
                 background-color: @inputBg-readonly;
                 color: @themeColor;
-                
+
                 i {
                     color: @scuess-color;
                     font-size: 40px;

package/src/components/controls/controlMap.js

@@ -70,7 +70,7 @@ const pathMap = {
         selectDepartments: "./senior/selectDepartments.vue",
         BriLabels: "./senior/BriLabels.vue",
         DshPackage: "./senior/DshPackage.vue",
-        flatTable: "./senior/flatTable.vue",
+        flatTable: "./senior/flatTable/flatTable.vue",
         cascaderTable: "./senior/cascaderTable"
     },
     special: {

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

@@ -162,7 +162,11 @@ export default {
         },
         // 已选择项的对象列表
         curValObjList () {
-            return this.curValList.map(arrItem => this.getItemObj(arrItem));
+            return this.curValList.map((item, index) =>
+                index < this.curValList.length - 1
+                    ? this.getItemObj(item, { marginRight: "4px" })
+                    : this.getItemObj(item)
+            );
         },
         curValNameList () {
             return this.curValObjList.map(item => item[this.nameKey]);
@@ -203,32 +207,33 @@ export default {
         },
 
         /* --------- 工具类 -------- */
-        getItemObj (val) {
+        getItemObj (val, selfStyle = {}) {
             const objArr = this.$getTreeLinealDatas(val, this.cascaderAllData, undefined, this.saveKey);
+            const obj = objArr.length
+                ? {
+                    ...objArr.slice(-1)[0],
+                    [this.nameKey]: this.transformFullName(val)
+                }
+                : {
+                    [this.saveKey]: val,
+                    [this.nameKey]: `提示：选项${val}已不存在`
+            };
 
             return !this.$isEmptyData(val)
-                ? objArr.length
-                    ? {
-                        ...objArr.slice(-1)[0],
-                        [this.nameKey]: this.transformFullName(val),
-                        // 查看状态时tag用
-                        style: {
-                            ...this.tagStyle,
-                            ...this.getItemColorStyle(objArr.slice(-1)[0])
-                        },
-                        color: undefined
-                    }
-                    : {
-                        _key: val,
-                        name: `提示：选项${val}已不存在`,
-                        style: {
-                            ...this.tagStyle
-                        }
-                    }
+                ? {
+                    name: obj[this.nameKey], // 查看状态时tag用
+                    ...obj,
+                    style: {
+                        ...this.tagStyle,
+                        ...this.getItemColorStyle(obj),
+                        ...selfStyle
+                    }, // 查看状态时tag用
+                    color: undefined
+                }
                 : undefined;
         },
         // 每项的颜色相关style --flat方式在用
-        getItemColorStyle (item) {
+        getItemColorStyle (item = {}) {
             const color = this.colorMap[item.color] || this.colorMap["color-default"];
             return this.useColor
                 ? {

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

@@ -27,7 +27,7 @@ export default {
         },
         /* 列表形式下用到的 */
         rowIndex: Number,
-        parentData: {
+        parentListData: {
             type: Array,
             default () {
                 return [];
@@ -43,7 +43,7 @@ export default {
                 "max-width": "100%",
                 height: "24px",
                 padding: "4px 8px",
-                margin: "2px 4px 2px 0px",
+                margin: "2px 0px",
                 "border-radius": "4px",
                 "line-height": "16px",
                 "font-size": "12px",

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

@@ -88,7 +88,11 @@ export default {
         },
         // 已选择项的对象列表
         curValObjList () {
-            return this.curValList.map(key => this.getItemObj(key));
+            return this.curValList.map((item, index) =>
+                index < this.curValList.length - 1
+                    ? this.getItemObj(item, { marginRight: "4px" })
+                    : this.getItemObj(item)
+            );
         },
         curValNameList () {
             return this.curValObjList.map(item => item[this.nameKey] || item.name || item._name);
@@ -140,7 +144,7 @@ export default {
 
         /* ------- 方法 ------- */
         // 获取某项的对象数据
-        getItemObj (val) {
+        getItemObj (val, selfStyle = {}) {
             const obj = this.listData.find(item => item[this.saveKey] === val) || {
                 [this.saveKey]: val,
                 [this.nameKey]: `提示：选项${val}已不存在`
@@ -148,13 +152,13 @@ export default {
 
             return !this.$isEmptyData(val)
                 ? {
-                    name: obj[this.nameKey],
+                    name: obj[this.nameKey], // 查看状态时tag用
                     ...obj,
-                    // 查看状态时tag用
                     style: {
                         ...this.tagStyle,
-                        ...this.getItemColorStyle(obj)
-                    },
+                        ...this.getItemColorStyle(obj),
+                        ...selfStyle
+                    }, // 查看状态时tag用
                     color: undefined
                 }
                 : undefined;

package/src/components/controls/senior/{flatTable.vue → flatTable/flatTable.vue}

@@ -22,7 +22,7 @@
             <template v-else>
                 <!-- 配置端 设置默认值用-->
                 <dsh-btn-modal v-if="propsObj._key === '_default'">
-                    <bri-flat-table
+                    <dsh-flat-table
                         :canEdit="finalCanEdit"
                         :columns="columns"
                         :data="curVal.list"
@@ -30,7 +30,7 @@
                         :parentObj="value"
                         :propsObj="propsObj"
                         @change="change"
-                    ></bri-flat-table>
+                    ></dsh-flat-table>
                 </dsh-btn-modal>
 
                 <!-- 正常使用 -->
@@ -43,7 +43,7 @@
                         @click="$dispatchEvent($event)"
                     ></dsh-buttons>
 
-                    <bri-flat-table
+                    <dsh-flat-table
                         ref="dshFatTable"
                         :canEdit="finalCanEdit"
                         :columns="columns"
@@ -53,7 +53,7 @@
                         :parentObj="value"
                         :propsObj="propsObj"
                         @change="change"
-                    ></bri-flat-table>
+                    ></dsh-flat-table>
 
                     <!-- 全屏查看 -->
                     <dsh-modal
@@ -61,7 +61,7 @@
                         mode="custom"
                         :propsObj="modalPropsObj"
                     >
-                        <bri-flat-table
+                        <dsh-flat-table
                             :canEdit="finalCanEdit"
                             :columns="columns"
                             :data="curVal.list"
@@ -70,7 +70,7 @@
                             :parentObj="value"
                             :propsObj="propsObj"
                             @change="change"
-                        ></bri-flat-table>
+                        ></dsh-flat-table>
                     </dsh-modal>
                 </template>
             </template>
@@ -88,9 +88,9 @@
 </template>
 
 <script>
-    import controlMixin from "../mixins/controlMixin.js";
-    import DshBtnModal from "../../small/DshBtnModal.vue";
-    import BriFlatTable from "../../list/BriFlatTable.vue";
+    import controlMixin from "../../mixins/controlMixin.js";
+    import DshBtnModal from "../../../small/DshBtnModal.vue";
+    import DshFlatTable from "../../../list/DshFlatTable.vue";
     import flatTableImportModal from "./flatTableImportModal.vue";
 
     export default {
@@ -100,7 +100,7 @@
         ],
         components: {
             DshBtnModal,
-            BriFlatTable,
+            DshFlatTable,
             flatTableImportModal
         },
         props: {},

package/src/components/form/searchMixin.js

@@ -180,13 +180,18 @@ export default {
                     );
                     const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
 
-                    const operators = fieldData[!dynamicList.length && ["set"].includes(this.mode) ? "operatorsSet" : "operators"] || fieldData.operators || [];
+                    const operators = ["_id"].includes(curFormItem._key)
+                        ? []
+                        : (fieldData[!dynamicList.length && ["set"].includes(this.mode) ? "operatorsSet" : "operators"] ||
+                            fieldData.operators || []);
                     const fieldOperator = ["_id"].includes(curFormItem._key)
                         ? "eq"
-                        : initContion.fieldOperator || (
-                            ["reference"].includes(fieldType) && this.isSimpleSearch
-                                ? "eq"
-                                : (operators[0] || {})._key
+                        : (
+                            initContion.fieldOperator || (
+                                ["reference"].includes(fieldType) && this.isSimpleSearch
+                                    ? "eq"
+                                    : (operators[0] || {})._key
+                            )
                     );
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 

package/src/components/list/DshCascaderTable.vue

@@ -348,7 +348,7 @@
         computed: {
             selfPropsObj () {
                 return {
-                    isShare: false, // 是否是分享页在用
+                    // isShare: false, // 是否是分享页在用
 
                     _showRequired: true, // 表头显示校验符号*
                     _showDescription: true, // 表头显示提示
@@ -360,9 +360,9 @@
                     _contentHeight: this.propsObj._contentHeight || 400 // 表格最大高度
                 };
             },
-            isShare () {
-                return this.selfPropsObj.isShare;
-            },
+            // isShare () {
+            //     return this.selfPropsObj.isShare;
+            // },
             contentHeight () {
                 return this.selfPropsObj._contentHeight;
             },

package/src/components/list/{BriFlatTable.vue → DshFlatTable.vue}

@@ -1,7 +1,7 @@
 <template>
-    <div class="BriFlatTable">
+    <div class="DshFlatTable">
         <bri-table
-            class="BriFlatTable-main"
+            class="DshFlatTable-main"
             :columns="showColumns"
             :data="listData"
             :footer-data="footerData"
@@ -12,7 +12,7 @@
 
         <!-- 添加行 -->
         <dsh-buttons
-            class="BriFlatTable-create"
+            class="DshFlatTable-create"
             :list="$getOperationList(['canCreate'])"
             @click="$dispatchEvent($event, null, null, listData)"
         ></dsh-buttons>
@@ -20,96 +20,41 @@
 </template>
 
 <script>
+    import DshFlatTableMixin from "./mixins/DshFlatTableMixin.js";
     import DshListUnit from "../unit/DshListUnit.vue";
 
     export default {
-        name: "BriFlatTable",
+        name: "DshFlatTable",
+        mixins: [
+            DshFlatTableMixin
+        ],
         components: {
             DshListUnit
         },
-        props: {
-            canEdit: {
-                type: Boolean,
-                default: true
-            },
-            columns: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
-            data: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
-            oldData: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
-            rowDefault: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            },
-
-            parentObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            },
-            propsObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            }
-        },
-        model: {
-            prop: "data",
-            event: "change"
-        },
+        props: {},
         data () {
-            return {
-                showRuleMessage: false, // 显示校验文字
-                ruleRecordMap: {}
-            };
+            return {};
         },
         computed: {
-            listData () {
-                this.data.forEach(item => {
-                    !item._id && this.$set(item, "_id", this.$ObjectID().str);
-                });
-                return this.data;
-            },
             footerData () {
                 if (this.useSummary && this.listData.length) {
-                    const row = this.filterColumns.reduce((row, col) => {
-                        if (col._type === "number") {
-                            row[col._key] = this.$calNumList(this.listData.map(item => item[col._key]), col._summaryType, { ...col, _defaultDigit: 2 });
-                        }
-                        return row;
-                    }, {
-                        _id: this.$ObjectID().str,
-                        custome: "汇总"
-                    });
-
-                    return [row];
+                    return [
+                        this.filterColumns.reduce((obj, col) => {
+                            return {
+                                ...obj,
+                                [col._key]: col._type === "number"
+                                    ? this.$calNumList(this.listData.map(item => item[col._key]), col._summaryType, { ...col, _defaultDigit: 2 })
+                                    : obj[col._key]
+                            };
+                        }, {
+                            _id: this.$ObjectID().str,
+                            custome: "汇总"
+                        })
+                    ];
                 } else {
                     return [];
                 }
             },
-            oldListData () {
-                this.oldData.forEach(item => {
-                    !item._id && this.$set(item, "_id", this.$ObjectID().str);
-                });
-                return this.oldData;
-            },
 
             tablePropsObj () {
                 return {
@@ -123,29 +68,9 @@
             },
             selfPropsObj () {
                 return {
-                    isShare: false, // 是否是分享页在用
-
-                    _showRequired: true, // 表头显示校验符号*
-                    _showDescription: true, // 表头显示提示
-                    _headHeightAuto: false, // 表头高度自适应
-                    _heightAuto: false, // 单元格高度自适应
-                    _useSelection: false, // 使用选择列
-                    _useIndex: true, // 使用序号列
-                    _useSummary: false, // 使用汇总行
-                    _disabledBtns: false, // 禁用增删按钮
-                    _disabledCreateBtn: false, // 置灰新增按钮，目前只内部使用，comp_web数据表配置页那块
-                    _disabledOldDataRow: false, // 置灰老数据行包含删除
-                    ...this.propsObj,
-
-                    _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
+                    ...this.commonPropsObj
                 };
             },
-            isShare () {
-                return this.selfPropsObj.isShare;
-            },
-            contentHeight () {
-                return this.selfPropsObj._contentHeight;
-            },
             showRequired () {
                 return this.selfPropsObj._showRequired;
             },
@@ -158,38 +83,11 @@
             heightAuto () {
                 return this.selfPropsObj._heightAuto;
             },
-            useSelection () {
-                return this.selfPropsObj._useSelection;
-            },
-            useIndex () {
-                return this.selfPropsObj._useIndex;
-            },
-            useSummary () {
-                return this.selfPropsObj._useSummary;
-            },
-            disabledBtns () {
-                return this.selfPropsObj._disabledBtns;
-            },
-            disabledCreateBtn () {
-                return this.selfPropsObj._disabledCreateBtn;
-            },
-            disabledOldDataRow () {
-                return this.selfPropsObj._disabledOldDataRow;
-            },
 
-            useCampare () {
-                return !!this.oldListData.length;
-            },
-            filterColumns () {
-                return this.columns.filter(column => {
-                    return column._isRelyParent
-                        ? this.$isFormItemShow(column, this.parentObj, true)
-                        : !["hide"].includes(column._displayType);
-                });
-            },
             showColumns () {
-                const operationList = this.$getOperationList(["delete"]);
-                const showColumns = [
+                const operationList = this.$getOperationList(["canDelete"]);
+
+                return [
                     ...(
                         this.useSelection === true
                             ? [
@@ -226,7 +124,7 @@
                             filter: undefined,
                             sortBy: undefined,
                             renderBodyCell: ({ row, column, rowIndex }, h) => {
-                                column = this.$transformFieldProperty(column, row);
+                                column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
 
                                 return [
                                     this.isShowCompare(column, row, this.oldListData[rowIndex])
@@ -249,8 +147,8 @@
                                                         formData: row,
                                                         formItem: this.resetCol(column, row),
                                                         rowIndex: rowIndex,
-                                                        parentData: this.listData,
-                                                        allFormList: this.columns
+                                                        allFormList: this.columns,
+                                                        parentListData: this.listData
                                                     },
                                                     on: {
                                                         blur: () => this.controlBlur(null, column, row, arguments),
@@ -265,8 +163,8 @@
                                                 formData: row,
                                                 formItem: this.resetCol(column, row),
                                                 rowIndex: rowIndex,
-                                                parentData: this.listData,
-                                                allFormList: this.columns
+                                                allFormList: this.columns,
+                                                parentListData: this.listData
                                             },
                                             on: {
                                                 blur: () => this.controlBlur(null, column, row, arguments),
@@ -281,13 +179,17 @@
                                         : undefined
                                 ];
                             },
+                            renderHeaderCell: ({ column }, h) => {
+                                column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : {});
+
+                                return this.$getHeadRender(h, column, {
+                                    showRequired: this.showRequired,
+                                    showDescription: this.showDescription,
+                                    headHeightAuto: this.headHeightAuto
+                                });
+                            },
                             ...colItem
-                        })),
-                        {
-                            showRequired: this.showRequired,
-                            showDescription: this.showDescription,
-                            headHeightAuto: this.headHeightAuto
-                        }
+                        }))
                     ),
 
                     ...(
@@ -303,7 +205,10 @@
                                     renderBodyCell: (params, h) => {
                                         return h("dsh-buttons", {
                                             props: {
-                                                list: operationList.map(btnItem => ({ ...btnItem, disabled: this.disabledOldDataRow && !params.row.__isCreate__ }))
+                                                list: operationList.map(btnItem => ({
+                                                    ...btnItem,
+                                                    disabled: this.disabledOldDataRow && !params.row.__isCreate__
+                                                }))
                                             },
                                             on: {
                                                 click: (operationItem) => {
@@ -317,13 +222,10 @@
                             : []
                     )
                 ];
-                return showColumns;
             },
-            selfRowDefault () {
-                return this.$filterObj(this.columns, this.rowDefault);
-            },
-            operationMap () {
-                const allOperationMap = {
+
+            allOperationMap () {
+                return {
                     canCreate: {
                         name: "添加一行",
                         type: "canCreate",
@@ -333,9 +235,9 @@
                         event: "clickCreate",
                         btnType: "default"
                     },
-                    delete: {
+                    canDelete: {
                         name: "删除",
-                        type: "delete",
+                        type: "canDelete",
                         btnType: "errorText",
                         icon: "ios-trash-outline",
                         size: "small",
@@ -353,29 +255,10 @@
                         event: "changeVal"
                     }
                 };
-
-                return this.canEdit
-                    ? this.$categoryMapToMap(
-                        allOperationMap,
-                        null,
-                        this.disabledBtns ? ["canCreate", "delete"] : []
-                    )
-                    : {};
             }
         },
         created () {},
         methods: {
-            // 共外部使用
-            validate () {
-                this.showRuleMessage = true;
-
-                return this.listData.every(row =>
-                    this.filterColumns.every(column => {
-                        column = this.$transformFieldProperty(column, row);
-                        return this.getRuleResult(column, row).bool;
-                    })
-                );
-            },
             // 点击 -添加行
             clickCreate (operationItem, row, index, list) {
                 const newRow = {
@@ -389,18 +272,6 @@
 
                 this.change("createRow", null, newRow, newRowIndex);
             },
-            // 点击 -删除行
-            clickDelete (operationItem, row, rowIndex, list) {
-                this.$Modal.confirm({
-                    title: "警告",
-                    content: "确定删除吗？",
-                    onOk: () => {
-                        list.splice(rowIndex, 1);
-
-                        this.change("deleteRow", null, row, rowIndex);
-                    }
-                });
-            },
             changeSelect (list) {
                 this.$emit("changeSelect", list);
             },
@@ -412,57 +283,13 @@
             // 表单控件失去焦点
             controlBlur (operationItem, col, row, params) {
                 this.$set(this.ruleRecordMap, `${row._id}dsh${col._key}`, { showRuleMessage: true });
-            },
-            change (...params) {
-                this.$emit("change", { list: this.listData, rowDefault: this.rowDefault }, ...params);
-            },
-
-            /* --------------- 工具方法 ------------- */
-            resetCol (col, row) {
-                let resetMap = {
-                    select: {
-                        _optionKind: "dropdown"
-                    },
-                    checkbox: {
-                        _optionKind: "dropdown"
-                    }
-                };
-                return {
-                    ...col,
-                    ...(resetMap[col._type] || {}),
-                    isShare: this.isShare,
-                    _heightAuto: this.heightAuto
-                    // canEdit: this.$isAdvRelyShow(col, row, true)
-                };
-            },
-            getUnitCanEdit (col, row) {
-                return this.canEdit && // 是否是编辑状态
-                    // (!this.disabledOldDataRow || !!this.createRowMap[row._id]) && // 是否让老数据行置灰
-                    (!this.disabledOldDataRow || !!row.__isCreate__) && // 是否让老数据行置灰
-                    (!col.dependRowCanEdit || row.canEdit !== false) &&
-                    this.$isAdvRelyShow(col, row, true); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
-            },
-            isShowCompare (col, row, oldRow = {}) {
-                return this.useCampare && ["number"].includes(col._type) &&
-                    !(this.$isEmptyData(row[col._key]) && this.$isEmptyData(oldRow[col._key])) &&
-                    row[col._key] !== oldRow[col._key];
-            },
-            // 是否显示 单元格校验提示文字
-            getRuleResult (col, row) {
-                if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
-                    return this.$getFieldRuleResult(col, row);
-                } else {
-                    return {
-                        bool: true
-                    };
-                }
             }
         }
     };
 </script>
 
 <style lang="less" scoped>
-    .BriFlatTable {
+    .DshFlatTable {
         &-main {
             width: 100%;
             height: auto;

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

@@ -0,0 +1,213 @@
+export default {
+    mixins: [],
+    components: {},
+    props: {
+        canEdit: {
+            type: Boolean,
+            default: true
+        },
+        columns: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        data: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        oldData: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        rowDefault: {
+            type: Object,
+            default () {
+                return {};
+            }
+        },
+        parentObj: {
+            type: Object,
+            default () {
+                return {};
+            }
+        },
+        propsObj: {
+            type: Object,
+            default () {
+                return {};
+            }
+        }
+    },
+    model: {
+        prop: "data",
+        event: "change"
+    },
+    data () {
+        return {
+            showRuleMessage: false, // 显示校验文字
+            ruleRecordMap: {}
+        };
+    },
+    computed: {
+        listData () {
+            this.data.forEach(item => {
+                !item._id && this.$set(item, "_id", this.$ObjectID().str);
+            });
+            return this.data;
+        },
+        oldListData () {
+            this.oldData.forEach(item => {
+                !item._id && this.$set(item, "_id", this.$ObjectID().str);
+            });
+            return this.oldData;
+        },
+        useCampare () {
+            return !!this.oldListData.length;
+        },
+
+        commonPropsObj () {
+            return {
+                // isShare: false, // 是否是分享页在用
+
+                _showRequired: true, // 表头显示校验符号*
+                _showDescription: true, // 表头显示提示
+                _headHeightAuto: false, // 表头高度自适应
+                _heightAuto: false, // 单元格高度自适应
+                _useSelection: false, // 使用选择列
+                _useIndex: true, // 使用序号列
+                _useSummary: false, // 使用汇总行
+                _disabledBtns: false, // 禁用增删按钮
+                _disabledCreateBtn: false, // 置灰新增按钮，目前只内部使用，comp_web数据表配置页那块
+                _disabledOldDataRow: false, // 置灰老数据行包含删除
+                ...this.propsObj,
+
+                _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
+            };
+        },
+        // isShare () {
+        //     return this.selfPropsObj.isShare;
+        // },
+        contentHeight () {
+            return this.selfPropsObj._contentHeight;
+        },
+        useSelection () {
+            return this.selfPropsObj._useSelection;
+        },
+        useIndex () {
+            return this.selfPropsObj._useIndex;
+        },
+        useSummary () {
+            return this.selfPropsObj._useSummary;
+        },
+        disabledBtns () {
+            return this.selfPropsObj._disabledBtns;
+        },
+        disabledCreateBtn () {
+            return this.selfPropsObj._disabledCreateBtn;
+        },
+        disabledOldDataRow () {
+            return this.selfPropsObj._disabledOldDataRow;
+        },
+
+        filterColumns () {
+            return this.columns.filter(column =>
+                column._isRelyByParent
+                    ? this.$isAdvRelyShow(column, this.parentObj, true, true, this.listData)
+                    : !["hide"].includes(column._displayType)
+            );
+        },
+        selfRowDefault () {
+            return this.$filterObj(this.filterColumns, this.rowDefault);
+        },
+
+        operationMap () {
+            return this.canEdit
+                ? this.$categoryMapToMap(
+                    this.allOperationMap,
+                    null,
+                    this.disabledBtns ? ["canCreate", "canDelete"] : []
+                )
+                : {};
+        }
+    },
+    created () { },
+    methods: {
+        // 共外部使用
+        validate () {
+            this.showRuleMessage = true;
+
+            return this.listData.every(row =>
+                this.filterColumns.every(column => {
+                    column = this.$transformFieldProperty(column, column._isRuleByParent ? this.parentObj : row);
+                    return this.getRuleResult(column, row).bool;
+                })
+            );
+        },
+        // 是否显示 单元格校验提示文字
+        getRuleResult (col, row) {
+            if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
+                return this.$getFieldRuleResult(col, row);
+            } else {
+                return {
+                    bool: true
+                };
+            }
+        },
+
+        // 点击 -删除行
+        clickDelete (operationItem, row, rowIndex, list) {
+            this.$Modal.confirm({
+                title: "警告",
+                content: "确定删除吗？",
+                onOk: () => {
+                    list.splice(rowIndex, 1);
+
+                    this.change("deleteRow", null, row, rowIndex);
+                }
+            });
+        },
+        change (...params) {
+            this.$emit("change", { list: this.listData, rowDefault: this.rowDefault }, ...params);
+        },
+
+        /* --------------- 工具方法 ------------- */
+        resetCol (col, row) {
+            let resetMap = {
+                select: {
+                    _optionKind: "dropdown"
+                },
+                checkbox: {
+                    _optionKind: "dropdown"
+                }
+            };
+            return {
+                ...col,
+                ...(resetMap[col._type] || {}),
+                // isShare: this.isShare,
+                _heightAuto: this.heightAuto
+            };
+        },
+        getUnitCanEdit (col, row) {
+            return this.getRowCanEdit(row) && this.getColCanEdit(col, row);
+        },
+        getRowCanEdit (row) {
+            return this.canEdit && // 是否是编辑状态
+            // (!this.disabledOldDataRow || !!this.createRowMap[row._id]) && // 是否让老数据行置灰
+            (!this.disabledOldDataRow || !!row.__isCreate__); // 是否让老数据行置灰
+        },
+        getColCanEdit (col, row) {
+            return (!col.dependRowCanEdit || row.canEdit !== false) &&
+            (col._isRelyByParent ? true : this.$isAdvRelyShow(col, row, true)); // 在老数据行里某些列不可编辑; // 在老数据行里某些列不可编辑
+        },
+        isShowCompare (col, row, oldRow = {}) {
+            return this.useCampare && ["number"].includes(col._type) &&
+                !(this.$isEmptyData(row[col._key]) && this.$isEmptyData(oldRow[col._key])) &&
+                row[col._key] !== oldRow[col._key];
+        }
+    }
+};

package/src/components/unit/DshListUnit.vue

@@ -23,9 +23,9 @@
                     size: 'default',
                     inTable: true
                 }"
-                :allFormList="allFormList"
                 :rowIndex="rowIndex"
-                :parentData="parentData"
+                :allFormList="allFormList"
+                :parentListData="parentListData"
                 @blur="blur"
                 @change="change"
             ></component>
@@ -49,7 +49,7 @@
 
             indexStr: String,
             rowIndex: Number,
-            parentData: {
+            parentListData: {
                 type: Array,
                 default () {
                     return [];

package/src/index.js

@@ -9,7 +9,7 @@ import CN from "vue-easytable/libs/locale/lang/zh-CN.js";
 
 // list
 import BriTable from "./components/list/BriTable.vue";
-import BriFlatTable from "./components/list/BriFlatTable.vue";
+import DshFlatTable from "./components/list/DshFlatTable.vue";
 import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
@@ -228,7 +228,7 @@ export {
     Error403,
     Error404,
 
-    BriFlatTable,
+    DshFlatTable,
     // DshCascaderTable,
 
     BriCard,