bri-components 1.2.57 → 1.2.59

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

@@ -1,111 +1,111 @@
 <template>
-    <!-- 单选模式 -->
+    <!-- 单选模式 编辑 -->
     <div
-        v-if="!multipleMode"
+        v-if="!multipleMode && canEdit"
         class="DshSelect"
     >
-        <template v-if="canEdit">
-            <!-- 有选项 -->
-            <template v-if="listData.length">
-                <!-- flat方式 -->
-                <template v-if="['flat', 'button'].includes(showType)">
-                    <RadioGroup
-                        :class="{
+        <!-- 有选项 -->
+        <template v-if="listData.length">
+            <!-- flat方式 -->
+            <template v-if="['flat', 'button'].includes(showType)">
+                <RadioGroup
+                    :class="{
                         'DshSelect-flat': true,
                         'DshSelect-flat-color': useColor,
-                        'DshSelect-flat-scroll': selfPropsObj._span < 24 && !selfPropsObj._br
+                        'DshSelect-flat-scroll': !isFullRow
                     }"
-                        v-model="value[controlKey]"
-                        :type="radioGroupType"
-                        @on-change="change"
+                    :value="curVal"
+                    :type="radioGroupType"
+                >
+                    <Radio
+                        v-for="(item, index) in listData"
+                        :key="item._key"
+                        :class="getItemClass(item)"
+                        :style="getItemColorStyle(item)"
+                        :label="item._key"
+                        :disabled="getRadioItemDisabled(item)"
+                        :border="useColor"
+                        @click.native="clickRadioItem(item, index)"
                     >
-                        <Radio
-                            v-for="(item, index) in listData"
-                            :key="index"
-                            :class="getItemColorClass(item)"
-                            :style="getItemStyle(item)"
-                            :label="item._key"
-                            :disabled="getItemDisabled(item)"
-                            :border="useColor"
-                            @click.native="cancelSelect(item)"
-                        >
-                            <span @click.stop="clickOpenTip(item)">
-                                {{ item.name || item._name }}
-                            </span>
-                        </Radio>
-                    </RadioGroup>
-
-                    <!-- tip项弹框提示 -->
-                    <dsh-render :render="tipModalRender"></dsh-render>
-                </template>
-
-                <!-- dropdown模式 -->
-                <template v-else>
-                    <Select
-                        v-model="curVal"
-                        :placeholder="selfPropsObj._placeholder"
-                        :multiple="false"
-                        :disabled="!finalCanEdit"
-                        :clearable="selfPropsObj._clearable"
-                        :filterable="selfPropsObj._filterable"
-                        :size="selfPropsObj._size"
-                        :transfer="selfPropsObj._transfer"
-                        :transfer-class-name="selfPropsObj._transferClassName"
-                        @on-change="change"
-                    >
-                        <!-- </Option>必须和输出内容在一行，否则出现空格导致_filterable出bug -->
-                        <Option
-                            v-for="(item, index) in listData"
-                            :key="index"
-                            :value="item._key"
-                            :label="item.name || item._name"
-                            :disabled="getItemDisabled(item)"
-                        >
-                            <Icon
-                                v-if="item.icon || item.customIcon"
-                                :type="item.icon"
-                                :custom="item.customIcon ? `bico-font ${item.customIcon}` : undefined"
-                                :color="item.color"
-                                :size="item.size || 20"
-                            />{{ item.name || item._name }}
-                        </Option>
-                    </Select>
-                </template>
+                        <span>
+                            {{ item.name || item._name }}
+                        </span>
+                    </Radio>
+                </RadioGroup>
             </template>
 
-            <!-- 无选项 -->
-            <div
-                v-else
-                class="dsh-subtip"
-            >-- 无选择项 --</div>
+            <!-- dropdown模式 -->
+            <template v-else>
+                <Select
+                    class="DshSelect-dropdown"
+                    v-model="curVal"
+                    :placeholder="selfPropsObj._placeholder"
+                    :multiple="false"
+                    :disabled="!finalCanEdit"
+                    :clearable="selfPropsObj._clearable"
+                    :filterable="selfPropsObj._filterable"
+                    :size="selfPropsObj._size"
+                    :transfer="selfPropsObj._transfer"
+                    :transfer-class-name="selfPropsObj._transferClassName"
+                >
+                    <!-- </Option>必须和输出内容在一行，否则出现空格导致_filterable出bug -->
+                    <Option
+                        v-for="(item, index) in listData"
+                        :key="item._key"
+                        :value="item._key"
+                        :label="item.name || item._name"
+                        :disabled="getRadioItemDisabled(item, index)"
+                    >
+                        <Icon
+                            v-if="item.icon || item.customIcon"
+                            :type="item.icon"
+                            :custom="item.customIcon ? `bico-font ${item.customIcon}` : undefined"
+                            :color="item.color"
+                            :size="item.size || 20"
+                        />
+
+                        <slot :item="item"></slot>
+
+                        <span>{{ item.name || item._name }}</span>
+                    </Option>
+                </Select>
+            </template>
         </template>
 
