bri-components 1.4.10 → 1.4.11

package/package.json

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

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

@@ -433,7 +433,7 @@
                 }
             },
             getBtns (fileItem) {
-                return ["image", "application/pdf", "text/plain"].some(type => fileItem.mimetype.includes(type))
+                return ["image", "application/pdf", "text/plain", "application/msword"].some(type => fileItem.mimetype.includes(type)) || fileItem.mimetype.includes("wordprocessingml.document") || fileItem.mimetype.includes("wordprocessingml.presentation") || fileItem.mimetype.includes("wordprocessingml.sheet")
                     ? undefined
                     : ["canDelete", "canEdit", "canDownload"];
             }

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

@@ -32,7 +32,10 @@
             <!-- 单元格的查看 进度条模式 -->
             <div
                 v-if="selfPropsObj._showProgress"
-                class="DshNumber-show"
+                :class="{
+                    'DshNumber-show': true,
+                    [`DshNumber-show-${unitAlign}`]: true
+                }"
             >
                 <Progress
                     :percent="progressNum"
@@ -198,13 +201,35 @@
                 align-items: center;
 
                 .ivu-progress-outer {
+                    flex: 1;
                     padding-right: 0px;
                     margin-right: 0px;
                 }
 
                 .ivu-progress-text {
                     width: 55px;
-                    text-align: center;
+                    min-width: 55px;
+                    margin-left: 0px;
+                    text-align: right;
+                }
+            }
+
+            &-center {
+                .ivu-progress-show-info {
+                    .ivu-progress-outer {}
+
+                    .ivu-progress-text {
+                        text-align: center;
+                    }
+                }
+            }
+            &-right {
+                .ivu-progress-show-info {
+                    .ivu-progress-outer {}
+
+                    .ivu-progress-text {
+                        text-align: right;
+                    }
                 }
             }
         }

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

