bri-components 1.2.17 → 1.2.19

package/package.json

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

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

@@ -2,13 +2,13 @@
     <div class="InfoCascader">
         <dsh-modal
             v-model="modalVal"
-            :propsObj="modalPropsObj"
             mode="middle"
+            :propsObj="modalPropsObj"
         >
             <dsh-input
                 class="InfoCascader-search"
                 :value="searchData"
-                :propsObj="inputPropsObj"
+                :propsObj="searchPropsObj"
             ></dsh-input>
 
             <div class="InfoCascader-content">
@@ -19,6 +19,7 @@
                         :data="treeData"
                     ></Tree>
                 </div>
+
                 <div class="InfoCascader-content-right">
                     <div class="InfoCascader-content-right-title">
                         {{curName}}说明
@@ -34,7 +35,7 @@
             <div class="InfoCascader-footer">
                 <dsh-buttons
                     class="InfoCascader-footer-btns"
-                    :list="$getOperationList(['cancel', 'confirm'])"
+                    :list="$getOperationList(['canCancel', 'canConfirm'])"
                     @click="$dispatchEvent($event)"
                 ></dsh-buttons>
             </div>
@@ -46,7 +47,10 @@
     export default {
         name: "InfoCascader",
         props: {
-            showModal: Boolean,
+            showModal: {
+                type: Boolean,
+                default: false
+            },
 
             value: {
                 type: Array,
@@ -69,32 +73,34 @@
         },
         data () {
             return {
+                searchData: {
+                    search: ""
+                },
+                searchPropsObj: {
+                    _key: "search",
+                    _name: "关键字搜索"
+                },
+                curSelect: {},
+
+                show: true,
+                curName: "",
                 description: "",
+
                 operationMap: {
-                    cancel: {
+                    canCancel: {
                         name: "取消",
                         type: "clickCancel",
                         event: "clickCancel",
                         class: "z-default"
                     },
-                    confirm: {
+                    canConfirm: {
                         name: "确定",
                         btnType: "primary",
                         type: "clickConfirm",
                         event: "clickConfirm",
                         class: "z-primary"
                     }
-                },
-                curSelect: {},
-                curName: "",
-                searchData: {
-                    search: ""
-                },
-                inputPropsObj: {
-                    _key: "search",
-                    _name: "关键字搜索"
-                },
-                show: true
+                }
             };
         },
         computed: {

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

@@ -55,6 +55,7 @@
                 >
                     <div :class="{
                         ...commonClass,
+                        'dsh-ellipsis': unitWrap,
                         'DshInput-unit': isUnitShow,
                         'DshInput-show': !isUnitShow
                     }">
@@ -102,6 +103,7 @@
                     _autosize: {
                         minRows: 2
                     },
+                    _wrap: true, // 单元格文字换行
 
                     ...this.propsObj,
                     ...this.commonDealPropsObj
@@ -119,12 +121,16 @@
             // 子类型，只在type="text"有效
             subType () {
                 return this.selfPropsObj._textType;
+            },
+            unitWrap () {
+                return !(this.isUnitShow && !!this.selfPropsObj._wrap);
             }
         },
         created () {},
         methods: {
             onSearch (...params) {
-                this.$emit("search", ...params);
+                this.$emit("search");
+                this.$emit("inputChange");
             },
             // 无参数
             onFocus () {
@@ -138,12 +144,17 @@
                 }
             },
             onEnter (event) {
+                this.$emit("enter");
                 this.$emit("inputChange");
             },
             // 参数event
             onChange (event) {
-                this.$emit("inputChange");
                 this.changeStatus = true;
+
+                clearTimeout(this.timer);
+                this.timer = setTimeout(() => {
+                    this.$emit("inputChange");
+                }, 1000);
             },
             onClear () {
                 this.change();

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

@@ -51,7 +51,6 @@
                     :propsObj="modalPropsObj"
                 >
                     <dsh-cascader-table
-                        v-if="curVal && isEnlarge"
                         useCol
                         :canEdit="finalCanEdit"
                         :treeColumns="treeColumns"

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

@@ -56,7 +56,6 @@
                     :propsObj="modalPropsObj"
                 >
                     <bri-flat-table
-                        v-if="isEnlarge"
                         :canEdit="finalCanEdit"
                         :columns="columns"
                         :data="curVal.list"

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

@@ -6,7 +6,7 @@
             :transfer="true"
             maxWidth="200"
         >
-            <div @click.stop="clickInput">
+            <div @click="clickInput">
                 <slot>
                     <!-- 编辑 -->
                     <bri-control-input
@@ -19,11 +19,36 @@
                         :value="curValList"
                         :inputIcon="inputIcon"
                         :propsObj="selfPropsObj"
-                        @clickDeleteItem="clickDeleteItem"
-                        @clickClear="clickClear"
+                        @deleteItem="clickDeleteItem"
+                        @clear="clickClear"
                     ></bri-control-input>
 
-                    <!-- 查看 -->
+                    <!-- 表格查看 -->
+                    <div
+                        v-else-if="isUnitShow"
+                        class="selectUsers-unit"
+                    >
+                        <template v-if="!$isEmptyData(curValList)">
+                            <img
+                                v-for="item in curValList"
+                                :src="$imageResize(item.avatarurl, imageResizeConfig) || $imageSrcMap.system.boy"
+                                :key="item._key"
+                                class="selectUsers-unit-img"
+                            />
+                            <span
+                                v-if="curValList[0]"
+                                class="selectUsers-unit-text"
+                            >
+                                {{ curValList[0].name || curValList[0].realname || curValList[0].mobile }}
+                            </span>
+                        </template>
+
+                        <template v-else>
+                            {{ emptyShowVal }}
+                        </template>
+                    </div>
+
+                    <!-- 弹窗查看 -->
                     <div
                         v-else
                         :class="{
@@ -50,8 +75,8 @@
             v-if="finalCanEdit"
             class="selectUsers-modal"
             v-model="showModal"
-            :propsObj="modalPropsObj"
             mode="custom"
+            :propsObj="modalPropsObj"
             @cancel="clickCancel"
         >
             <div class="selectUsers-modal-wrap">
@@ -65,7 +90,7 @@
                         <dsh-input
                             :value="searchData"
                             :propsObj="inputPropsObj"
-                            @change="search"
+                            @inputChange="search"
                         ></dsh-input>
                     </div>
 
@@ -200,6 +225,7 @@
                     closable: true,
                     class: "bri-modal-center"
                 },
+
                 // 筛选
                 searchData: {
                     name: ""
@@ -217,10 +243,10 @@
                         realname: "当前用户"
                     }
                 ],
-
                 loading: false,
                 userList: [],
                 departmentList: [],
+
                 // 分页
                 total: 0,
                 pagePropsObj: {
@@ -245,6 +271,11 @@
                         btnType: "primary",
                         event: "clickConfirm"
                     }
+                },
+                imageResizeConfig: {
+                    m: "fixed",
+                    w: 18,
+                    h: 18
                 }
             };
         },
