bri-components 1.3.26 → 1.3.28

package/src/components/list/mixins/{tableMixin.js → flatTableMixin.js}

@@ -1,31 +1,70 @@
 export default {
     mixins: [],
     components: {},
-    props: {},
+    props: {
+        columns: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        data: {
+            type: Array,
+            default () {
+                return [];
+            }
+        },
+        oldData: {
+            type: Array,
+            default () {
+                return [];
+            }
+        }
+    },
+    model: {
+        prop: "data",
+        event: "change"
+    },
     data () {
         return {};
     },
     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;
+        },
         footerData () {
-            if (this.useSummary && this.listData.length) {
-                return [
+            return this.useSummary && this.listData.length
+                ? [
                     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 })
+                            [col._key]: col._type === "number" && ![undefined, null, "", "no"].includes(col._summaryType)
+                                ? this.$calNumList(
+                                    this.listData.map(item => item[col._key]),
+                                    col._summaryType,
+                                    { ...col, _defaultDigit: 2 }
+                                )
                                 : (obj[col._key] || "--")
                         };
                     }, {
                         _id: this.$ObjectID().str,
                         __index__: "汇总",
-                        __isExpand__: "-",
                         __operation__: "——"
                     })
-                ];
-            } else {
-                return [];
-            }
+                ]
+                : [];
         },
 
         tablePropsObj () {
@@ -47,19 +86,10 @@ export default {
                 ...this.commonPropsObj
             };
         },
-        showRequired () {
-            return this.selfPropsObj._showRequired;
-        },
-        showDescription () {
-            return this.selfPropsObj._showDescription;
-        },
-        headHeightAuto () {
-            return this.selfPropsObj._headHeightAuto;
-        },
-        heightAuto () {
-            return this.selfPropsObj._heightAuto;
-        },
 
+        filterColumns () {
+            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
+        },
         showColumns () {
             return [
                 ...(this.useSelection === true ? [this.selectionColumn] : []),
@@ -218,17 +248,21 @@ export default {
                     disabled: false,
                     event: "clickDelete"
                 },
-                // expand: {
-                //     name: "展开",
-                //     type: "expand",
-                //     event: "clickExpand"
-                // },
                 changeVal: {
                     name: "改变输入框值",
                     type: "changeVal",
                     event: "changeVal"
                 }
             };
+        },
+        operationMap () {
+            return this.canEdit
+                ? this.$categoryMapToMap(
+                    this.allOperationMap,
+                    null,
+                    this.disabledBtns ? ["canCreate", "canDelete"] : []
+                )
+                : {};
         }
     },
     created () { },
@@ -246,6 +280,18 @@ export default {
 
             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);
         },
