@easyv/config 1.0.49 → 1.0.50

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 (3) hide show
  1. package/lib/series.js +6 -7
  2. package/package.json +1 -1
  3. package/src/series.js +6 -7
package/lib/series.js CHANGED
@@ -18,7 +18,6 @@ var _mapping = {
18
18
  var defaultBandSeries = {
19
19
  mapping: _mapping,
20
20
  yOrZ: 'y',
21
- fillType: 'color',
22
21
  fillImage: 'components/static-image/superChart/pattern.png',
23
22
  fill: {
24
23
  type: 'linear',
@@ -131,7 +130,7 @@ var bandSeries = function bandSeries() {
131
130
  displayName: '堆叠',
132
131
  value: stack,
133
132
  type: 'input'
134
- }, patternType === undefined && {
133
+ }, fillType !== undefined && {
135
134
  name: 'fillType',
136
135
  displayName: '填充样式',
137
136
  value: fillType,
@@ -145,19 +144,19 @@ var bandSeries = function bandSeries() {
145
144
  value: 'pattern'
146
145
  }]
147
146
  }
148
- }, patternType === undefined && {
147
+ }, fillType !== undefined && {
149
148
  rule: [['fillType', '$eq', 'color']],
150
149
  name: 'fill',
151
150
  displayName: '颜色',
152
151
  type: 'multicolor',
153
152
  value: fill
154
- }, patternType === undefined && {
153
+ }, fillType !== undefined && {
155
154
  rule: [['fillType', '$eq', 'pattern']],
156
155
  name: 'url',
157
156
  displayName: '纹理图片',
158
157
  type: 'uploadImage',
159
158
  value: fillImage
160
- }, patternType === undefined && {
159
+ }, fillType !== undefined && {
161
160
  rule: [['fillType', '$eq', 'pattern']],
162
161
  name: 'size',
163
162
  displayName: '尺寸',
@@ -179,7 +178,7 @@ var bandSeries = function bandSeries() {
179
178
  }
180
179
  }],
181
180
  type: 'group'
182
- }, patternType === undefined && {
181
+ }, fillType !== undefined && {
183
182
  rule: [['fillType', '$eq', 'pattern']],
184
183
  type: "range",
185
184
  name: "opacity",
@@ -190,7 +189,7 @@ var bandSeries = function bandSeries() {
190
189
  min: 0,
191
190
  step: 0.01
192
191
  }
193
- }, patternType !== undefined && {
192
+ }, (patternType !== undefined || fillType === undefined) && {
194
193
  name: 'fill',
195
194
  displayName: '颜色',
196
195
  type: 'multicolor',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@easyv/config",
3
- "version": "1.0.49",
3
+ "version": "1.0.50",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/series.js CHANGED
@@ -5,7 +5,6 @@ const _mapping = { fieldName: '', displayName: '' };
5
5
  const defaultBandSeries = {
6
6
  mapping: _mapping,
7
7
  yOrZ: 'y',
8
- fillType: 'color',
9
8
  fillImage: 'components/static-image/superChart/pattern.png',
10
9
  fill: {
11
10
  type: 'linear',
@@ -95,7 +94,7 @@ export const bandSeries = (
95
94
  value: stack,
96
95
  type: 'input',
97
96
  },
98
- patternType === undefined && {
97
+ fillType !== undefined && {
99
98
  name: 'fillType',
100
99
  displayName: '填充样式',
101
100
  value: fillType,
@@ -107,21 +106,21 @@ export const bandSeries = (
107
106
  ],
108
107
  },
109
108
  },
110
- patternType === undefined && {
109
+ fillType !== undefined && {
111
110
  rule: [['fillType', '$eq', 'color']],
112
111
  name: 'fill',
113
112
  displayName: '颜色',
114
113
  type: 'multicolor',
115
114
  value: fill,
116
115
  },
117
- patternType === undefined && {
116
+ fillType !== undefined && {
118
117
  rule: [['fillType', '$eq', 'pattern']],
119
118
  name: 'url',
120
119
  displayName: '纹理图片',
121
120
  type: 'uploadImage',
122
121
  value: fillImage,
123
122
  },
124
- patternType === undefined && {
123
+ fillType !== undefined && {
125
124
  rule: [['fillType', '$eq', 'pattern']],
126
125
  name: 'size',
127
126
  displayName: '尺寸',
@@ -141,7 +140,7 @@ export const bandSeries = (
141
140
  ],
142
141
  type: 'group',
143
142
  },
144
- patternType === undefined && {
143
+ fillType !== undefined && {
145
144
  rule: [['fillType', '$eq', 'pattern']],
146
145
  type: "range",
147
146
  name: "opacity",
@@ -149,7 +148,7 @@ export const bandSeries = (
149
148
  value: opacity,
150
149
  config: { max: 1, min: 0, step: 0.01 }
151
150
  },
152
- patternType !== undefined && {
151
+ (patternType !== undefined || fillType === undefined) && {
153
152
  name: 'fill',
154
153
  displayName: '颜色',
155
154
  type: 'multicolor',