@easyv/config 1.3.4 → 1.3.6

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 (4) hide show
  1. package/lib/label.js +178 -171
  2. package/package.json +2 -2
  3. package/src/font.js +23 -23
  4. package/src/label.js +257 -231
package/lib/label.js CHANGED
@@ -344,10 +344,10 @@ var labelOfPie = function labelOfPie() {
344
344
  min: 0
345
345
  }
346
346
  }, {
347
- "name": "sameColor",
348
- "displayName": "颜色跟随",
349
- "value": percentSameColor,
350
- "type": "boolean"
347
+ name: "sameColor",
348
+ displayName: "颜色跟随",
349
+ value: percentSameColor,
350
+ type: "boolean"
351
351
  }, {
352
352
  rule: [["show", "$eq", true]],
353
353
  name: "font",
@@ -365,11 +365,11 @@ var labelOfPie = function labelOfPie() {
365
365
  value: showValue,
366
366
  type: "boolean"
367
367
  }, {
368
- rule: [['show', '$eq', true]],
369
- name: 'sameColor',
370
- displayName: '颜色跟随',
368
+ rule: [["show", "$eq", true]],
369
+ name: "sameColor",
370
+ displayName: "颜色跟随",
371
371
  value: valueSameColor,
372
- type: 'boolean'
372
+ type: "boolean"
373
373
  }, {
374
374
  rule: [["show", "$eq", true]],
375
375
  name: "suffix",
@@ -452,10 +452,8 @@ var labelOfRose = function labelOfRose() {
452
452
  exports.labelOfRose = labelOfRose;
453
453
  var defaultAxisLabel = {
454
454
  show: true,
455
- format: {
456
- type: "date",
457
- showType: "MM月"
458
- },
455
+ type: "date",
456
+ showType: "MM月",
459
457
  appearance: {
460
458
  count: 3,
461
459
  angle: 0,
@@ -463,6 +461,7 @@ var defaultAxisLabel = {
463
461
  textOverflow: "ellipsis",
464
462
  speed: 5
465
463
  },
464
+ adaptive: false,
466
465
  showLast: false,
467
466
  autoSort: false,
468
467
  textAlign: "center",
@@ -478,12 +477,10 @@ var axisLabel = function axisLabel() {
478
477
  var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultAxisLabel,
479
478
  _ref4$show = _ref4.show,
480
479
  showLabel = _ref4$show === void 0 ? defaultAxisLabel.show : _ref4$show,
481
- _ref4$format = _ref4.format;
482
- _ref4$format = _ref4$format === void 0 ? defaultAxisLabel.format : _ref4$format;
483
- var _ref4$format$type = _ref4$format.type,
484
- labelType = _ref4$format$type === void 0 ? defaultAxisLabel.format.type : _ref4$format$type,
485
- _ref4$format$showType = _ref4$format.showType,
486
- labelShowType = _ref4$format$showType === void 0 ? defaultAxisLabel.format.showType : _ref4$format$showType,
480
+ _ref4$labelType = _ref4.labelType,
481
+ labelType = _ref4$labelType === void 0 ? defaultAxisLabel.type : _ref4$labelType,
482
+ _ref4$showType = _ref4.showType,
483
+ labelShowType = _ref4$showType === void 0 ? defaultAxisLabel.showType : _ref4$showType,
487
484
  _ref4$appearance = _ref4.appearance;
488
485
  _ref4$appearance = _ref4$appearance === void 0 ? defaultAxisLabel.appearance : _ref4$appearance;
489
486
  var _ref4$appearance$coun = _ref4$appearance.count,
@@ -496,6 +493,8 @@ var axisLabel = function axisLabel() {
496
493
  textOverflow = _ref4$appearance$text === void 0 ? defaultAxisLabel.appearance.textOverflow : _ref4$appearance$text,
497
494
  _ref4$appearance$spee = _ref4$appearance.speed,
498
495
  speed = _ref4$appearance$spee === void 0 ? defaultAxisLabel.appearance.speed : _ref4$appearance$spee,
496
+ _ref4$adaptive = _ref4.adaptive,
497
+ adaptive = _ref4$adaptive === void 0 ? defaultAxisLabel.adaptive : _ref4$adaptive,
499
498
  _ref4$showLast = _ref4.showLast,
500
499
  showLast = _ref4$showLast === void 0 ? defaultAxisLabel.showLast : _ref4$showLast,
501
500
  _ref4$autoSort = _ref4.autoSort,
@@ -522,143 +521,144 @@ var axisLabel = function axisLabel() {
522
521
  rule: [["show", "$eq", true]],
523
522
  name: "format",
524
523
  displayName: "格式",
525
- value: [{
526
- name: "type",
527
- displayName: "",
528
- value: labelType,
529
- type: "radio",
530
- config: {
531
- options: [{
532
- name: "类目型",
533
- value: "category"
534
- }, {
535
- name: "时间型",
536
- value: "date"
537
- }],
538
- span: 24
539
- }
540
- }, {
541
- rule: [["type", "$eq", "date"]],
542
- name: "showType",
543
- displayName: "",
544
- value: labelShowType,
545
- type: "select",
546
- config: {
547
- options: [{
548
- name: "2017年11日 08:00:00",
549
- value: "YYYY年MD日 HH:mm:ss"
550
- }, {
551
- name: "2017年01月01日 08:00:00",
552
- value: "YYYY年MM月DD日 HH:mm:ss"
553
- }, {
554
- name: "2017-1-1 08:00:00",
555
- value: "YYYY-M-D HH:mm:ss"
556
- }, {
557
- name: "2017-01-01 08:00:00",
558
- value: "YYYY-MM-DD HH:mm:ss"
559
- }, {
560
- name: "2017.1.1 08:00:00",
561
- value: "YYYY.M.D HH:mm:ss"
562
- }, {
563
- name: "2017.01.01 08:00:00",
564
- value: "YYYY.MM.DD HH:mm:ss"
565
- }, {
566
- name: "2017年11日",
567
- value: "YYYY年MD日"
568
- }, {
569
- name: "2017年01月01日",
570
- value: "YYYY年MM月DD日"
571
- }, {
572
- name: "2017年01月",
573
- value: "YYYY年MM月"
574
- }, {
575
- name: "2017-1-1",
576
- value: "YYYY-M-D"
577
- }, {
578
- name: "2017-01",
579
- value: "YYYY-MM"
580
- }, {
581
- name: "2017-01-01",
582
- value: "YYYY-MM-DD"
583
- }, {
584
- name: "2017.1.1",
585
- value: "YYYY.M.D"
586
- }, {
587
- name: "2017.01.01",
588
- value: "YYYY.MM.DD"
589
- }, {
590
- name: "2017年",
591
- value: "YYYY年"
592
- }, {
593
- name: "2017(年)",
594
- value: "YYYY(年)"
595
- }, {
596
- name: "11日",
597
- value: "MD日"
598
- }, {
599
- name: "01月01日",
600
- value: "MM月DD日"
601
- }, {
602
- name: "01月01日01时",
603
- value: "MM月DD日HH时"
604
- }, {
605
- name: "1-1",
606
- value: "M-D"
607
- }, {
608
- name: "01-01",
609
- value: "MM-DD"
610
- }, {
611
- name: "1.1",
612
- value: "M.D"
613
- }, {
614
- name: "01.01",
615
- value: "MM.DD"
616
- }, {
617
- name: "1月",
618
- value: "M月"
619
- }, {
620
- name: "01月",
621
- value: "MM月"
622
- }, {
623
- name: "1(月)",
624
- value: "M"
625
- }, {
626
- name: "01(月)",
627
- value: "MM"
628
- }, {
629
- name: "1日",
630
- value: "D日"
631
- }, {
632
- name: "01日",
633
- value: "DD日"
634
- }, {
635
- name: "1(日)",
636
- value: "D"
637
- }, {
638
- name: "01(日)",
639
- value: "DD"
640
- }, {
641
- name: "08:00:00",
642
- value: "HH:mm:ss"
643
- }, {
644
- name: "08:00",
645
- value: "HH:mm"
646
- }, {
647
- name: "星期一",
648
- value: "X"
649
- }, {
650
- name: "Monday",
651
- value: "W"
652
- }, {
653
- name: "Mon",
654
- value: "w"
655
- }],
656
- span: 24
657
- }
658
- }],
659
- type: "group"
524
+ value: labelType,
525
+ type: "radio",
526
+ config: {
527
+ options: [{
528
+ name: "类目型",
529
+ value: "category"
530
+ }, {
531
+ name: "时间型",
532
+ value: "date"
533
+ }],
534
+ span: 24
535
+ }
536
+ }, {
537
+ rule: [["format", "$eq", "date"]],
538
+ name: "showType",
539
+ displayName: "",
540
+ value: labelShowType,
541
+ type: "select",
542
+ config: {
543
+ options: [{
544
+ name: "2017年1月1日 08:00:00",
545
+ value: "YYYY年M月D日 HH:mm:ss"
546
+ }, {
547
+ name: "2017年0101日 08:00:00",
548
+ value: "YYYY年MMDD日 HH:mm:ss"
549
+ }, {
550
+ name: "2017-1-1 08:00:00",
551
+ value: "YYYY-M-D HH:mm:ss"
552
+ }, {
553
+ name: "2017-01-01 08:00:00",
554
+ value: "YYYY-MM-DD HH:mm:ss"
555
+ }, {
556
+ name: "2017.1.1 08:00:00",
557
+ value: "YYYY.M.D HH:mm:ss"
558
+ }, {
559
+ name: "2017.01.01 08:00:00",
560
+ value: "YYYY.MM.DD HH:mm:ss"
561
+ }, {
562
+ name: "2017年1月1日",
563
+ value: "YYYY年M月D日"
564
+ }, {
565
+ name: "2017年0101日",
566
+ value: "YYYY年MMDD日"
567
+ }, {
568
+ name: "2017年01月",
569
+ value: "YYYY年MM月"
570
+ }, {
571
+ name: "2017-1-1",
572
+ value: "YYYY-M-D"
573
+ }, {
574
+ name: "2017-01",
575
+ value: "YYYY-MM"
576
+ }, {
577
+ name: "2017-01-01",
578
+ value: "YYYY-MM-DD"
579
+ }, {
580
+ name: "2017.1.1",
581
+ value: "YYYY.M.D"
582
+ }, {
583
+ name: "2017.01.01",
584
+ value: "YYYY.MM.DD"
585
+ }, {
586
+ name: "2017",
587
+ value: "YYYY"
588
+ }, {
589
+ name: "2017()",
590
+ value: "YYYY()"
591
+ }, {
592
+ name: "1月1日",
593
+ value: "M月D日"
594
+ }, {
595
+ name: "0101日",
596
+ value: "MMDD日"
597
+ }, {
598
+ name: "01月01日01时",
599
+ value: "MM月DD日HH时"
600
+ }, {
601
+ name: "1-1",
602
+ value: "M-D"
603
+ }, {
604
+ name: "01-01",
605
+ value: "MM-DD"
606
+ }, {
607
+ name: "1.1",
608
+ value: "M.D"
609
+ }, {
610
+ name: "01.01",
611
+ value: "MM.DD"
612
+ }, {
613
+ name: "1月",
614
+ value: "M月"
615
+ }, {
616
+ name: "01月",
617
+ value: "MM月"
618
+ }, {
619
+ name: "1()",
620
+ value: "M"
621
+ }, {
622
+ name: "01(月)",
623
+ value: "MM"
624
+ }, {
625
+ name: "1日",
626
+ value: "D日"
627
+ }, {
628
+ name: "01日",
629
+ value: "DD日"
630
+ }, {
631
+ name: "1()",
632
+ value: "D"
633
+ }, {
634
+ name: "01(日)",
635
+ value: "DD"
636
+ }, {
637
+ name: "08:00:00",
638
+ value: "HH:mm:ss"
639
+ }, {
640
+ name: "08:00",
641
+ value: "HH:mm"
642
+ }, {
643
+ name: "星期一",
644
+ value: "X"
645
+ }, {
646
+ name: "Monday",
647
+ value: "W"
648
+ }, {
649
+ name: "Mon",
650
+ value: "w"
651
+ }],
652
+ span: 24
653
+ }
660
654
  }, {
661
655
  rule: [["show", "$eq", true]],
656
+ name: "adaptive",
657
+ displayName: "刻度自适应",
658
+ value: adaptive,
659
+ type: "boolean"
660
+ }, {
661
+ rule: [["show", "$eq", true], ["adaptive", "$eq", false]],
662
662
  name: "appearance",
663
663
  displayName: "展示",
664
664
  tip: "展示标签的数量会根据原标签数量进行整除后按间距调整标签分布,如果输入的数量不能被整除,则无法按照输入数量进行展示。",
@@ -728,22 +728,29 @@ var axisLabel = function axisLabel() {
728
728
  other: {
729
729
  tip: "数据按时间自动排序展示"
730
730
  }
731
- }, (0, _.showRule)()), (0, _.sc)("textAlign", "对齐", "radio", textAlign, {
732
- mode: "icon",
733
- options: [{
734
- name: "左对齐",
735
- value: "left",
736
- icon: "align-left"
737
- }, {
738
- name: "居中对齐",
739
- value: "center",
740
- icon: "align-center"
741
- }, {
742
- name: "右对齐",
743
- value: "right",
744
- icon: "align-right"
745
- }]
746
- }, (0, _.showRule)("show", "$eq", true)), _objectSpread({
731
+ }, (0, _.showRule)("format", "$eq", "date")), {
732
+ rule: [["adaptive", "$eq", false]],
733
+ type: "radio",
734
+ name: "textAlign",
735
+ displayName: "对齐",
736
+ value: textAlign,
737
+ config: {
738
+ mode: "icon",
739
+ options: [{
740
+ name: "左对齐",
741
+ value: "left",
742
+ icon: "align-left"
743
+ }, {
744
+ name: "居中对齐",
745
+ value: "center",
746
+ icon: "align-center"
747
+ }, {
748
+ name: "右对齐",
749
+ value: "right",
750
+ icon: "align-right"
751
+ }]
752
+ }
753
+ }, _objectSpread({
747
754
  rule: [["show", "$eq", true]]
748
755
  }, (0, _.translate)(labelTranslateX, labelTranslateY)), {
749
756
  rule: [["show", "$eq", true]],
@@ -1025,8 +1032,8 @@ var valueAsixLabel = function valueAsixLabel() {
1025
1032
  }, (0, _.extent)({
1026
1033
  min: percentMin,
1027
1034
  max: percentMax,
1028
- customSuffix: '%',
1029
- customName: 'percentageExtent'
1035
+ customSuffix: "%",
1036
+ customName: "percentageExtent"
1030
1037
  })), {
1031
1038
  rule: [["show", "$eq", true]],
1032
1039
  name: "auto",
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@easyv/config",
3
- "version": "1.3.4",
3
+ "version": "1.3.6",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -28,4 +28,4 @@
28
28
  "commit": true
29
29
  }
30
30
  }
31
- }
31
+ }
package/src/font.js CHANGED
@@ -1,23 +1,23 @@
1
- const defaultFont = {
2
- fontFamily: 'SourceHanSansCN-Medium',
3
- fontSize: 12,
4
- color: 'rgba(230,247,255,0.7)',
5
- bold: false,
6
- italic: false,
7
- letterSpacing: 0,
8
- };
9
- export default ({
10
- fontFamily = defaultFont.fontFamily,
11
- fontSize = defaultFont.fontSize,
12
- color = defaultFont.color,
13
- bold = defaultFont.bold,
14
- italic = defaultFont.italic,
15
- letterSpacing = defaultFont.letterSpacing,
16
- } = defaultFont) => ({
17
- fontFamily,
18
- fontSize,
19
- color,
20
- bold,
21
- italic,
22
- letterSpacing,
23
- });
1
+ const defaultFont = {
2
+ fontFamily: 'SourceHanSansCN-Medium',
3
+ fontSize: 12,
4
+ color: 'rgba(230,247,255,0.7)',
5
+ bold: false,
6
+ italic: false,
7
+ letterSpacing: 0,
8
+ };
9
+ export default ({
10
+ fontFamily = defaultFont.fontFamily,
11
+ fontSize = defaultFont.fontSize,
12
+ color = defaultFont.color,
13
+ bold = defaultFont.bold,
14
+ italic = defaultFont.italic,
15
+ letterSpacing = defaultFont.letterSpacing,
16
+ } = defaultFont) => ({
17
+ fontFamily,
18
+ fontSize,
19
+ color,
20
+ bold,
21
+ italic,
22
+ letterSpacing,
23
+ });
package/src/label.js CHANGED
@@ -71,12 +71,15 @@ export default ({
71
71
  },
72
72
  },
73
73
  reverse !== undefined && {
74
- rule: [["position", "$neq", "middle"], ["position", "$neq", "chartStart"]],
74
+ rule: [
75
+ ["position", "$neq", "middle"],
76
+ ["position", "$neq", "chartStart"],
77
+ ],
75
78
  name: "reverse",
76
79
  displayName: "负值反向",
77
80
  type: "boolean",
78
81
  value: reverse,
79
- tip: "开启后负值的标签会与正值对称显示"
82
+ tip: "开启后负值的标签会与正值对称显示",
80
83
  },
81
84
  {
82
85
  _rule: [["show", "$eq", true]],
@@ -102,10 +105,20 @@ const defaultLabelOfPie = {
102
105
  distance: 30,
103
106
  lineLength: 10,
104
107
  mode: "horizontal",
105
- align:"center",
108
+ align: "center",
106
109
  translate: { x: 0, y: 0 },
107
- name: { show: true, font: defaultFont, maxWidth: 40, translate: { x: 0, y: 0 } },
108
- percent: { show: true, precision: 0, font: defaultFont, translate: { x: 0, y: 0 } },
110
+ name: {
111
+ show: true,
112
+ font: defaultFont,
113
+ maxWidth: 40,
114
+ translate: { x: 0, y: 0 },
115
+ },
116
+ percent: {
117
+ show: true,
118
+ precision: 0,
119
+ font: defaultFont,
120
+ translate: { x: 0, y: 0 },
121
+ },
109
122
  value: {
110
123
  show: true,
111
124
  suffix: {
@@ -115,7 +128,7 @@ const defaultLabelOfPie = {
115
128
  translate: { x: 0, y: 0 },
116
129
  },
117
130
  font: defaultFont,
118
- translate: { x: 0, y: 0 }
131
+ translate: { x: 0, y: 0 },
119
132
  },
120
133
  };
121
134
  export const labelOfPie = ({
@@ -131,20 +144,20 @@ export const labelOfPie = ({
131
144
  font: nameFont = defaultLabelOfPie.name.font,
132
145
  maxWidth = defaultLabelOfPie.name.maxWidth,
133
146
  overflow,
134
- translate:{
135
- x:nameX = defaultLabelOfPie.name.translate.x,
136
- y:nameY = defaultLabelOfPie.name.translate.y
137
- } = defaultLabelOfPie.name.translate
147
+ translate: {
148
+ x: nameX = defaultLabelOfPie.name.translate.x,
149
+ y: nameY = defaultLabelOfPie.name.translate.y,
150
+ } = defaultLabelOfPie.name.translate,
138
151
  } = defaultLabelOfPie.name,
139
152
  percent: {
140
153
  show: showPercent = defaultLabelOfPie.percent.show,
141
154
  precision = defaultLabelOfPie.percent.precision,
142
155
  sameColor: percentSameColor = defaultLabelOfPie.percent.sameColor,
143
156
  font: percentFont = defaultLabelOfPie.percent.font,
144
- translate:{
145
- x:percentX = defaultLabelOfPie.percent.translate.x,
146
- y:percentY = defaultLabelOfPie.percent.translate.y
147
- } = defaultLabelOfPie.percent.translate
157
+ translate: {
158
+ x: percentX = defaultLabelOfPie.percent.translate.x,
159
+ y: percentY = defaultLabelOfPie.percent.translate.y,
160
+ } = defaultLabelOfPie.percent.translate,
148
161
  } = defaultLabelOfPie.percent,
149
162
  value: {
150
163
  show: showValue = defaultLabelOfPie.value.show,
@@ -159,10 +172,10 @@ export const labelOfPie = ({
159
172
  } = defaultLabelOfPie.value.suffix.translate,
160
173
  } = defaultLabelOfPie.value.suffix,
161
174
  font: valueFont = defaultLabelOfPie.value.font,
162
- translate:{
163
- x:valueX = defaultLabelOfPie.value.translate.x,
164
- y:valueY = defaultLabelOfPie.value.translate.y
165
- } = defaultLabelOfPie.value.translate
175
+ translate: {
176
+ x: valueX = defaultLabelOfPie.value.translate.x,
177
+ y: valueY = defaultLabelOfPie.value.translate.y,
178
+ } = defaultLabelOfPie.value.translate,
166
179
  } = defaultLabelOfPie.value,
167
180
  } = defaultLabelOfPie) => ({
168
181
  name: "label",
@@ -222,19 +235,22 @@ export const labelOfPie = ({
222
235
  },
223
236
  },
224
237
  {
225
- rule:[["show","$eq",true],["mode","$eq","vertical"]],
226
- name:"align",
227
- displayName:"对齐",
228
- type:"radio",
229
- value:"center",
230
- config:{
231
- mode:"icon",
232
- options:[
233
- { name:"左对齐", value:"left", icon:"align-left" },
234
- { name:"居中对齐", value:"center", icon:"align-center" },
235
- { name:"右对齐", value:"right", icon:"align-right" }
236
- ]
237
- }
238
+ rule: [
239
+ ["show", "$eq", true],
240
+ ["mode", "$eq", "vertical"],
241
+ ],
242
+ name: "align",
243
+ displayName: "对齐",
244
+ type: "radio",
245
+ value: "center",
246
+ config: {
247
+ mode: "icon",
248
+ options: [
249
+ { name: "左对齐", value: "left", icon: "align-left" },
250
+ { name: "居中对齐", value: "center", icon: "align-center" },
251
+ { name: "右对齐", value: "right", icon: "align-right" },
252
+ ],
253
+ },
238
254
  },
239
255
  {
240
256
  rule: [["show", "$eq", true]],
@@ -293,11 +309,11 @@ export const labelOfPie = ({
293
309
  },
294
310
  },
295
311
  {
296
- "name": "sameColor",
297
- "displayName": "颜色跟随",
298
- "value": percentSameColor,
299
- "type": "boolean"
300
- },
312
+ name: "sameColor",
313
+ displayName: "颜色跟随",
314
+ value: percentSameColor,
315
+ type: "boolean",
316
+ },
301
317
  {
302
318
  rule: [["show", "$eq", true]],
303
319
  name: "font",
@@ -320,11 +336,11 @@ export const labelOfPie = ({
320
336
  type: "boolean",
321
337
  },
322
338
  {
323
- rule: [['show', '$eq', true]],
324
- name: 'sameColor',
325
- displayName: '颜色跟随',
339
+ rule: [["show", "$eq", true]],
340
+ name: "sameColor",
341
+ displayName: "颜色跟随",
326
342
  value: valueSameColor,
327
- type: 'boolean',
343
+ type: "boolean",
328
344
  },
329
345
  {
330
346
  rule: [["show", "$eq", true]],
@@ -416,7 +432,8 @@ export const labelOfRose = ({
416
432
 
417
433
  const defaultAxisLabel = {
418
434
  show: true,
419
- format: { type: "date", showType: "MM月" },
435
+ type: "date",
436
+ showType: "MM月",
420
437
  appearance: {
421
438
  count: 3,
422
439
  angle: 0,
@@ -424,6 +441,7 @@ const defaultAxisLabel = {
424
441
  textOverflow: "ellipsis",
425
442
  speed: 5,
426
443
  },
444
+ adaptive:false,
427
445
  showLast: false,
428
446
  autoSort: false,
429
447
  textAlign: "center",
@@ -432,10 +450,8 @@ const defaultAxisLabel = {
432
450
  };
433
451
  export const axisLabel = ({
434
452
  show: showLabel = defaultAxisLabel.show,
435
- format: {
436
- type: labelType = defaultAxisLabel.format.type,
437
- showType: labelShowType = defaultAxisLabel.format.showType,
438
- } = defaultAxisLabel.format,
453
+ labelType: labelType = defaultAxisLabel.type,
454
+ showType: labelShowType = defaultAxisLabel.showType,
439
455
  appearance: {
440
456
  count = defaultAxisLabel.appearance.count,
441
457
  angle = defaultAxisLabel.appearance.angle,
@@ -443,6 +459,7 @@ export const axisLabel = ({
443
459
  textOverflow = defaultAxisLabel.appearance.textOverflow,
444
460
  speed = defaultAxisLabel.appearance.speed,
445
461
  } = defaultAxisLabel.appearance,
462
+ adaptive=defaultAxisLabel.adaptive,
446
463
  showLast = defaultAxisLabel.showLast,
447
464
  autoSort = defaultAxisLabel.autoSort,
448
465
  textAlign = defaultAxisLabel.textAlign,
@@ -465,187 +482,191 @@ export const axisLabel = ({
465
482
  rule: [["show", "$eq", true]],
466
483
  name: "format",
467
484
  displayName: "格式",
468
- value: [
469
- {
470
- name: "type",
471
- displayName: "",
472
- value: labelType,
473
- type: "radio",
474
- config: {
475
- options: [
476
- {
477
- name: "类目型",
478
- value: "category",
479
- },
480
- {
481
- name: "时间型",
482
- value: "date",
483
- },
484
- ],
485
- span: 24,
485
+ value: labelType,
486
+ type: "radio",
487
+ config: {
488
+ options: [
489
+ {
490
+ name: "类目型",
491
+ value: "category",
486
492
  },
487
- },
488
- {
489
- rule: [["type", "$eq", "date"]],
490
- name: "showType",
491
- displayName: "",
492
- value: labelShowType,
493
- type: "select",
494
- config: {
495
- options: [
496
- {
497
- name: "2017年1月1日 08:00:00",
498
- value: "YYYY年M月D日 HH:mm:ss",
499
- },
500
- {
501
- name: "2017年01月01日 08:00:00",
502
- value: "YYYY年MM月DD日 HH:mm:ss",
503
- },
504
- {
505
- name: "2017-1-1 08:00:00",
506
- value: "YYYY-M-D HH:mm:ss",
507
- },
508
- {
509
- name: "2017-01-01 08:00:00",
510
- value: "YYYY-MM-DD HH:mm:ss",
511
- },
512
- {
513
- name: "2017.1.1 08:00:00",
514
- value: "YYYY.M.D HH:mm:ss",
515
- },
516
- {
517
- name: "2017.01.01 08:00:00",
518
- value: "YYYY.MM.DD HH:mm:ss",
519
- },
520
- {
521
- name: "2017年1月1日",
522
- value: "YYYY年M月D日",
523
- },
524
- {
525
- name: "2017年01月01日",
526
- value: "YYYY年MM月DD日",
527
- },
528
- {
529
- name: "2017年01月",
530
- value: "YYYY年MM月",
531
- },
532
- {
533
- name: "2017-1-1",
534
- value: "YYYY-M-D",
535
- },
536
- {
537
- name: "2017-01",
538
- value: "YYYY-MM",
539
- },
540
- {
541
- name: "2017-01-01",
542
- value: "YYYY-MM-DD",
543
- },
544
- {
545
- name: "2017.1.1",
546
- value: "YYYY.M.D",
547
- },
548
- {
549
- name: "2017.01.01",
550
- value: "YYYY.MM.DD",
551
- },
552
- {
553
- name: "2017年",
554
- value: "YYYY年",
555
- },
556
- {
557
- name: "2017(年)",
558
- value: "YYYY(年)",
559
- },
560
- {
561
- name: "1月1日",
562
- value: "M月D日",
563
- },
564
- {
565
- name: "01月01日",
566
- value: "MM月DD日",
567
- },
568
- {
569
- name: "01月01日01时",
570
- value: "MM月DD日HH时",
571
- },
572
- {
573
- name: "1-1",
574
- value: "M-D",
575
- },
576
- {
577
- name: "01-01",
578
- value: "MM-DD",
579
- },
580
- {
581
- name: "1.1",
582
- value: "M.D",
583
- },
584
- {
585
- name: "01.01",
586
- value: "MM.DD",
587
- },
588
- {
589
- name: "1月",
590
- value: "M月",
591
- },
592
- {
593
- name: "01月",
594
- value: "MM月",
595
- },
596
- {
597
- name: "1(月)",
598
- value: "M",
599
- },
600
- {
601
- name: "01(月)",
602
- value: "MM",
603
- },
604
- {
605
- name: "1日",
606
- value: "D日",
607
- },
608
- {
609
- name: "01日",
610
- value: "DD日",
611
- },
612
- {
613
- name: "1(日)",
614
- value: "D",
615
- },
616
- {
617
- name: "01(日)",
618
- value: "DD",
619
- },
620
- {
621
- name: "08:00:00",
622
- value: "HH:mm:ss",
623
- },
624
- {
625
- name: "08:00",
626
- value: "HH:mm",
627
- },
628
- {
629
- name: "星期一",
630
- value: "X",
631
- },
632
- {
633
- name: "Monday",
634
- value: "W",
635
- },
636
- {
637
- name: "Mon",
638
- value: "w",
639
- },
640
- ],
641
- span: 24,
493
+ {
494
+ name: "时间型",
495
+ value: "date",
642
496
  },
643
- },
497
+ ],
498
+ span: 24,
499
+ },
500
+ },
501
+ {
502
+ rule: [["format", "$eq", "date"]],
503
+ name: "showType",
504
+ displayName: "",
505
+ value: labelShowType,
506
+ type: "select",
507
+ config: {
508
+ options: [
509
+ {
510
+ name: "2017年1月1日 08:00:00",
511
+ value: "YYYY年M月D日 HH:mm:ss",
512
+ },
513
+ {
514
+ name: "2017年01月01日 08:00:00",
515
+ value: "YYYY年MM月DD日 HH:mm:ss",
516
+ },
517
+ {
518
+ name: "2017-1-1 08:00:00",
519
+ value: "YYYY-M-D HH:mm:ss",
520
+ },
521
+ {
522
+ name: "2017-01-01 08:00:00",
523
+ value: "YYYY-MM-DD HH:mm:ss",
524
+ },
525
+ {
526
+ name: "2017.1.1 08:00:00",
527
+ value: "YYYY.M.D HH:mm:ss",
528
+ },
529
+ {
530
+ name: "2017.01.01 08:00:00",
531
+ value: "YYYY.MM.DD HH:mm:ss",
532
+ },
533
+ {
534
+ name: "2017年1月1日",
535
+ value: "YYYY年M月D日",
536
+ },
537
+ {
538
+ name: "2017年01月01日",
539
+ value: "YYYY年MM月DD日",
540
+ },
541
+ {
542
+ name: "2017年01月",
543
+ value: "YYYY年MM月",
544
+ },
545
+ {
546
+ name: "2017-1-1",
547
+ value: "YYYY-M-D",
548
+ },
549
+ {
550
+ name: "2017-01",
551
+ value: "YYYY-MM",
552
+ },
553
+ {
554
+ name: "2017-01-01",
555
+ value: "YYYY-MM-DD",
556
+ },
557
+ {
558
+ name: "2017.1.1",
559
+ value: "YYYY.M.D",
560
+ },
561
+ {
562
+ name: "2017.01.01",
563
+ value: "YYYY.MM.DD",
564
+ },
565
+ {
566
+ name: "2017年",
567
+ value: "YYYY年",
568
+ },
569
+ {
570
+ name: "2017(年)",
571
+ value: "YYYY(年)",
572
+ },
573
+ {
574
+ name: "1月1日",
575
+ value: "M月D日",
576
+ },
577
+ {
578
+ name: "01月01日",
579
+ value: "MM月DD日",
580
+ },
581
+ {
582
+ name: "01月01日01时",
583
+ value: "MM月DD日HH时",
584
+ },
585
+ {
586
+ name: "1-1",
587
+ value: "M-D",
588
+ },
589
+ {
590
+ name: "01-01",
591
+ value: "MM-DD",
592
+ },
593
+ {
594
+ name: "1.1",
595
+ value: "M.D",
596
+ },
597
+ {
598
+ name: "01.01",
599
+ value: "MM.DD",
600
+ },
601
+ {
602
+ name: "1月",
603
+ value: "M月",
604
+ },
605
+ {
606
+ name: "01月",
607
+ value: "MM月",
608
+ },
609
+ {
610
+ name: "1(月)",
611
+ value: "M",
612
+ },
613
+ {
614
+ name: "01(月)",
615
+ value: "MM",
616
+ },
617
+ {
618
+ name: "1日",
619
+ value: "D日",
620
+ },
621
+ {
622
+ name: "01日",
623
+ value: "DD日",
624
+ },
625
+ {
626
+ name: "1(日)",
627
+ value: "D",
628
+ },
629
+ {
630
+ name: "01(日)",
631
+ value: "DD",
632
+ },
633
+ {
634
+ name: "08:00:00",
635
+ value: "HH:mm:ss",
636
+ },
637
+ {
638
+ name: "08:00",
639
+ value: "HH:mm",
640
+ },
641
+ {
642
+ name: "星期一",
643
+ value: "X",
644
+ },
645
+ {
646
+ name: "Monday",
647
+ value: "W",
648
+ },
649
+ {
650
+ name: "Mon",
651
+ value: "w",
652
+ },
653
+ ],
654
+ span: 24,
655
+ },
656
+ },
657
+ {
658
+ rule: [
659
+ ["show", "$eq", true]
644
660
  ],
645
- type: "group",
661
+ name: "adaptive",
662
+ displayName: "刻度自适应",
663
+ value: adaptive,
664
+ type: "boolean"
646
665
  },
647
666
  {
648
- rule: [["show", "$eq", true]],
667
+ rule: [
668
+ ["show", "$eq", true],["adaptive", "$eq", false]
669
+ ],
649
670
  name: "appearance",
650
671
  displayName: "展示",
651
672
  tip: "展示标签的数量会根据原标签数量进行整除后按间距调整标签分布,如果输入的数量不能被整除,则无法按照输入数量进行展示。",
@@ -724,14 +745,15 @@ export const axisLabel = ({
724
745
  tip: "数据按时间自动排序展示",
725
746
  },
726
747
  },
727
- showRule()
748
+ showRule("format", "$eq", "date")
728
749
  ),
729
- sc(
730
- "textAlign",
731
- "对齐",
732
- "radio",
733
- textAlign,
734
- {
750
+ {
751
+ rule: [["adaptive", "$eq", false]],
752
+ type: "radio",
753
+ name: "textAlign",
754
+ displayName: "对齐",
755
+ value: textAlign,
756
+ config: {
735
757
  mode: "icon",
736
758
  options: [
737
759
  { name: "左对齐", value: "left", icon: "align-left" },
@@ -739,8 +761,7 @@ export const axisLabel = ({
739
761
  { name: "右对齐", value: "right", icon: "align-right" },
740
762
  ],
741
763
  },
742
- showRule("show", "$eq", true)
743
- ),
764
+ },
744
765
  {
745
766
  rule: [["show", "$eq", true]],
746
767
  ...translate(labelTranslateX, labelTranslateY),
@@ -1020,7 +1041,12 @@ export const valueAsixLabel = ({
1020
1041
  ["show", "$eq", true],
1021
1042
  ["numericalRangeModel", "$eq", "percentage"],
1022
1043
  ],
1023
- ...extent({ min: percentMin, max: percentMax, customSuffix: '%', customName: 'percentageExtent' }),
1044
+ ...extent({
1045
+ min: percentMin,
1046
+ max: percentMax,
1047
+ customSuffix: "%",
1048
+ customName: "percentageExtent",
1049
+ }),
1024
1050
  },
1025
1051
  {
1026
1052
  rule: [["show", "$eq", true]],