bri-components 1.2.65 → 1.2.67

package/package.json

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

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

@@ -1,32 +1,30 @@
 <template>
-    <!-- 单选模式 -->
+    <!-- 单选模式 编辑 -->
     <div
-        v-if="!multipleMode"
+        v-if="!multipleMode && canEdit"
         class="DshInput"
     >
-        <!-- 编辑 -->
-        <template v-if="canEdit">
-            <Input
-                class="DshInput-edit"
-                v-model="value[controlKey]"
-                :type="inputType"
-                :placeholder="selfPropsObj._placeholder"
-                :readonly="selfPropsObj._readonly"
-                :disabled="selfPropsObj._disabled"
-                :clearable="selfPropsObj._clearable"
-                :size="selfPropsObj._size"
-                :rows="selfPropsObj._rows"
-                :search="selfPropsObj._search"
-                :show-word-limit="selfPropsObj._showWordLimit"
-                :maxlength="selfPropsObj._maxlength"
-                :autosize="selfPropsObj._autosize"
-                @on-enter="onEnter"
-                @on-search="onSearch"
-                @on-focus="onFocus"
-                @on-change="onChange"
-                @on-blur="onBlur"
-                @on-clear="onClear"
-            >
+        <i-input
+            class="DshInput-edit"
+            v-model="value[controlKey]"
+            :type="inputType"
+            :placeholder="selfPropsObj._placeholder"
+            :readonly="selfPropsObj._readonly"
+            :disabled="selfPropsObj._disabled"
+            :clearable="selfPropsObj._clearable"
+            :size="selfPropsObj._size"
+            :rows="selfPropsObj._rows"
+            :search="selfPropsObj._search"
+            :show-word-limit="selfPropsObj._showWordLimit"
+            :maxlength="selfPropsObj._maxlength"
+            :autosize="selfPropsObj._autosize"
+            @on-enter="onEnter"
+            @on-search="onSearch"
+            @on-focus="onFocus"
+            @on-change="onChange"
+            @on-blur="onBlur"
+            @on-clear="onClear"
+        >
             <span
                 v-if="selfPropsObj._prepend"
                 slot="prepend"
@@ -36,49 +34,61 @@
                 v-if="selfPropsObj._append"
                 slot="append"
             >{{ selfPropsObj._append }}</span>
-            </Input>
-        </template>
+        </i-input>
+    </div>
 
-        <!-- 查看 -->
-        <template v-else>
-            <!-- 查看页 的textarea单独处理 -->
-            <template v-if="inputType === 'textarea' && !$isEmptyData(curVal) && !isUnitShow">
-                <p
-                    class="DshInput-show-textarea"
-                    v-text="showVal"
-                ></p>
-            </template>
+    <!-- 单选模式 查看 -->
+    <div v-else-if="!multipleMode && !canEdit">
+        <!-- 有值 -->
+        <template v-if="!$isEmptyData(curVal)">
+            <!-- 详情页查看 且单独占一行高度自由时 -->
+            <div
+                v-if="isHeightAuto"
+                :class="{
+                    ...commonClass,
+                    'DshInput-show-auto': true
+                }"
+                v-html="showVal"
+            ></div>
 
             <!-- 表格和查看页 里的查看 -->
-            <template v-else>
-                <bri-tooltip
-                    :content="showVal"
-                    :defaultDisabled="false"
-                    maxWidth="200"
-                    :transfer="true"
-                >
-                    <div :class="{
+            <bri-tooltip
+                v-else
+                :content="showVal"
+                :defaultDisabled="false"
+                :transfer="true"
+            >
+                <a
+                    v-if="inputType === 'url'"
+                    :class="{
                         ...commonClass,
-                        'DshInput-unit': isUnitShow,
-                        'DshInput-show': !isUnitShow
-                    }">
-                        <!-- 有值 -->
-                        <a
-                            v-if="inputType === 'url' && !$isEmptyData(curVal)"
-                            class="text"
-                            @click="goHttpWindow($event)"
-                        >
-                            {{ showVal }}
-                        </a>
+                        'DshInput-show-ellipsis': true,
+                        'DshInput-show-ellipsis-url': true
+                    }"
+                    @click="goHttpWindow($event)"
+                >
+                    {{ showVal }}
+                </a>
 