@@ -258,6 +304,9 @@ export default {
         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 = {
@@ -274,6 +323,11 @@ export default {
                 // isShare: this.isShare,
                 _heightAuto: this.heightAuto
             };
+        },
+        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/list/mixins/{DshFlatTableMixin.js → tableBaseMixin.js}

@@ -1,29 +1,15 @@
+import DshListUnit from "../../unit/DshListUnit.vue";
+
 export default {
     mixins: [],
-    components: {},
+    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 () {
@@ -50,10 +36,6 @@ export default {
             }
         }
     },
-    model: {
-        prop: "data",
-        event: "change"
-    },
     data () {
         return {
             showRuleMessage: false, // 显示校验文字
@@ -61,22 +43,6 @@ export default {
         };
     },
     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, // 是否是分享页在用
@@ -87,7 +53,7 @@ export default {
                 _heightAuto: false, // 单元格高度自适应
                 _useSelection: false, // 使用选择列
                 _useIndex: true, // 使用序号列
-                _useSummary: true, // 使用汇总行
+                _useSummary: false, // 使用汇总行
                 _disabledBtns: false, // 禁用增删按钮
                 _disabledCreateBtn: false, // 置灰新增按钮，目前只内部使用，comp_web数据表配置页那块
                 _disabledOldDataRow: false, // 置灰老数据行包含删除
@@ -102,6 +68,18 @@ export default {
         contentHeight () {
             return this.selfPropsObj._contentHeight;
         },
+        showRequired () {
+            return this.selfPropsObj._showRequired;
+        },
+        showDescription () {
+            return this.selfPropsObj._showDescription;
+        },
+        headHeightAuto () {
+            return this.selfPropsObj._headHeightAuto;
+        },
+        heightAuto () {
+            return this.selfPropsObj._heightAuto;
+        },
         useSelection () {
             return this.selfPropsObj._useSelection;
         },
@@ -121,22 +99,8 @@ export default {
             return this.selfPropsObj._disabledOldDataRow;
         },
 
-        filterColumns () {
-            console.log(this.listData);
-            return this.columns.filter(col => this.$isAdvRelyShow(col, this.listData, this.parentObj, true));
-        },
         selfRowDefault () {
             return this.$filterObj(this.filterColumns, this.rowDefault);
-        },
-
-        operationMap () {
-            return this.canEdit
-                ? this.$categoryMapToMap(
-                    this.allOperationMap,
-                    null,
-                    this.disabledBtns ? ["canCreate", "canDelete"] : []
-                )
-                : {};
         }
     },
     created () { },
@@ -145,14 +109,14 @@ export default {
         validate () {
             this.showRuleMessage = true;
 
-            return this.listData.every(row => this.getRowRuleResult(row));
+            return this.listData.every((row, rowIndex) => this.getRowRuleResult(row, rowIndex));
         },
         // 整行校验结果
-        getRowRuleResult (row) {
-            return this.filterColumns.every(column => this.getColRuleResult(column, row).bool);
+        getRowRuleResult (row, rowIndex) {
+            return this.filterColumns.every(column => this.getColRuleResult(column, row, rowIndex).bool);
         },
         // 单元格校验结果
-        getColRuleResult (col, row) {
+        getColRuleResult (col, row, rowIndex) {
             col = this.$transformFieldProperty(col, row, this.parentObj);
             if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || this.showRuleMessage) {
                 return this.$getFieldRuleResult(col, row);
@@ -163,39 +127,21 @@ export default {
             }
         },
 
-        // 点击 -删除行
-        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);
-        },
-
         /* --------------- 工具方法 ------------- */
         getRowCanEdit (row) {
-            return this.canEdit && // 是否是编辑状态
-            (this.disabledOldDataRow ? !!row.__isCreate__ : true); // 是否让老数据行置灰
+            return this.canEdit && ( // 是否是编辑状态
+                this.disabledOldDataRow ? !!row.__isCreate__ : true); // 是否让老数据行置灰
         },
         getColCanEdit (col, row) {
-            return col.dependRowCanEdit ? row.canEdit !== false : true;// 在老数据行里某些列不可编辑
+            return (col.dependRowCanEdit ? row.canEdit !== false : true) && // 在老数据行里某些列不可编辑
+                col._enterType !== "calculate" && // 计算的不可编辑
+                col._readonly !== true && // 不能为只读
+            (["number"].includes(col._type) && ![undefined, null, "", "no"].includes(col._summaryType) ? row.isLeaf !== false : true); // 级联表格 -“需要计的数字列 且 不是叶子行的”不可编辑（必须用isLeaf !== false判断，因为牵扯内部表格也在用）
         },
         getUnitCanEdit (col, row) {
             return this.getRowCanEdit(row) &&
                 this.getColCanEdit(col, row) &&
                 this.$isAdvRelyShow(col, row, this.parentObj, 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/styles/components/list/BriTable.less

@@ -37,34 +37,43 @@
                 height: 100% !important;
 
                 .ve-table-content-wrapper table.ve-table-content {
-                    thead.ve-table-header tr.ve-table-header-tr th.ve-table-header-th {
-                        padding: 4px 8px;
-
-                        .ve-table-filter .ve-table-filter-icon {
-                            &:hover {
-                                color: @themeColor;
+                    thead.ve-table-header {
+                        tr.ve-table-header-tr th.ve-table-header-th {
+                            padding: 4px 8px;
+    
+                            .ve-table-filter .ve-table-filter-icon {
+                                &:hover {
+                                    color: @themeColor;
+                                }
                             }
-                        }
-                        
-                        // 排序
-                        .ve-table-sort {
-                            position: absolute !important;
-                            top: 5px;
-                            right: 4px;
-
-                            .icon-vet-sort-top-arrow:before {
-                                content: "\e6347";
+                            
+                            // 排序
+                            .ve-table-sort {
+                                position: absolute !important;
+                                top: 5px;
+                                right: 4px;
+    
+                                .icon-vet-sort-top-arrow:before {
+                                    content: "\e6347";
+                                }
+    
+                                .icon-vet-sort-bottom-arrow:before {
+                                    content: "\e6349";
+                                }
                             }
+                        }
+                    }
+
+                    tbody.ve-table-body {
+                        tr.ve-table-body-tr, 
+                        tr.ve-table-expand-tr {
+                            height: auto;
 
-                            .icon-vet-sort-bottom-arrow:before {
-                                content: "\e6349";
+                            td.ve-table-body-td {
+                                padding: 4px 16px;
                             }
                         }
                     }
-                    
-                    // tbody.ve-table-body tr.ve-table-body-tr td.ve-table-body-td {
-                    //     padding: 4px 12px;
-                    // }
                 }
             }
             
@@ -91,7 +100,7 @@
     &-empty {
         width: 100%;
         height: 100%;
-        padding: 9px 20px;
+        padding: 9px 16px;
         border: 1px solid @borderColor;
         border-top: none;
         // border-bottom-left-radius: @borderRadius;
@@ -115,12 +124,12 @@
         position: relative;
 
         &-tip {
-            padding: 0px 0px 0px 20px;
+            padding: 0px 0px 0px 16px;
             font-size: 12px;
             line-height: 1;
             color: #ed4014;
             position: absolute;
-            top: calc(100% - 13px);
+            top: calc(100% - 12px);
             left: 0px;
         }
 
@@ -142,19 +151,20 @@
         }
 
         &-edit {
-            padding: 4px 20px 12px 20px!important;
+            padding: 4px 16px 12px 16px!important;
         }
         &-show {
-            padding: 4px 20px!important;
-            // padding: 4px 12px!important;
+  
         }
-        &-normal {
-            padding: 4px 8px!important;
-            // padding: 4px 12px!important;
+        &-hide {
+            display: none!important;
         }
         &-index {
             padding: 4px 16px 4px 12px!important;
         }
+        &-expand {
+
+        }
     }
 }
 

package/src/styles/global/text.less

@@ -33,9 +33,6 @@
     font-weight: 600;
     color: @textColor;
 }
-.dsh-hide {
-    display: none!important;
-}
 .dsh-subtip {
     width: 100%;
     text-align: center;

package/src/styles/reset-iview-other.less

@@ -38,8 +38,4 @@
 .ivu-select-dropdown:not(.ivu-cascader-transfer) {
     max-width: 420px;
     max-height: 300px;
-}
-
-.ivu-cascader-menu {
-    max-width: 350px;
 }

package/src/utils/table.js

@@ -9,8 +9,8 @@ const getHeadRender = function (h, column, {
         style: {
             display: "inline-block",
             maxWidth: "100%",
-            paddingLeft: "12px",
-            paddingRight: column._description ? "30px" : "12px",
+            paddingLeft: "8px",
+            paddingRight: column._description ? "26px" : "8px",
             verticalAlign: "middle",
             position: "relative"
         }
@@ -19,7 +19,7 @@ const getHeadRender = function (h, column, {
             style: {
                 position: "absolute",
                 top: "0px",
-                left: "0px",
+                left: "-2px",
                 color: "#ed4014"
             }
         }, "*"),
@@ -41,7 +41,7 @@ const getHeadRender = function (h, column, {
             style: {
                 position: "absolute",
                 bottom: "1px",
-                right: "12px",
+                right: "8px",
                 cursor: "pointer"
             },
             props: {
@@ -68,6 +68,7 @@ const transformToColumns = function (form, {
     return form
         .map(col => {
             const typeData = this.$modFieldMap[col._type] || {};
+            const typeWidth = typeData.width + (col._type === "number" && col._unit ? col._unit.length * 16 : 0);
 
             return {
                 title: col._name,
@@ -75,7 +76,7 @@ const transformToColumns = function (form, {
                 key: col._key,
                 align: col._align || typeData.align,
                 fixed: col._fixed,
-                width: col._width || typeData.width,
+                width: col._width || typeWidth,
                 sortBy: showHeadFilter
                     ? col._sortBy || typeData.sortBy
                     : undefined,