vsyswin-ui 0.2.53 → 0.2.56

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vsyswin-ui",
-    "version": "0.2.53",
+    "version": "0.2.56",
     "main": "lib/vsyswin-ui.umd.min.js",
     "private": false,
     "description": "Vue2.x的应用组件库.",

package/packages/search-bar/src/search-bar.vue

@@ -91,6 +91,7 @@
                   <template v-else-if="item.type === 'select'">
                     <span class="syswin-filter-item__name" v-if="item.name && !item.hideName">{{ item.name }}</span>
                     <el-select
+                      size="small"
                       :multiple="!!item.multiple"
                       collapse-tags
                       clearable
@@ -179,6 +180,7 @@
                   <template v-else-if="item.type === 'select'">
                     <span class="syswin-filter-item__name" v-if="item.name && !item.hideName">{{ item.name }}</span>
                     <el-select
+                      size="small"
                       :multiple="!!item.multiple"
                       collapse-tags
                       clearable
@@ -251,6 +253,7 @@
                       <template v-else-if="item.type === 'select'">
                         <span class="syswin-filter-item__name" v-if="item.name">{{ item.name }}</span>
                         <el-select
+                          size="small"
                           :multiple="!!item.multiple"
                           collapse-tags
                           clearable
@@ -379,7 +382,7 @@ export default {
     saveToLocalPosition: {
       type: String,
       default: 'right',
-      validator: function(value) {
+      validator: function (value) {
         return ['left', 'right'].indexOf(value) !== -1
       }
     },
@@ -435,8 +438,8 @@ export default {
     createTagList() {
       const list = []
       this.currentSearchList.length &&
-        this.currentSearchList.forEach(ele => {
-          ele.itemList.forEach(item => {
+        this.currentSearchList.forEach((ele) => {
+          ele.itemList.forEach((item) => {
             if (item.isActive || item.type === 'slot') {
               let obj = {
                 pId: ele.id,
@@ -469,10 +472,10 @@ export default {
               } else if (item.type === 'select') {
                 if (!item.value) return
                 if (item.multiple) {
-                  const valueOptions = item.value.map(x => item.options.find(f => f.value === x))
-                  obj.name = valueOptions.map(x => x.label).join(',')
+                  const valueOptions = item.value.map((x) => item.options.find((f) => f.value === x))
+                  obj.name = valueOptions.map((x) => x.label).join(',')
                 } else {
-                  obj.name = item.options.find(x => x.value === item.value).label
+                  obj.name = item.options.find((x) => x.value === item.value).label
                 }
               } else if (item.type === 'slot') {
                 const info = item.getValue()
@@ -529,9 +532,9 @@ export default {
       this.$emit('on-search', { keyword: this.keyword, filterList })
     },
     handleTagClose(tag) {
-      const parentItem = this.currentSearchList.find(x => x.id === tag.pId)
-      const parentIndex = this.currentSearchList.findIndex(x => x.id === tag.pId)
-      const childIndex = parentItem.itemList.findIndex(x => x.id === tag.id)
+      const parentItem = this.currentSearchList.find((x) => x.id === tag.pId)
+      const parentIndex = this.currentSearchList.findIndex((x) => x.id === tag.pId)
+      const childIndex = parentItem.itemList.findIndex((x) => x.id === tag.id)
       parentItem.itemList.forEach((item, index) => {
         if (parentItem.multiple) {
           // 多选
@@ -547,6 +550,9 @@ export default {
             if (item.type === 'select') {
               item.value = item.multiple ? [] : null
             }
+            if (item.type === 'slot') {
+              item.setValue({ name: '', value: '' })
+            }
           }
         }
       })
@@ -557,10 +563,10 @@ export default {
     },
     // 关闭所有的标签
     handleClearAllTags() {
-      this.tagList.forEach(tag => {
-        const parentItem = this.currentSearchList.find(x => x.id === tag.pId)
-        const parentIndex = this.currentSearchList.findIndex(x => x.id === tag.pId)
-        const childIndex = parentItem.itemList.findIndex(x => x.id === tag.id)
+      this.tagList.forEach((tag) => {
+        const parentItem = this.currentSearchList.find((x) => x.id === tag.pId)
+        const parentIndex = this.currentSearchList.findIndex((x) => x.id === tag.pId)
+        const childIndex = parentItem.itemList.findIndex((x) => x.id === tag.id)
         parentItem.itemList.forEach((item, index) => {
           if (parentItem.multiple) {
             // 多选
@@ -576,6 +582,9 @@ export default {
               if (item.type === 'select') {
                 item.value = item.multiple ? [] : null
               }
+              if (item.type === 'slot') {
+                item.setValue({ name: '', value: '' })
+              }
             }
           }
         })
@@ -591,8 +600,8 @@ export default {
       this.keyword = ''
 
       const currentSearchList = _.cloneDeep(this.currentSearchList)
-      currentSearchList.forEach(ele => {
-        ele.itemList.forEach(item => {
+      currentSearchList.forEach((ele) => {
+        ele.itemList.forEach((item) => {
           item.isActive = !!item.default
           if (['month', 'year'].includes(item.type)) {
             item.value = item.default && item.defaultValue ? item.defaultValue : ''
@@ -603,8 +612,8 @@ export default {
           if (item.type === 'select') {
             if (item.default && item.defaultValue) {
               if (item.multiple) {
-                const valueOptions = item.defaultValue.map(x => item.options.find(f => f.value === x))
-                item.value = valueOptions.map(x => x.value)
+                const valueOptions = item.defaultValue.map((x) => item.options.find((f) => f.value === x))
+                item.value = valueOptions.map((x) => x.value)
               } else {
                 item.value = item.defaultValue
               }
@@ -621,8 +630,8 @@ export default {
     setDefaultTagList() {
       const list = []
       if (this.currentSearchList) {
-        this.currentSearchList.forEach(ele => {
-          ele.itemList.forEach(item => {
+        this.currentSearchList.forEach((ele) => {
+          ele.itemList.forEach((item) => {
             if (item.default) {
               // 如果是默认值
               const obj = {
@@ -655,10 +664,10 @@ export default {
               } else if (item.type === 'select') {
                 if (!item.defaultValue) return
                 if (item.multiple) {
-                  const valueOptions = item.defaultValue.map(x => item.options.find(f => f.value === x))
-                  obj.name = valueOptions.map(x => x.label).join(',')
+                  const valueOptions = item.defaultValue.map((x) => item.options.find((f) => f.value === x))
+                  obj.name = valueOptions.map((x) => x.label).join(',')
                 } else {
-                  const defaultItem = item.options.find(x => x.value === item.defaultValue)
+                  const defaultItem = item.options.find((x) => x.value === item.defaultValue)
                   obj.name = defaultItem.label
                   obj.value = defaultItem
                 }
@@ -730,15 +739,15 @@ export default {
     // 切换保存过滤条件的下拉框
     handleChangeCondition(value) {
       this.conditionValue = value
-      const list = this.conditionList.filter(item => item.value === value)
+      const list = this.conditionList.filter((item) => item.value === value)
       if (list.length) {
         const currentSearchList = _.cloneDeep(this.currentSearchList)
         const { keyword = '', filterList = [] } = list[0]
         this.keyword = keyword
 
         // 先清空所有标签
-        currentSearchList.forEach(ele => {
-          ele.itemList.forEach(item => {
+        currentSearchList.forEach((ele) => {
+          ele.itemList.forEach((item) => {
             item.isActive = false
             item.type === 'daterange' && (item.value = null)
           })
@@ -746,10 +755,10 @@ export default {
 
         // 设置选中的标签
         if (filterList && filterList.length) {
-          filterList.forEach(ele => {
-            currentSearchList.forEach(item => {
+          filterList.forEach((ele) => {
+            currentSearchList.forEach((item) => {
               if (ele.pId === item.id) {
-                item.itemList.forEach(v => {
+                item.itemList.forEach((v) => {
                   if (v.type === 'slot') {
                     v.setValue({ value: ele.value, name: ele.name, ...ele })
                   }
@@ -786,7 +795,7 @@ export default {
       let localList = localStorage.getItem(`syswin${this.storageName}`)
       if (!['', undefined, null].includes(localList)) {
         localList = JSON.parse(localList)
-        const idx = localList.findIndex(ele => ele.value === item.value)
+        const idx = localList.findIndex((ele) => ele.value === item.value)
         idx > -1 && localList.splice(idx, 1)
         localList.length > 0
           ? localStorage.setItem(`syswin${this.storageName}`, JSON.stringify(localList))
@@ -807,7 +816,7 @@ export default {
         this.conditionValue = momentValue
       } else {
         // 编辑
-        const index = this.conditionList.findIndex(ele => ele.value === this.currentData.value)
+        const index = this.conditionList.findIndex((ele) => ele.value === this.currentData.value)
         const item = this.conditionList[index]
         item.label = label
         this.$set(this.conditionList, index, item)

package/packages/simple-search-bar/src/simple-search-bar.vue

@@ -2,7 +2,8 @@
   <div class="header-filter">
     <div class="header-filter-input">
       <slot name="filterInput">
-        <el-input class="header-filter-input" :placeholder="placeholder" v-model.trim="keyword" @input="search" clearable>
+        <el-input class="header-filter-input" size="small" :placeholder="placeholder" @keyup.enter.native="search"
+          v-model.trim="keyword" @input="auto && search" @clear="search" clearable>
           <el-button type="primary" slot="append" icon="el-icon-search" @click="search()"></el-button>
         </el-input>
       </slot>
@@ -32,10 +33,15 @@ export default {
     placeholder: {
       type: String,
       default: '请输入搜索关键字'
+    },
+    // 在input框输入是否自动搜索->也即，是否会自动触发@input事件
+    auto: {
+      type: Boolean,
+      default: false
     }
   },
   methods: {
-    search: debounce(200, function() {
+    search: debounce(200, function () {
       // 执行搜索事件
       this.$emit('input', this.keyword)
       this.$emit('search', this.keyword)