bri-components 1.4.41 → 1.4.43

package/package.json

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

package/src/components/controls/DshControlInput.vue

@@ -111,7 +111,21 @@
                 this.$emit("clickItem", ...params);
             },
             clickClear () {
-                this.$emit("clear");
+                const cb = () => {
+                    this.$emit("clear");
+                };
+
+                if (this.propsObj._useDeleteTip === true) {
+                    this.$Modal.confirm({
+                        title: "提示",
+                        content: "确定清除全部内容吗？",
+                        onOk: () => {
+                            cb();
+                        }
+                    });
+                } else {
+                    cb();
+                }
             }
         }
     };

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

@@ -105,12 +105,17 @@ export default {
         commonDealPropsObj () {
             const selectControlTypes = ["coordinates", "date", "switch", "select", "checkbox", "file", "region", "regions", "cascader", "cascaders", "users", "departments", "reference"];
             return {
-                // TODO: 此处的请输入可能还有请选择之类的，待处理
                 _placeholder: this.canEdit && this.propsObj._enterType !== "calculate" && this.propsObj._disabled !== true && this.propsObj._readonly !== true
                     ? (this.propsObj._placeholder || `${selectControlTypes.includes(this.controlType) ? "选择" : "输入"}${this.propsObj._name}`)
                     : "",
                 _clearable: this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly && (this.propsObj._clearable === undefined ? true : this.propsObj._clearable),
-                _disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly)
+                _disabled: !(this.finalCanEdit && !this.propsObj._disabled && !this.propsObj._readonly),
+                // 目前部门、用户在用，以后还会增多
+                _useDeleteTip: this.isInDftSearch || this.isInSearch
+                    ? false
+                    : this.propsObj._useDeleteTip == undefined
+                        ? false
+                        : this.propsObj._useDeleteTip // 删除项进行提示（筛选下删除项不提示）
             };
         },
         // 是否为多选模式

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

@@ -53,7 +53,6 @@ export default {
             return {
                 _highSearch: false,
                 _searchString: "",
-                _useDeleteTip: false, // 删除项进行提示
 
                 _reverseFilter: false, // 反向过滤
                 _userDepartFilterVals: [], // 过滤的数据的第一级选项

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

@@ -28,7 +28,7 @@
             </div>
         </bri-tooltip>
 
-        <!-- label后可自定义内容 -->
+        <!-- 点击选中项后的自定义内容 -->
         <dsh-render :render="itemTipRender"></dsh-render>
 
         <!-- 搜索选择框 -->
@@ -266,10 +266,10 @@
             },
 
             curShowValList () {
-                return this.curValList.map(depart => {
+                return this.curValList.map(itemObj => {
                     return {
-                        ...depart,
-                        full_name: this.useFullName ? depart.full_name : undefined
+                        ...itemObj,
+                        full_name: this.useFullName ? this.getFullName(itemObj) : undefined
                     };
                 });
             }
@@ -278,10 +278,13 @@
         methods: {
             /* ----------- 接口方法和加工方法 --------- */
             // 获取显示名
-            getShowName (selectItem) {
+            getShowName (itemObj) {
                 return this.useFullName
-                    ? selectItem.full_name || selectItem.name
-                    : selectItem.name;
+                    ? this.getFullName(itemObj)
+                    : itemObj.name;
+            },
+            getFullName (itemObj) {
+                return itemObj.full_name || this.$getTreeLinealDatasByNode(itemObj, this.departShowList, "_key").map(levelObj => levelObj.name).join("/") || itemObj.name;
             },
 
             getData () {

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

@@ -26,7 +26,7 @@
             </div>
         </bri-tooltip>
 
-        <!-- label后可自定义内容 -->
+        <!-- 点击选中项后的自定义内容 -->
         <dsh-render :render="itemTipRender"></dsh-render>
 
         <!-- 搜索选择框 -->
@@ -190,7 +190,7 @@
                             class="selectUsers-show-unit-img"
                         />
                         <span
-                            :key="item._key"
+                            :key="item._key + 'img'"
                             class="selectUsers-show-unit-text"
                         >
                             {{ getShowName(item) }}

package/src/components/small/BriTooltip.vue

@@ -20,7 +20,7 @@
     export default {
         name: "BriTooltip",
         props: {
-            content: String,
+            content: [String, Number],
             placement: {
                 type: String,
                 default: "bottom"