bri-components 1.4.33 → 1.4.35

package/package.json

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

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

@@ -235,13 +235,6 @@
                 this.showModal = false;
                 this.curVal = this.newVal;
             },
-            // 点击删除
-            clickClear () {
-                this.curVal = {
-                    name: "",
-                    lnglat: []
-                };
-            },
             // 清除已选内容
             clickModalClear () {
                 this.newVal = {

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

@@ -228,10 +228,6 @@ export default {
     },
     created () { },
     methods: {
-        // 点击清除
-        clickClear () {
-            this.curValList = [];
-        },
         confirmCb (selectedValue, selectedOptions) {
             this.curValList = selectedValue;
 

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

@@ -110,7 +110,7 @@ export default {
         multipleMode () {
             return this.isOnDftSearch || this.isOnSearch
                 ? true
-                : ["checkbox", "regions", "cascaders"].includes(this.controlType)
+                : ["checkbox", "regions", "cascaders", "labels", "refCheckbox"].includes(this.controlType)
                     ? true
                     : !!this.selfPropsObj && !!this.selfPropsObj._multiple;
         },
@@ -122,7 +122,7 @@ export default {
         },
         // 是否为tag显示
         isTagShow () {
-            return ["users", "departments", "select", "checkbox", "regions", "cascaders", "switch", "labels", "refSelect"].includes(this.controlType);
+            return ["switch", "select", "checkbox", "regions", "cascaders", "users", "departments", "labels", "refSelect", "refCheckbox"].includes(this.controlType);
         },
 
         /* ----- 表单相关 ----- */
@@ -325,6 +325,21 @@ export default {
                 this.openModal();
             }
         },
+        // 点击清除
+        clickClear () {
+            if (this.controlType === "coordinates") {
+                this.curVal = {
+                    name: "",
+                    lnglat: []
+                };
+            }
+            else if (this.typeInfoData.dataType === "array" || this.multipleMode) {
+                this.curValList = [];
+            } else {
+                this.curVal = "";
+            }
+        },
+
         /* ----- 工具方法 ------- */
         // 切换弹框
         toggleModal (bool) {

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

@@ -121,10 +121,6 @@ export default {
             this.getListData();
         },
 
-        // 点击清除
-        clickClear () {
-            this.curVal = "";
-        },
         // 单选模式 点击选项
         clickRadioItem (item, index) {
             if (!this.getRadioItemDisabled(item)) {

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

@@ -110,20 +110,10 @@ export default {
     },
     created () { },
     methods: {
-        // 点击输入框 打开选择模态框
-        clickInput () {
-            if (!this.disabled) {
-                this.openModal();
-            }
-        },
         // 点击删除某项
         clickDeleteItem (selectItem) {
             this.curValList = this.curValList.filter(item => item._key !== selectItem._key);
         },
-        // 点击清除选择项
-        clickClear () {
-            this.curValList = [];
-        },
         clickItem (item, index) {
             this.itemTipRender = this.getItemTipRender(item, index);
         },

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

@@ -211,10 +211,6 @@
             clickDeleteItem (deleteItem) {
                 this.curValList = this.curValList.filter(item => item._key !== deleteItem._key);
             },
-            // 点击清除选择项
-            clickClear () {
-                this.curValList = [];
-            },
 
             // 接口 -获取列表数据
             getListData () {

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

@@ -408,6 +408,7 @@
                     return arr.reduce((totalList, item) => {
                         return [
                             ...totalList,
+                            item,
                             ...loop(item.children)
                         ];
                     }, []);
@@ -418,11 +419,7 @@
             userShowList () {
                 // 有部门过滤就只显示对应的部门，无过滤就涌全部用户（包含无部门用户）
                 let list = this.filterVals.length || this.cascaderVals.length
-                    ? this.userList.filter(item =>
-                        this.reverseFilter
-                            ? !this.allDepartShowKeys.includes(item.departmentKey)
-                            : this.allDepartShowKeys.includes(item.departmentKey)
-                    )
+                    ? this.userList.filter(item => this.allDepartShowKeys.includes(item.departmentKey))
                     : this.userList;
 
                 list = this.curDepart._key === "_highSearch"

package/src/components/list/mixins/tableBaseMixin.js

@@ -1135,7 +1135,7 @@ export default {
                             e.stopPropagation();
                         }
                     }
-                });
+            });
         },
         topSearchRender (h) {
             return this.searchFormList.length
@@ -1425,7 +1425,7 @@ export default {
         getRowDelBtnCanEdit (row, rowIndex) {
             return row.__readonly__ !== true && // 不能为只读数据
                 (this.disabledDeleteDftRow ? row.__isDefault__ !== true : true) && // 默认数据可删除
-                (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
+            (this.disabledDeleteOldRow ? row.__old__ !== true : true); // 老数据可删除
         },
         // 行内容是否可编辑
         getRowCanEdit (row, rowIndex) {