bri-components 1.2.48 → 1.2.50

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

@@ -1,5 +1,9 @@
 <template>
-    <div class="DshNumber">
+    <!-- 单选模式 -->
+    <div
+        v-if="!multipleMode"
+        class="DshNumber"
+    >
         <!-- 编辑 -->
         <template v-if="canEdit">
             <BriInputNumber
@@ -46,11 +50,21 @@
             </template>
         </template>
     </div>
+
+    <!-- 多选模式 -->
+    <dsh-numberange
+        v-else
+        :canEdit="canEdit"
+        :value="value"
+        :propsObj="propsObj"
+        @change="change"
+    ></dsh-numberange>
 </template>
 
 <script>
     import controlMixin from "../../controlMixin.js";
     import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
+    import DshNumberange from "./DshNumberange.vue";
 
     export default {
         name: "DshNumber",
@@ -58,7 +72,8 @@
             controlMixin
         ],
         components: {
-            BriInputNumber
+            BriInputNumber,
+            DshNumberange
         },
         props: {},
         data () {
@@ -133,3 +148,60 @@
         methods: {}
     };
 </script>
+
+<style lang="less" scoped>
+    .DshNumber {
+        width: 100%;
+
+        &-edit {
+            &-suffix {
+                min-width: 32px;
+                border-left: 1px solid @borderColor;
+                background-color: #F0F0F0;
+                text-align: center;
+                color: @textColor;
+            }
+        }
+    }
+</style>
+<style lang="less">
+    .ivu-input-number {
+        width: 100%;
+
+        .ivu-input-number-input {
+            color: @textColor;
+        }
+
+        &-disabled {
+            .ivu-input-number-input {
+                opacity: 1;
+                background: @inputBg-disabled;
+                color: @textColor;
+                &::-webkit-input-placeholder {
+                    color: @placeholder-disabled-color;
+                }
+            }
+        }
+
+        &-handler {
+            &-wrap {
+                border-left: none;
+            }
+            &-down {
+                border: none;
+            }
+            &:hover {
+                background-color: @hoverBg;
+
+                .ivu-input-number-handler-down-inner,
+                .ivu-input-number-handler-up-inner {
+                    color: @textColor;
+                }
+            }
+            &-down-inner,
+            &-up-inner {
+                color: @contentColor;
+            }
+        }
+    }
+</style>

package/src/components/controls/base/{DshNumberange.vue → DshNumber/DshNumberange.vue}

@@ -52,8 +52,8 @@
 </template>
 
 <script>
-    import controlMixin from "../controlMixin.js";
-    import BriInputNumber from "./DshNumber/BriInputNumber/BriInputNumber.vue";
+    import controlMixin from "../../controlMixin.js";
+    import BriInputNumber from "./BriInputNumber/BriInputNumber.vue";
 
     export default {
         name: "DshNumberange",
@@ -125,3 +125,38 @@
         methods: {}
     };
 </script>
+
+<style lang="less" scoped>
+    .DshNumberange {
+        width: 100%;
+        display: flex;
+        align-items: center;
+
+        &-left,
+        &-right {
+            flex: 1;
+        }
+
+        &-center {
+            width: 30px;
+            text-align: center;
+            color: @textColor;
+        }
+
+        &-suffix {
+            padding-right: 24px;
+            padding-left: 8px;
+            line-height: 30px;
+            white-space: nowrap;
+        }
+    }
+</style>
+<style lang="less">
+    .DshNumberange {
+        input {
+            text-overflow: ellipsis;
+            overflow: hidden;
+            white-space: nowrap;
+        }
+    }
+</style>

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

