vsyswin-ui 0.2.66 → 0.2.67

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/lib/vsyswin-ui.common.js +193 -63
  2. package/lib/vsyswin-ui.common.js.map +1 -1
  3. package/lib/vsyswin-ui.umd.js +193 -63
  4. package/lib/vsyswin-ui.umd.js.map +1 -1
  5. package/lib/vsyswin-ui.umd.min.js +59 -59
  6. package/lib/vsyswin-ui.umd.min.js.map +1 -1
  7. package/package.json +2 -1
  8. package/packages/search-bar/src/search-bar.vue +66 -10
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vsyswin-ui",
3
- "version": "0.2.66",
3
+ "version": "0.2.67",
4
4
  "main": "lib/vsyswin-ui.umd.min.js",
5
5
  "private": false,
6
6
  "description": "Vue2.x的应用组件库.",
@@ -9,6 +9,7 @@
9
9
  "syswin-ui"
10
10
  ],
11
11
  "scripts": {
12
+ "dev": "vue-cli-service serve",
12
13
  "serve": "vue-cli-service serve",
13
14
  "build": "vue-cli-service build",
14
15
  "lint": "vue-cli-service lint",
package/packages/search-bar/src/search-bar.vue CHANGED
@@ -58,6 +58,22 @@
58
58
  >
59
59
  </el-date-picker>
60
60
  </template>
61
+ <template v-else-if="item.type === 'monthrange'">
62
+ <span class="syswin-filter-item__name" v-if="item.name && !item.hideName">{{ item.name }}</span>
63
+ <el-date-picker
64
+ type="monthrange"
65
+ v-model="item.value"
66
+ size="small"
67
+ range-separator="至"
68
+ start-placeholder="开始月份"
69
+ end-placeholder="结束月份"
70
+ :editable="false"
71
+ :unlink-panels="true"
72
+ value-format="timestamp"
73
+ @change="handleChangeDateragne(idx, index)"
74
+ >
75
+ </el-date-picker>
76
+ </template>
61
77
  <template v-else-if="item.type === 'month' || item.type === 'year'">
62
78
  <span class="syswin-filter-item__name" v-if="item.name && !item.hideName">{{ item.name }}</span>
63
79
  <el-date-picker
@@ -147,6 +163,22 @@
147
163
  >
148
164
  </el-date-picker>
149
165
  </template>
166
+ <template v-else-if="item.type === 'monthrange'">
167
+ <span class="syswin-filter-item__name" v-if="item.name">{{ item.name }}</span>
168
+ <el-date-picker
169
+ type="monthrange"
170
+ v-model="item.value"
171
+ size="small"
172
+ range-separator="至"
173
+ start-placeholder="开始月份"
174
+ end-placeholder="结束月份"
175
+ :editable="false"
176
+ :unlink-panels="true"
177
+ value-format="timestamp"
178
+ @change="handleChangeDateragne(idx, index)"
179
+ >
180
+ </el-date-picker>
181
+ </template>
150
182
  <template v-else-if="item.type === 'month' || item.type === 'year'">
151
183
  <span class="syswin-filter-item__name" v-if="item.name && !item.hideName">{{ item.name }}</span>
152
184
  <el-date-picker
@@ -232,6 +264,22 @@
232
264
  >
233
265
  </el-date-picker>
234
266
  </template>
267
+ <template v-else-if="item.type === 'monthrange'">
268
+ <span class="syswin-filter-item__name" v-if="item.name">{{ item.name }}</span>
269
+ <el-date-picker
270
+ type="monthrange"
271
+ v-model="item.value"
272
+ size="small"
273
+ range-separator="至"
274
+ start-placeholder="开始月份"
275
+ end-placeholder="结束月份"
276
+ :editable="false"
277
+ :unlink-panels="true"
278
+ value-format="timestamp"
279
+ @change="handleChangeDateragne(idx, index + maxConditionLength)"
280
+ >
281
+ </el-date-picker>
282
+ </template>
235
283
  <template v-else-if="item.type === 'datetimerange'">
236
284
  <span class="syswin-filter-item__name" v-if="item.name">{{ item.name }}</span>
237
285
  <el-date-picker
@@ -477,6 +525,11 @@ export default {
477
525
  return
478
526
  }
479
527
  obj.name = `${moment(item.value[0]).format('YYYY-MM-DD')}至${moment(item.value[1]).format('YYYY-MM-DD')}`
528
+ } else if (item.type === 'monthrange') {
529
+ if (!item.value || !item.value[0]) {
530
+ return
531
+ }
532
+ obj.name = `${moment(item.value[0]).format('YYYY-MM')}至${moment(item.value[1]).format('YYYY-MM')}`
480
533
  } else if (item.type === 'datetimerange') {
481
534
  if (!item.value || !item.value[0]) {
482
535
  return
@@ -573,7 +626,7 @@ export default {
573
626
  // 单选
574
627
  if (index === childIndex) {
575
628
  item.isActive = false
576
- ;(item.type === 'daterange' || item.type === 'datetimerange') && (item.value = null)
629
+ ;(item.type === 'daterange' || item.type === 'monthrange' || item.type === 'datetimerange') && (item.value = null)
577
630
  if (item.type === 'month' || item.type === 'year') {
578
631
  item.value = ''
579
632
  }
@@ -605,7 +658,7 @@ export default {
605
658
  // 单选
606
659
  if (index === childIndex) {
607
660
  item.isActive = false
608
- ;(item.type === 'daterange' || item.type === 'datetimerange') && (item.value = null)
661
+ ;(item.type === 'daterange' || item.type === 'monthrange' || item.type === 'datetimerange') && (item.value = null)
609
662
  if (item.type === 'month' || item.type === 'year') {
610
663
  item.value = ''
611
664
  }
@@ -636,7 +689,7 @@ export default {
636
689
  if (['month', 'year'].includes(item.type)) {
637
690
  item.value = item.default && item.defaultValue ? item.defaultValue : ''
638
691
  }
639
- if (item.type === 'daterange' || item.type === 'datetimerange') {
692
+ if (item.type === 'daterange' || item.type === 'monthrange' || item.type === 'datetimerange') {
640
693
  item.value = item.default && item.defaultValue ? item.defaultValue : null
641
694
  }
642
695
  if (item.type === 'select') {
@@ -682,6 +735,11 @@ export default {
682
735
  return
683
736
  }
684
737
  obj.name = `${moment(item.defaultValue[0]).format('YYYY-MM-DD')}至${moment(item.defaultValue[1]).format('YYYY-MM-DD')}`
738
+ } else if (item.type === 'monthrange') {
739
+ if (!item.defaultValue || !item.defaultValue[0]) {
740
+ return
741
+ }
742
+ obj.name = `${moment(item.defaultValue[0]).format('YYYY-MM')}至${moment(item.defaultValue[1]).format('YYYY-MM')}`
685
743
  } else if (item.type === 'datetimerange') {
686
744
  if (!item.defaultValue || !item.defaultValue[0]) {
687
745
  return
@@ -721,7 +779,7 @@ export default {
721
779
  } else {
722
780
  // 单选
723
781
  item.isActive = index === childIndex ? !childItem.isActive : false
724
- ;(item.type === 'daterange' || item.type === 'datetimerange') && (item.value = null)
782
+ ;(item.type === 'daterange' || item.type === 'monthrange' || item.type === 'datetimerange') && (item.value = null)
725
783
  if (item.type === 'month' || item.type === 'year') {
726
784
  item.value = ''
727
785
  }
@@ -779,8 +837,7 @@ export default {
779
837
  // 先清空所有标签
780
838
  currentSearchList.forEach((ele) => {
781
839
  ele.itemList.forEach((item) => {
782
- item.isActive = false
783
- item.type === 'daterange' && (item.value = null)
840
+ item.isActive = false(['daterange', 'monthrange'].includes(item.type)) && (item.value = null)
784
841
  })
785
842
  })
786
843
 
@@ -794,11 +851,10 @@ export default {
794
851
  if (item.multiple) {
795
852
  // 多选
796
853
  v.id === ele.id && (v.isActive = true)
797
- v.id === ele.id && v.type === 'daterange' && (v.value = ele.value)
854
+ v.id === ele.id && ['daterange', 'monthrange'].includes(v.type) && (v.value = ele.value)
798
855
  } else {
799
856
  // 单选
800
- v.isActive = v.id === ele.id
801
- v.type === 'daterange' && (v.value = v.id === ele.id ? ele.value : null)
857
+ v.isActive = v.id === ele.id[('daterange', 'monthrange')].includes(v.type) && (v.value = v.id === ele.id ? ele.value : null)
802
858
  }
803
859
  } else if (v.type === 'slot') {
804
860
  v.setValue && v.setValue({ value: ele.value, name: ele.name, ...ele })
@@ -810,7 +866,7 @@ export default {
810
866
  }
811
867
  } else if (v.type === 'month' || v.type === 'year') {
812
868
  v.value = ele.value
813
- } else if (v.type === 'daterange' || v.type === 'datetimerange') {
869
+ } else if (v.type === 'daterange' || v.type === 'monthrange' || v.type === 'datetimerange') {
814
870
  v.value = ele.value
815
871
  }
816
872
  })