bri-components 1.2.58 → 1.2.59

package/package.json

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

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

@@ -26,17 +26,18 @@
     <!-- 单选模式 查看 -->
     <div
         v-else-if="!multipleMode && !canEdit"
-        class="DshCascader"
+        class="DshCascader-show"
     >
         <!-- 有值 -->
         <bri-tooltip
             v-if="!$isEmptyData(curValList)"
             :content="showVal"
-            placement="top"
-            maxWidth="200"
             :transfer="true"
         >
-            <div :class="commonClass">
+            <div :class="{
+                commonClass,
+                'DshCascader-show-ellipsis': true
+            }">
                 {{ showVal }}
             </div>
         </bri-tooltip>
@@ -83,19 +84,15 @@
         <bri-tooltip
             v-if="!$isEmptyData(curValList)"
             :content="showMulVal"
-            placement="top"
-            maxWidth="200"
             :transfer="true"
         >
-            <div :class="{
-                ...commonClass,
-                'DshCascader-show-row': isFullRow && !isUnitShow
-            }">
-                <dsh-tags
-                    class="text"
-                    :list="curValNameList"
-                ></dsh-tags>
-            </div>
+            <dsh-tags
+                :class="{
+                    ...commonClass,
+                    'DshCascaders-show-ellipsis': !(isDetailShow && isFullRow)
+                }"
+                :list="curValNameList"
+            ></dsh-tags>
         </bri-tooltip>
 
         <!-- 无值 -->
@@ -139,7 +136,7 @@
         computed: {
             selfPropsObj () {
                 return {
-                    _showMode: "default", // 只有单选模式有效，值为"default", "custom", "simple"
+                    _showMode: "default", // 值为"default", "custom", "simple"
                     _transfer: true,
                     _transferClassName: "",
 
@@ -165,23 +162,18 @@
 
 <style lang="less">
     .DshCascader {
-
+        &-show {
+            &-ellipsis {
+                .dsh-ellipsis();
+            }
+        }
     }
 
     // 多选
     .DshCascaders {
         &-show {
-            height: auto;
-
-            &-row {
-                .text,
-                .overflow {
-                    .bri-scrollbar3();
-                    width: 100%;
-                    height: 100%;
-                    white-space: normal;
-                    overflow: auto;
-                }
+            &-ellipsis {
+                .dsh-ellipsis();
             }
         }
     }

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

@@ -1,111 +1,105 @@
 <template>
-    <div class="DshCheckbox">
-        <!-- 编辑 -->
-        <template v-if="canEdit">
-            <!-- 有选项 -->
-            <template v-if="listData.length">
-                <!-- flat方式 -->
-                <template v-if="showType === 'flat'">
-                    <CheckboxGroup
-                        :class="{
+    <!-- 编辑 -->
+    <div
+        v-if="canEdit"
+        class="DshCheckbox"
+    >
+        <!-- 有选项 -->
+        <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,
+                        'DshCheckbox-flat-scroll': !isFullRow,
                     }"
-                        v-model="curValList"
+                    v-model="curValList"
+                >
+                    <Checkbox
+                        v-for="(item, index) in listData"
+                        :key="item._key"
+                        :class="getItemClass(item)"
+                        :style="getItemColorStyle(item)"
+                        :label="item._key"
+                        :disabled="getCheckItemDisabled(item)"
+                        :border="useColor"
+                        @click.native="clickCheckItem(item, index)"
                     >
-                        <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>
+                        <slot :item="item"></slot>
 
-                            <span>{{ item.name || item._name }}</span>
-                        </Checkbox>
-
-                        <!-- tip项弹框提示 -->
-                        <dsh-render :render="tipModalRender"></dsh-render>
-                    </CheckboxGroup>
-                </template>
+                        <span>{{ item.name || item._name }}</span>
+                    </Checkbox>
+                </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"
+            <!-- dropdown模式 -->
+            <template v-else>
+                <Select
+                    :class="{
+                        'DshCheckbox-dropdown': true,
+                    }"
+                    :value="curValList"
+                    :multiple="true"
+                    :placeholder="selfPropsObj._placeholder"
+                    :disabled="selfPropsObj._disabled"
+                    :filterable="selfPropsObj._filterable"
+                    :transfer="selfPropsObj._transfer"
+                    :transfer-class-name="selfPropsObj._transferClassName"
+                    :max-tag-count="selfPropsObj._maxTagCount"
+                    @on-select="changeCheckValue"
+                >
+                    <Option
+                        v-for="(item, index) in listData"
+                        :key="item._key"
+                        :value="item._key"
+                        :label="item.name || item._name"
+                        :disabled="getCheckItemDisabled(item, index)"
                     >
-                        <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>
+                        <Checkbox :value="getCheckItemStatus(item)"></Checkbox>
 
-                            <slot :item="item"></slot>
+                        <slot :item="item"></slot>
 
-                            <span>{{ item.name || item._name }}</span>
-                            <span style="float:right; padding-right:20px">
-                                {{ item.rightName }}
-                            </span>
-                        </Option>
-                    </Select>
-                </template>
+                        <span>{{ item.name || item._name }}</span>
+                    </Option>
+                </Select>
             </template>
-
-            <!-- 无选项 -->
-            <div
-                v-else
-                class="dsh-subtip"
-            >-- 无选择项 --</div>
         </template>
 
-        <!-- 查看 -->
-        <template v-else>
-            <bri-tooltip
-                :content="showMulVal"
-                placement="top"
-                maxWidth="200"
-                :transfer="true"
-            >
-                <div :class="{
+        <!-- 无选项 -->
+        <div
+            v-else
+            class="dsh-subtip"
+        >-- 无选择项 --</div>
+    </div>
+
+    <!-- 查看 -->
+    <div
+        v-else
+        class="DshCheckbox-show"
+    >
+        <!-- 有值 -->
+        <bri-tooltip
+            v-if="!$isEmptyData(curValList)"
+            :content="showMulVal"
+            :transfer="true"
+        >
+            <dsh-tags
+                :class="{
                     ...commonClass,
-                    'DshCheckbox-show': true
-                }">
-                    <!-- 有值 -->
-                    <dsh-tags
-                        v-if="!$isEmptyData(curValList)"
-                        class="text"
-                        :list="curValObjList"
-                    ></dsh-tags>
+                    'DshCheckbox-show-ellipsis': !(isDetailShow && isFullRow)
+                }"
+                :list="curValObjList"
+            ></dsh-tags>
+        </bri-tooltip>
 
