lshcom 1.0.6 → 1.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lshcom",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "files": [
     "src/assets/*",
     "src/common/common.js",

package/src/common/global.js

@@ -38,7 +38,7 @@ const global = {
   },
   // 保留
   retain:{
-    number(val = '') {console.log('val',val);return val.replace(/[^\d]/g,'')}, // 只保留数字
+    number(val = '') {return val.replace(/[^\d]/g,'')}, // 只保留数字
     decimals2(val = '') {return val.replace(/[^\d.]/g,'').replace(/\.{2,}/g,'.').replace(/^\./g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.').replace(/^(\-)*(\d+)\.(\d\d).*$/,'$1$2.$3')}, // 保留两位小数
   },
   format(date, fmt = 'yyyy-MM-dd hh:mm:ss') {

package/src/components/el/Select.vue

@@ -36,6 +36,8 @@
       placeholder: { type: String, default: '请选择' }, // 占位符
       multiple: { type: Boolean, default: false },  // 是否多选
       selectAllable: Boolean, // 是否可全选
+      selectAllLable: { type: String, default: '全部' }, // 全选的label
+      selectAllValue: { type: String, default: '' }, // 全选的value
       collapseTags: { type: Boolean, default: false }, // 多选时是否将选中值按文字的形式展示
       disabled: { type: Boolean, default: false },  // 是否禁用
       clearable: { type: Boolean, default: true }, // 是否可以清空选项
@@ -67,7 +69,8 @@
         this.selectValue = val
       },
       options: function (val, oldVal) {
-        this.selectOptions = val
+        this.selectOptions = JSON.parse(JSON.stringify(val))
+        this.unshiftAll()
       },
     },
     computed: {
@@ -80,10 +83,7 @@
       },
     },
     mounted() {
-      this.selectValue = this.value
-      this.selectOptions = this.options
-      this.queryParams[this.pageKey[0]] = this.pageStart
-      this.queryParams[this.pageKey[1]] = this.pageNums
+      this.resetData()
     },
     methods: {
       change(value){
@@ -94,20 +94,23 @@
             this.$refs.select.previousQuery = this.queryParams[this.queryKey]
           });
         }
+        // 全选和单选交互
         if(this.multiple && this.selectAllable){
-          if(value.includes(this.selectOptions[0][this.optionValue])) {
-            if(value.length > 1){
-              value = [this.selectOptions[0][this.optionValue]]
-            }
-            this.selectOptions.map(item => item.disabled = true)
-            this.selectOptions[0].disabled = false
+          if(value.length === 1 && value[0] === this.selectAllValue) {
+            this.$emit('input', value)
+            this.$emit('change', value)
+            return
+          } else if(value.length === 2 && value[0] === this.selectAllValue) {
+            value.splice(0, 1)
+          } else if(value.includes(this.selectAllValue)) {
+            value = [this.selectAllValue]
           } else {
-            this.selectOptions.map(item => item.disabled = false)
+            this.$emit('change', value)
           }
-          this.selectOptions = JSON.parse(JSON.stringify(this.selectOptions))
+        } else {
+          this.$emit('change', value)
         }
         this.$emit('input', value)
-        this.$emit('change', value)
       },
       removeTag(value){
         this.$emit('remove-tag', value)
@@ -130,6 +133,15 @@
           })
         }
       },
+      // 重置数据
+      resetData(){
+        this.firstGetData = true
+        this.selectValue = this.value
+        this.selectOptions = JSON.parse(JSON.stringify(this.options))
+        this.unshiftAll()
+        this.queryParams[this.pageKey[0]] = this.pageStart
+        this.queryParams[this.pageKey[1]] = this.pageNums
+      },
       loadmore(){
         if (!this.remote) return;
         if (this.nomore) return;
@@ -149,6 +161,7 @@
       },
       // 下拉框出现时，第一次获取数据
       visibleChange(val) {
+        this.$emit('visible-change', val)
         if (val && this.api) {
           if (this.firstGetData) this.getData();
           // 远程搜索把搜索值附上
@@ -163,7 +176,13 @@
             })
           }
         }
-      }
+      },
+      // 添加全部选项
+      unshiftAll() {
+        if(this.multiple && this.selectAllable && (!this.selectOptions[0] || this.selectOptions[0][this.optionValue] != this.selectAllValue)) {
+          this.selectOptions.unshift({[this.optionLabel]: this.selectAllLable, [this.optionValue]: this.selectAllValue})
+        }
+      },
     },
   };
 </script>