@@ -0,0 +1,280 @@
+<template>
+    <div class="DshCheckbox">
+        <!-- 编辑 -->
+        <template v-if="canEdit">
+            <!-- 有选项 -->
+            <template v-if="listData.length">
+                <!-- flat方式 -->
+                <template v-if="showType === 'flat'">
+                    <CheckboxGroup
+                        :class="{
+                        'DshCheckbox-flat': true,
+                        'DshCheckbox-flat-color': useColor,
+                        'DshCheckbox-flat-disabled': !canEdit,
+                        'DshCheckbox-flat-scroll': selfPropsObj._span < 24 && !selfPropsObj._br,
+                    }"
+                        v-model="curValList"
+                    >
+                        <Checkbox
+                            v-for="(item, index) in listData"
+                            :key="index"
+                            :class="[
+                                'DshCheckbox-item',
+                                getItemColorClass(item),
+                                selfPropsObj.class,
+                                item.class
+                            ]"
+                            :style="getItemStyle(item)"
+                            :label="item._key"
+                            :disabled="getItemDisabled(item)"
+                            :border="useColor"
+                            @click.native="clickOpenTip(item)"
+                        >
+                            <slot :item="item"></slot>
+
+                            <span>{{ item.name || item._name }}</span>
+                        </Checkbox>
+
+                        <!-- tip项弹框提示 -->
+                        <dsh-render :render="tipModalRender"></dsh-render>
+                    </CheckboxGroup>
+                </template>
+
+                <!-- dropdown模式 -->
+                <template v-else>
+                    <Select
+                        v-model="value[controlKey]"
+                        :multiple="true"
+                        :placeholder="selfPropsObj._placeholder"
+                        :disabled="!finalCanEdit"
+                        :filterable="selfPropsObj._filterable"
+                        :transfer="selfPropsObj._transfer"
+                        :transfer-class-name="selfPropsObj._transferClassName"
+                        :max-tag-count="selfPropsObj._maxTagCount"
+                        @on-select="changeSelect"
+                    >
+                        <Option
+                            v-for="(item, index) in listData"
+                            :key="index"
+                            :value="item._key"
+                            :label="item.name || item._name"
+                            :disabled="getItemDisabled(item)"
+                        >
+                            <Checkbox :value="getItemSelectStatus(item)"></Checkbox>
+
+                            <slot :item="item"></slot>
+
+                            <span>{{ item.name || item._name }}</span>
+                            <span style="float:right; padding-right:20px">
+                                {{ item.rightName }}
+                            </span>
+                        </Option>
+                    </Select>
+                </template>
+            </template>
+
+            <!-- 无选项 -->
+            <div
+                v-else
+                class="dsh-subtip"
+            >-- 无选择项 --</div>
+        </template>
+
+        <!-- 查看 -->
+        <template v-else>
+            <bri-tooltip
+                :content="showMulVal"
+                placement="top"
+                maxWidth="200"
+                :transfer="true"
+            >
+                <div :class="{
+                    ...commonClass,
+                    'DshCheckbox-show': true
+                }">
+                    <!-- 有值 -->
+                    <dsh-tags
+                        v-if="!$isEmptyData(curValList)"
+                        class="text"
+                        :list="curValObjList"
+                    ></dsh-tags>
+
+                    <!-- 无值 -->
+                    <template v-else>
+                        {{ emptyShowVal }}
+                    </template>
+                </div>
+            </bri-tooltip>
+        </template>
+    </div>
+</template>
+
+<script>
+    import selectMixin from "./selectMixin.js";
+
+    export default {
+        name: "DshCheckbox",
+        mixins: [
+            selectMixin
+        ],
+        components: {},
+        props: {},
+        data () {
+            return {};
+        },
+        computed: {
+            selfPropsObj () {
+                return {
+                    _transfer: true,
+                    ...this.selectPropsObj
+                };
+            }
+        },
+        created () {},
+        methods: {
+            // 下拉框的change (下拉方式时用v-model触发change有问题，组件进来如果值不为空的，就会v-model返值一次)
+            changeSelect (item) {
+                if (this.curValList.includes(item.value)) {
+                    let itemIndex = this.curValList.findIndex(valItem => valItem === item.value);
+                    this.curValList.splice(itemIndex, 1);
+                } else {
+                    this.curValList.push(item.value);
+                }
+
+                this.curValList = [...this.curValList];
+            },
+
+            getItemColorClass (item) {
+                return this.colorMap[item.color] ? item.color : "color-1";
+            },
+            getItemStyle (item) {
+                const color = this.colorMap[item.color] || this.colorMap["color-1"];
+                return {
+                    background: this.useColor ? this.$getColor(color, 0.1) : undefined,
+                    color: this.useColor ? color : undefined
+                };
+            },
+            // 获取某项的置灰状态
+            getItemDisabled (item) {
+                return !!(
+                    !this.finalCanEdit ||
+                    item._disabled ||
+                    this.curValList.length >= this.selfPropsObj._max && !this.getItemSelectStatus(item)
+                );
+            },
+            // 获取某项的选中状态
+            getItemSelectStatus (item) {
+                return this.curValList.includes(item._key);
+            }
+        }
+    };
+</script>
+
+<style lang="less">
+    .DshCheckbox {
+        width: 100%;
+
+        &-flat {
+            width: 100%;
+
+            // 选中时背景为白色
+            .ivu-checkbox-checked .ivu-checkbox-inner {
+                background-color: @themeColor;
+            }
+
+            &-item {}
+
+            &-color {
+                .ivu-checkbox-border {
+                    margin-right: 16px;
+                    height: 32px;
+                    border: none;
+                    border-radius: 4px;
+                    line-height: 32px;
+                    color: #FFF;
+                }
+
+                .ivu-checkbox {
+                    .ivu-checkbox-inner {
+                        border: 2px solid @themeColor;
+                        background-color: transparent;
+                    }
+
+                    .ivu-checkbox-focus {
+                        box-shadow: 0 0 0 0;
+                    }
+                }
+
+                .ivu-checkbox-disabled+span {
+                    color: inherit;
+                }
+
+                each(@resourceColor, {
+                    .color-@{index} {
+                        .ivu-checkbox {
+                            .ivu-checkbox-inner {
+                                border-color: @value;
+                            }
+                        }
+
+                        .ivu-checkbox-checked {
+                            .ivu-checkbox-inner {
+                                background-color: @value;
+                            }
+                        }
+                    }
+                });
+            }
+
+            &-disabled {
+                .ivu-checkbox-disabled+span {
+                    color: #515a6e;
+                }
+            }
+
+            &-scroll {
+                overflow: auto;
+                white-space: nowrap;
+
+                .bri-scrollbar3();
+            }
+        }
+
+        &-show {}
+
+        .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;
+            }
+        }
+    }
+</style>