-                    <!-- 无值 -->
-                    <template v-else>
-                        {{ emptyShowVal }}
-                    </template>
-                </div>
-            </bri-tooltip>
-        </template>
+        <!-- 无值 -->
+        <div
+            v-else
+            :class="commonClass"
+        >
+            {{ emptyShowVal }}
+        </div>
     </div>
 </template>
 
@@ -125,46 +119,22 @@
         computed: {
             selfPropsObj () {
                 return {
+                    _max: 100000000,
                     _transfer: true,
-                    ...this.selectPropsObj
+                    _transferClassName: "",
+
+                    ...this.basePropsObj
                 };
             }
         },
         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);
+            // 多选模式 值改变 (pc端下拉方式时，用v-model触发change有问题，组件进来如果值不为空的，就会v-model返值一次)
+            changeCheckValue (item) {
+                this.clickCheckItem({
+                    ...item,
+                    _key: item.value
+                });
             }
         }
     };
@@ -172,108 +142,140 @@
 
 <style lang="less">
     .DshCheckbox {
-        width: 100%;
-
         &-flat {
             width: 100%;
 
-            // 选中时背景为白色
-            .ivu-checkbox-checked .ivu-checkbox-inner {
-                background-color: @themeColor;
-            }
+            .ivu-checkbox-wrapper {
+                margin-bottom: 4px;
+                margin-right: 16px;
 
-            &-item {}
+                .ivu-checkbox {
+                    &.ivu-checkbox-checked {
+                        .ivu-checkbox-inner {
+                            background-color: @themeColor;
+                        }
+                    }
+                }
+            }
 
             &-color {
-                .ivu-checkbox-border {
-                    margin-right: 16px;
+                .ivu-checkbox-wrapper {
                     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 {
+                        .ivu-checkbox-inner {
+                            border: 2px solid @themeColor;
+                            background-color: transparent;
+                        }
+                        .ivu-checkbox-focus {
+                            box-shadow: 0 0 0 0;
+                        }
 
-                    .ivu-checkbox-focus {
-                        box-shadow: 0 0 0 0;
+                        &.ivu-checkbox-checked {
+                            .ivu-checkbox-inner {
+                                &:after {
+                                    top: 2px;
+                                    left: 4px;
+                                }
+                            }
+                        }
                     }
-                }
 
-                .ivu-checkbox-disabled+span {
-                    color: inherit;
+                    &-disabled {
+                        background-color: #f3f3f3!important;
+                        color: #E5E5E5!important;
+
+                        .ivu-checkbox.ivu-checkbox-disabled {
+                            .ivu-checkbox-inner {
+                                border-color: #E5E5E5;
+                            }
+
+                            &.ivu-checkbox-checked {
+                                .ivu-checkbox-inner {
+                                    background-color: #E5E5E5;
+                                }
+                            }
+
+                            & + span {
+                                color: #E5E5E5;
+                            }
+                        }
+                    }
                 }
 
+                // ivu-checkbox-wrapper 和 color-1 在一个div上
                 each(@resourceColor, {
                     .color-@{index} {
                         .ivu-checkbox {
                             .ivu-checkbox-inner {
                                 border-color: @value;
                             }
-                        }
 
-                        .ivu-checkbox-checked {
-                            .ivu-checkbox-inner {
-                                background-color: @value;
+                            &.ivu-checkbox-checked {
+                                .ivu-checkbox-inner {
+                                    background-color: @value;
+                                }
                             }
                         }
                     }
                 });
             }
 
-            &-disabled {
-                .ivu-checkbox-disabled+span {
-                    color: #515a6e;
-                }
-            }
-
             &-scroll {
-                overflow: auto;
+                .bri-scrollbar3();
                 white-space: nowrap;
+                overflow: auto;
 
-                .bri-scrollbar3();
+                .ivu-checkbox-wrapper {
+                    margin-bottom: 4px;
+                }
             }
         }
 
-        &-show {}
-
-        .ivu-select-multiple {
-            .ivu-select-selection {
-                height: 32px;
-                .dsh-flex-row-between-center();
+        &-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();
+                    & > 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-tag {
+                            margin: 2px 4px 0px 0px;
+                            background-color: @borderColor;
+                        }
                     }
                 }
-            }
 
-            &.ivu-select-disabled {
-                .ivu-select-selection {
-                    & > div {
-                        .ivu-tag {
-                            background-color: @border-disabled;
+                &.ivu-select-disabled {
+                    .ivu-select-selection {
+                        & > div {
+                            .ivu-tag {
+                                background-color: @border-disabled;
+                            }
                         }
                     }
                 }
+
+                .ivu-select-item-selected:after {
+                    content: none;
+                }
             }
+        }
 
-            .ivu-select-item-selected:after {
-                content: none;
+        // 查看
+        &-show {
+            &-ellipsis {
+                .dsh-ellipsis();
             }
         }
     }

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>
 
     <!-- 多选模式 -->
@@ -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/mixins/controlMixin.js

@@ -47,7 +47,11 @@ export default {
             },
             set (val) {
                 this.value[this.controlKey] = val;
-                // this.change();
+                // 修复文本框clear后值为undefined，后端无法更新保存数据bug
+                if (["select"].includes(this.controlType) && this.value[this.controlKey] === undefined) {
+                    this.value[this.controlKey] = "";
+                }
+                this.change();
             }
         },
         // 值为[]类型用的
@@ -122,6 +126,9 @@ export default {
         isFullRow () {
             return this.propsObj._span === 24 || !this.propsObj._span;
         },
+        clearable () {
+            return this.commonDealPropsObj._clearable;
+        },
         // showAlign () {
         //     return !this.isUnitShow
         //         ? "flex-start"
@@ -133,12 +140,17 @@ export default {
         // },
 
         /* 部分条件下 才使用的属性 */
+        // isShare () {
+        //     return !!this.propsObj.isShare;
+        // },
         isInTable () {
             return !!this.propsObj.isInTable;
         },
+        // 高级搜索状态
         isOnSearch () {
             return !!this.propsObj.onSearch;
         },
+        // 默认搜索状态
         isOnDftSearch () {
             return !!this.propsObj.onDftSearch;
         },
@@ -148,9 +160,12 @@ export default {
         isUnitShow () {
             return this.isInTable && !this.canEdit;
         },
-        // isShare () {
-        //     return !!this.propsObj.isShare;
-        // },
+        isDetailUpdate () {
+            return !this.isInTable && !!this.canEdit;
+        },
+        isDetailShow () {
+            return !this.isInTable && !this.canEdit;
+        },
 
         /* 部分控件下 才使用的属性 */
         compKey () {
@@ -188,6 +203,12 @@ export default {
             this.$emit("refChange", this.value[this.controlKey]);
         },
 
+        // 点击输入框
+        clickInput () {
+            if (!this.selfPropsObj._disabled) {
+                this.openModal();
+            }
+        },
         /* ----- 工具方法 ------- */
         // 切换弹框
         toggleModal (bool) {

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

@@ -9,14 +9,11 @@ export default {
     props: {},
     data () {
         return {
-            initListData: [],
-            showTipTpl: false,
-            showTipModal: false,
-            dynamicContent: ""
+            initListData: []
         };
     },
     computed: {
-        selectPropsObj () {
+        basePropsObj () {
             return {
                 colorMap: resourceData.colorMap,
                 _optionKind: "dropdown", // "flat"、"dropdown"
@@ -46,17 +43,8 @@ export default {
                 : listData;
         },
 
-        openTip () {
-            return this.isOnSearch ? false : this.propsObj._openTip;
-        },
-        modalTipContent () {
-            return this.propsObj._tipContent || this.dynamicContent || "暂无信息";
-        },
-
         curValObj () {
-            return this.$isEmptyData(this.curVal)
-                ? undefined
-                : this.getItemData(this.curVal);
+            return this.getItemObj(this.curVal);
         },
         valStr: {
             get () {
@@ -77,7 +65,7 @@ export default {
         },
         // 已选择项的对象列表
         curValObjList () {
-            return this.curValList.map(key => this.getItemData(key));
+            return this.curValList.map(key => this.getItemObj(key));
         },
         valListStr () {
             return this.curValObjList.map(item => item.name || item._name).join("、");
@@ -93,129 +81,94 @@ export default {
     },
     methods: {
         init () {
-            this.getTipData();
             this.getListData();
         },
 
-        getItemData (key) {
-            const obj = this.listData.find(item => item._key === key) || {
-                _key: key,
-                name: `温馨提示：选项${key}已找不到`
-            };
-
-            return {
-                ...obj,
-                style: this.getItemStyle(obj),
-                color: undefined
-            };
+        // 单选模式 点击选项
+        clickRadioItem (item, index) {
+            if (!this.getRadioItemDisabled(item)) {
+                if (this.curVal === item._key) {
+                    if (this.clearable) {
+                        this.curVal = "";
+                    }
+                } else {
+                    this.curVal = item._key;
+                }
+            }
         },
-        getItemStyle (item) {
+        // 多选模式 点击选项
+        clickCheckItem (item, index) {
+            if (!this.getCheckItemDisabled(item)) {
+                if (this.curValList.includes(item._key)) {
+                    this.curValList = this.curValList.filter(key => key !== item._key);
+                } else {
+                    this.curValList = [...this.curValList, item._key];
+                }
+            }
+        },
+
+        /* ------- 方法 ------- */
+        getItemClass (item) {
+            return [
+                this.useColor
+                    ? this.colorMap[item.color] ? item.color : "color-1"
+                    : undefined,
+                item.class
+            ];
+        },
+        getItemColorStyle (item) {
             const color = this.colorMap[item.color] || this.colorMap["color-1"];
+            return this.useColor
+                ? {
+                    backgroundColor: this.$getColor(color, 0.1),
+                    color: color
+                }
+                : {};
+        },
+        getItemShowStyle (item) {
             return {
-                "background-color": this.useColor ? this.$getColor(color, 0.1) : "#E5E5E5",
-                color: this.useColor ? color : "rgba(0, 0, 0, 0.9)",
+                ...this.getItemColorStyle(item),
                 display: "inline-block",
                 "max-width": "100%",
                 padding: "0px 6px",
                 "border-radius": "4px"
             };
         },
-        // 获取某项的置灰状态
-        getItemDisabled (item) {
-            return !!(this.selfPropsObj._disabled || item._disabled);
-        },
+        // 获取单选项的置灰状态
+        getRadioItemDisabled (item) {
+            return !!(
+                this.selfPropsObj._disabled ||
+                item._disabled
+            );
+        },
+        // 获取多选项的置灰状态
+        getCheckItemDisabled (item) {
+            return !!(
+                this.selfPropsObj._disabled ||
+                item._disabled ||
+                (this.curValList.length >= this.selfPropsObj._max && !this.getCheckItemStatus(item))
+            );
+        },
+        // 获取多选项的选中状态
+        getCheckItemStatus (item) {
+            return this.curValList.includes(item._key);
+        },
+        getItemObj (key) {
+            const obj = this.listData.find(item => item._key === key) || {
+                _key: key,
+                name: `温馨提示：选项${key}已找不到`
+            };
 
-        // 是否打开tip弹窗
-        clickOpenTip (item) {
-            if (item.__isTip__) {
-                if (this.propsObj._tipKind === "dynamic" && !this.propsObj._tipContent) {
-                    this.getTipUrl();
-                } else {
-                    this.showTipTpl = true;
-                    this.showTipModal = true;
-                }
-            }
-        },
-        getTipUrl () {
-            if (this.propsObj._tipUrl) {
-                this.$https({
-                    url: {
-                        module: "customPath",
-                        name: this.propsObj._tipUrl
-                    },
-                    params: {
-                        formData: this.value,
-                        propsObj: this.propsObj
-                    },
-                    callback: res => {
-                        this.dynamicContent = res;
-                        this.showTipTpl = true;
-                        this.showTipModal = true;
-                    }
-                });
-            } else {
-                this.$Message.warning("请配置接口路径！");
-            }
-        },
-        tipModalRender (h) {
-            return this.showTipTpl
-                ? h("dsh-modal", {
-                    props: {
-                        value: this.showTipModal,
-                        mode: "custom",
-                        propsObj: {
-                            title: "温馨提示",
-                            maskClosable: true,
-                            class: "DshSelect-modal"
-                        }
-                    },
-                    on: {
-                        input: bool => {
-                            this.showTipModal = bool;
-                        }
-                    }
-                }, [
-                    h("div", {
-                        class: "DshSelect-modal-content",
-                        domProps: {
-                            innerHTML: this.modalTipContent
-                        }
-                    }),
-                    h("div", {
-                        class: "DshSelect-modal-footer"
-                    }, [
-                        h("Button", {
-                            props: {
-                                type: "primary"
-                            },
-                            on: {
-                                click: () => {
-                                    this.showTipModal = false;
-                                }
-                            }
-                        }, "我知道了")
-                    ])
-                ])
-                : undefined;
-        },
-        getTipData () {
-            if (
-                (this.propsObj._key !== "_default") &&
-                this.finalCanEdit &&
-                this.openTip
-            ) {
-                let tipObj = {
-                    _key: "openTip",
-                    _name: this.propsObj._tipName || "其他",
-                    __isTip__: true,
-                    _disabled: true,
-                    color: "#6991cc",
-                    class: `Dsh${this.propsObj._type}-tip`
-                };
-                this.initListData.push(tipObj);
-            }
+            return this.$isEmptyData(key)
+                ? undefined
+                : {
+                    ...obj,
+                    style: this.getItemShowStyle(obj),
+                    color: undefined
+            };
         },
-        // 接口 -获取自定义的接口数据
+
+        // TODO：待删除 接口 -获取自定义的接口数据
         getListData () {
             this.selfPropsObj._customData.forEach(item => {
                 this.$https({
@@ -226,8 +179,8 @@ export default {
                             ...this.initListData,
                             ...data.list.map(dataItem =>
                                 ({
-                                    _key: dataItem[item._key || "_key"],
-                                    name: dataItem[item._name || "name"]
+                                    _key: dataItem._key,
+                                    name: dataItem.name
                                 })
                             )
                         ];

package/src/components/small/BriTooltip.vue

@@ -82,6 +82,5 @@
 <style lang="less" scoped>
     .BriTooltip {
         width: 100%;
-        display: flex;
     }
 </style>

package/src/components/unit/DshFormUnit.vue

@@ -46,7 +46,7 @@
                         <!-- label后可自定义内容 -->
                         <dsh-render
                             v-if="formItem._tipsRender"
-                            :render="tipsRender(formItem,formData)"
+                            :render="tipsRender(formItem, formData)"
                         ></dsh-render>
                     </span>
                 </bri-tooltip>
@@ -227,13 +227,13 @@
 
                 &-left {
                     flex: 1;
-                    min-width: 100px;
+                    min-width: 0px;
                 }
 
                 &-right {
-                    max-width: 120px;
+                    flex: none;
+                    max-width: 80px;
                     min-width: 0px;
-                    text-align: right;
                 }
             }