@@ -294,7 +325,7 @@
                 if (this.finalCanEdit) {
                     this.openModal();
                     this.newValList = this.$deepCopy(this.curValList);
-                    this.initModal();
+                    this.modalInit();
                 }
             },
             clickDeleteItem (deleteItem) {
@@ -305,7 +336,7 @@
             },
 
             /* ---------- 弹框里 --------- */
-            initModal () {
+            modalInit () {
                 this.searchData = {
                     name: ""
                 };
@@ -369,34 +400,31 @@
 
             /* ----------- 接口方法 ------------- */
             getUserListData () {
-                this.loading = true;
                 this.userList = [];
-                let searchName = this.searchData.name;
-                let search = {};
-                if (searchName && searchName !== "") {
-                    search["realname"] = {
-                        "$regex": `.*${this.$speciaWord(searchName)}.*`, $options: "i"
-                    };
-                } else {
-                    delete search["realname"];
-                }
+
                 this.$https({
                     url: {
                         module: "company",
                         name: "userIndex"
                     },
                     params: {
-                        search: search,
+                        search: {
+                            realname: this.searchData.name
+                                ? {
+                                    "$regex": `.*${this.$speciaWord(this.searchData.name)}.*`, $options: "i"
+                                }
+                                : undefined
+                        },
                         department: this.curDepartment._key,
                         pagination: {
                             page: this.pagePropsObj.page,
                             pagesize: this.pagePropsObj.pagesize
                         }
                     },
+                    loadingName: "loading",
                     callback: data => {
-                        this.total = data.total;
                         this.userList = data.list;
-                        this.loading = false;
+                        this.total = data.total;
                     }
                 });
             },

package/src/components/list/BriTable.vue

@@ -76,6 +76,7 @@
                     scrollWidth: "0",
                     borderY: true,
                     fixedHeader: true,
+                    canClick: false,
                     cellSelectionOption: {
                         enable: false
                     },
@@ -91,11 +92,14 @@
                 return this.propsObj.state || this.state;
             },
             selfClassName () {
+                let className = "";
+                if (this.selfPropsObj.canClick) {
+                    className += "bri-table-click ";
+                }
                 if (this.loading || !this.data.length) {
-                    return "bri-table-onlyhead";
-                } else {
-                    return "";
+                    className += "bri-table-onlyhead ";
                 }
+                return className;
             },
 
             rowStyleOption () {

package/src/components/list/BriTree.vue

@@ -19,12 +19,11 @@
         <dsh-modal
             class="BriTree-modal"
             v-model="treeFormShow"
-            :propsObj="treeFormPropsObj"
             mode="custom"
+            :propsObj="treeFormPropsObj"
         >
             <div class="BriTree-modal-content">
                 <dsh-form
-                    v-if="treeFormShow"
                     ref="treeForm"
                     :formList="treeFormList"
                     :formData="treeFormData"

package/src/components/small/DshBtnModal.vue

@@ -1,21 +1,19 @@
 <template>
     <div class="DshBtnModal">
         <dsh-buttons
-            :list="$getOperationList(['set'])"
+            :list="$getOperationList(['canSet'])"
             @click="$dispatchEvent($event)"
         ></dsh-buttons>
 
-        <div v-if="showModal">
-            <dsh-modal
-                v-model="showModal"
-                :mode="selfModalPropsObj.mode"
-                :propsObj="selfModalPropsObj"
-            >
-                <div style="margin: 10px 30px;">
-                    <slot></slot>
-                </div>
-            </dsh-modal>
-        </div>
+        <dsh-modal
+            v-model="showModal"
+            :mode="selfModalPropsObj.mode"
+            :propsObj="selfModalPropsObj"
+        >
+            <div style="margin: 10px 30px;">
+                <slot></slot>
+            </div>
+        </dsh-modal>
     </div>
 </template>
 
@@ -34,9 +32,9 @@
             return {
                 showModal: false,
                 operationMap: {
-                    set: {
+                    canSet: {
                         name: "设置默认内容",
-                        type: "set",
+                        type: "canSet",
                         btnType: "dashed",
                         size: "default",
                         long: true,

package/src/components/small/DshDropdown.vue

@@ -139,7 +139,7 @@
         },
         computed: {
             showList () {
-                return this.useSearch
+                return this.useSearch && this.searchName
                     ? this.list.filter(item => (item.name || item._name).includes(this.searchName))
                     : this.list;
             }

package/src/components/small/DshModal.vue

@@ -63,8 +63,8 @@
             mode: {
                 type: String,
                 default: "default",
-                validator: function (value) {
-                    return ["small", "default", "middle", "large", "custom", "auto"].indexOf(value) !== -1;
+                validator (val) {
+                    return ["small", "default", "middle", "large", "custom", "auto"].includes(val);
                 }
             },
             propsObj: {

package/src/styles/components/controls/senior/selectUsers/selectUsers.less

@@ -5,6 +5,23 @@
 
     &-show {}
 
+    &-unit {
+        .dsh-ellipsis();
+        padding-left: 5px;
+
+        &-img {
+            width: 18px;
+            height: 18px;
+            vertical-align: middle;
+            margin-left: -5px;
+            border-radius: 50%;
+        }
+
+        &-text {
+            vertical-align: middle;
+        }
+    }
+
     // 弹框部分
     &-modal {
         &-wrap {

package/src/styles/components/form/DshForm.less

@@ -9,5 +9,6 @@
     .ivu-form-item-error-tip {
         top: 90%;
         left: 15px;
+        font-size: 12px;
     }
 }

package/src/styles/components/list/BriTable.less

@@ -52,6 +52,12 @@
         max-width: calc(100% - 20px);
     }
 
+    &-click {
+        td {
+            cursor: pointer;
+        }
+    }
+
     td {
         white-space: normal !important;
     }

package/src/styles/components/small/DshModal.less

@@ -3,6 +3,7 @@
         width: 100%;
         height: 100%;
     }
+
     &-close {
         padding: 2px;
         position: absolute;
@@ -81,8 +82,8 @@
                     .DshModal-close {
                         top: 20px;
                         right: 24px;
-                        color: rgba(0,0,0,0.6);
-                        font-size: 16px!important;
+                        color: rgba(0, 0, 0, 0.6);
+                        font-size: 16px !important;
                     }
 
                     .ivu-modal {
@@ -93,7 +94,7 @@
                             border-bottom: none;
 
                             &-inner {
-                                color: rgba(0,0,0,0.9);
+                                color: rgba(0, 0, 0, 0.9);
                                 font-size: 16px;
                                 font-weight: 500;
                                 line-height: 24px;
@@ -121,8 +122,18 @@
                 height: 80% !important;
                 min-width: 500px;
                 min-height: 400px;
+
                 // max-width: 900px;
                 // max-height: 800px;
+                .ivu-modal-content {
+                    .ivu-modal-header {
+
+                        &-inner {
+                            line-height: 24px;
+                            height: 24px;
+                        }
+                    }
+                }
             }
         }
     }
@@ -166,26 +177,26 @@
                 height: 100%;
                 display: flex;
                 flex-direction: column;
-    
+
                 .DshModal-close,
                 .ivu-modal-close {
                     top: 20px;
                     right: 24px;
                     color: @contentColor;
                     font-size: @smallTitleSize;
-    
+
                     .ivu-icon-ios-close {
                         font-size: 22px;
                         color: @contentColor;
                     }
                 }
-        
+
                 .ivu-modal-header {
                     width: 100%;
                     height: 44px;
                     padding: 20px 24px 0px 24px;
                     border-bottom: none;
-    
+
                     &-inner {
                         color: rgba(0, 0, 0, 0.9);
                         font-size: 16px;
@@ -194,7 +205,7 @@
                         height: 24px;
                     }
                 }
-        
+
                 .ivu-modal-body {
                     flex: 1;
                     overflow: auto;