bri-components 1.2.101 → 1.3.1

package/package.json

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

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

@@ -194,8 +194,8 @@
                 if (data.res === 0) {
                     if (this.multipleMode) {
                         this.curValList = [
-                            data.data,
-                            ...this.curValList
+                            ...this.curValList,
+                            data.data
                         ];
                     } else {
                         this.curValList = [

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

@@ -9,7 +9,7 @@
                 customIcon: 'bico-Cascadetable'
             }]"></dsh-icons>
             <span class="cascaderTable-unit-text">
-                {{ curVal && curVal.tree.length }}行
+                {{ showVal }}
             </span>
         </span>
 
@@ -131,6 +131,10 @@
                     showSlotClose: false,
                     closable: true
                 };
+            },
+
+            showVal () {
+                return `${this.curVal ? this.$getTreeLeafTotal(this.curVal.tree) : 0} 行`;
             }
         },
         created () {},

package/src/components/form/DshForm.vue

@@ -170,8 +170,11 @@
                     "users", "departments", "labels", "flatTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
-                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable",
+                    "_name", "_key", "_default", "_required", "_span", "_br", "_line", "_noLabel", "_clearable", "",
                     "_disabledBtns", "_disabledOldDataRow"
+                ],
+                subIgnoreProperties: [
+                    "_regStr", "_regMessage"
                 ]
             };
         },
@@ -304,7 +307,8 @@
                         _displayType: "show",
                         canEdit: true
                     }).forEach(arr => {
-                        !this.ignoreProperties.includes(arr[0]) && this.$set(formItem, arr[0], arr[1]);
+                        !this.ignoreProperties.includes(arr[0]) && (formData.__parentKey__ ? !this.subIgnoreProperties.includes(arr[0]) : true) &&
+                            this.$set(formItem, arr[0], arr[1]);
                     });
                 }
 

package/src/components/list/BriFlatTable.vue

@@ -2,10 +2,10 @@
     <div class="BriFlatTable">
         <bri-table
             class="BriFlatTable-main"
-            :propsObj="tablePropsObj"
             :columns="showColumns"
             :data="listData"
             :footer-data="footerData"
+            :propsObj="tablePropsObj"
             @changeSelect="changeSelect"
             @selectAll="changeSelect"
         ></bri-table>
@@ -81,11 +81,6 @@
             };
         },
         computed: {
-            tablePropsObj () {
-                return {
-                    maxHeight: this.contentHeight
-                };
-            },
             listData () {
                 this.data.forEach(item => {
                     !item._id && this.$set(item, "_id", this.$ObjectID().str);
@@ -108,6 +103,11 @@
                 return this.oldData;
             },
 
+            tablePropsObj () {
+                return {
+                    maxHeight: this.contentHeight
+                };
+            },
             selfPropsObj () {
                 return {
                     isShare: false, // 是否是分享页在用
@@ -119,6 +119,7 @@
                     _disabledBtns: false, // 禁用增删按钮
                     _disabledCreateBtn: false, // 置灰新增按钮，目前只内部使用，comp_web数据表配置页那块
                     _disabledOldDataRow: false, // 置灰老数据行包含删除
+                    _heightAuto: false, // 单元格内容高度自适应
 
                     ...this.propsObj
                 };
@@ -147,6 +148,10 @@
             disabledOldDataRow () {
                 return this.selfPropsObj._disabledOldDataRow;
             },
+            heightAuto () {
+                return this.selfPropsObj._heightAuto;
+            },
+
             useCampare () {
                 return !!this.oldListData.length;
             },
@@ -414,6 +419,7 @@
                 return {
                     ...col,
                     ...(resetMap[col._type] || {}),
+                    _heightAuto: this.heightAuto,
                     isShare: this.isShare
                 };
             },

package/src/components/list/DshCascaderTable.vue

@@ -152,7 +152,7 @@
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="{
                                                         ...col,
-                                                        _heightAuto: true
+                                                        _heightAuto: heightAuto
                                                     }"
                                                     @blur="controlBlur(null, col, row[col.nodeKey], arguments)"
                                                     @change="$dispatchEvent(operationMap.changeVal, col, row[col.nodeKey], arguments)"
@@ -338,29 +338,35 @@
             };
         },
         computed: {
+            treeData () {
+                return this.transforBriTreeData();
+            },
+            rows () {
+                return this.transformRows();
+            },
+            // 供表格渲染行使用的columns的数组集合, 每一行columns不一样，组成二重数组
+            rowColumnsArr () {
+                return this.transformRowColumnsArr();
+            },
+
             selfPropsObj () {
                 return {
                     _disabledBtns: false, // 禁用增删按钮
+                    _heightAuto: false, // 单元格内容高度自适应
+
                     ...this.propsObj
                 };
             },
             disabledBtns () {
                 return this.selfPropsObj._disabledBtns;
             },
-
-            treeData () {
-                return this.transforBriTreeData();
+            heightAuto () {
+                return this.selfPropsObj._heightAuto;
             },
+
             columns () {
                 return this.transformColumns(this.treeColumns);
             },
-            rows () {
-                return this.transformRows();
-            },
-            // 供表格渲染行使用的columns的数组集合, 每一行columns不一样，组成二重数组
-            rowColumnsArr () {
-                return this.transformRowColumnsArr();
-            },
 
             operationMap () {
                 return this.canEdit
@@ -540,20 +546,21 @@
             // 是否显示 单元格校验提示文字
             getRuleResult (col, row, rowIndex, showRuleMessage = this.showRuleMessage) {
                 if ((this.ruleRecordMap[`${row._id}dsh${col._key}`] || {}).showRuleMessage || showRuleMessage) {
-                    if (col._regStr && [";", "；"].some(symbol => col._regStr.includes(symbol))) {
-                        col._regStr = col._regStr
-                            .replace(/\n/g, "")
-                            .split(";")
-                            .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex];
-                    }
-                    if (col._regMessage && [";", "；"].some(symbol => col._regMessage.includes(symbol))) {
-                        col._regMessage = col._regMessage
-                            .replace(/\n/g, "")
-                            .split(";")
-                            .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex];
-                    }
-
-                    return this.$getFieldRuleResult(col, row);
+                    return this.$getFieldRuleResult({
+                        ...col,
+                        _regStr: col._regStr && [";", "；"].some(symbol => col._regStr.includes(symbol))
+                            ? col._regStr
+                                .replace(/\n/g, "")
+                                .split(";")
+                                .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex]
+                            : col._regStr,
+                        _regMessage: col._regMessage && [";", "；"].some(symbol => col._regMessage.includes(symbol))
+                            ? col._regMessage
+                                .replace(/\n/g, "")
+                                .split(";")
+                                .reduce((arr, item) => arr.concat(item.split("；")), [])[rowIndex]
+                            : col._regMessage
+                    }, row);
                 } else {
                     return {
                         bool: true
@@ -890,7 +897,7 @@
                     width: 100%;
                     flex: 1;
                     min-height: 0px;
-                    margin-top: 40px;
+                    margin-top: 47px;
                     overflow: auto;
 
                     &-inner {}