vsyswin-ui 0.2.72 → 0.2.75

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 (10) hide show
  1. package/lib/vsyswin-ui.common.js +158 -108
  2. package/lib/vsyswin-ui.common.js.map +1 -1
  3. package/lib/vsyswin-ui.umd.js +158 -108
  4. package/lib/vsyswin-ui.umd.js.map +1 -1
  5. package/lib/vsyswin-ui.umd.min.js +14 -14
  6. package/lib/vsyswin-ui.umd.min.js.map +1 -1
  7. package/package.json +1 -1
  8. package/packages/search-bar/src/search-bar.scss +4 -0
  9. package/packages/search-bar/src/search-bar.vue +53 -2
  10. package/packages/table/src/table.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vsyswin-ui",
3
- "version": "0.2.72",
3
+ "version": "0.2.75",
4
4
  "main": "lib/vsyswin-ui.umd.min.js",
5
5
  "private": false,
6
6
  "description": "Vue2.x的应用组件库.",
package/packages/search-bar/src/search-bar.scss CHANGED
@@ -87,6 +87,10 @@
87
87
  z-index: $--zindex-modal;
88
88
  overflow: hidden;
89
89
 
90
+ ::v-deep .el-range-editor--small .el-range-separator {
91
+ line-height: 28px;
92
+ }
93
+
90
94
  @include e(wrap) {
91
95
  border: $--border-base;
92
96
  border-bottom: none;
package/packages/search-bar/src/search-bar.vue CHANGED
@@ -48,6 +48,7 @@
48
48
  type="daterange"
49
49
  v-model="item.value"
50
50
  size="small"
51
+ :picker-options="item.pickerOptions && pickerOptions"
51
52
  range-separator="至"
52
53
  start-placeholder="开始日期"
53
54
  end-placeholder="结束日期"
@@ -92,6 +93,7 @@
92
93
  type="datetimerange"
93
94
  v-model="item.value"
94
95
  size="small"
96
+ :picker-options="item.pickerOptions && pickerOptions"
95
97
  :format="item.format ? item.format : 'yyyy-MM-dd HH:mm:ss'"
96
98
  :default-time="['00:00:00', '23:59:59']"
97
99
  :unlink-panels="true"
@@ -153,6 +155,7 @@
153
155
  type="daterange"
154
156
  v-model="item.value"
155
157
  size="small"
158
+ :picker-options="item.pickerOptions && pickerOptions"
156
159
  range-separator="至"
157
160
  start-placeholder="开始日期"
158
161
  end-placeholder="结束日期"
@@ -197,6 +200,7 @@
197
200
  type="datetimerange"
198
201
  v-model="item.value"
199
202
  size="small"
203
+ :picker-options="item.pickerOptions && pickerOptions"
200
204
  :format="item.format ? item.format : 'yyyy-MM-dd HH:mm:ss'"
201
205
  :default-time="['00:00:00', '23:59:59']"
202
206
  :unlink-panels="true"
@@ -226,6 +230,9 @@
226
230
  <el-option v-for="opt in item.options" :key="opt.id" :label="opt.label" :value="opt.value"></el-option>
227
231
  </el-select>
228
232
  </template>
233
+ <template v-else-if="item.type === 'slot'">
234
+ <slot :name="item.slot" :item="item">内容为空</slot>
235
+ </template>
229
236
  </li>
230
237
  </ul>
231
238
  </div>
@@ -254,6 +261,7 @@
254
261
  type="daterange"
255
262
  v-model="item.value"
256
263
  size="small"
264
+ :picker-options="item.pickerOptions && pickerOptions"
257
265
  range-separator="至"
258
266
  start-placeholder="开始日期"
259
267
  end-placeholder="结束日期"
@@ -286,6 +294,7 @@
286
294
  type="datetimerange"
287
295
  v-model="item.value"
288
296
  size="small"
297
+ :picker-options="item.pickerOptions && pickerOptions"
289
298
  :format="item.format ? item.format : 'yyyy-MM-dd HH:mm:ss'"
290
299
  :default-time="['00:00:00', '23:59:59']"
291
300
  :unlink-panels="true"
@@ -457,6 +466,10 @@ export default {
457
466
  // 自定义条件标签的显示
458
467
  type: Boolean,
459
468
  default: false
469
+ },
470
+ maxConditionLength: {
471
+ type: Number,
472
+ default: 4
460
473
  }
461
474
  },
462
475
  data() {
@@ -464,13 +477,51 @@ export default {
464
477
  keyword: '',
465
478
  currentSearchList: [],
466
479
  shrinkFilterList: false,
467
- maxConditionLength: 4,
468
480
  conditionList: [],
469
481
  conditionValue: '',
470
482
  currentData: {},
471
483
  dialogConditionVisible: false,
472
484
  hasSetDefaultTag: false, // 是否设置过默认tag
473
- tagList: []
485
+ tagList: [],
486
+ pickerOptions: {
487
+ shortcuts: [
488
+ {
489
+ text: '今日',
490
+ onClick(picker) {
491
+ const end = new Date(new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000 - 1) // 今日23:59:59的时间
492
+ const start = new Date(new Date().setHours(0, 0, 0, 0)) // 今日0点
493
+ picker.$emit('pick', [start, end])
494
+ }
495
+ },
496
+ {
497
+ text: '最近三天',
498
+ onClick(picker) {
499
+ const end = new Date()
500
+ const start = new Date()
501
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 3)
502
+ picker.$emit('pick', [start, end])
503
+ }
504
+ },
505
+ {
506
+ text: '最近一周',
507
+ onClick(picker) {
508
+ const end = new Date()
509
+ const start = new Date()
510
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
511
+ picker.$emit('pick', [start, end])
512
+ }
513
+ },
514
+ {
515
+ text: '最近一个月',
516
+ onClick(picker) {
517
+ const end = new Date()
518
+ const start = new Date()
519
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
520
+ picker.$emit('pick', [start, end])
521
+ }
522
+ }
523
+ ]
524
+ }
474
525
  }
475
526
  },
476
527
  computed: {},
package/packages/table/src/table.vue CHANGED
@@ -598,7 +598,7 @@ export default {
598
598
  }
599
599
  .el-table__empty-block {
600
600
  position: absolute!important;
601
- height: calc(100% - 40px)!important;
601
+ height: calc(100% - 60px)!important;
602
602
  }
603
603
 
604
604
  // .el-table::before {