bri-components 1.4.70 → 1.4.72

package/package.json

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

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

@@ -145,7 +145,7 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _fileType: "file",
+                    _fileType: "file", // "file", "image"
                     _showMode: this.isHeightAuto ? "old" : "inline", // 宽度为100%、且不在表格字段里的 显示老版
 
                     _multiple: true,
@@ -157,10 +157,6 @@
                     ...this.commonDealPropsObj
                 };
             },
-            isShowEditIcon () {
-                // 因为编辑name 需要这三个参数，因此没有这三个参数时不显示此按钮
-                return this.compKey && this.appKey && this.modKey && !!(this.$getHttpPathMap({}).file && this.$getHttpPathMap({}).file.updateFileName);
-            },
             subType () {
                 return this.selfPropsObj._fileType;
             },
@@ -180,13 +176,16 @@
             maxSize () {
                 return this.selfPropsObj._maxSize;
             },
-
             // 限制文件格式
             accept () {
                 return (this.subType === "image" ? imageType : fileTypes)
                     .map(type => `.${type}`)
                     .join();
             },
+            isShowEditIcon () {
+                // 因为编辑name 需要这三个参数，因此没有这三个参数时不显示此按钮
+                return this.compKey && this.appKey && this.modKey && !!(this.$getHttpPathMap({}).file && this.$getHttpPathMap({}).file.updateFileName);
+            },
             classes () {
                 return {
                     [`${prefixCls}`]: true,

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

@@ -223,6 +223,7 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _mapType: "2D", // "2D", "3D"
                     _showType: "marker", // "marker", "multipleMarker", "polyline", "polygon", "rectangle"
                     _icon: "ios-map-outline",
 
@@ -230,6 +231,9 @@
                     ...this.commonDealPropsObj
                 };
             },
+            subType () {
+                return this.selfPropsObj._mapType;
+            },
             showMode () {
                 return this.selfPropsObj._showType;
             },
@@ -309,7 +313,7 @@
                         pitchEnable: true,
                         zoom: this.propsObj._zoom || 12,
                         pitch: 50,
-                        viewMode: this.propsObj._mapType || "2D", // 开启3D视图,默认为关闭
+                        viewMode: this.subType,
                         center: this.propsObj._center && this.propsObj._center.split(",").map(i => Number(i)) || undefined
                     });
 

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

@@ -1,42 +1,42 @@
 <template>
     <div
         class="DshDivider"
-        :style="propsObj._tagKind === 'flag' ? { marginRight:'36px' } : {}"
+        :style="showMode === 'flag' ? { marginRight:'36px' } : {}"
     >
         <!-- <div class="DshDivider-cli">
-            <p>{{ propsObj._name }}</p>
+            <p>{{ controlName }}</p>
         </div> -->
 
         <div
-            v-if="propsObj._tagKind === 'flag'"
+            v-if="showMode === 'flag'"
             class="DshDivider-flag"
         >
             <Icon
                 size="15"
                 style="margin-top: -1px"
-                :custom="'bico-font ' + propsObj._tagIcon"
+                :custom="'bico-font ' + iconType"
             />
-            <p>{{ propsObj._name }}</p>
+            <p>{{ controlName }}</p>
             <span class="triangle-topleft"></span>
             <span class="triangle-topright"></span>
         </div>
 
         <div
-            v-else-if="propsObj._tagKind === 'line'"
+            v-else-if="showMode === 'line'"
             class="DshDivider-line"
         >
-            <p>{{ propsObj._name }}</p>
+            <p>{{ controlName }}</p>
             <span></span>
         </div>
 
         <div
-            v-else-if="propsObj._tagKind === 'circle'"
+            v-else-if="showMode === 'circle'"
             class="DshDivider-circle"
         >
             <span class="DshDivider-circle-icon">
-                <Icon :custom="'bico-font ' + propsObj._tagIcon" />
+                <Icon :custom="'bico-font ' + iconType" />
             </span>
-            <p>{{ propsObj._name }}</p>
+            <p>{{ controlName }}</p>
         </div>
     </div>
 </template>
@@ -53,7 +53,22 @@
         data () {
             return {};
         },
-        computed: {},
+        computed: {
+            selfPropsObj () {
+                return {
+                    _tagKind: "flag", // "flag", "line", "circle"
+                    _tagIcon: "", // flag、circle下使用
+
+                    ...this.propsObj
+                };
+            },
+            showMode () {
+                return this.selfPropsObj._tagKind;
+            },
+            iconType () {
+                return this.selfPropsObj._tagIcon;
+            }
+        },
         created () {},
         methods: {}
     };

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

@@ -141,7 +141,8 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _textType: "default", // ["default", "url"]
+                    _textType: "default", // 子类型"default", "url"，只在type="text"有效
+
                     _readonly: ["serialNumber"].includes(this.controlType),
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
                     _autosize: {
@@ -154,7 +155,6 @@
                     ...this.commonDealPropsObj
                 };
             },
-            // 子类型，只在type="text"有效
             subType () {
                 return ["textarea", "email", "password", "url", "number", "tel"].includes(this.controlType)
                     ? this.controlType

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

@@ -39,7 +39,7 @@ export default {
                 _joinSymbol: _joinSymbol // 级联拼接符
             };
         },
