bri-components 1.2.0 → 1.2.1

package/package.json

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

package/src/abolish/DshFlatTable.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :class="`DshFlatTable control-default`">
+    <div class="DshFlatTable">
         <!-- 表格内容 -->
         <div class="DshFlatTable-block">
             <table

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

@@ -14,7 +14,8 @@
             `BriUpload-${showType}`,
             {
                 'BriUpload-readonly': !canEdit,
-                'BriUpload-disabled': canEdit && !propsObj.canEdit
+                'BriUpload-disabled': canEdit && !finalCanEdit,
+                'BriUpload-unit': isUnitShow
             }
         ]"
     >

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

@@ -3,9 +3,9 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <!-- 多选 多选的filterable必须是false，不然出bug -->
-            <template v-if="useMultiple">
+            <template v-if="multipleMode">
                 <Cascader
-                    class="DshCascader-multiple"
+                    class="DshCascader-edit-multiple"
                     :value="multipleSelectVal"
                     :data="renderCascaderData"
                     :disabled="!finalCanEdit"
@@ -22,30 +22,32 @@
                     <div
                         :class="{
                             ...commonClass,
-                            'DshCascader-multiple-input': true,
-                            'DshCascader-multiple-input-row': isMultipleRow,
+                            'DshCascader-edit-multiple-edit': true,
+                            'DshCascader-row': isMultipleRow,
                         }"
                         @click="clickInput"
                     >
                         <!-- 有值 -->
-                        <dsh-tags
-                            v-if="!$isEmptyData(curVal)"
-                            class="hasdata"
-                            :list="curValNameList"
-                            :propsObj="{
-                                disabled: !finalCanEdit,
-                                size: 'medium'
-                            }"
-                            @delete="deleteItem"
-                        ></dsh-tags>
+                        <template v-if="!$isEmptyData(curValList)">
+                            <dsh-tags
+                                class="overflow"
+                                :list="curValNameList"
+                                :propsObj="{
+                                    disabled: !finalCanEdit
+                                }"
+                                @delete="deleteItem"
+                            ></dsh-tags>
+
+                            <Icon
+                                class="icon-default"
+                                type="ios-arrow-down"
+                            />
+                        </template>
 
                         <!-- 无值 -->
-                        <div
-                            v-else
-                            class="nodata"
-                        >
+                        <template v-else>
                             {{ emptyShowVal }}
-                        </div>
+                        </template>
                     </div>
                 </Cascader>
             </template>
@@ -57,7 +59,7 @@
                     <div
                         :class="{
                             ...commonClass,
-                            'DshCascader-custom-input': true
+                            'DshCascader-edit-custom': true
                         }"
                         @mouseenter="isHover = true"
                         @mouseleave="isHover = false"
@@ -65,19 +67,19 @@
                     >
                         <!-- 内容 -->
                         <div class="text">
-                            {{ showText }}
+                            {{ showVal }}
                         </div>
 
                         <!-- 右侧图标 -->
                         <Icon
                             v-if="selfPropsObj._clearable && isHover"
-                            class="clear"
+                            class="icon-close"
                             type="md-close"
                             @click.stop="clickClear"
                         />
                         <Icon
                             v-else
-                            class="clear"
+                            class="icon-default"
                             type="ios-arrow-down"
                         />
                     </div>
@@ -97,7 +99,7 @@
                 <!-- 输入框方式 -->
                 <template v-else>
                     <Cascader
-                        class="DshCascader-single"
+                        class="DshCascader-edit-single"
                         :value="curValList"
                         :data="renderCascaderData"
                         :placeholder="selfPropsObj._placeholder"
@@ -120,9 +122,9 @@
         <!-- 查看 -->
         <template v-else>
             <!-- 多选 -->
-            <template v-if="useMultiple">
+            <template v-if="multipleMode">
                 <bri-tooltip
-                    :content="showMultipleText"
+                    :content="showMultipleVal"
                     placement="top"
                     maxWidth="200"
                     :transfer="true"
@@ -130,29 +132,25 @@
                     <div :class="{
                         ...commonClass,
                         'DshCascader-show-multiple': true,
-                        'DshCascader-show-multiple-row': isMultipleRow,
+                        'DshCascader-row': isMultipleRow,
                     }">
                         <!-- 有值 -->
                         <dsh-tags
