@easyv/config 1.2.9 → 1.2.11

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/lib/label.js CHANGED
@@ -645,7 +645,7 @@ var axisLabel = function axisLabel() {
645
645
  displayName: "显示最新",
646
646
  value: showLast,
647
647
  type: "boolean",
648
- tip: "显示返回最新数据的轴标签"
648
+ tip: "开启后会必定展示首尾日期的数据,但可能会导致标签数量和预期不一致"
649
649
  }, (0, _.sc)("autoSort", "自动排序", "boolean", autoSort, {
650
650
  other: {
651
651
  tip: "数据按时间自动排序展示"
package/lib/tooltip.js CHANGED
@@ -14,7 +14,9 @@ var defaultTooltip = {
14
14
  x: 0,
15
15
  y: 0
16
16
  },
17
- image: '',
17
+ bgType: 'image',
18
+ bgColor: 'rgba(48, 55, 66, 0.85)',
19
+ image: 'components/static-image/vectorShapeV2/tipboxBg.png',
18
20
  size: {
19
21
  width: 120,
20
22
  height: 110
@@ -27,6 +29,8 @@ var defaultTooltip = {
27
29
  },
28
30
  data: {
29
31
  xAxis: {
32
+ background: "",
33
+ gap: 5,
30
34
  font: {
31
35
  fontFamily: 'Mircosoft Yahei',
32
36
  fontSize: 16,
@@ -43,7 +47,9 @@ var defaultTooltip = {
43
47
  },
44
48
  data: {
45
49
  lineHeight: 18,
50
+ gap: 5,
46
51
  iconSize: 10,
52
+ background: "",
47
53
  num: "",
48
54
  name: {
49
55
  fontFamily: 'Mircosoft Yahei',
@@ -99,6 +105,10 @@ var _default = function _default() {
99
105
  tipTranslateX = _ref$tip$translate$x === void 0 ? defaultTooltip.tip.translate.x : _ref$tip$translate$x,
100
106
  _ref$tip$translate$y = _ref$tip$translate.y,
101
107
  tipTranslateY = _ref$tip$translate$y === void 0 ? defaultTooltip.tip.translate.y : _ref$tip$translate$y,
108
+ _ref$tip$bgType = _ref$tip.bgType,
109
+ bgType = _ref$tip$bgType === void 0 ? defaultTooltip.tip.bgType : _ref$tip$bgType,
110
+ _ref$tip$bgColor = _ref$tip.bgColor,
111
+ bgColor = _ref$tip$bgColor === void 0 ? defaultTooltip.tip.bgColor : _ref$tip$bgColor,
102
112
  _ref$tip$image = _ref$tip.image,
103
113
  image = _ref$tip$image === void 0 ? defaultTooltip.tip.image : _ref$tip$image,
104
114
  _ref$tip$size = _ref$tip.size;
@@ -121,7 +131,11 @@ var _default = function _default() {
121
131
  _ref$tip$data = _ref$tip$data === void 0 ? defaultTooltip.tip.data : _ref$tip$data;
122
132
  var _ref$tip$data$xAxis = _ref$tip$data.xAxis;
123
133
  _ref$tip$data$xAxis = _ref$tip$data$xAxis === void 0 ? defaultTooltip.tip.data.xAxis : _ref$tip$data$xAxis;
124
- var _ref$tip$data$xAxis$f = _ref$tip$data$xAxis.font;
134
+ var _ref$tip$data$xAxis$b = _ref$tip$data$xAxis.background,
135
+ xAxisBg = _ref$tip$data$xAxis$b === void 0 ? defaultTooltip.tip.data.xAxis.background : _ref$tip$data$xAxis$b,
136
+ _ref$tip$data$xAxis$g = _ref$tip$data$xAxis.gap,
137
+ xAxisGap = _ref$tip$data$xAxis$g === void 0 ? defaultTooltip.tip.data.xAxis.gap : _ref$tip$data$xAxis$g,
138
+ _ref$tip$data$xAxis$f = _ref$tip$data$xAxis.font;
125
139
  _ref$tip$data$xAxis$f = _ref$tip$data$xAxis$f === void 0 ? defaultTooltip.tip.data.xAxis.font : _ref$tip$data$xAxis$f;
126
140
  var xAxisFontFamily = _ref$tip$data$xAxis$f.fontFamily,
127
141
  xAxisFontSize = _ref$tip$data$xAxis$f.fontSize,
@@ -139,10 +153,14 @@ var _default = function _default() {
139
153
  _ref$tip$data$data = _ref$tip$data$data === void 0 ? defaultTooltip.tip.data.data : _ref$tip$data$data;
140
154
  var _ref$tip$data$data$li = _ref$tip$data$data.lineHeight,
141
155
  lineHeight = _ref$tip$data$data$li === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip$data$data$li,
156
+ _ref$tip$data$data$ga = _ref$tip$data$data.gap,
157
+ dataGap = _ref$tip$data$data$ga === void 0 ? defaultTooltip.tip.data.gap : _ref$tip$data$data$ga,
142
158
  _ref$tip$data$data$ic = _ref$tip$data$data.iconSize,
143
159
  iconSize = _ref$tip$data$data$ic === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip$data$data$ic,
144
160
  _ref$tip$data$data$nu = _ref$tip$data$data.num,
145
161
  num = _ref$tip$data$data$nu === void 0 ? defaultTooltip.tip.data.num : _ref$tip$data$data$nu,
162
+ _ref$tip$data$data$ba = _ref$tip$data$data.background,
163
+ dataBg = _ref$tip$data$data$ba === void 0 ? defaultTooltip.tip.data.background : _ref$tip$data$data$ba,
146
164
  _ref$tip$data$data$na = _ref$tip$data$data.name;
147
165
  _ref$tip$data$data$na = _ref$tip$data$data$na === void 0 ? defaultTooltip.tip.data.data.name : _ref$tip$data$data$na;
148
166
  var nameFontFamily = _ref$tip$data$data$na.fontFamily,
@@ -201,9 +219,30 @@ var _default = function _default() {
201
219
  name: 'tip',
202
220
  displayName: '提示框',
203
221
  value: [(0, _.translate)(tipTranslateX, tipTranslateY), {
222
+ name: "bgType",
223
+ displayName: "背景类型",
224
+ type: "radio",
225
+ value: bgType,
226
+ config: {
227
+ options: [{
228
+ name: "颜色",
229
+ value: "color"
230
+ }, {
231
+ name: "图片",
232
+ value: "image"
233
+ }]
234
+ }
235
+ }, {
236
+ rule: [["bgType", "$eq", "color"]],
237
+ name: "bgColor",
238
+ displayName: "颜色",
239
+ type: "color",
240
+ value: bgColor
241
+ }, {
242
+ rule: [["bgType", "$eq", "image"]],
204
243
  type: 'uploadImage',
205
244
  name: 'image',
206
- displayName: '背景',
245
+ displayName: '图片',
207
246
  value: image
208
247
  }, {
209
248
  name: 'size',
@@ -238,6 +277,16 @@ var _default = function _default() {
238
277
  name: 'xAxis',
239
278
  displayName: '类目标签',
240
279
  value: [{
280
+ name: "background",
281
+ displayName: "背景图",
282
+ type: "image",
283
+ value: xAxisBg
284
+ }, {
285
+ name: "gap",
286
+ displayName: "下间距",
287
+ type: "number",
288
+ value: xAxisGap
289
+ }, {
241
290
  name: 'font',
242
291
  displayName: '文本样式',
243
292
  value: {
@@ -276,15 +325,25 @@ var _default = function _default() {
276
325
  displayName: '数据',
277
326
  name: 'data',
278
327
  value: [{
279
- displayName: '行间距',
328
+ displayName: '行高',
280
329
  type: 'number',
281
330
  value: lineHeight,
282
331
  name: 'lineHeight'
332
+ }, {
333
+ displayName: '行间距',
334
+ type: 'number',
335
+ value: dataGap,
336
+ name: 'gap'
283
337
  }, {
284
338
  displayName: '图标尺寸',
285
339
  type: 'number',
286
340
  value: iconSize,
287
341
  name: 'iconSize'
342
+ }, {
343
+ name: "background",
344
+ displayName: "背景图",
345
+ type: "image",
346
+ value: dataBg
288
347
  }, {
289
348
  displayName: "保留小数",
290
349
  type: "input",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@easyv/config",
3
- "version": "1.2.9",
3
+ "version": "1.2.11",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/label.js CHANGED
@@ -655,7 +655,7 @@ export const axisLabel = ({
655
655
  displayName: "显示最新",
656
656
  value: showLast,
657
657
  type: "boolean",
658
- tip: "显示返回最新数据的轴标签",
658
+ tip: "开启后会必定展示首尾日期的数据,但可能会导致标签数量和预期不一致",
659
659
  },
660
660
  sc(
661
661
  "autoSort",
package/src/tooltip.js CHANGED
@@ -5,7 +5,9 @@ const defaultTooltip = {
5
5
  interval: 4,
6
6
  tip: {
7
7
  translate: { x: 0, y: 0 },
8
- image: '',
8
+ bgType: 'image',
9
+ bgColor: 'rgba(48, 55, 66, 0.85)',
10
+ image: 'components/static-image/vectorShapeV2/tipboxBg.png',
9
11
  size: { width: 120, height: 110 },
10
12
  margin: {
11
13
  marginTop: 13,
@@ -15,6 +17,8 @@ const defaultTooltip = {
15
17
  },
16
18
  data: {
17
19
  xAxis: {
20
+ background:"",
21
+ gap:5,
18
22
  font: {
19
23
  fontFamily: 'Mircosoft Yahei',
20
24
  fontSize: 16,
@@ -26,10 +30,11 @@ const defaultTooltip = {
26
30
  align: 'left',
27
31
  translate: { x: 0, y: 0 },
28
32
  },
29
-
30
33
  data: {
31
34
  lineHeight: 18,
35
+ gap:5,
32
36
  iconSize: 10,
37
+ background:"",
33
38
  num:"",
34
39
  name: {
35
40
  fontFamily: 'Mircosoft Yahei',
@@ -72,10 +77,12 @@ export default ({
72
77
  x: tipTranslateX = defaultTooltip.tip.translate.x,
73
78
  y: tipTranslateY = defaultTooltip.tip.translate.y,
74
79
  } = defaultTooltip.tip.translate,
80
+ bgType = defaultTooltip.tip.bgType,
81
+ bgColor = defaultTooltip.tip.bgColor,
75
82
  image = defaultTooltip.tip.image,
76
83
  size: {
77
84
  width: tipWidth = defaultTooltip.tip.size.width,
78
- height: tipHeight = defaultTooltip.tip.size.height,
85
+ height: tipHeight = defaultTooltip.tip.size.height
79
86
  } = defaultTooltip.tip.size,
80
87
  margin: {
81
88
  marginTop = defaultTooltip.tip.margin.marginTop,
@@ -85,6 +92,8 @@ export default ({
85
92
  } = defaultTooltip.tip.margin,
86
93
  data: {
87
94
  xAxis: {
95
+ background:xAxisBg = defaultTooltip.tip.data.xAxis.background,
96
+ gap:xAxisGap = defaultTooltip.tip.data.xAxis.gap,
88
97
  font: {
89
98
  fontFamily: xAxisFontFamily,
90
99
  fontSize: xAxisFontSize,
@@ -100,8 +109,10 @@ export default ({
100
109
  // iconSize = defaultTooltip.tip.data.iconSize,
101
110
  data: {
102
111
  lineHeight = defaultTooltip.tip.data.lineHeight,
112
+ gap:dataGap = defaultTooltip.tip.data.gap,
103
113
  iconSize = defaultTooltip.tip.data.iconSize,
104
114
  num = defaultTooltip.tip.data.num,
115
+ background:dataBg = defaultTooltip.tip.data.background,
105
116
  name: {
106
117
  fontFamily: nameFontFamily,
107
118
  fontSize: nameFontSize,
@@ -167,9 +178,29 @@ export default ({
167
178
  value: [
168
179
  translate(tipTranslateX, tipTranslateY),
169
180
  {
181
+ name:"bgType",
182
+ displayName:"背景类型",
183
+ type:"radio",
184
+ value:bgType,
185
+ config:{
186
+ options:[
187
+ {name:"颜色",value:"color"},
188
+ {name:"图片",value:"image"}
189
+ ]
190
+ }
191
+ },
192
+ {
193
+ rule:[["bgType","$eq","color"]],
194
+ name:"bgColor",
195
+ displayName:"颜色",
196
+ type:"color",
197
+ value:bgColor
198
+ },
199
+ {
200
+ rule:[["bgType","$eq","image"]],
170
201
  type: 'uploadImage',
171
202
  name: 'image',
172
- displayName: '背景',
203
+ displayName: '图片',
173
204
  value: image,
174
205
  },
175
206
  {
@@ -193,7 +224,7 @@ export default ({
193
224
  span: 12,
194
225
  suffix: 'H',
195
226
  },
196
- },
227
+ }
197
228
  ],
198
229
  type: 'group',
199
230
  },
@@ -211,6 +242,18 @@ export default ({
211
242
  name: 'xAxis',
212
243
  displayName: '类目标签',
213
244
  value: [
245
+ {
246
+ name:"background",
247
+ displayName:"背景图",
248
+ type:"image",
249
+ value:xAxisBg
250
+ },
251
+ {
252
+ name:"gap",
253
+ displayName:"下间距",
254
+ type:"number",
255
+ value:xAxisGap
256
+ },
214
257
  {
215
258
  name: 'font',
216
259
  displayName: '文本样式',
@@ -255,17 +298,29 @@ export default ({
255
298
  name: 'data',
256
299
  value: [
257
300
  {
258
- displayName: '行间距',
301
+ displayName: '行高',
259
302
  type: 'number',
260
303
  value: lineHeight,
261
304
  name: 'lineHeight',
262
305
  },
306
+ {
307
+ displayName: '行间距',
308
+ type: 'number',
309
+ value: dataGap,
310
+ name: 'gap',
311
+ },
263
312
  {
264
313
  displayName: '图标尺寸',
265
314
  type: 'number',
266
315
  value: iconSize,
267
316
  name: 'iconSize',
268
317
  },
318
+ {
319
+ name:"background",
320
+ displayName:"背景图",
321
+ type:"image",
322
+ value:dataBg
323
+ },
269
324
  {
270
325
  displayName:"保留小数",
271
326
  type:"input",