@easyv/config 1.1.8 → 1.1.9

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/animation.js +2 -3
  2. package/lib/baseLine.js +16 -9
  3. package/package.json +1 -1
  4. package/src/animation.js +2 -3
  5. package/src/baseLine.js +15 -9
package/lib/animation.js CHANGED
@@ -25,10 +25,9 @@ var _default = function _default() {
25
25
  return {
26
26
  name: 'animation',
27
27
  displayName: '轮播动画',
28
- type: 'group',
29
28
  value: [{
30
29
  name: 'show',
31
- displayName: '打开',
30
+ displayName: '',
32
31
  value: show,
33
32
  type: 'boolean'
34
33
  }, {
@@ -73,7 +72,7 @@ var dataAnimation = function dataAnimation() {
73
72
  displayName: '数据动画',
74
73
  value: [{
75
74
  name: 'show',
76
- displayName: '打开',
75
+ displayName: '',
77
76
  value: show,
78
77
  type: 'boolean'
79
78
  }, {
package/lib/baseLine.js CHANGED
@@ -22,19 +22,26 @@ var defaultBaseLine = {
22
22
  marginLeft: 0,
23
23
  marginRight: 100
24
24
  },
25
- lineType: 'solid',
26
- color: '#BAE7FF',
25
+ lineType: 'dash',
26
+ color: '#FF781E',
27
27
  lineWidth: 1,
28
- strokeDasharray: '3,3'
28
+ strokeDasharray: '3,4'
29
29
  },
30
30
  dataStyle: {
31
31
  label: {
32
32
  show: true,
33
33
  text: '平均值',
34
- font: (0, _.font)(),
34
+ font: (0, _.font)({
35
+ color: 'rgba(255, 120, 30, 0.7)',
36
+ fontFamily: 'Mircosoft Yahei',
37
+ fontSize: 12,
38
+ bold: false,
39
+ italic: false,
40
+ letterSpacing: 0
41
+ }),
35
42
  translate: {
36
- x: 0,
37
- y: 0
43
+ x: 4,
44
+ y: 1
38
45
  }
39
46
  },
40
47
  data: {
@@ -75,11 +82,11 @@ var _default = function _default() {
75
82
  _ref$dataStyle$label$ = _ref$dataStyle$label.showLabel,
76
83
  showLabel = _ref$dataStyle$label$ === void 0 ? defaultBaseLine.dataStyle.label.show : _ref$dataStyle$label$,
77
84
  _ref$dataStyle$label$2 = _ref$dataStyle$label.text,
78
- text = _ref$dataStyle$label$2 === void 0 ? defaultBaseLine.dataStyle.label : _ref$dataStyle$label$2,
85
+ text = _ref$dataStyle$label$2 === void 0 ? defaultBaseLine.dataStyle.label.text : _ref$dataStyle$label$2,
79
86
  _ref$dataStyle$label$3 = _ref$dataStyle$label.textStyle,
80
- textStyle = _ref$dataStyle$label$3 === void 0 ? defaultBaseLine.dataStyle.font : _ref$dataStyle$label$3,
87
+ textStyle = _ref$dataStyle$label$3 === void 0 ? defaultBaseLine.dataStyle.label.font : _ref$dataStyle$label$3,
81
88
  _ref$dataStyle$label$4 = _ref$dataStyle$label.translate;
82
- _ref$dataStyle$label$4 = _ref$dataStyle$label$4 === void 0 ? defaultBaseLine.dataStyle.translate : _ref$dataStyle$label$4;
89
+ _ref$dataStyle$label$4 = _ref$dataStyle$label$4 === void 0 ? defaultBaseLine.dataStyle.label.translate : _ref$dataStyle$label$4;
83
90
  var x = _ref$dataStyle$label$4.x,
84
91
  y = _ref$dataStyle$label$4.y,
85
92
  _ref$dataStyle$data = _ref$dataStyle.data;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@easyv/config",
3
- "version": "1.1.8",
3
+ "version": "1.1.9",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/animation.js CHANGED
@@ -11,11 +11,10 @@ export default ({
11
11
  } = animation) => ({
12
12
  name: 'animation',
13
13
  displayName: '轮播动画',
14
- type: 'group',
15
14
  value: [
16
15
  {
17
16
  name: 'show',
18
- displayName: '打开',
17
+ displayName: '',
19
18
  value: show,
20
19
  type: 'boolean',
21
20
  },
@@ -57,7 +56,7 @@ export const dataAnimation = ({
57
56
  value: [
58
57
  {
59
58
  name: 'show',
60
- displayName: '打开',
59
+ displayName: '',
61
60
  value: show,
62
61
  type: 'boolean',
63
62
  },
package/src/baseLine.js CHANGED
@@ -1,6 +1,5 @@
1
1
  //@ts-check
2
2
  import { font, translate } from '.';
3
-
4
3
  const defaultBaseLine = {
5
4
  line: {
6
5
  yOrZ: 'y',
@@ -8,17 +7,24 @@ const defaultBaseLine = {
8
7
  marginLeft: 0,
9
8
  marginRight: 100
10
9
  },
11
- lineType: 'solid',
12
- color: '#BAE7FF',
10
+ lineType: 'dash',
11
+ color: '#FF781E',
13
12
  lineWidth: 1,
14
- strokeDasharray: '3,3'
13
+ strokeDasharray: '3,4'
15
14
  },
16
15
  dataStyle: {
17
16
  label: {
18
17
  show: true,
19
18
  text: '平均值',
20
- font: font(),
21
- translate: { x: 0, y: 0 },
19
+ font: font({
20
+ color: 'rgba(255, 120, 30, 0.7)',
21
+ fontFamily: 'Mircosoft Yahei',
22
+ fontSize: 12,
23
+ bold: false,
24
+ italic: false,
25
+ letterSpacing: 0,
26
+ }),
27
+ translate: { x: 4, y: 1 },
22
28
  },
23
29
  data: {
24
30
  show: false,
@@ -42,9 +48,9 @@ export default ({
42
48
  dataStyle: {
43
49
  label: {
44
50
  showLabel = defaultBaseLine.dataStyle.label.show,
45
- text = defaultBaseLine.dataStyle.label,
46
- textStyle = defaultBaseLine.dataStyle.font,
47
- translate: { x, y } = defaultBaseLine.dataStyle.translate,
51
+ text = defaultBaseLine.dataStyle.label.text,
52
+ textStyle = defaultBaseLine.dataStyle.label.font,
53
+ translate: { x, y } = defaultBaseLine.dataStyle.label.translate,
48
54
  },
49
55
  data: {
50
56
  showData = defaultBaseLine.dataStyle.data.show,