-        regionType () {
+        subType () {
             return this.selfPropsObj._regionType;
         },
         showMode () {
@@ -84,7 +84,7 @@ export default {
             return ["userIndustry"].includes(this.controlType)
                 ? userIndustryData
                 : ["region", "regions"].includes(this.controlType)
-                    ? this.regionType === "benji"
+                    ? this.subType === "benji"
                         ? benjiRegionData
                         : regionData
                     : this.selfPropsObj._data;

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

@@ -159,8 +159,8 @@ export default {
 
             return !this.$isEmptyData(val)
                 ? {
-                    name: obj[this.nameKey], // 查看状态时tag用
                     ...obj,
+                    name: obj[this.nameKey] || obj.name || obj._name, // 查看状态时tag用
                     style: {
                         ...this.tagStyle,
                         ...this.getItemColorStyle(obj),

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

@@ -165,7 +165,7 @@
                     ...this.commonDealPropsObj
                 };
             },
-            labelType () {
+            subType () {
                 return this.selfPropsObj._labelType;
             },
             onlySelect () {
@@ -227,7 +227,7 @@
                     _key: this.$randomB36("Labels"),
                     isEdit: true,
                     name: "",
-                    labelType: this.labelType
+                    labelType: this.subType
                 });
             },
             clickDeleteItem (deleteItem) {
@@ -246,7 +246,7 @@
                             entityKey: this.entityKey,
                             modKey: this.modKey,
                             fieldKey: this.fieldKey, // 当前字段Key
-                            labelType: this.labelType
+                            labelType: this.subType
                         },
                         pagination: {
                             page: 1,

package/src/components/form/DshForm.vue

@@ -203,7 +203,7 @@
                     "users", "departments", "labels", "flatTable", "cascaderTable", "reference", "referenceBy"
                 ],
                 ignoreProperties: [
-                    "_name", "_key", "_span", "_br", "_line", "_noLabel", "_required", "_regStr", "_regMessage", "_clearable", "_default"
+                    "_name", "_key", "_span", "_br", "_line", "_noLabel", "_required", "_clearable", "_default"
                 ]
                 // subIgnoreProperties: []
             };
@@ -409,7 +409,7 @@
                 // 格式校验（不依赖必填）
                 if (ruleConfig.regs && ruleConfig.regs.length) {
                     rules.push({
-                        message: formItem._regMessage || `"${formItem._name}"格式不正确!`,
+                        message: formItem._regMessage || ruleConfig._regMessage || `"${formItem._name}"格式不正确!`,
                         trigger: "blur, change",
                         type: "string",
                         transform: (val) => {

package/src/components/list/BriTable.vue

@@ -37,7 +37,7 @@
         <!-- loading -->
         <bri-loading
             class="bri-table-empty"
-            :value="isLoading ? 1 : data.length? 0 : 2"
+            :value="isLoading ? 1 : data.length ? 0 : 2"
         >
             <template slot="nodata">
                 {{ noDataText }}
@@ -179,7 +179,7 @@
                                 .reduce((obj, attr) => {
                                     return { sortType: params[attr], field: attr };
                                 }, {});
-                        this.$emit("sort-change", sortObj);
+                        this.$emit("changeSort", sortObj);
                     },
                     ...(this.propsObj.sortOption || {})
                 };

package/src/components/list/DshBox/DshBox.vue

@@ -14,7 +14,7 @@
                 :isLoading="isLoading ? isLoading : listPropsObj && listPropsObj.isLoading"
                 :noDataText="listPropsObj && listPropsObj.noDataText || '暂无数据…'"
                 @clickRow="clickRow"
-                @sortChange="changeSort"
+                @changeSort="changeSort"
                 @changeSelect="changeSelect"
                 @selectAll="selectAll"
                 @select="select"

package/src/components/list/DshBox/DshTable.vue

@@ -9,7 +9,7 @@
             @changeSelect="changeSelect"
             @selectAll="changeSelect"
             @click-row="clickRow"
-            @sort-change="changeSort"
+            @changeSort="changeSort"
         ></bri-table>
     </div>
 </template>
@@ -189,7 +189,7 @@
 
             // 改变选择项
             changeSort (...params) {
-                this.$emit("sortChange", ...params);
+                this.$emit("changeSort", ...params);
             },
             // 改变选择项
             changeSelect (...params) {

package/src/components/unit/DshFormUnit.vue

@@ -138,9 +138,12 @@
             unitStyle () {
                 return {
                     width: `calc(${(this.formItem._br && this.formItem._span ? this.formItem._span / 24 : 1) * 100}% - 12px)`,
-                    height: this.formItem._br || [undefined, 0, 24].includes(this.formItem._span)
-                        ? undefined
-                        : `${this.height - (this.canEdit ? 0 : 10)}px`, // 去掉下padding
+                    height: this.formItem._formHeight
+                        ? `${this.formItem._formHeight}px`
+                        : (this.formItem._br || [undefined, 0, 24].includes(this.formItem._span)
+                            ? undefined
+                            : `${this.height - (this.canEdit ? 0 : 10)}px`// 去掉下padding
+                        ),
                     minHeight: "42px",
                     paddingBottom: this.canEdit ? undefined : "0px", // 详情查看页时，不要上下的padding，为了美观