@@ -72,75 +72,14 @@ export default {
         };
     },
     computed: {
-        // 值为不是[]类型用的
-        curVal: {
-            get () {
-                // // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
-                // if (!this.isInTable) {
-                //     if (["select"].includes(this.controlType)) {
-                //         if (!this.$dataType(this.propsObj._filterFunc, "function")) {
-                //             this.value[this.controlKey] = this.listData.some(item => item[this.saveKey] === this.value[this.controlKey])
-                //                 ? this.value[this.controlKey]
-                //                 : "";
-                //         }
-                //     }
-                // }
-
-                return this.value[this.controlKey];
-            },
-            set (val) {
-                // 修复文本框clear后值为undefined，后端无法更新保存数据bug
-                if (["select"].includes(this.controlType) && val === undefined) {
-                    val = "";
-                }
-
-                this.$set(this.value, this.controlKey, val);
-                this.change();
-            }
+        typeInfoData () {
+            return this.$modFieldMap[this.controlType] || {};
         },
-        // 值为[]类型用的
-        curValList: {
-            get () {
-                // // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
-                // if (!this.isInTable) {
-                //     const valList = this.value[this.controlKey] || [];
-                //     if ((["select"].includes(this.controlType) && this.multipleMode) || ["checkbox"].includes(this.controlType)) {
-                //         this.value[this.controlKey] = valList.some(valKey => !this.listDataKeys.includes(valKey))
-                //             ? valList.filter(valKey => this.listDataKeys.includes(valKey))
-                //             : valList;
-                //     }
-                //     // else if (["region", "cascader"].includes(this.controlType)) {
-                //     //     this.value[this.controlKey] = this.$getTreeLinealDatas(valList, this.cascaderAllData, undefined, this.saveKey).length
-                //     //         ? valList
-                //     //         : [];
-                //     // }
-                //     // else if (["regions", "cascaders"].includes(this.controlType)) {
-                //     //     this.value[this.controlKey] = valList.filter(valListItem =>
-                //     //         this.$getTreeLinealDatas(valListItem, this.cascaderAllData, undefined, this.saveKey).length
-                //     //     );
-                //     // }
-                // }
 
-                return this.value[this.controlKey] || [];
-            },
-            set (valList) {
-                this.$set(this.value, this.controlKey, valList);
-                this.change();
-            }
-        },
-        emptyShowVal () {
-            return this.canEdit
-                ? this.commonDealPropsObj._placeholder
-                : this.isUnitShow
-                    ? "--"
-                    : "暂无内容";
-        },
-        showVal () {
-            return this.$isEmptyData(this.curVal)
-                ? this.emptyShowVal
-                : this.curVal;
+        /* ----- 基本 ----- */
+        finalCanEdit () {
+            return this.canEdit && (this.propsObj.canEdit == undefined ? true : this.propsObj.canEdit);
         },
-
         controlKey () {
             return this.propsObj._key;
         },
@@ -156,19 +95,6 @@ export default {
         controlName () {
             return this.propsObj._name;
         },
-        finalCanEdit () {
-            return this.canEdit && (this.propsObj.canEdit == undefined ? true : this.propsObj.canEdit);
-        },
-        // 是否为多选模式
-        multipleMode () {
-            return this.isOnDftSearch || this.isOnSearch
-                ? true
-                : ["checkbox", "regions", "cascaders"].includes(this.controlType) || !!this.selfPropsObj._multiple;
-        },
-        // 是否为tag显示
-        tagShow () {
-            return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch", "labels", "refSelect"].includes(this.controlType);
-        },
         commonDealPropsObj () {
             const selectControlTypes = ["coordinates", "date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "users", "departments", "reference"];
             return {
@@ -180,13 +106,29 @@ export default {
                 _disabled: this.propsObj._disabled || ["serialNumber"].includes(this.controlType) || !this.finalCanEdit
             };
         },
+        // 是否为多选模式
+        multipleMode () {
+            return this.isOnDftSearch || this.isOnSearch
+                ? true
+                : ["checkbox", "regions", "cascaders"].includes(this.controlType) || !!this.selfPropsObj._multiple;
+        },
+        // 是否高度自由（在表格内且_heightAuto为true，2.详情页内且独占一行）
+        isHeightAuto () {
+            return this.isInTable
+                ? !!this.propsObj._heightAuto
+                : this.isFullRow;
+        },
+        // 是否为tag显示
+        isTagShow () {
+            return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch", "labels", "refSelect"].includes(this.controlType);
+        },
         commonClass () {
             return {
                 "bri-control-edit": this.canEdit && this.finalCanEdit,
                 "bri-control-disabled": this.canEdit && !this.finalCanEdit,
                 "bri-control-unit": this.isUnitShow,
                 "bri-control-show": this.isDetailShow,
-                [`control-show-${this.showStatusMode}${this.tagShow ? "-tag" : ""}`]: this.isDetailShow,
+                [`control-show-${this.showStatusMode}${this.isTagShow ? "-tag" : ""}`]: this.isDetailShow,
                 "dsh-ellipsis": this.isUnitShow,
                 "bri-control-nodata": this.$isEmptyData(this.curVal)
             };
@@ -197,10 +139,12 @@ export default {
                 "bri-control-disabled": this.canEdit && !this.finalCanEdit,
                 "bri-control-unit": this.isUnitShow,
                 "bri-control-show": this.isDetailShow,
-                [`control-show-${this.showStatusMode}${this.tagShow ? "-tag" : ""}`]: this.isDetailShow,
+                [`control-show-${this.showStatusMode}${this.isTagShow ? "-tag" : ""}`]: this.isDetailShow,
                 "bri-control-nodata": this.$isEmptyData(this.curVal)
             };
         },
+
+        /* ----- 表单相关 ----- */
         clearable () {
             return this.commonDealPropsObj._clearable;
         },
@@ -208,18 +152,17 @@ export default {
         isFullRow () {
             return this.propsObj._span === 24 || !this.propsObj._span;
         },
-        // 控件内容的高度自由（在表格内且_heightAuto为true，2.详情页内且独占一行）
-        isHeightAuto () {
-            return this.isInTable
-                ? !!this.propsObj._heightAuto
-                : this.isFullRow;
-        },
         // 查看页下的展示模式
         showStatusMode () {
             return this.propsObj.showStatusMode || "defaut"; // "default", "frame", "backdrop"
         },
 
-        /* 部分条件下 才使用的属性 */
+        /* ----- 单元格相关 ----- */
+        unitAlign () {
+            return this.propsObj._align || this.typeInfoData.align || "left"; // "left", "center", "right"
+        },
+
+        /* ----- 部分条件下 才使用的属性 ----- */
         // isShare () {
         //     return !!this.propsObj.isShare;
         // },
@@ -255,17 +198,8 @@ export default {
         isDetailShow () {
             return !this.isInTable && !this.canEdit;
         },
-        // showAlign () {
-        //     return !this.isUnitShow
-        //         ? "flex-start"
-        //         : this.propsObj._align === "right"
-        //             ? "flex-end"
-        //             : this.propsObj._align === "center"
-        //                 ? "center"
-        //                 : "flex-start";
-        // },
 
-        /* 部分控件下 才使用的属性 */
+        /* ----- 部分控件下 才使用的属性 ----- */
         compKey () {
             return this.propsObj.compKey;
         },
@@ -285,7 +219,7 @@ export default {
             return this.propsObj.allScreenKey;
         },
 
-        /* 移动端在用 */
+        /* ----- 移动端在用 ----- */
         // 只做校验而隐藏的的field框，所用的propsObj
         ruleFieldPropsObj () {
             return {
@@ -297,6 +231,76 @@ export default {
             return this.$isEmptyData(this.curVal) && this.$isEmptyData(this.curValList)
                 ? ""
                 : "有值";
+        },
+
+        /* ----- 值 ----- */
+        // 值为不是[]类型用的
+        curVal: {
+            get () {
+                // // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
+                // if (!this.isInTable) {
+                //     if (["select"].includes(this.controlType)) {
+                //         if (!this.$dataType(this.propsObj._filterFunc, "function")) {
+                //             this.value[this.controlKey] = this.listData.some(item => item[this.saveKey] === this.value[this.controlKey])
+                //                 ? this.value[this.controlKey]
+                //                 : "";
+                //         }
+                //     }
+                // }
+
+                return this.value[this.controlKey];
+            },
+            set (val) {
+                // 修复文本框clear后值为undefined，后端无法更新保存数据bug
+                if (["select"].includes(this.controlType) && val === undefined) {
+                    val = "";
+                }
+
+                this.$set(this.value, this.controlKey, val);
+                this.change();
+            }
+        },
+        // 值为[]类型用的
+        curValList: {
+            get () {
+                // // 原选项变动了或选项动态改变时，过滤掉已不存在的选项值
+                // if (!this.isInTable) {
+                //     const valList = this.value[this.controlKey] || [];
+                //     if ((["select"].includes(this.controlType) && this.multipleMode) || ["checkbox"].includes(this.controlType)) {
+                //         this.value[this.controlKey] = valList.some(valKey => !this.listDataKeys.includes(valKey))
+                //             ? valList.filter(valKey => this.listDataKeys.includes(valKey))
+                //             : valList;
+                //     }
+                //     // else if (["region", "cascader"].includes(this.controlType)) {
+                //     //     this.value[this.controlKey] = this.$getTreeLinealDatas(valList, this.cascaderAllData, undefined, this.saveKey).length
+                //     //         ? valList
+                //     //         : [];
+                //     // }
+                //     // else if (["regions", "cascaders"].includes(this.controlType)) {
+                //     //     this.value[this.controlKey] = valList.filter(valListItem =>
+                //     //         this.$getTreeLinealDatas(valListItem, this.cascaderAllData, undefined, this.saveKey).length
+                //     //     );
+                //     // }
+                // }
+
+                return this.value[this.controlKey] || [];
+            },
+            set (valList) {
+                this.$set(this.value, this.controlKey, valList);
+                this.change();
+            }
+        },
+        emptyShowVal () {
+            return this.canEdit
+                ? this.commonDealPropsObj._placeholder
+                : this.isUnitShow
+                    ? "--"
+                    : "暂无内容";
+        },
+        showVal () {
+            return this.$isEmptyData(this.curVal)
+                ? this.emptyShowVal
+                : this.curVal;
         }
     },
     methods: {

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

@@ -22,7 +22,6 @@
                     :tableDataObj="curVal"
                     :data="curVal.list"
                     :rowDefault="curVal.rowDefault"
-                    :rowspanMap="curVal.rowspanMap"
                     :columns="subForm"
                     :propsObj="defaultPropsObj"
                     :allFormList="allFormList"
@@ -39,7 +38,6 @@
                 :tableDataObj="curVal"
                 :data="curVal.list"
                 :rowDefault="curVal.rowDefault"
-                :rowspanMap="curVal.rowspanMap"
                 :compareData="curVal.oldList"
                 :columns="subForm"
                 :propsObj="propsObj"

package/src/components/list/DshCascaderTable.vue

@@ -52,7 +52,7 @@
                 <!-- 搜索条件 -->
                 <dsh-render :render="topSearchRender"></dsh-render>
 
-                <div class="DshCasTable-main">
+                <div class="DshCasTable-fullscreen-inner-main DshCasTable-main">
                     <div
                         class="DshCasTable-main-center"
                         :style="{
@@ -67,6 +67,9 @@
                         <dsh-render :render="tableBodyRender"></dsh-render>
                     </div>
                 </div>
+
+                <!-- 添加行 -->
+                <dsh-render :render="createBtnRender"></dsh-render>
             </div>
         </dsh-modal>
     </div>
@@ -147,7 +150,16 @@
 
         &-fullscreen {
             &-inner {
+                width: 100%;
+                height: 100%;
                 padding: 10px 20px;
+                display: flex;
+                flex-direction: column;
+
+                &-main {
+                    flex: 1;
+                    min-width: 0px;
+                }
             }
         }
     }

package/src/components/list/DshFlatTable.vue

@@ -61,7 +61,7 @@
                 @selectAll="changeSelect"
             ></bri-table>
             <bri-table
-                v-show="showListData.length && isSearching"
+                v-show="!showListData.length || isSearching"
                 ref="briTable"
                 class="DshFlatTable-main"
                 :columns="showColumns"
@@ -71,16 +71,6 @@
                 @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>
 
         <!-- 添加行 -->
@@ -108,8 +98,8 @@
 
                 <!-- 表格 -->
                 <bri-table
-                    v-show="showListData.length"
-                    class="DshFlatTable-main"
+                    v-show="showListData.length && !isSearching"
+                    class="DshFlatTable-fullscreen-inner-main"
                     :columns="showColumns"
                     :data="renderedListData"
                     :footer-data="footerData"
@@ -118,8 +108,8 @@
                     @selectAll="changeSelect"
                 ></bri-table>
                 <bri-table
-                    v-show="!showListData.length"
-                    class="DshFlatTable-main"
+                    v-show="!showListData.length || isSearching"
+                    class="DshFlatTable-fullscreen-inner-main"
                     :columns="showColumns"
                     :data="showListData"
                     :footer-data="footerData"
@@ -228,16 +218,16 @@
 
         &-fullscreen {
             &-inner {
+                width: 100%;
+                height: 100%;
                 padding: 10px 20px;
-            }
-        }
-    }
-</style>
-<style lang="less">
-    .DshFlatTable {
-        &-form {
-            .item {
+                display: flex;
+                flex-direction: column;
 
+                &-main {
+                    flex: 1;
+                    min-width: 0px;
+                }
             }
         }
     }

package/src/components/list/DshTreeTable.vue

@@ -58,7 +58,7 @@
                 <!-- 表格 -->
                 <bri-table
                     v-show="showListData.length"
-                    class="DshTreeTable-main"
+                    class="DshTreeTable-fullscreen-inner-main"
                     :columns="showColumns"
                     :data="renderedListData"
                     :footer-data="footerData"
@@ -68,7 +68,7 @@
                 ></bri-table>
                 <bri-table
                     v-show="!showListData.length"
-                    class="DshTreeTable-main"
+                    class="DshTreeTable-fullscreen-inner-main"
                     :columns="showColumns"
                     :data="showListData"
                     :footer-data="footerData"
@@ -117,7 +117,16 @@
 
         &-fullscreen {
             &-inner {
+                width: 100%;
+                height: 100%;
                 padding: 10px 20px;
+                display: flex;
+                flex-direction: column;
+
+                &-main {
+                    flex: 1;
+                    min-width: 0px;
+                }
             }
         }
     }

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

@@ -1,18 +1,14 @@
 export default {
     mixins: [],
     components: {},
-    props: {
-        rowspanMap: {
-            type: Object,
-            default () {
-                return {};
-            }
-        }
-    },
+    props: {},
     data () {
         return {};
     },
     computed: {
+        rowspanMap () {
+            return this.tableDataObj.rowspanMap || {};
+        },
         selfBasePropsObj () {
             return {
                 _mergeRowColKeys: [] // 合并行的列
@@ -126,33 +122,37 @@ export default {
             if (this.mergeRowColKeys.length) {
                 this.$set(this.tableDataObj, "rowspanMap", this.tableDataObj.rowspanMap || {});
 
+                // TODO: 待删除
+                Object.entries(this.rowspanMap).forEach(arr => {
+                    if (arr[0].includes("dsh")) {
+                        this.rowspanMap[arr[0].split("dsh").join("--")] = this.rowspanMap[arr[1]];
+                        delete this.rowspanMap[arr[0]];
+                    }
+                });
+
                 this.allListData.forEach((rowItem, rowIndex) => {
                     this.mergeRowColKeys.forEach(colKey => {
                         const column = { _key: colKey };
 
-                        // 新增时，行的_id被置换，rowspanMap也要相应置换
-                        if (this.idRecordMap[rowItem._id]) {
-                            const oldId = this.idRecordMap[rowItem._id];
-                            this.rowspanMap[this.getMixKey(rowItem, column)] = this.getRealRowspan({
-                                row: { ...rowItem, _id: oldId },
-                                rowIndex,
-                                column
-                            });
-
-                            // 清除rowspanMap里和默认行老_id相关的
-                            delete this.rowspanMap[this.getMixKey({ _id: oldId }, column)];
-                        }
-                        else {
+                        // 新增页 -行的_id被置换，rowspanMap也要相应置换，还要清除rowspanMap里和默认行老_id相关的
+                        const oldId = this.idRecordMap[rowItem._id];
+                        const oldRow = { ...rowItem, _id: oldId };
+                        if (oldId && ![undefined, null].includes(this.rowspanMap[this.getMixKey(oldRow, column)])) {
+                            this.rowspanMap[this.getMixKey(rowItem, column)] = this.getRealRowspan({ row: oldRow, rowIndex, column });
+                            delete this.rowspanMap[this.getMixKey(oldRow, column)];
+                        } else {
                             this.rowspanMap[this.getMixKey(rowItem, column)] = this.getRealRowspan({ row: rowItem, rowIndex, column });
                         }
                     });
                 });
 
-                // 清除rowspanMap无用的（针对老数据）
-                Object.keys(this.rowspanMap).forEach(mixKey => {
-                    const id = mixKey.split("dsh")[0];
-                    if (!this.allListMap[id]) {
-                        delete this.rowspanMap[mixKey];
+                // 清除rowspanMap无用的（针对来回改mergeRowColKeys）
+                Object.entries(this.rowspanMap).forEach(arr => {
+                    const keyArr = arr[0].split("--");
+                    const id = keyArr[0];
+                    const colKey = keyArr.slice(1).join("--");
+                    if (!this.allListMap[id] || !this.mergeRowColKeys.includes(colKey)) {
+                        delete this.rowspanMap[arr[0]];
                     }
                 });
             }
@@ -312,9 +312,7 @@ export default {
         getRealRowspan ({ row, rowIndex, column }) {
             return ![undefined, null].includes(this.rowspanMap[this.getMixKey(row, column)])
                 ? this.rowspanMap[this.getMixKey(row, column)]
-                : ![undefined, null].includes(this.rowspanMap[this.getMixKey(row, column, false)])
-                    ? this.rowspanMap[this.getMixKey(row, column, false)]
-                    : this.getRowspan({ row, rowIndex, column }, this.allListData);
+                : this.getRowspan({ row, rowIndex, column }, this.allListData);
         },
         // 计算rowspan
         getRowspan ({ row, rowIndex, column }, list = this.showListData) {

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

@@ -1050,7 +1050,7 @@ export default {
                             e.stopPropagation();
                         }
                     }
-                });
+            });
         },
         topSearchRender (h) {
             return this.searchFormList.length
@@ -1340,7 +1340,7 @@ export default {
         getRowDelBtnCanEdit (row, rowIndex) {
             return row.__readonly__ !== true && // 不能为只读数据
                 (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-                (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {
@@ -1592,11 +1592,9 @@ export default {
                     ? compareRow[curColKey].length === row[curColKey].length && compareRow[curColKey].every((item, index) => item._key === row[curColKey][index]._key)
                     : compareRow[curColKey] === row[curColKey];
         },
-        // 行id+列key组成键
-        getMixKey (row, column, useDsh = true) {
-            return useDsh
-                ? `${row._id}dsh${column._key}`
-                : `${row._id}${column._key}`;
+        // 行id + 分隔符 + 列key 组成键
+        getMixKey (row, column, splitStr = "--") {
+            return `${row._id}${splitStr}${column._key}`;
         }
     }
 };