-        <!-- 查看 -->
-        <template v-else>
-            <bri-tooltip
-                :content="showVal"
-                maxWidth="200"
-                placement="top"
-                :transfer="true"
-            >
-                <div :class="{
+        <!-- 无选项 -->
+        <div
+            v-else
+            class="dsh-subtip"
+        >-- 无选择项 --</div>
+    </div>
+
+    <!-- 单选模式 查看 -->
+    <div
+        v-else-if="!multipleMode && !canEdit"
+        class="DshSelect-show"
+    >
+        <!-- 有值 -->
+        <bri-tooltip
+            v-if="!$isEmptyData(curVal)"
+            :content="showVal"
+            :transfer="true"
+        >
+            <dsh-tags
+                :class="{
                     ...commonClass,
-                    'DshSelect-show': true
-                }">
-                    <!-- 有值 -->
-                    <dsh-tags
-                        v-if="!$isEmptyData(curVal)"
-                        class="text"
-                        :list="[curValObj]"
-                    ></dsh-tags>
-
-                    <!-- 无值 -->
-                    <template v-else>
-                        {{ emptyShowVal }}
-                    </template>
-                </div>
-            </bri-tooltip>
-        </template>
+                    'DshSelect-show-ellipsis': !(isDetailShow && isFullRow)
+                }"
+                :list="[curValObj]"
+            ></dsh-tags>
+        </bri-tooltip>
+
+        <!-- 无值 -->
+        <div
+            v-else
+            :class="commonClass"
+        >
+            {{ emptyShowVal }}
+        </div>
     </div>
 
     <!-- 多选模式 -->
@@ -119,7 +119,7 @@
 </template>
 
 <script>
-    import selectMixin from "./selectMixin.js";
+    import selectMixin from "../../mixins/selectMixin.js";
     import DshCheckbox from "./DshCheckbox.vue";
 
     export default {
@@ -138,7 +138,8 @@
             selfPropsObj () {
                 return {
                     _transfer: true,
-                    ...this.selectPropsObj
+
+                    ...this.basePropsObj
                 };
             },
             radioGroupType () {
@@ -146,45 +147,12 @@
             }
         },
         created () {},
-        methods: {
-            // 取消flat模式的选择项
-            cancelSelect (item) {
-                if (item._disabled !== true && this.selfPropsObj._clearable !== false) {
-                    if (item._key === this.curVal) {
-                        this.value[this.controlKey] = "";
-                        this.change();
-                    }
-                }
-
-                this.clickOpenTip(item);
-            },
-            change (...params) {
-                // 修复clear后值为undefined，数据库不更新数据bug
-                if (this.value[this.controlKey] == undefined) {
-                    this.value[this.controlKey] = "";
-                }
-
-                this.$emit("change", this.curVal);
-            },
-
-            getItemColorClass (item) {
-                return this.colorMap[item.color] ? item.color : "color-1";
-            },
-            getItemStyle (item) {
-                const color = this.colorMap[item.color] || this.colorMap["color-1"];
-                return {
-                    backgroundColor: this.useColor ? this.$getColor(color, 0.1) : undefined,
-                    color: this.useColor ? color : undefined
-                };
-            }
-        }
+        methods: {}
     };
 </script>
 
 <style lang="less">
     .DshSelect {
-        width: 100%;
-
         &-flat {
             width: 100%;
 
@@ -249,10 +217,46 @@
             }
 
             &-scroll {
+                .bri-scrollbar3();
                 overflow: auto;
                 white-space: nowrap;
+            }
+        }
 
-                .bri-scrollbar3();
+        &-dropdown {
+            .ivu-select-multiple {
+                .ivu-select-selection {
+                    height: 32px;
+                    .dsh-flex-row-between-center();
+
+                    & > div {
+                        width: 100%;
+                        height: 100%;
+                        word-break: keep-all;
+                        white-space: nowrap;
+                        overflow: auto;
+                        .bri-scrollbar3();
+
+                        .ivu-tag {
+                            margin: 2px 4px 0px 0px;
+                            background-color: @borderColor;
+                        }
+                    }
+                }
+
+                &.ivu-select-disabled {
+                    .ivu-select-selection {
+                        & > div {
+                            .ivu-tag {
+                                background-color: @border-disabled;
+                            }
+                        }
+                    }
+                }
+
+                .ivu-select-item-selected:after {
+                    content: none;
+                }
             }
         }
 
