bri-components 1.4.11 → 1.4.13

package/package.json

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

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

@@ -433,9 +433,18 @@
                 }
             },
             getBtns (fileItem) {
-                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"];
+                if (["image", "application/pdf", "text/plain"].some(type => fileItem.mimetype.includes(type)) ||
+                    fileItem.mimetype.includes("wordprocessingml.document") ||
+                    fileItem.mimetype.includes("application/msword") ||
+                    fileItem.mimetype.includes("presentationml.presentation") ||
+                    fileItem.mimetype.includes("application/vnd.ms-powerpoint") ||
+                    fileItem.mimetype.includes("spreadsheetml.sheet"))
+                {
+                    return undefined;
+                }
+                else {
+                    ["canDelete", "canEdit", "canDownload"];
+                }
             }
         }
     };

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

@@ -99,11 +99,11 @@ export default {
             const selectControlTypes = ["coordinates", "date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "users", "departments", "reference"];
             return {
                 // TODO: 此处的请输入可能还有请选择之类的，待处理
-                _placeholder: this.canEdit && this.propsObj._enterType !== "calculate"
+                _placeholder: this.canEdit && this.propsObj._enterType !== "calculate" && this.propsObj._disabled !== true
                     ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : undefined,
                 _clearable: this.finalCanEdit && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
-                _disabled: this.propsObj._disabled || ["serialNumber"].includes(this.controlType) || !this.finalCanEdit
+                _disabled: this.propsObj._disabled || !this.finalCanEdit
             };
         },
         // 是否为多选模式

package/src/components/list/DshCascaderTable.vue

@@ -53,13 +53,7 @@
                 <dsh-render :render="topSearchRender"></dsh-render>
 
                 <div class="DshCasTable-fullscreen-inner-main DshCasTable-main">
-                    <div
-                        class="DshCasTable-main-center"
-                        :style="{
-                            maxHeight: `${contentHeight}px`,
-                            height: `${contentHeight}px`
-                        }"
-                    >
+                    <div class="DshCasTable-main-center">
                         <!-- 表头 -->
                         <dsh-render :render="tableHeadRender"></dsh-render>
 
@@ -158,7 +152,7 @@
 
                 &-main {
                     flex: 1;
-                    min-width: 0px;
+                    min-height: 0px;
                 }
             }
         }

package/src/components/list/DshFlatTable.vue

@@ -103,7 +103,7 @@
                     :columns="showColumns"
                     :data="renderedListData"
                     :footer-data="footerData"
-                    :propsObj="tablePropsObj"
+                    :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
@@ -113,7 +113,7 @@
                     :columns="showColumns"
                     :data="showListData"
                     :footer-data="footerData"
-                    :propsObj="tablePropsObj"
+                    :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
@@ -226,7 +226,7 @@
 
                 &-main {
                     flex: 1;
-                    min-width: 0px;
+                    min-height: 0px;
                 }
             }
         }

package/src/components/list/DshTreeTable.vue

@@ -62,7 +62,7 @@
                     :columns="showColumns"
                     :data="renderedListData"
                     :footer-data="footerData"
-                    :propsObj="tablePropsObj"
+                    :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
@@ -72,7 +72,7 @@
                     :columns="showColumns"
                     :data="showListData"
                     :footer-data="footerData"
-                    :propsObj="tablePropsObj"
+                    :propsObj="tableInModalPropsObj"
                     @changeSelect="changeSelect"
                     @selectAll="changeSelect"
                 ></bri-table>
@@ -125,7 +125,7 @@
 
                 &-main {
                     flex: 1;
-                    min-width: 0px;
+                    min-height: 0px;
                 }
             }
         }

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

@@ -73,6 +73,16 @@ export default {
                 // this.$set(treeFormItem, "canDelete", true);
             });
         },
+        // 点开模态框后处理 -表头跟着内容行滚动
+        dealingOpenModal () {
+            if (this.isEnlargeFlag) {
+                setTimeout(() => {
+                    document.querySelector(".DshCasTable-fullscreen-inner-main .DshCasTable-main-center-list").addEventListener("scroll", (e) => {
+                        document.querySelector(".DshCasTable-fullscreen-inner-main .DshCasTable-main-center-top").scrollLeft = e.srcElement.scrollLeft;
+                    }, false);
+                }, 0);
+            }
+        },
 
         /* ----------- 渲染函数（声明：为了代码更加规范清晰，return的是h相关的函数，则函数名get开头；return的是h的直接调用，函数名不要get开头）---------- */
         // 表格表头渲染函数

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

@@ -282,7 +282,7 @@ export default {
         },
         changeVal (operationItem, row, rowIndex, column, params) {
             this.$set(this.ruleRecordMap, this.getMixKey(row, column), { showRuleMessage: true });
-            if (!["text", "textarea", "idcard", "email", "phone", "url", "password", "serialNumber"].includes(column._key)) {
+            if (!["text", "textarea", "idcard", "email", "phone", "url", "password"].includes(column._key)) {
                 this.dealSameRowsVal({ row, rowIndex, column });
             }
 

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

@@ -102,7 +102,7 @@ export default {
             showImportModal: false,
             exportTimer: null,
             isEnlarge: false,
-            isEnlargeFlag: true, // 为重渲染膜态框内容而用
+            isEnlargeFlag: false, // 为重渲染膜态框内容而用
 
             baseOperationMap: {
                 canCreate: {
@@ -565,6 +565,12 @@ export default {
                 }
             };
         },
+        tableInModalPropsObj () {
+            return {
+                ...this.tablePropsObj,
+                maxHeight: undefined
+            };
+        },
 
         hideColKeys () {
             return this.selfPropsObj._hideColKeys;
@@ -712,6 +718,7 @@ export default {
         isEnlarge (bool) {
             setTimeout(() => {
                 this.isEnlargeFlag = bool;
+                this.dealingOpenModal && this.dealingOpenModal();
             }, 0);
         }
     },
@@ -1417,6 +1424,7 @@ export default {
                 !(["cascaderTable"].includes(this.controlType) && ["level", "children"].includes(column._key)) && // 层级表格的固定字段不可编辑
                 column._enterType !== "calculate" && // 计算的不可编辑
                 column._readonly !== true && // 只读
+                column._disabled !== true && // 只读
                 column.canEdit !== false; // 字段本身编辑权限 考虑为undefined时候
         },