-                            v-if="!$isEmptyData(curVal)"
+                            v-if="!$isEmptyData(curValList)"
                             :class="{
-                                hasdata: true,
-                                'hasdata-unit': isUnitShow
+                                overflow: true,
+                                'overflow-unit': isUnitShow
                             }"
                             :list="curValNameList"
                             :propsObj="{
-                                disabled: true,
-                                size: 'medium'
+                                closable: false
                             }"
                         ></dsh-tags>
 
                         <!-- 无值 -->
-                        <div
-                            v-else
-                            class="nodata"
-                        >
+                        <template v-else>
                             {{ emptyShowVal }}
-                        </div>
+                        </template>
                     </div>
                 </bri-tooltip>
             </template>
@@ -160,7 +158,7 @@
             <!-- 单选 -->
             <template v-else>
                 <bri-tooltip
-                    :content="showText"
+                    :content="showVal"
                     placement="top"
                     maxWidth="200"
                     :transfer="true"
@@ -169,7 +167,7 @@
                         ...commonClass,
                         'DshCascader-show-single': true
                     }">
-                        {{ showText }}
+                        {{ showVal }}
                     </div>
                 </bri-tooltip>
             </template>
@@ -234,7 +232,7 @@
                 return {
                     _filterable: true,
                     _showMode: false,
-                    _transfer: true,
+                    _transfer: false,
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
@@ -262,29 +260,33 @@
             },
 
             // 是否多选类型
-            useMultiple () {
+            multipleMode () {
                 return ["regions", "cascaders"].includes(this.propsObj._type);
             },
+            // 只有多选时有效
             isMultipleRow () {
-                return this.useMultiple && (this.selfPropsObj._span === 24 || !this.selfPropsObj._span);
+                return this.multipleMode && (this.selfPropsObj._span === 24 || !this.selfPropsObj._span);
             },
+            // 只有单选时有效
             showMode () {
                 return this.selfPropsObj._showMode;
             },
 
-            showText () {
-                return this.$isEmptyData(this.curVal)
-                    ? this.emptyShowVal
-                    : this.$getTreeLinealDatas(this.curValList, this.cascaderData, "name").join("/");
-            },
-            showMultipleText () {
-                return this.curValNameList.join("、");
-            },
-            // 多选用的展示文字
+            // 多选用 名字组成的列表
             curValNameList () {
                 return this.curValList.map(item =>
                     this.$getTreeLinealDatas(item, this.cascaderData, "name").join("/")
                 );
+            },
+            showVal () {
+                return this.$isEmptyData(this.curValList)
+                    ? this.emptyShowVal
+                    : this.$getTreeLinealDatas(this.curValList, this.cascaderData, "name").join("/");
+            },
+            showMultipleVal () {
+                return this.$isEmptyData(this.curValList)
+                    ? this.emptyShowVal
+                    : this.curValNameList.join("、");
             }
         },
         created () {},

package/src/components/controls/base/DshCascader/InfoCascader.vue