-                        <!-- 无值 -->
-                        <template v-else>
-                            {{ showVal }}
-                        </template>
-                    </div>
-                </bri-tooltip>
-            </template>
+                <div
+                    v-else
+                    :class="{
+                        ...commonClass,
+                        'DshInput-show-ellipsis': true
+                    }"
+                >
+                    {{ showVal }}
+                </div>
+            </bri-tooltip>
         </template>
+
+        <!-- 无值 -->
+        <div
+            v-else
+            :class="commonClass"
+        >
+            {{ emptyShowVal }}
+        </div>
     </div>
 
     <!-- 多选模式 -->
@@ -117,7 +127,8 @@
                     _readonly: ["serialNumber"].includes(this.controlType),
                     _showWordLimit: this.propsObj._showWordLimit || (!!this.propsObj._maxlength || this.propsObj._maxlength === 0),
                     _autosize: {
-                        minRows: 2
+                        minRows: 2,
+                        maxRows: 20
                     },
 
                     ...this.propsObj,
@@ -182,16 +193,23 @@
 </script>
 
 <style lang="less">
+    @import url("../../control.less");
+
     .DshInput {
+        #control-show();
         width: 100%;
 
         &-show {
-            &-textarea {
-                display: inline-block;
-                width: 100%;
-                height: auto;
-                white-space: pre-wrap;
-                min-height: 32px;
+            &-auto {
+                white-space: pre-wrap!important;
+                max-height: 500px;
+                overflow: auto;
+            }
+
+            &-ellipsis {
+                &-url {
+                    color: @themeColor!important;
+                }
             }
         }
     }

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

@@ -33,7 +33,11 @@
             <!-- dropdown模式 -->
             <template v-else>
                 <Select
-                    class="DshCheckbox-dropdown"
+                    :class="{
+                        'DshCheckbox-dropdown': true,
+                        'DshCheckbox-dropdown-auto': isHeightAuto,
+                        'DshCheckbox-dropdown-scroll': !isHeightAuto,
+                    }"
                     :value="curValList"
                     :multiple="true"
                     :placeholder="selfPropsObj._placeholder"
@@ -130,7 +134,7 @@
                 return {
                     _max: 100000000,
                     _transfer: true,
-                    _transferClassName: "",
+                    _transferClassName: "DshCheckbox-dropdown-transfer",
 
                     ...this.basePropsObj
                 };

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

@@ -151,6 +151,7 @@
             selfPropsObj () {
                 return {
                     _transfer: true,
+                    _transferClassName: "DshSelect-dropdown-transfer",
 
                     ...this.basePropsObj
                 };

package/src/components/controls/control.less

@@ -50,7 +50,6 @@
                             background-color: @themeColor;
                         }
                     }
-
                     .ivu-checkbox-inner {
                         background-color: @themeColor;
                     }
@@ -65,22 +64,29 @@
             &-disabled {
                 .ivu-@{control-type} {
                     .ivu-@{control-type}-inner {
-                        border-color: #aaaaaa!important; // 为了useColor且disbaled时，压住下面each里的样式，这些还生效
+                        border-color: #aaaaaa;
                     }
 
                     &-checked {
-                        .ivu-@{control-type}-inner {
-                            background-color: #E5E5E5!important; // 为了useColor且disbaled时，压住下面each里的样式，这些还生效
-
+                        // 因为不一致，所以明确名字分开写
+                        .ivu-radio-inner {
+                            &::after {
+                                background-color: #aaaaaa;
+                            }
+                        }
+                        .ivu-checkbox-inner {
+                            background-color: #aaaaaa;
+                            
+                            // 对勾的颜色
                             &::after {
-                                background-color: #aaaaaa!important; // 为了useColor且disbaled时，压住下面each里的样式，这些还生效
+                                border-color: #f3f3f3;
                             }
                         }
                     }
 
 
                     & + span {
-                        color: #aaaaaa!important; // 为了useColor且disbaled时，压住下面each里的样式，这些还生效
+                        color: #aaaaaa;
                     }
                 }
             }
@@ -149,11 +155,39 @@
                     }
 
                     &-disabled {
-                        border-color: #f3f3f3;
-                        background-color: #f3f3f3!important; // 压住style里的background-color
+                        border-color: transparent;
+                        
+                        .ivu-@{control-type} {
+                            .ivu-@{control-type}-inner {
+                                border-color: #cccccc;
+                            }
+                            
+                            &-checked {
+                                // 因为不一致，所以明确名字分开写
+                                .ivu-radio-inner {
+                                    &::after {
+                                        background-color: #cccccc;
+                                    }
+                                }
+                                .ivu-checkbox-inner {
+                                    background-color: #cccccc;
+                                    
+                                    // 对勾的颜色
+                                    &::after {
+                                        border-color: #f3f3f3;
+                                    }
+                                }
+                            }
+                            
+                            
+                            & + span {
+                                color: @value;
+                                opacity: 0.5;
+                            }
+                        }
 
                         &.ivu-@{control-type}-wrapper-checked {
-                            border-color: #aaaaaa;
+                            border-color: #cccccc;
                         }
                     }
                 }
