bri-components 1.4.16 → 1.4.18

package/package.json

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

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -389,7 +389,7 @@
             // 接口 -下载
             handleDownload (operationItem, fileItem, fileIndex) {
                 axios
-                    .get(fileItem.url, {
+                    .get(fileItem.downloadUrl, {
                         responseType: "blob"
                     })
                     .then((res) => {

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

@@ -12,7 +12,7 @@
                     <dsh-control-input
                         v-if="canEdit"
                         :class="commonClass"
-                        :value="curValList"
+                        :value="selfCurValList"
                         :disabled="selfPropsObj._disabled"
                         :propsObj="selfPropsObj"
                         @deleteItem="clickDeleteItem"
@@ -27,9 +27,9 @@
                         }"
                     >
                         <dsh-tags
-                            v-if="!$isEmptyData(curValList)"
+                            v-if="!$isEmptyData(selfCurValList)"
                             class="text"
-                            :list="curValList"
+                            :list="selfCurValList"
                         ></dsh-tags>
 
                         <template v-else>
@@ -61,7 +61,7 @@
                         class="item"
                     >
                         <span class="item-name">
-                            {{ selectItem.full_name || selectItem.name }}
+                            {{ getShowName(selectItem) }}
                         </span>
                         <Icon
                             class="item-delete"
@@ -87,7 +87,6 @@
                     class="list-center"
                 >
                     <bri-loading v-if="loading" />
-
                     <template v-else>
                         <!-- 树形形式 -->
                         <div class="list-center-tree">
@@ -101,6 +100,7 @@
                                     @on-change="changeSelect"
                                 ></bri-tree-item>
                             </template>
+
                             <div
                                 v-else
                                 class="tree-nodata"
@@ -111,6 +111,7 @@
                     </template>
                 </div>
             </div>
+
             <dsh-buttons
                 class="bri-modal-footer"
                 :list="$getOperationList(['canCancel', 'canConfirm'])"
@@ -172,6 +173,9 @@
                     _highSearch: false,
                     _changeOnSelect: true,
                     _searchString: "",
+                    _useFullName: false, // 使用全名
+                    _expandLevel: 1, // 列表打开，默认展开到第几级
+
                     _reverseFilter: false,
                     _userDepartFilterVals: [],
 
@@ -179,14 +183,6 @@
                     ...this.commonDealPropsObj
                 };
             },
-            // 反向过滤
-            reverseFilter () {
-                return this.selfPropsObj._reverseFilter;
-            },
-            // 禁止显示的部门以及部门下人员
-            listFilterVals () {
-                return this.selfPropsObj._userDepartFilterVals || [];
-            },
             highSearch () {
                 return this.isOnSearch ? true : this.selfPropsObj._highSearch;
             },
@@ -196,6 +192,20 @@
             searchString () {
                 return this.selfPropsObj._searchString;
             },
+            useFullName () {
+                return this.selfPropsObj._useFullName;
+            },
+            expandLevel () {
+                return this.selfPropsObj._expandLevel;
+            },
+            // 反向过滤
+            reverseFilter () {
+                return this.selfPropsObj._reverseFilter;
+            },
+            // 禁止显示的部门以及部门下人员
+            listFilterVals () {
+                return this.selfPropsObj._userDepartFilterVals || [];
+            },
 
             modalPropsObj () {
                 return {
@@ -216,10 +226,20 @@
                 ], this.selectKeys);
             },
 
+            selfCurValList () {
+                return this.curValList.map(depart => {
+                    return {
+                        ...depart,
+                        full_name: this.useFullName ? depart.full_name : undefined
+                    };
+                });
+            },
             showVal () {
-                return this.$isEmptyData(this.curValList)
+                return this.$isEmptyData(this.selfCurValList)
                     ? this.emptyShowVal
-                    : this.curValList.map(depart => depart.full_name || depart.name).join("、");
+                    : this.selfCurValList
+                        .map(depart => this.getShowName(depart))
+                        .join("、");
             }
         },
         created () {},
@@ -233,17 +253,17 @@
                 if (this.finalCanEdit) {
                     this.openModal();
 
-                    this.newValList = this.$deepCopy(this.curValList);
+                    this.newValList = this.$deepCopy(this.selfCurValList);
                     this.searchName = "";
                     this.getListData();
                 }
             },
             clickDeleteItem (deleteItem) {
-                this.curValList = this.curValList.filter(item => item._key != deleteItem._key);
+                this.selfCurValList = this.selfCurValList.filter(item => item._key != deleteItem._key);
             },
             // 点击清除选择项
             clickClear () {
-                this.curValList = [];
+                this.selfCurValList = [];
             },
 
             /* ---------- 弹框里 --------- */
@@ -269,17 +289,23 @@
             clickConfirm () {
                 this.closeModal();
 
-                this.curValList = this.newValList;
+                this.selfCurValList = this.newValList;
             },
 
             /* ----------- 接口方法和加工方法 --------- */
+            // 获取显示名
+            getShowName (depart) {
+                return this.useFullName
+                    ? depart.full_name || depart.name
+                    : depart.name;
+            },
             // 处理数据
             transformDepartmentList (data = [], selectKeys = []) {
                 return data.map(item => ({
                     ...item,
                     title: item.name,
                     checked: selectKeys.includes(item._key),
-                    expand: !!(item.children && item.children.length && item.level < 2),
+                    expand: !!(item.children && item.children.length && item.level < this.expandLevel),
                     children: this.transformDepartmentList(item.children, selectKeys)
                 }));
             },