@easyv/config 1.3.8 → 1.3.10

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 (5) hide show
  1. package/lib/pieTooltip.js +47 -32
  2. package/lib/tooltip.js +146 -131
  3. package/package.json +1 -1
  4. package/src/pieTooltip.js +51 -35
  5. package/src/tooltip.js +169 -153
package/lib/pieTooltip.js CHANGED
@@ -26,6 +26,8 @@ var defaultTooltip = {
26
26
  data: {
27
27
  lineHeight: 18,
28
28
  iconSize: 10,
29
+ iconGapName: 4,
30
+ nameGapData: 10,
29
31
  num: "",
30
32
  name: {
31
33
  fontFamily: "SourceHanSansCN-Medium",
@@ -86,12 +88,6 @@ var _default = function _default() {
86
88
  tipTranslateY = _ref$tip$translate$y === void 0 ? defaultTooltip.tip.translate.y : _ref$tip$translate$y,
87
89
  _ref$tip$image = _ref$tip.image,
88
90
  image = _ref$tip$image === void 0 ? defaultTooltip.tip.image : _ref$tip$image,
89
- _ref$tip$size = _ref$tip.size;
90
- _ref$tip$size = _ref$tip$size === void 0 ? defaultTooltip.tip.size : _ref$tip$size;
91
- var _ref$tip$size$width = _ref$tip$size.width,
92
- tipWidth = _ref$tip$size$width === void 0 ? defaultTooltip.tip.size.width : _ref$tip$size$width,
93
- _ref$tip$size$height = _ref$tip$size.height,
94
- tipHeight = _ref$tip$size$height === void 0 ? defaultTooltip.tip.size.height : _ref$tip$size$height,
95
91
  _ref$tip$margin = _ref$tip.margin;
96
92
  _ref$tip$margin = _ref$tip$margin === void 0 ? defaultTooltip.tip.margin : _ref$tip$margin;
97
93
  var _ref$tip$margin$margi = _ref$tip$margin.marginTop,
@@ -106,7 +102,11 @@ var _default = function _default() {
106
102
  _ref$tip$data$lineHei = _ref$tip$data.lineHeight,
107
103
  lineHeight = _ref$tip$data$lineHei === void 0 ? defaultTooltip.tip.data.lineHeight : _ref$tip$data$lineHei,
108
104
  _ref$tip$data$iconSiz = _ref$tip$data.iconSize,
109
- iconSize = _ref$tip$data$iconSiz === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip$data$iconSiz,
105
+ iconSize = _ref$tip$data$iconSiz === void 0 ? defaultTooltip.tip.data.iconGapName : _ref$tip$data$iconSiz,
106
+ _ref$tip$data$iconGap = _ref$tip$data.iconGapName,
107
+ iconGapName = _ref$tip$data$iconGap === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip$data$iconGap,
108
+ _ref$tip$data$nameGap = _ref$tip$data.nameGapData,
109
+ nameGapData = _ref$tip$data$nameGap === void 0 ? defaultTooltip.tip.data.nameGapData : _ref$tip$data$nameGap,
110
110
  _ref$tip$data$num = _ref$tip$data.num,
111
111
  num = _ref$tip$data$num === void 0 ? defaultTooltip.tip.data.num : _ref$tip$data$num,
112
112
  _ref$tip$data$name = _ref$tip$data.name;
@@ -161,28 +161,33 @@ var _default = function _default() {
161
161
  name: "image",
162
162
  displayName: "背景",
163
163
  value: image
164
- }, {
165
- name: "size",
166
- displayName: "尺寸",
167
- value: [{
168
- name: "width",
169
- displayName: "宽度",
170
- value: tipWidth,
171
- config: {
172
- span: 12,
173
- suffix: "W"
174
- }
175
- }, {
176
- name: "height",
177
- displayName: "高度",
178
- value: tipHeight,
179
- config: {
180
- span: 12,
181
- suffix: "H"
182
- }
183
- }],
184
- type: "group"
185
- }, (0, _.margin)({
164
+ },
165
+ // {
166
+ // name: "size",
167
+ // displayName: "尺寸",
168
+ // value: [
169
+ // {
170
+ // name: "width",
171
+ // displayName: "宽度",
172
+ // value: tipWidth,
173
+ // config: {
174
+ // span: 12,
175
+ // suffix: "W",
176
+ // },
177
+ // },
178
+ // {
179
+ // name: "height",
180
+ // displayName: "高度",
181
+ // value: tipHeight,
182
+ // config: {
183
+ // span: 12,
184
+ // suffix: "H",
185
+ // },
186
+ // },
187
+ // ],
188
+ // type: "group",
189
+ // },
190
+ (0, _.margin)({
186
191
  marginTop: marginTop,
187
192
  marginRight: marginRight,
188
193
  marginBottom: marginBottom,
@@ -195,6 +200,16 @@ var _default = function _default() {
195
200
  type: "number",
196
201
  value: iconSize,
197
202
  name: "iconSize"
203
+ }, {
204
+ displayName: "图标间距",
205
+ type: "number",
206
+ value: iconGapName,
207
+ name: "iconGapName"
208
+ }, {
209
+ displayName: "数据间距",
210
+ type: "number",
211
+ value: nameGapData,
212
+ name: "nameGapData"
198
213
  }, {
199
214
  name: "name",
200
215
  displayName: "系列名称",
@@ -266,10 +281,10 @@ var _default = function _default() {
266
281
  value: true,
267
282
  type: "boolean"
268
283
  }, {
269
- name: 'precision',
270
- displayName: '小数位数',
284
+ name: "precision",
285
+ displayName: "小数位数",
271
286
  value: 0,
272
- type: 'input',
287
+ type: "input",
273
288
  config: {
274
289
  min: 0,
275
290
  step: 1
package/lib/tooltip.js CHANGED
@@ -14,9 +14,9 @@ var defaultTooltip = {
14
14
  x: 0,
15
15
  y: 0
16
16
  },
17
- bgType: 'image',
18
- bgColor: 'rgba(48, 55, 66, 0.85)',
19
- image: 'components/static-image/vectorShapeV2/tipboxBg.png',
17
+ bgType: "image",
18
+ bgColor: "rgba(48, 55, 66, 0.85)",
19
+ image: "components/static-image/vectorShapeV2/tipboxBg.png",
20
20
  size: {
21
21
  width: 120,
22
22
  height: 110
@@ -32,14 +32,14 @@ var defaultTooltip = {
32
32
  background: "",
33
33
  gap: 5,
34
34
  font: {
35
- fontFamily: 'SourceHanSansCN-Medium',
35
+ fontFamily: "SourceHanSansCN-Medium",
36
36
  fontSize: 16,
37
- color: '#E6F6FF',
37
+ color: "#E6F6FF",
38
38
  bold: false,
39
39
  italic: false,
40
40
  letterSpacing: 0
41
41
  },
42
- align: 'left',
42
+ align: "left",
43
43
  translate: {
44
44
  x: 0,
45
45
  y: 0
@@ -49,29 +49,31 @@ var defaultTooltip = {
49
49
  lineHeight: 18,
50
50
  gap: 5,
51
51
  iconSize: 10,
52
+ iconGapName: 0,
53
+ nameGapData: 10,
52
54
  background: "",
53
55
  num: "",
54
56
  name: {
55
- fontFamily: 'SourceHanSansCN-Medium',
57
+ fontFamily: "SourceHanSansCN-Medium",
56
58
  fontSize: 12,
57
- color: '#C8E7FF',
59
+ color: "#C8E7FF",
58
60
  bold: false,
59
61
  italic: false,
60
62
  letterSpacing: 0
61
63
  },
62
64
  value: {
63
- fontFamily: 'SourceHanSansCN-Medium',
65
+ fontFamily: "SourceHanSansCN-Medium",
64
66
  fontSize: 12,
65
- color: '#D4EFFC',
67
+ color: "#D4EFFC",
66
68
  bold: false,
67
69
  italic: false,
68
70
  letterSpacing: 0
69
71
  },
70
72
  suffix: {
71
73
  font: {
72
- fontFamily: 'SourceHanSansCN-Medium',
74
+ fontFamily: "SourceHanSansCN-Medium",
73
75
  fontSize: 12,
74
- color: '#D4EFFC',
76
+ color: "#D4EFFC",
75
77
  bold: false,
76
78
  italic: false,
77
79
  letterSpacing: 0
@@ -87,7 +89,7 @@ var defaultTooltip = {
87
89
  indicator: {
88
90
  zIndex: "bottom",
89
91
  width: 12,
90
- color: 'RGBA(255,255,255,0.3)'
92
+ color: "RGBA(255,255,255,0.3)"
91
93
  }
92
94
  };
93
95
  var _default = function _default() {
@@ -112,12 +114,6 @@ var _default = function _default() {
112
114
  bgColor = _ref$tip$bgColor === void 0 ? defaultTooltip.tip.bgColor : _ref$tip$bgColor,
113
115
  _ref$tip$image = _ref$tip.image,
114
116
  image = _ref$tip$image === void 0 ? defaultTooltip.tip.image : _ref$tip$image,
115
- _ref$tip$size = _ref$tip.size;
116
- _ref$tip$size = _ref$tip$size === void 0 ? defaultTooltip.tip.size : _ref$tip$size;
117
- var _ref$tip$size$width = _ref$tip$size.width,
118
- tipWidth = _ref$tip$size$width === void 0 ? defaultTooltip.tip.size.width : _ref$tip$size$width,
119
- _ref$tip$size$height = _ref$tip$size.height,
120
- tipHeight = _ref$tip$size$height === void 0 ? defaultTooltip.tip.size.height : _ref$tip$size$height,
121
117
  _ref$tip$margin = _ref$tip.margin;
122
118
  _ref$tip$margin = _ref$tip$margin === void 0 ? defaultTooltip.tip.margin : _ref$tip$margin;
123
119
  var _ref$tip$margin$margi = _ref$tip$margin.marginTop,
@@ -158,18 +154,22 @@ var _default = function _default() {
158
154
  dataGap = _ref$tip$data$data$ga === void 0 ? defaultTooltip.tip.data.gap : _ref$tip$data$data$ga,
159
155
  _ref$tip$data$data$ic = _ref$tip$data$data.iconSize,
160
156
  iconSize = _ref$tip$data$data$ic === void 0 ? defaultTooltip.tip.data.iconSize : _ref$tip$data$data$ic,
157
+ _ref$tip$data$data$ic2 = _ref$tip$data$data.iconGapName,
158
+ iconGapName = _ref$tip$data$data$ic2 === void 0 ? defaultTooltip.tip.data.iconGapName : _ref$tip$data$data$ic2,
159
+ _ref$tip$data$data$na = _ref$tip$data$data.nameGapData,
160
+ nameGapData = _ref$tip$data$data$na === void 0 ? defaultTooltip.tip.data.nameGapData : _ref$tip$data$data$na,
161
161
  _ref$tip$data$data$nu = _ref$tip$data$data.num,
162
162
  num = _ref$tip$data$data$nu === void 0 ? defaultTooltip.tip.data.num : _ref$tip$data$data$nu,
163
163
  _ref$tip$data$data$ba = _ref$tip$data$data.background,
164
164
  dataBg = _ref$tip$data$data$ba === void 0 ? defaultTooltip.tip.data.background : _ref$tip$data$data$ba,
165
- _ref$tip$data$data$na = _ref$tip$data$data.name;
166
- _ref$tip$data$data$na = _ref$tip$data$data$na === void 0 ? defaultTooltip.tip.data.data.name : _ref$tip$data$data$na;
167
- var nameFontFamily = _ref$tip$data$data$na.fontFamily,
168
- nameFontSize = _ref$tip$data$data$na.fontSize,
169
- nameColor = _ref$tip$data$data$na.color,
170
- nameBold = _ref$tip$data$data$na.bold,
171
- nameItalic = _ref$tip$data$data$na.italic,
172
- nameLetterSpacing = _ref$tip$data$data$na.letterSpacing,
165
+ _ref$tip$data$data$na2 = _ref$tip$data$data.name;
166
+ _ref$tip$data$data$na2 = _ref$tip$data$data$na2 === void 0 ? defaultTooltip.tip.data.data.name : _ref$tip$data$data$na2;
167
+ var nameFontFamily = _ref$tip$data$data$na2.fontFamily,
168
+ nameFontSize = _ref$tip$data$data$na2.fontSize,
169
+ nameColor = _ref$tip$data$data$na2.color,
170
+ nameBold = _ref$tip$data$data$na2.bold,
171
+ nameItalic = _ref$tip$data$data$na2.italic,
172
+ nameLetterSpacing = _ref$tip$data$data$na2.letterSpacing,
173
173
  _ref$tip$data$data$va = _ref$tip$data$data.value;
174
174
  _ref$tip$data$data$va = _ref$tip$data$data$va === void 0 ? defaultTooltip.tip.data.data.value : _ref$tip$data$data$va;
175
175
  var valueFontFamily = _ref$tip$data$data$va.fontFamily,
@@ -197,30 +197,30 @@ var _default = function _default() {
197
197
  _ref$indicator$color = _ref$indicator.color,
198
198
  color = _ref$indicator$color === void 0 ? defaultTooltip.indicator.color : _ref$indicator$color;
199
199
  return {
200
- name: 'tooltip',
201
- displayName: '提示框',
200
+ name: "tooltip",
201
+ displayName: "提示框",
202
202
  value: [{
203
- name: 'auto',
204
- displayName: '自动轮播',
203
+ name: "auto",
204
+ displayName: "自动轮播",
205
205
  value: auto,
206
- type: 'boolean'
206
+ type: "boolean"
207
207
  }, {
208
- name: 'manual',
209
- displayName: '悬停触发',
208
+ name: "manual",
209
+ displayName: "悬停触发",
210
210
  value: manual,
211
- type: 'boolean'
211
+ type: "boolean"
212
212
  }, {
213
- rule: [['auto', '$eq', true]],
214
- name: 'interval',
215
- displayName: '停留时间',
213
+ rule: [["auto", "$eq", true]],
214
+ name: "interval",
215
+ displayName: "停留时间",
216
216
  value: interval,
217
- type: 'number',
217
+ type: "number",
218
218
  config: {
219
- suffix: 's'
219
+ suffix: "s"
220
220
  }
221
221
  }, {
222
- name: 'tip',
223
- displayName: '提示框',
222
+ name: "tip",
223
+ displayName: "提示框",
224
224
  value: [(0, _.translate)(tipTranslateX, tipTranslateY), {
225
225
  name: "bgType",
226
226
  displayName: "背景类型",
@@ -243,42 +243,47 @@ var _default = function _default() {
243
243
  value: bgColor
244
244
  }, {
245
245
  rule: [["bgType", "$eq", "image"]],
246
- type: 'uploadImage',
247
- name: 'image',
248
- displayName: '图片',
246
+ type: "uploadImage",
247
+ name: "image",
248
+ displayName: "图片",
249
249
  value: image
250
- }, {
251
- name: 'size',
252
- displayName: '尺寸',
253
- value: [{
254
- name: 'width',
255
- displayName: '宽度',
256
- value: tipWidth,
257
- config: {
258
- span: 12,
259
- suffix: 'W'
260
- }
261
- }, {
262
- name: 'height',
263
- displayName: '高度',
264
- value: tipHeight,
265
- config: {
266
- span: 12,
267
- suffix: 'H'
268
- }
269
- }],
270
- type: 'group'
271
- }, (0, _.margin)({
250
+ },
251
+ // {
252
+ // name: 'size',
253
+ // displayName: '尺寸',
254
+ // value: [
255
+ // {
256
+ // name: 'width',
257
+ // displayName: '宽度',
258
+ // value: tipWidth,
259
+ // config: {
260
+ // span: 12,
261
+ // suffix: 'W',
262
+ // },
263
+ // },
264
+ // {
265
+ // name: 'height',
266
+ // displayName: '高度',
267
+ // value: tipHeight,
268
+ // config: {
269
+ // span: 12,
270
+ // suffix: 'H',
271
+ // },
272
+ // }
273
+ // ],
274
+ // type: 'group',
275
+ // },
276
+ (0, _.margin)({
272
277
  marginTop: marginTop,
273
278
  marginRight: marginRight,
274
279
  marginBottom: marginBottom,
275
280
  marginLeft: marginLeft
276
281
  }), {
277
- name: 'data',
278
- displayName: '框内数据',
282
+ name: "data",
283
+ displayName: "框内数据",
279
284
  value: [{
280
- name: 'xAxis',
281
- displayName: '类目标签',
285
+ name: "xAxis",
286
+ displayName: "类目标签",
282
287
  value: [{
283
288
  name: "background",
284
289
  displayName: "背景图",
@@ -290,8 +295,8 @@ var _default = function _default() {
290
295
  type: "number",
291
296
  value: xAxisGap
292
297
  }, {
293
- name: 'font',
294
- displayName: '文本样式',
298
+ name: "font",
299
+ displayName: "文本样式",
295
300
  value: {
296
301
  fontFamily: xAxisFontFamily,
297
302
  fontSize: xAxisFontSize,
@@ -300,48 +305,58 @@ var _default = function _default() {
300
305
  italic: xAxisItalic,
301
306
  letterSpacing: xAxisLetterSpacing
302
307
  },
303
- type: 'textStyle',
304
- markColorType: 'textColor'
308
+ type: "textStyle",
309
+ markColorType: "textColor"
305
310
  }, {
306
- name: 'align',
307
- displayName: '对齐方式',
311
+ name: "align",
312
+ displayName: "对齐方式",
308
313
  value: align,
309
- type: 'radio',
314
+ type: "radio",
310
315
  config: {
311
316
  options: [{
312
- name: '左对齐',
313
- value: 'left',
314
- icon: 'align-left'
317
+ name: "左对齐",
318
+ value: "left",
319
+ icon: "align-left"
315
320
  }, {
316
- name: '居中对齐',
317
- value: 'center',
318
- icon: 'align-center'
321
+ name: "居中对齐",
322
+ value: "center",
323
+ icon: "align-center"
319
324
  }, {
320
- name: '右对齐',
321
- value: 'right',
322
- icon: 'align-right'
325
+ name: "右对齐",
326
+ value: "right",
327
+ icon: "align-right"
323
328
  }],
324
- mode: 'icon'
329
+ mode: "icon"
325
330
  }
326
331
  }, (0, _.translate)(x, y)]
327
332
  }, {
328
- displayName: '数据',
329
- name: 'data',
333
+ displayName: "数据",
334
+ name: "data",
330
335
  value: [{
331
- displayName: '行高',
332
- type: 'number',
336
+ displayName: "图标间距",
337
+ type: "number",
338
+ value: iconGapName,
339
+ name: "iconGapName"
340
+ }, {
341
+ displayName: "数据间距",
342
+ type: "number",
343
+ value: nameGapData,
344
+ name: "nameGapData"
345
+ }, {
346
+ displayName: "行高",
347
+ type: "number",
333
348
  value: lineHeight,
334
- name: 'lineHeight'
349
+ name: "lineHeight"
335
350
  }, {
336
- displayName: '行间距',
337
- type: 'number',
351
+ displayName: "行间距",
352
+ type: "number",
338
353
  value: dataGap,
339
- name: 'gap'
354
+ name: "gap"
340
355
  }, {
341
- displayName: '图标尺寸',
342
- type: 'number',
356
+ displayName: "图标尺寸",
357
+ type: "number",
343
358
  value: iconSize,
344
- name: 'iconSize'
359
+ name: "iconSize"
345
360
  }, {
346
361
  name: "background",
347
362
  displayName: "背景图",
@@ -353,8 +368,8 @@ var _default = function _default() {
353
368
  value: num,
354
369
  name: "num"
355
370
  }, {
356
- name: 'name',
357
- displayName: '系列名称',
371
+ name: "name",
372
+ displayName: "系列名称",
358
373
  value: {
359
374
  fontFamily: nameFontFamily,
360
375
  fontSize: nameFontSize,
@@ -363,11 +378,11 @@ var _default = function _default() {
363
378
  italic: nameItalic,
364
379
  letterSpacing: nameLetterSpacing
365
380
  },
366
- type: 'textStyle',
367
- markColorType: 'textColor'
381
+ type: "textStyle",
382
+ markColorType: "textColor"
368
383
  }, {
369
- name: 'value',
370
- displayName: '系列值',
384
+ name: "value",
385
+ displayName: "系列值",
371
386
  value: {
372
387
  fontFamily: valueFontFamily,
373
388
  fontSize: valueFontSize,
@@ -376,19 +391,19 @@ var _default = function _default() {
376
391
  italic: valueFontItalic,
377
392
  letterSpacing: valueFontLetterSpacing
378
393
  },
379
- type: 'textStyle',
380
- markColorType: 'textColor'
394
+ type: "textStyle",
395
+ markColorType: "textColor"
381
396
  }, {
382
- name: 'suffix',
383
- displayName: '后缀',
397
+ name: "suffix",
398
+ displayName: "后缀",
384
399
  value: [{
385
- name: 'show',
386
- displayName: '显示',
400
+ name: "show",
401
+ displayName: "显示",
387
402
  value: false,
388
- type: 'boolean'
403
+ type: "boolean"
389
404
  }, {
390
- name: 'content',
391
- displayName: '内容',
405
+ name: "content",
406
+ displayName: "内容",
392
407
  value: [{
393
408
  name: "suffixText1",
394
409
  displayName: "后缀",
@@ -445,10 +460,10 @@ var _default = function _default() {
445
460
  }]
446
461
  }]
447
462
  },
448
- type: 'array'
463
+ type: "array"
449
464
  }, {
450
- name: 'font',
451
- displayName: '文本样式',
465
+ name: "font",
466
+ displayName: "文本样式",
452
467
  value: {
453
468
  fontFamily: suffixFontFamily,
454
469
  fontSize: suffixFontSize,
@@ -457,20 +472,20 @@ var _default = function _default() {
457
472
  italic: suffixItalic,
458
473
  letterSpacing: suffixLetterSpacing
459
474
  },
460
- type: 'textStyle',
461
- markColorType: 'textColor'
475
+ type: "textStyle",
476
+ markColorType: "textColor"
462
477
  }, (0, _.translate)(x, y)]
463
478
  }]
464
479
  }]
465
480
  }]
466
481
  }, {
467
- name: 'indicator',
468
- displayName: '指示器',
482
+ name: "indicator",
483
+ displayName: "指示器",
469
484
  value: [{
470
- name: 'zIndex',
471
- displayName: '层级',
485
+ name: "zIndex",
486
+ displayName: "层级",
472
487
  value: zIndex,
473
- type: 'radio',
488
+ type: "radio",
474
489
  config: {
475
490
  options: [{
476
491
  name: "顶层",
@@ -481,18 +496,18 @@ var _default = function _default() {
481
496
  }]
482
497
  }
483
498
  }, {
484
- name: 'width',
485
- displayName: '粗细',
499
+ name: "width",
500
+ displayName: "粗细",
486
501
  value: width,
487
- type: 'number',
502
+ type: "number",
488
503
  config: {
489
- suffix: '%'
504
+ suffix: "%"
490
505
  }
491
506
  }, {
492
- name: 'color',
493
- displayName: '颜色',
507
+ name: "color",
508
+ displayName: "颜色",
494
509
  value: color,
495
- type: 'color'
510
+ type: "color"
496
511
  }]
497
512
  }]
498
513
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@easyv/config",
3
- "version": "1.3.8",
3
+ "version": "1.3.10",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/pieTooltip.js CHANGED
@@ -14,6 +14,8 @@ const defaultTooltip = {
14
14
  data: {
15
15
  lineHeight: 18,
16
16
  iconSize: 10,
17
+ iconGapName: 4,
18
+ nameGapData: 10,
17
19
  num: "",
18
20
  name: {
19
21
  fontFamily: "SourceHanSansCN-Medium",
@@ -65,10 +67,10 @@ export default ({
65
67
  y: tipTranslateY = defaultTooltip.tip.translate.y,
66
68
  } = defaultTooltip.tip.translate,
67
69
  image = defaultTooltip.tip.image,
68
- size: {
69
- width: tipWidth = defaultTooltip.tip.size.width,
70
- height: tipHeight = defaultTooltip.tip.size.height,
71
- } = defaultTooltip.tip.size,
70
+ // size: {
71
+ // width: tipWidth = defaultTooltip.tip.size.width,
72
+ // height: tipHeight = defaultTooltip.tip.size.height,
73
+ // } = defaultTooltip.tip.size,
72
74
  margin: {
73
75
  marginTop = defaultTooltip.tip.margin.marginTop,
74
76
  marginBottom = defaultTooltip.tip.margin.marginBottom,
@@ -77,7 +79,9 @@ export default ({
77
79
  } = defaultTooltip.tip.margin,
78
80
  data: {
79
81
  lineHeight = defaultTooltip.tip.data.lineHeight,
80
- iconSize = defaultTooltip.tip.data.iconSize,
82
+ iconSize = defaultTooltip.tip.data.iconGapName,
83
+ iconGapName = defaultTooltip.tip.data.iconSize,
84
+ nameGapData = defaultTooltip.tip.data.nameGapData,
81
85
  num = defaultTooltip.tip.data.num,
82
86
  name: {
83
87
  fontFamily: nameFontFamily,
@@ -140,31 +144,31 @@ export default ({
140
144
  displayName: "背景",
141
145
  value: image,
142
146
  },
143
- {
144
- name: "size",
145
- displayName: "尺寸",
146
- value: [
147
- {
148
- name: "width",
149
- displayName: "宽度",
150
- value: tipWidth,
151
- config: {
152
- span: 12,
153
- suffix: "W",
154
- },
155
- },
156
- {
157
- name: "height",
158
- displayName: "高度",
159
- value: tipHeight,
160
- config: {
161
- span: 12,
162
- suffix: "H",
163
- },
164
- },
165
- ],
166
- type: "group",
167
- },
147
+ // {
148
+ // name: "size",
149
+ // displayName: "尺寸",
150
+ // value: [
151
+ // {
152
+ // name: "width",
153
+ // displayName: "宽度",
154
+ // value: tipWidth,
155
+ // config: {
156
+ // span: 12,
157
+ // suffix: "W",
158
+ // },
159
+ // },
160
+ // {
161
+ // name: "height",
162
+ // displayName: "高度",
163
+ // value: tipHeight,
164
+ // config: {
165
+ // span: 12,
166
+ // suffix: "H",
167
+ // },
168
+ // },
169
+ // ],
170
+ // type: "group",
171
+ // },
168
172
  margin({
169
173
  marginTop,
170
174
  marginRight,
@@ -181,6 +185,18 @@ export default ({
181
185
  value: iconSize,
182
186
  name: "iconSize",
183
187
  },
188
+ {
189
+ displayName: "图标间距",
190
+ type: "number",
191
+ value: iconGapName,
192
+ name: "iconGapName",
193
+ },
194
+ {
195
+ displayName: "数据间距",
196
+ type: "number",
197
+ value: nameGapData,
198
+ name: "nameGapData",
199
+ },
184
200
  {
185
201
  name: "name",
186
202
  displayName: "系列名称",
@@ -265,14 +281,14 @@ export default ({
265
281
  type: "boolean",
266
282
  },
267
283
  {
268
- name: 'precision',
269
- displayName: '小数位数',
284
+ name: "precision",
285
+ displayName: "小数位数",
270
286
  value: 0,
271
- type: 'input',
287
+ type: "input",
272
288
  config: {
273
289
  min: 0,
274
- step: 1
275
- }
290
+ step: 1,
291
+ },
276
292
  },
277
293
  {
278
294
  name: "fontStyle",
package/src/tooltip.js CHANGED
@@ -1,13 +1,13 @@
1
- import { translate, margin } from '.';
1
+ import { translate, margin } from ".";
2
2
  const defaultTooltip = {
3
3
  auto: false,
4
4
  manual: true,
5
5
  interval: 4,
6
6
  tip: {
7
7
  translate: { x: 0, y: 0 },
8
- bgType: 'image',
9
- bgColor: 'rgba(48, 55, 66, 0.85)',
10
- image: 'components/static-image/vectorShapeV2/tipboxBg.png',
8
+ bgType: "image",
9
+ bgColor: "rgba(48, 55, 66, 0.85)",
10
+ image: "components/static-image/vectorShapeV2/tipboxBg.png",
11
11
  size: { width: 120, height: 110 },
12
12
  margin: {
13
13
  marginTop: 13,
@@ -20,53 +20,55 @@ const defaultTooltip = {
20
20
  background: "",
21
21
  gap: 5,
22
22
  font: {
23
- fontFamily: 'SourceHanSansCN-Medium',
23
+ fontFamily: "SourceHanSansCN-Medium",
24
24
  fontSize: 16,
25
- color: '#E6F6FF',
25
+ color: "#E6F6FF",
26
26
  bold: false,
27
27
  italic: false,
28
28
  letterSpacing: 0,
29
29
  },
30
- align: 'left',
30
+ align: "left",
31
31
  translate: { x: 0, y: 0 },
32
32
  },
33
33
  data: {
34
34
  lineHeight: 18,
35
35
  gap: 5,
36
36
  iconSize: 10,
37
+ iconGapName: 0,
38
+ nameGapData: 10,
37
39
  background: "",
38
40
  num: "",
39
41
  name: {
40
- fontFamily: 'SourceHanSansCN-Medium',
42
+ fontFamily: "SourceHanSansCN-Medium",
41
43
  fontSize: 12,
42
- color: '#C8E7FF',
44
+ color: "#C8E7FF",
43
45
  bold: false,
44
46
  italic: false,
45
47
  letterSpacing: 0,
46
48
  },
47
49
  value: {
48
- fontFamily: 'SourceHanSansCN-Medium',
50
+ fontFamily: "SourceHanSansCN-Medium",
49
51
  fontSize: 12,
50
- color: '#D4EFFC',
52
+ color: "#D4EFFC",
51
53
  bold: false,
52
54
  italic: false,
53
55
  letterSpacing: 0,
54
56
  },
55
57
  suffix: {
56
58
  font: {
57
- fontFamily: 'SourceHanSansCN-Medium',
59
+ fontFamily: "SourceHanSansCN-Medium",
58
60
  fontSize: 12,
59
- color: '#D4EFFC',
61
+ color: "#D4EFFC",
60
62
  bold: false,
61
63
  italic: false,
62
- letterSpacing: 0
64
+ letterSpacing: 0,
63
65
  },
64
66
  translate: { x: 0, y: 0 },
65
- }
67
+ },
66
68
  },
67
69
  },
68
70
  },
69
- indicator: { zIndex: "bottom", width: 12, color: 'RGBA(255,255,255,0.3)' },
71
+ indicator: { zIndex: "bottom", width: 12, color: "RGBA(255,255,255,0.3)" },
70
72
  };
71
73
  export default ({
72
74
  auto = defaultTooltip.auto,
@@ -80,10 +82,10 @@ export default ({
80
82
  bgType = defaultTooltip.tip.bgType,
81
83
  bgColor = defaultTooltip.tip.bgColor,
82
84
  image = defaultTooltip.tip.image,
83
- size: {
84
- width: tipWidth = defaultTooltip.tip.size.width,
85
- height: tipHeight = defaultTooltip.tip.size.height
86
- } = defaultTooltip.tip.size,
85
+ // size: {
86
+ // width: tipWidth = defaultTooltip.tip.size.width,
87
+ // height: tipHeight = defaultTooltip.tip.size.height
88
+ // } = defaultTooltip.tip.size,
87
89
  margin: {
88
90
  marginTop = defaultTooltip.tip.margin.marginTop,
89
91
  marginBottom = defaultTooltip.tip.margin.marginBottom,
@@ -111,6 +113,8 @@ export default ({
111
113
  lineHeight = defaultTooltip.tip.data.lineHeight,
112
114
  gap: dataGap = defaultTooltip.tip.data.gap,
113
115
  iconSize = defaultTooltip.tip.data.iconSize,
116
+ iconGapName = defaultTooltip.tip.data.iconGapName,
117
+ nameGapData = defaultTooltip.tip.data.nameGapData,
114
118
  num = defaultTooltip.tip.data.num,
115
119
  background: dataBg = defaultTooltip.tip.data.background,
116
120
  name: {
@@ -148,34 +152,34 @@ export default ({
148
152
  color = defaultTooltip.indicator.color,
149
153
  } = defaultTooltip.indicator,
150
154
  } = defaultTooltip) => ({
151
- name: 'tooltip',
152
- displayName: '提示框',
155
+ name: "tooltip",
156
+ displayName: "提示框",
153
157
  value: [
154
158
  {
155
- name: 'auto',
156
- displayName: '自动轮播',
159
+ name: "auto",
160
+ displayName: "自动轮播",
157
161
  value: auto,
158
- type: 'boolean',
162
+ type: "boolean",
159
163
  },
160
164
  {
161
- name: 'manual',
162
- displayName: '悬停触发',
165
+ name: "manual",
166
+ displayName: "悬停触发",
163
167
  value: manual,
164
- type: 'boolean',
168
+ type: "boolean",
165
169
  },
166
170
  {
167
- rule: [['auto', '$eq', true]],
168
- name: 'interval',
169
- displayName: '停留时间',
171
+ rule: [["auto", "$eq", true]],
172
+ name: "interval",
173
+ displayName: "停留时间",
170
174
  value: interval,
171
- type: 'number',
175
+ type: "number",
172
176
  config: {
173
- suffix: 's',
177
+ suffix: "s",
174
178
  },
175
179
  },
176
180
  {
177
- name: 'tip',
178
- displayName: '提示框',
181
+ name: "tip",
182
+ displayName: "提示框",
179
183
  value: [
180
184
  translate(tipTranslateX, tipTranslateY),
181
185
  {
@@ -186,49 +190,49 @@ export default ({
186
190
  config: {
187
191
  options: [
188
192
  { name: "颜色", value: "color" },
189
- { name: "图片", value: "image" }
190
- ]
191
- }
193
+ { name: "图片", value: "image" },
194
+ ],
195
+ },
192
196
  },
193
197
  {
194
198
  rule: [["bgType", "$eq", "color"]],
195
199
  name: "bgColor",
196
200
  displayName: "颜色",
197
201
  type: "color",
198
- value: bgColor
202
+ value: bgColor,
199
203
  },
200
204
  {
201
205
  rule: [["bgType", "$eq", "image"]],
202
- type: 'uploadImage',
203
- name: 'image',
204
- displayName: '图片',
206
+ type: "uploadImage",
207
+ name: "image",
208
+ displayName: "图片",
205
209
  value: image,
206
210
  },
207
- {
208
- name: 'size',
209
- displayName: '尺寸',
210
- value: [
211
- {
212
- name: 'width',
213
- displayName: '宽度',
214
- value: tipWidth,
215
- config: {
216
- span: 12,
217
- suffix: 'W',
218
- },
219
- },
220
- {
221
- name: 'height',
222
- displayName: '高度',
223
- value: tipHeight,
224
- config: {
225
- span: 12,
226
- suffix: 'H',
227
- },
228
- }
229
- ],
230
- type: 'group',
231
- },
211
+ // {
212
+ // name: 'size',
213
+ // displayName: '尺寸',
214
+ // value: [
215
+ // {
216
+ // name: 'width',
217
+ // displayName: '宽度',
218
+ // value: tipWidth,
219
+ // config: {
220
+ // span: 12,
221
+ // suffix: 'W',
222
+ // },
223
+ // },
224
+ // {
225
+ // name: 'height',
226
+ // displayName: '高度',
227
+ // value: tipHeight,
228
+ // config: {
229
+ // span: 12,
230
+ // suffix: 'H',
231
+ // },
232
+ // }
233
+ // ],
234
+ // type: 'group',
235
+ // },
232
236
  margin({
233
237
  marginTop,
234
238
  marginRight,
@@ -236,28 +240,28 @@ export default ({
236
240
  marginLeft,
237
241
  }),
238
242
  {
239
- name: 'data',
240
- displayName: '框内数据',
243
+ name: "data",
244
+ displayName: "框内数据",
241
245
  value: [
242
246
  {
243
- name: 'xAxis',
244
- displayName: '类目标签',
247
+ name: "xAxis",
248
+ displayName: "类目标签",
245
249
  value: [
246
250
  {
247
251
  name: "background",
248
252
  displayName: "背景图",
249
253
  type: "image",
250
- value: xAxisBg
254
+ value: xAxisBg,
251
255
  },
252
256
  {
253
257
  name: "gap",
254
258
  displayName: "下间距",
255
259
  type: "number",
256
- value: xAxisGap
260
+ value: xAxisGap,
257
261
  },
258
262
  {
259
- name: 'font',
260
- displayName: '文本样式',
263
+ name: "font",
264
+ displayName: "文本样式",
261
265
  value: {
262
266
  fontFamily: xAxisFontFamily,
263
267
  fontSize: xAxisFontSize,
@@ -266,71 +270,83 @@ export default ({
266
270
  italic: xAxisItalic,
267
271
  letterSpacing: xAxisLetterSpacing,
268
272
  },
269
- type: 'textStyle',
270
- markColorType: 'textColor',
273
+ type: "textStyle",
274
+ markColorType: "textColor",
271
275
  },
272
276
  {
273
- name: 'align',
274
- displayName: '对齐方式',
277
+ name: "align",
278
+ displayName: "对齐方式",
275
279
  value: align,
276
- type: 'radio',
280
+ type: "radio",
277
281
  config: {
278
282
  options: [
279
- { name: '左对齐', value: 'left', icon: 'align-left' },
283
+ { name: "左对齐", value: "left", icon: "align-left" },
280
284
  {
281
- name: '居中对齐',
282
- value: 'center',
283
- icon: 'align-center',
285
+ name: "居中对齐",
286
+ value: "center",
287
+ icon: "align-center",
284
288
  },
285
289
  {
286
- name: '右对齐',
287
- value: 'right',
288
- icon: 'align-right',
290
+ name: "右对齐",
291
+ value: "right",
292
+ icon: "align-right",
289
293
  },
290
294
  ],
291
- mode: 'icon',
295
+ mode: "icon",
292
296
  },
293
297
  },
294
298
  translate(x, y),
295
299
  ],
296
300
  },
297
301
  {
298
- displayName: '数据',
299
- name: 'data',
302
+ displayName: "数据",
303
+ name: "data",
300
304
  value: [
301
305
  {
302
- displayName: '行高',
303
- type: 'number',
306
+ displayName: "图标间距",
307
+ type: "number",
308
+ value: iconGapName,
309
+ name: "iconGapName",
310
+ },
311
+ {
312
+ displayName: "数据间距",
313
+ type: "number",
314
+ value: nameGapData,
315
+ name: "nameGapData",
316
+ },
317
+ {
318
+ displayName: "行高",
319
+ type: "number",
304
320
  value: lineHeight,
305
- name: 'lineHeight',
321
+ name: "lineHeight",
306
322
  },
307
323
  {
308
- displayName: '行间距',
309
- type: 'number',
324
+ displayName: "行间距",
325
+ type: "number",
310
326
  value: dataGap,
311
- name: 'gap',
327
+ name: "gap",
312
328
  },
313
329
  {
314
- displayName: '图标尺寸',
315
- type: 'number',
330
+ displayName: "图标尺寸",
331
+ type: "number",
316
332
  value: iconSize,
317
- name: 'iconSize',
333
+ name: "iconSize",
318
334
  },
319
335
  {
320
336
  name: "background",
321
337
  displayName: "背景图",
322
338
  type: "image",
323
- value: dataBg
339
+ value: dataBg,
324
340
  },
325
341
  {
326
342
  displayName: "保留小数",
327
343
  type: "input",
328
344
  value: num,
329
- name: "num"
345
+ name: "num",
330
346
  },
331
347
  {
332
- name: 'name',
333
- displayName: '系列名称',
348
+ name: "name",
349
+ displayName: "系列名称",
334
350
  value: {
335
351
  fontFamily: nameFontFamily,
336
352
  fontSize: nameFontSize,
@@ -339,12 +355,12 @@ export default ({
339
355
  italic: nameItalic,
340
356
  letterSpacing: nameLetterSpacing,
341
357
  },
342
- type: 'textStyle',
343
- markColorType: 'textColor',
358
+ type: "textStyle",
359
+ markColorType: "textColor",
344
360
  },
345
361
  {
346
- name: 'value',
347
- displayName: '系列值',
362
+ name: "value",
363
+ displayName: "系列值",
348
364
  value: {
349
365
  fontFamily: valueFontFamily,
350
366
  fontSize: valueFontSize,
@@ -353,22 +369,22 @@ export default ({
353
369
  italic: valueFontItalic,
354
370
  letterSpacing: valueFontLetterSpacing,
355
371
  },
356
- type: 'textStyle',
357
- markColorType: 'textColor',
372
+ type: "textStyle",
373
+ markColorType: "textColor",
358
374
  },
359
375
  {
360
- name: 'suffix',
361
- displayName: '后缀',
376
+ name: "suffix",
377
+ displayName: "后缀",
362
378
  value: [
363
379
  {
364
- name: 'show',
365
- displayName: '显示',
380
+ name: "show",
381
+ displayName: "显示",
366
382
  value: false,
367
- type: 'boolean'
383
+ type: "boolean",
368
384
  },
369
385
  {
370
- name: 'content',
371
- displayName: '内容',
386
+ name: "content",
387
+ displayName: "内容",
372
388
  value: [
373
389
  {
374
390
  name: "suffixText1",
@@ -386,8 +402,8 @@ export default ({
386
402
  value: "系列一",
387
403
  type: "input",
388
404
  config: {
389
- span: 12
390
- }
405
+ span: 12,
406
+ },
391
407
  },
392
408
  {
393
409
  name: "suffix",
@@ -395,12 +411,12 @@ export default ({
395
411
  value: "%",
396
412
  type: "input",
397
413
  config: {
398
- span: 12
399
- }
400
- }
401
- ]
402
- }
403
- ]
414
+ span: 12,
415
+ },
416
+ },
417
+ ],
418
+ },
419
+ ],
404
420
  },
405
421
  ],
406
422
  config: {
@@ -421,8 +437,8 @@ export default ({
421
437
  value: "",
422
438
  type: "input",
423
439
  config: {
424
- span: 12
425
- }
440
+ span: 12,
441
+ },
426
442
  },
427
443
  {
428
444
  name: "suffix",
@@ -430,20 +446,20 @@ export default ({
430
446
  value: "",
431
447
  type: "input",
432
448
  config: {
433
- span: 12
434
- }
435
- }
436
- ]
437
- }
438
- ]
449
+ span: 12,
450
+ },
451
+ },
452
+ ],
453
+ },
454
+ ],
439
455
  },
440
- ]
456
+ ],
441
457
  },
442
- type: 'array'
458
+ type: "array",
443
459
  },
444
460
  {
445
- name: 'font',
446
- displayName: '文本样式',
461
+ name: "font",
462
+ displayName: "文本样式",
447
463
  value: {
448
464
  fontFamily: suffixFontFamily,
449
465
  fontSize: suffixFontSize,
@@ -452,48 +468,48 @@ export default ({
452
468
  italic: suffixItalic,
453
469
  letterSpacing: suffixLetterSpacing,
454
470
  },
455
- type: 'textStyle',
456
- markColorType: 'textColor',
471
+ type: "textStyle",
472
+ markColorType: "textColor",
457
473
  },
458
474
  translate(x, y),
459
475
  ],
460
- }
476
+ },
461
477
  ],
462
- }
478
+ },
463
479
  ],
464
480
  },
465
481
  ],
466
482
  },
467
483
  {
468
- name: 'indicator',
469
- displayName: '指示器',
484
+ name: "indicator",
485
+ displayName: "指示器",
470
486
  value: [
471
487
  {
472
- name: 'zIndex',
473
- displayName: '层级',
488
+ name: "zIndex",
489
+ displayName: "层级",
474
490
  value: zIndex,
475
- type: 'radio',
491
+ type: "radio",
476
492
  config: {
477
493
  options: [
478
494
  { name: "顶层", value: "top" },
479
- { name: "底层", value: "bottom" }
495
+ { name: "底层", value: "bottom" },
480
496
  ],
481
497
  },
482
498
  },
483
499
  {
484
- name: 'width',
485
- displayName: '粗细',
500
+ name: "width",
501
+ displayName: "粗细",
486
502
  value: width,
487
- type: 'number',
503
+ type: "number",
488
504
  config: {
489
- suffix: '%',
505
+ suffix: "%",
490
506
  },
491
507
  },
492
508
  {
493
- name: 'color',
494
- displayName: '颜色',
509
+ name: "color",
510
+ displayName: "颜色",
495
511
  value: color,
496
- type: 'color',
512
+ type: "color",
497
513
  },
498
514
  ],
499
515
  },