@@ -174,21 +208,14 @@
     }
     
     &-dropdown {
+        // 输入框部分
         &.ivu-select-multiple {
             .ivu-select-selection {
-                height: 32px;
-
                 & > div {
-                    .bri-scrollbar3();
                     width: 100%;
                     height: 100%;
-                    word-break: keep-all;
-                    white-space: nowrap;
-                    overflow: auto;
-                    overflow-y: hidden;
                     
                     .ivu-tag {
-                        margin: 2px 4px 0px 0px;
                         background-color: @borderColor;
                     }
                 }
@@ -203,9 +230,50 @@
                     }
                 }
             }
+        }
+
+        &-auto {
+            &.ivu-select-multiple {
+                .ivu-select-selection {
+                    & > div {
+                        .ivu-tag {
+                            height: auto;
+    
+                            span:not(.ivu-select-max-tag) {
+                                text-overflow: auto;
+                                white-space: normal;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        &-scroll {
+            &.ivu-select-multiple {
+                .ivu-select-selection {
+                    height: 32px;
+
+                    & > div {
+                        .bri-scrollbar3();
+                        word-break: keep-all;
+                        white-space: nowrap;
+                        overflow: auto;
+                        overflow-y: hidden;
+
+                        .ivu-tag {
+
+                        }
+                    }
+                }
+            }
+        }
 
-            .ivu-select-item-selected:after {
-                content: none;
+        // 下拉面板
+        &-transfer {
+            &.ivu-select-dropdown {
+                max-width: 200px;
+                max-height: 350px;
             }
         }
     }

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

@@ -14,14 +14,16 @@ export default {
         basePropsObj () {
             const _joinSymbol = this.propsObj._joinSymbol || "/";
             return {
-                _showMode: "default",
+                _showMode: "default", // "default", "custom", "simple"
                 colorMap: resourceData.colorMap,
                 _useColor: false,
                 _saveKey: "_key",
                 _valueKey: "code",
                 _nameKey: "name",
-                _filterable: true,
-                _cascaderFilterVals: [], // 过滤级联数据，只保留的数组
+                _filterable: true, // 是否支持搜索
+                _data: [],
+                _reverseFilter: false, // 是否反向过滤，默认正向过滤
+                _cascaderFilterVals: [], // 过滤的级联数据
                 _renderFormat: (labels) => labels.join(_joinSymbol),
 
                 ...this.propsObj,
@@ -54,6 +56,9 @@ export default {
         cascaderLevel () {
             return this.selfPropsObj._cascaderLevel;
         },
+        reverseFilter () {
+            return this.selfPropsObj._reverseFilter;
+        },
         cascaderFilterVals () {
             return this.selfPropsObj._cascaderFilterVals;
         },
@@ -70,8 +75,12 @@ export default {
         },
         cascaderData () {
             const loop = (arr = [], level, parentKeys = [], filterVals = [], isMobile = false) => {
-                if (arr && filterVals.length) {
-                    arr = arr.filter(item => filterVals.includes(item[this.saveKey]));
+                if (filterVals.length) {
+                    arr = arr.filter(item =>
+                        this.reverseFilter
+                            ? !filterVals.includes(item[this.saveKey])
+                            : filterVals.includes(item[this.saveKey])
+                    );
                 }
 
                 return arr
@@ -154,7 +163,7 @@ export default {
         confirmMulCb (selectedValue, selectedOptions) {
             if (this.curValList.some(item => JSON.stringify(item) === JSON.stringify(selectedValue))) {
                 this.$Message.error({
-                    content: `"${this.transformFullName(selectedValue)}"已选择，请勿重复选择！`,
+                    content: `请勿重复选择"${this.transformFullName(selectedValue)}"！`,
                     duration: 4
                 });
             } else {
@@ -187,7 +196,7 @@ export default {
                     }
                     : {
                         _key: val,
-                        name: `提示：选项${val}已找不到`,
+                        name: `提示：选项${val}已不存在`,
                         style: {
                             ...this.tagStyle
                         }

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

@@ -18,9 +18,11 @@ export default {
                 _optionKind: "dropdown", // "flat"、"dropdown"
                 colorMap: resourceData.colorMap,
                 _useColor: false,
-                _filterable: true,
+                _filterable: true, // 是否支持搜索
                 _data: [],
                 _customData: [],
+                _reverseFilter: false, // 是否反向过滤，默认正向过滤
+                _selectFilterVals: [], // 过滤的数据
 
                 ...this.propsObj,
                 ...this.commonDealPropsObj
@@ -35,14 +37,27 @@ export default {
         useColor () {
             return this.selfPropsObj._useColor;
         },
+        reverseFilter () {
+            return this.selfPropsObj._reverseFilter;
+        },
+        selectFilterVals () {
+            return this.selfPropsObj._selectFilterVals;
+        },
+
         listData () {
-            const listData = this.selfPropsObj._data.concat(this.initListData);
+            let listData = this.selfPropsObj._data.concat(this.initListData);
+            if (this.selectFilterVals.length) {
+                listData = listData.filter(item =>
+                    this.reverseFilter
+                        ? !this.selectFilterVals.includes(item._key)
+                        : this.selectFilterVals.includes(item._key)
+                );
+            }
 
             return this.$dataType(this.selfPropsObj._filterFunc, "function")
                 ? this.selfPropsObj._filterFunc(listData, this.selfPropsObj, this.value)
                 : listData;
         },
-
         curValObj () {
             return this.getItemObj(this.curVal);
         },
@@ -120,7 +135,7 @@ export default {
         getItemObj (val) {
             const obj = this.listData.find(item => item._key === val) || {
                 _key: val,
-                name: `提示：选项${val}已找不到`
+                name: `提示：选项${val}已不存在`
             };
 
             return !this.$isEmptyData(val)

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

@@ -105,7 +105,7 @@
                                 v-else
                                 class="tree-nodata"
                             >
-                                暂无数据……
+                                暂无数据…
                             </div>
                         </div>
                     </template>

package/src/components/form/DshForm.vue

@@ -85,8 +85,10 @@
 
             <div
                 v-else
-                class="dsh-tip"
-            >{{ "---  无字段  ---" }}</div>
+                class="DshForm-nodata"
+            >
+                {{ "---  无字段  ---" }}
+            </div>
         </Row>
     </Form>
 </template>
@@ -400,6 +402,10 @@
         &-item-FormItem {
             margin-bottom: 0px;
         }
+
+        &-nodata {
+            #dsh-nodata();
+        }
     }
 </style>
 <style lang="less">

package/src/components/list/BriCard.vue

@@ -20,7 +20,7 @@
             v-else
             class="BriCard-nodata"
         >
-            暂无数据……
+            暂无数据…
         </div>
     </div>
 </template>

package/src/components/list/BriTable.vue

@@ -59,7 +59,7 @@
             isLoading: Boolean,
             noDataText: {
                 type: String,
-                default: "暂无内容"
+                default: "暂无数据…"
             },
             columns: Array,
             data: Array,

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

@@ -13,7 +13,7 @@
                 :propsObj="listPropsObj"
                 :changedFields="changedFields"
                 :isLoading="listPropsObj && listPropsObj.isLoading"
-                :noDataText="listPropsObj && listPropsObj.noDataText || '暂无内容...'"
+                :noDataText="listPropsObj && listPropsObj.noDataText || '暂无数据…'"
                 @clickRow="clickRow"
                 @sortChange="changeSort"
                 @changeSelect="changeSelect"