evui 3.4.19 → 3.4.21

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "evui",
3
- "version": "3.4.19",
3
+ "version": "3.4.21",
4
4
  "description": "A EXEM Library project",
5
5
  "author": "exem <dev_client@ex-em.com>",
6
6
  "license": "MIT",
@@ -34,7 +34,6 @@ export default {
34
34
  type: {
35
35
  type: String,
36
36
  default: 'default',
37
- validator: val => ['default', 'primary', 'info', 'warning', 'error', 'ghost', 'dashed', 'text'].includes(val),
38
37
  },
39
38
  htmlType: {
40
39
  type: String,
@@ -44,12 +43,10 @@ export default {
44
43
  shape: {
45
44
  type: String,
46
45
  default: 'square',
47
- validator: val => ['square', 'radius', 'circle'].includes(val),
48
46
  },
49
47
  size: {
50
48
  type: String,
51
49
  default: 'medium',
52
- validator: val => ['small', 'medium', 'large'].includes(val),
53
50
  },
54
51
  },
55
52
  emits: {
@@ -85,10 +85,6 @@ class Line {
85
85
  ctx.lineWidth = lineWidth;
86
86
  ctx.strokeStyle = Util.colorStringToRgba(mainColor, mainColorOpacity);
87
87
 
88
- if (this.fill) {
89
- ctx.fillStyle = Util.colorStringToRgba(mainColor, fillOpacity);
90
- }
91
-
92
88
  let startFillIndex = 0;
93
89
  const endPoint = chartRect.y2 - labelOffset.bottom;
94
90
 
@@ -146,7 +142,27 @@ class Line {
146
142
  if (this.fill && this.data.length) {
147
143
  ctx.beginPath();
148
144
 
149
- ctx.fillStyle = Util.colorStringToRgba(mainColor, fillOpacity);
145
+ const fillColor = Util.colorStringToRgba(mainColor, fillOpacity);
146
+
147
+ if (this.fill?.gradient) {
148
+ let maxValueYPos = this.data[0].yp;
149
+ let minValueYBottomPos = this.data[0].y;
150
+ this.data.forEach((data) => {
151
+ if (data.yp && data.yp <= maxValueYPos) {
152
+ maxValueYPos = data.yp;
153
+ } else if (data.y && data.y >= minValueYBottomPos) {
154
+ minValueYBottomPos = data.y;
155
+ }
156
+ });
157
+ const gradient = ctx.createLinearGradient(0, chartRect.y2, 0, maxValueYPos);
158
+ gradient.addColorStop(0, fillColor);
159
+ gradient.addColorStop(0.5, fillColor);
160
+ gradient.addColorStop(1, (extent.opacity < 1 ? fillColor : mainColor));
161
+
162
+ ctx.fillStyle = gradient;
163
+ } else {
164
+ ctx.fillStyle = fillColor;
165
+ }
150
166
 
151
167
  this.data.forEach((currData, ix) => {
152
168
  const isEmptyPoint = data => data?.x === null || data?.y === null
@@ -13,6 +13,13 @@
13
13
  class="filtering"
14
14
  :style="{ width: `${filteringItemsWidth}px` }"
15
15
  >
16
+ <div
17
+ v-if="isFiltering && !Object.keys(filteringItemsByColumn).length"
18
+ class="filtering-items filtering-items--used"
19
+ >
20
+ <ev-icon icon="ev-icon-filter-list" />
21
+ <span>Filter</span>
22
+ </div>
16
23
  <div
17
24
  v-if="isFiltering && Object.keys(filteringItemsByColumn).length"
18
25
  ref="filteringItemsRef"
@@ -874,7 +881,9 @@ export default {
874
881
  contextInfo.menu?.hide(e);
875
882
  }
876
883
  if (e.type === 'scroll' && !e.target.classList?.contains('table-body')
877
- && !e.target.offsetParent?.classList?.contains('ev-grid-column-setting')) {
884
+ && !e.target.offsetParent?.classList?.contains('ev-select-dropbox')
885
+ && !e.target.offsetParent?.classList?.contains('ev-grid-column-setting')
886
+ && !e.target.offsetParent?.classList?.contains('ev-text-field-wrapper')) {
878
887
  contextInfo.columnMenu?.hide(e);
879
888
  columnSettingInfo.isShowColumnSetting = false;
880
889
  filterInfo.isShowFilterSetting = false;
@@ -26,7 +26,7 @@ export default {
26
26
  }
27
27
  .gridToolbar > .column-setting__icon {
28
28
  float: right;
29
- margin: 0 5px;
29
+ margin: 10px 5px;
30
30
  cursor: pointer;
31
31
  &:hover {
32
32
  opacity: 0.6;
@@ -316,7 +316,9 @@
316
316
  border: 1px solid #198FFF;
317
317
  color: #198FFF;
318
318
  i {
319
- vertical-align: middle;
319
+ &:not(.filtering-items-expand) {
320
+ vertical-align: middle;
321
+ }
320
322
  }
321
323
  }
322
324
  &--title {
@@ -21,7 +21,6 @@ export default {
21
21
  size: {
22
22
  type: String,
23
23
  default: '',
24
- validator: val => ['', 'small', 'medium', 'large'].includes(val),
25
24
  },
26
25
  },
27
26
  emits: {
@@ -26,7 +26,7 @@ export default {
26
26
  }
27
27
  .tree-grid-toolbar > .column-setting__icon {
28
28
  float: right;
29
- margin: 0 5px;
29
+ margin: 10px 5px;
30
30
  cursor: pointer;
31
31
  &:hover {
32
32
  opacity: 0.6;