@@ -124,10 +124,6 @@
                     let newarr = [];
                     treeList.forEach(element => {
                         if (element.children && element.children.length) {
-                            if (element.title.indexOf(value) > -1) {
-                                element.expand = true;
-                                newarr.push(element);
-                            }
                             const ab = rebuildData(value, element.children);
                             const obj = {
                                 ...element,
@@ -136,6 +132,9 @@
                             };
                             if (ab && ab.length) {
                                 newarr.push(obj);
+                            } else if (element.title.indexOf(value) > -1) {
+                                element.expand = true;
+                                newarr.push(element);
                             }
                         } else {
                             if (element.title.indexOf(value) > -1) {

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

@@ -7,13 +7,13 @@
             <!-- 平铺 -->
             <CheckboxGroup
                 v-if="showType === 'flat'"
-                :class="[
-                    'DshCheckbox-checkboxGroup',
-                    { 'DshCheckbox-checkboxGroup-useColor' : selfPropsObj._useColor },
-                    { 'readonlyCheckbox' : !canEdit && !selfPropsObj._useColor },
-                    { 'readonlyColorCheckbox': !canEdit && selfPropsObj._useColor },
-                    { 'DshCheckbox-checkboxGroup-scroll': selfPropsObj._span < 24 && !selfPropsObj._br },
-                ]"
+                :class="{
+                    'DshCheckbox-group': true,
+                    'DshCheckbox-group-disabled': !canEdit && selfPropsObj._useColor,
+                    'DshCheckbox-group-color': selfPropsObj._useColor,
+                    'DshCheckbox-group-disabled-color': !canEdit && !selfPropsObj._useColor,
+                    'DshCheckbox-group-scroll': selfPropsObj._span < 24 && !selfPropsObj._br,
+                }"
                 v-model="value[controlKey]"
                 @on-change="change"
             >
@@ -104,7 +104,7 @@
 
             <div
                 v-else
-                class="control-notext dsh-ellipsis"
+                class="bri-control-nodata dsh-ellipsis"
             >
                 {{ emptyShowVal }}
             </div>

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

@@ -98,7 +98,7 @@
             </div>
             <div
                 v-else
-                class="control-notext dsh-ellipsis"
+                class="bri-control-nodata dsh-ellipsis"
             >
                 {{ emptyShowVal }}
             </div>

package/src/components/controls/controlMap.js

@@ -34,6 +34,8 @@ const componentNameMap = {
     editor: "DshEditor",
     tag: "DshDivider",
 
+    users: "selectUsers",
+    departments: "selectDepartments",
     labels: "BriLabels",
     package: "DshPackage",
     flatTable: "flatTable",
@@ -63,6 +65,8 @@ const pathMap = {
         DshEditor: "./base/DshEditor.vue",
         DshDivider: "./base/DshDivider.vue",
 
+        selectUsers: "./senior/selectUsers/selectUsers.vue",
+        selectDepartments: "./senior/selectDepartments.vue",
         BriLabels: "./senior/BriLabels.vue",
         DshPackage: "./senior/DshPackage.vue",
         flatTable: "./senior/flatTable.vue",

package/src/components/controls/controlMixin.js

@@ -1,5 +1,4 @@
 export default {
-    components: {},
     props: {
         canEdit: {
             type: Boolean,
@@ -38,9 +37,6 @@ export default {
         return {};
     },
     computed: {
-        controlKey () {
-            return this.propsObj._key;
-        },
         // 值为不是[]类型用的
         curVal: {
             get () {
@@ -53,7 +49,7 @@ export default {
         // 值为[]类型用的
         curValList: {
             get () {
-                return this.value[this.controlKey] || [];
+                return (this.value[this.controlKey] || []).filter(item => !!item);
             },
             set (val) {
                 this.value[this.controlKey] = val;
@@ -71,12 +67,18 @@ export default {
             return this.$isEmptyData(this.curVal) ? this.emptyShowVal : this.curVal;
         },
 
-        isUnitShow () {
-            return !this.canEdit && this.inTable;
+        controlKey () {
+            return this.propsObj._key;
+        },
+        controlType () {
+            return this.propsObj._type;
         },
         finalCanEdit () {
             return this.canEdit && (this.propsObj.canEdit == undefined ? true : this.propsObj.canEdit);
         },
+        isUnitShow () {
+            return !this.canEdit && this.inTable;
+        },
         commonDealPropsObj () {
             const selectControlTypes = ["date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "coordinates", "users", "departments"];
             return {
@@ -89,13 +91,13 @@ export default {
         },
         commonClass () {
             return {
-                "control-edit": this.canEdit && this.finalCanEdit,
-                "control-disabled": this.canEdit && !this.finalCanEdit,
-                "control-unit": !this.canEdit && this.isUnitShow,
-                "control-show": !this.canEdit && !this.isUnitShow,
+                "bri-control-edit": this.canEdit && this.finalCanEdit,
+                "bri-control-disabled": this.canEdit && !this.finalCanEdit,
+                "bri-control-unit": !this.canEdit && this.isUnitShow,
+                "bri-control-show": !this.canEdit && !this.isUnitShow,
 
                 "dsh-ellipsis": true,
-                "control-notext": !this.isUnitShow && this.$isEmptyData(this.curVal)
+                "bri-control-nodata": !this.isUnitShow && this.$isEmptyData(this.curVal)
             };
         },