@@ -308,11 +312,10 @@
             }
         }
 
-        &-tip {
-            cursor: pointer;
-
-            .ivu-radio {
-                display: none;
+        // 查看
+        &-show {
+            &-ellipsis {
+                .dsh-ellipsis();
             }
         }
     }

package/src/components/controls/base/DshSwitch/switchMixin.js

@@ -1,4 +1,4 @@
-import controlMixin from "../../controlMixin.js";
+import controlMixin from "../../mixins/controlMixin.js";
 import DshCheckbox from "../DshSelect/DshCheckbox.vue";
 
 export default {

package/src/components/controls/extra/themeColor.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "themeColor",

package/src/components/controls/extra/themeIcon.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
+    import controlMixin from "../mixins/controlMixin.js";
 
     export default {
         name: "themeIcon",

package/src/components/controls/{base/DshCascader → mixins}/cascaderMixin.js

@@ -1,4 +1,4 @@
-import controlMixin from "../../controlMixin.js";
+import controlMixin from "./controlMixin.js";
 import { regionData, userIndustryData } from "bri-datas";
 
 export default {
@@ -15,6 +15,9 @@ export default {
             const _joinSymbol = this.propsObj._joinSymbol || "/";
             return {
                 _showMode: "default",
+                _saveKey: "_key",
+                _valueKey: "code",
+                _nameKey: "name",
                 _filterable: true,
                 _cascaderFilterVals: [], // 过滤级联数据，只保留的数组
                 _renderFormat: (labels) => labels.join(_joinSymbol),
@@ -22,9 +25,6 @@ export default {
                 ...this.propsObj,
                 ...this.commonDealPropsObj,
 
-                _saveKey: this.propsObj._saveKey || "_key",
-                _valueKey: this.propsObj._valueKey || "code",
-                _nameKey: this.propsObj._nameKey || "name",
                 _changeOnSelect: this.isOnSearch
                     ? true
                     : this.propsObj._changeOnSelect == undefined ? false : this.propsObj._changeOnSelect, // 每级菜单都可取值 -默认取末级
@@ -34,18 +34,6 @@ export default {
         showType () {
             return this.selfPropsObj._showMode;
         },
-        filterable () {
-            return this.selfPropsObj._filterable;
-        },
-        cascaderLevel () {
-            return this.selfPropsObj._cascaderLevel;
-        },
-        cascaderFilterVals () {
-            return this.selfPropsObj._cascaderFilterVals;
-        },
-        changeOnSelect () {
-            return this.selfPropsObj._changeOnSelect;
-        },
         saveKey () {
             return this.selfPropsObj._saveKey;
         },
@@ -55,6 +43,12 @@ export default {
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
+        cascaderLevel () {
+            return this.selfPropsObj._cascaderLevel;
+        },
+        cascaderFilterVals () {
+            return this.selfPropsObj._cascaderFilterVals;
+        },
         renderFormat () {
             return this.selfPropsObj._renderFormat;
         },
@@ -67,13 +61,13 @@ export default {
                     : this.selfPropsObj._data;
         },
         cascaderData () {
-            const loop = (data = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
-                if (data && filterVals.length) {
-                    data = data.filter(item => filterVals.includes(item[this.saveKey]));
+            const loop = (arr = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
+                if (arr && filterVals.length) {
+                    arr = arr.filter(item => filterVals.includes(item[this.saveKey]));
                 }
 
-                return data
-                    ? data.reduce((arr, item) => {
+                return arr
+                    ? arr.reduce((arr, item) => {
                         let newItem = {
                             keys: [...parentKeys, item[this.saveKey]], // ！！此处就是用_key拼，不会用别的属性
                             code: [...parentKeys, item._key].join(""),
@@ -104,9 +98,7 @@ export default {
 
             return loop(this.originData, this.cascaderLevel, undefined, this.cascaderFilterVals, this.isMobile);
         },
-        curValKeyList () {
-            return this.$getTreeLinealDatas(this.curValList, this.cascaderData, this.valueKey, this.saveKey);
-        },
+
         curValName: {
             get () {
                 return this.transformFullName(this.curValList);
@@ -133,15 +125,6 @@ export default {
     },
     created () { },
     methods: {
-        // 点击选择框 进行选择
-        clickInput (e) {
-            if (!this.selfPropsObj._disabled) {
-                this.openModal();
-            } else {
-                e.stopPropagation();
-            }
-        },
-
         // 点击清除
         clickClear () {
             this.curValList = [];

package/src/components/controls/{base/DshCascader → mixins}/cascaderPickerMixin.js

@@ -6,6 +6,10 @@ export default {
             type: Boolean,
             default: false
         },
+        multipleMode: {
+            type: Boolean,
+            default: false
+        },
 
         activeValue: {
             type: Array,
@@ -13,10 +17,6 @@ export default {
                 return [];
             }
         },
-        activeStr: {
-            type: String,
-            default: ""
-        },
         data: {
             type: Array,
             drfault () {
@@ -36,7 +36,9 @@ export default {
             showMode: "default", // "flat", "default"
             maxFlatModeSearchNum: 80,
 
+            inputStr: "",
             selectedValue: [],
+            activeCodeValue: [],
 
             operationMap: {
                 canCancel: {
@@ -71,12 +73,6 @@ export default {
                 ...this.propsObj
             };
         },
-        filterable () {
-            return this.selfPropsObj._filterable;
-        },
-        changeOnSelect () {
-            return this.selfPropsObj._changeOnSelect;
-        },
         saveKey () {
             return this.selfPropsObj._saveKey;
         },
@@ -86,12 +82,18 @@ export default {
         nameKey () {
             return this.selfPropsObj._nameKey;
         },
-        renderFormat () {
-            return this.selfPropsObj._renderFormat;
-        },
         resourceKey () {
             return this.selfPropsObj._resourceKey;
         },
+        filterable () {
+            return this.selfPropsObj._filterable;
+        },
+        changeOnSelect () {
+            return this.selfPropsObj._changeOnSelect;
+        },
+        renderFormat () {
+            return this.selfPropsObj._renderFormat;
+        },
 
         canUseModeSwitch () {
             return this.searchName.trim() &&
@@ -107,15 +109,8 @@ export default {
                     将不支持使用模式切换，因为此时平级方式不方便，不适用`;
         },
 
-        inputStr: {
-            get () {
-                return this.activeStr;
-            },
-            set (str) {
-                if (!str) {
-                    this.$emit("clear", []);
-                }
-            }
+        initData () {
+            return this.data;
         },
         matchFunc () {
             return node => {
@@ -141,48 +136,44 @@ export default {
                 };
             });
         },
+        // activeCodeValue () {
+        //     return this.$getTreeLinealDatas(this.activeValue, this.data, this.valueKey, this.saveKey);
+        // },
         // 选中项 -各级数据对象集合
         selectedOptions () {
             return this.$getTreeLinealDatas(this.selectedValue, this.showTreeData, undefined, this.saveKey);
         },
         // 选中项 -最后一级数据对象
-        selectedLastOption () {
+        selectedObj () {
             return this.selectedOptions.slice(-1)[0];
         },
         // 选中项 -名字
         selectedName () {
-            return this.selectedLastOption ? this.selectedLastOption[this.nameKey] : "";
+            return this.selectedObj ? this.selectedObj[this.nameKey] : "";
         }
     },
-    created () { },
+    created () {
+        this.cascaderPickerInit();
+    },
     methods: {
-        clickInput () {
+        cascaderPickerInit () {
+            this.selectedValue = this.activeValue;
+            this.activeCodeValue = this.$getTreeLinealDatas(this.activeValue, this.data, this.valueKey, this.saveKey);
+        },
+
+        clickInput (e) {
             if (!this.selfPropsObj._disabled) {
                 this.showModal = true;
+            } else {
+                e.stopPropagation();
             }
         },
-        clickItem (node) {
-            this.oldSelectedValue = this.selectedValue;
-            this.selectedValue = node.keys;
-            // 避免重复点击
-            if (JSON.stringify(this.selectedValue) !== JSON.stringify(this.oldSelectedValue)) {
-                const obj = {
-                    value: this.selectedValue,
-                    selectedOptions: this.selectedOptions,
-                    tabIndex: this.curTabIndex
-                };
-                this.$emit("change", obj);
-                !node.children.length && this.$emit("finish", obj);
-            }
-
-            this.clickItemCb && this.clickItemCb(node);
-        },
         clickCancel () {
             this.showModal = false;
         },
         clickConfirm () {
             if (this.selectedValue.length && this.selectedOptions.length) {
-                if (!this.changeOnSelect && !this.selectedLastOption.isLeaf) {
+                if (!this.changeOnSelect && !this.selectedObj.isLeaf) {
                     this.$Message.error({
                         content: "请选择到末级数据！",
                         duration: 2
@@ -196,7 +187,24 @@ export default {
                     duration: 2
                 });
             }
+        },
+        getDescription (value = []) {
+            if (value.length) {
+                this.$https({
+                    url: {
+                        module: "sheet",
+                        name: "getResourceDescription"
+                    },
+                    params: {
+                        resourceKey: this.resourceKey,
+                        nodeKeys: value
+                    },
+                    callback: data => {
+                        this.description = data;
+                        this.selectedObj.description = data;
+                    }
+                });
+            }
         }
-
     }
 };