@easyv/config 1.3.0 → 1.3.1
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/animation.js +114 -106
- package/lib/control.js +122 -122
- package/lib/label.js +1071 -1071
- package/lib/legend.js +1153 -1153
- package/lib/sc.js +1 -1
- package/lib/textOverflow.js +44 -44
- package/package.json +1 -1
- package/src/animation.js +130 -120
- package/src/font.js +23 -23
- package/src/sc.js +17 -11
package/lib/sc.js
CHANGED
|
@@ -21,7 +21,7 @@ var _default = function _default(name, displayName) {
|
|
|
21
21
|
if (type) res["type"] = type;
|
|
22
22
|
if (config) {
|
|
23
23
|
if (config.other) res = _objectSpread(_objectSpread({}, res), config.other);
|
|
24
|
-
res[
|
|
24
|
+
res["config"] = config;
|
|
25
25
|
}
|
|
26
26
|
if (rule) res = _objectSpread(_objectSpread({}, rule), res);
|
|
27
27
|
return res;
|
package/lib/textOverflow.js
CHANGED
|
@@ -1,45 +1,45 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports["default"] = void 0;
|
|
7
|
-
var defaultTextOverflow = {
|
|
8
|
-
textOverflow: 'ellipsis',
|
|
9
|
-
speed: 5
|
|
10
|
-
};
|
|
11
|
-
var _default = function _default() {
|
|
12
|
-
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultTextOverflow,
|
|
13
|
-
_ref$textOverflow = _ref.textOverflow,
|
|
14
|
-
textOverflow = _ref$textOverflow === void 0 ? defaultTextOverflow.textOverflow : _ref$textOverflow,
|
|
15
|
-
_ref$speed = _ref.speed,
|
|
16
|
-
speed = _ref$speed === void 0 ? defaultTextOverflow.speed : _ref$speed;
|
|
17
|
-
return [{
|
|
18
|
-
name: 'textOverflow',
|
|
19
|
-
displayName: '文本溢出',
|
|
20
|
-
value: textOverflow,
|
|
21
|
-
type: 'select',
|
|
22
|
-
config: {
|
|
23
|
-
options: [{
|
|
24
|
-
name: '换行',
|
|
25
|
-
value: 'break-word'
|
|
26
|
-
}, {
|
|
27
|
-
name: '省略号',
|
|
28
|
-
value: 'ellipsis'
|
|
29
|
-
}, {
|
|
30
|
-
name: '跑马灯',
|
|
31
|
-
value: 'marquee'
|
|
32
|
-
}]
|
|
33
|
-
}
|
|
34
|
-
}, {
|
|
35
|
-
rule: [['textOverflow', '$eq', 'marquee'], ["LegendType", "$eq", "FixedWidth"]],
|
|
36
|
-
name: 'speed',
|
|
37
|
-
displayName: '滚动速度',
|
|
38
|
-
type: 'number',
|
|
39
|
-
value: speed,
|
|
40
|
-
config: {
|
|
41
|
-
min: 1
|
|
42
|
-
}
|
|
43
|
-
}];
|
|
44
|
-
};
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports["default"] = void 0;
|
|
7
|
+
var defaultTextOverflow = {
|
|
8
|
+
textOverflow: 'ellipsis',
|
|
9
|
+
speed: 5
|
|
10
|
+
};
|
|
11
|
+
var _default = function _default() {
|
|
12
|
+
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : defaultTextOverflow,
|
|
13
|
+
_ref$textOverflow = _ref.textOverflow,
|
|
14
|
+
textOverflow = _ref$textOverflow === void 0 ? defaultTextOverflow.textOverflow : _ref$textOverflow,
|
|
15
|
+
_ref$speed = _ref.speed,
|
|
16
|
+
speed = _ref$speed === void 0 ? defaultTextOverflow.speed : _ref$speed;
|
|
17
|
+
return [{
|
|
18
|
+
name: 'textOverflow',
|
|
19
|
+
displayName: '文本溢出',
|
|
20
|
+
value: textOverflow,
|
|
21
|
+
type: 'select',
|
|
22
|
+
config: {
|
|
23
|
+
options: [{
|
|
24
|
+
name: '换行',
|
|
25
|
+
value: 'break-word'
|
|
26
|
+
}, {
|
|
27
|
+
name: '省略号',
|
|
28
|
+
value: 'ellipsis'
|
|
29
|
+
}, {
|
|
30
|
+
name: '跑马灯',
|
|
31
|
+
value: 'marquee'
|
|
32
|
+
}]
|
|
33
|
+
}
|
|
34
|
+
}, {
|
|
35
|
+
rule: [['textOverflow', '$eq', 'marquee'], ["LegendType", "$eq", "FixedWidth"]],
|
|
36
|
+
name: 'speed',
|
|
37
|
+
displayName: '滚动速度',
|
|
38
|
+
type: 'number',
|
|
39
|
+
value: speed,
|
|
40
|
+
config: {
|
|
41
|
+
min: 1
|
|
42
|
+
}
|
|
43
|
+
}];
|
|
44
|
+
};
|
|
45
45
|
exports["default"] = _default;
|
package/package.json
CHANGED
package/src/animation.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { multiColor, font } from
|
|
1
|
+
import { multiColor, font } from "./";
|
|
2
2
|
const animation = {
|
|
3
3
|
show: false,
|
|
4
4
|
duration: 3,
|
|
@@ -8,47 +8,47 @@ export default ({
|
|
|
8
8
|
show = animation.show,
|
|
9
9
|
duration = animation.duration,
|
|
10
10
|
interval = animation.interval,
|
|
11
|
-
hoverStop
|
|
11
|
+
hoverStop,
|
|
12
12
|
} = animation) => ({
|
|
13
|
-
name:
|
|
14
|
-
displayName:
|
|
13
|
+
name: "animation",
|
|
14
|
+
displayName: "轮播动画",
|
|
15
15
|
value: [
|
|
16
16
|
{
|
|
17
|
-
name:
|
|
18
|
-
displayName:
|
|
17
|
+
name: "show",
|
|
18
|
+
displayName: "",
|
|
19
19
|
value: show,
|
|
20
|
-
type:
|
|
20
|
+
type: "boolean",
|
|
21
21
|
},
|
|
22
22
|
{
|
|
23
|
-
rule: [[
|
|
24
|
-
name:
|
|
25
|
-
displayName:
|
|
23
|
+
rule: [["show", "$eq", true]],
|
|
24
|
+
name: "duration",
|
|
25
|
+
displayName: "滚动时长",
|
|
26
26
|
value: duration,
|
|
27
|
-
type:
|
|
27
|
+
type: "number",
|
|
28
28
|
config: {
|
|
29
29
|
span: 12,
|
|
30
|
-
suffix:
|
|
30
|
+
suffix: "s",
|
|
31
31
|
},
|
|
32
32
|
},
|
|
33
33
|
{
|
|
34
|
-
rule: [[
|
|
35
|
-
name:
|
|
36
|
-
displayName:
|
|
34
|
+
rule: [["show", "$eq", true]],
|
|
35
|
+
name: "interval",
|
|
36
|
+
displayName: "间隔时长",
|
|
37
37
|
value: interval,
|
|
38
|
-
type:
|
|
38
|
+
type: "number",
|
|
39
39
|
config: {
|
|
40
40
|
span: 12,
|
|
41
|
-
suffix:
|
|
41
|
+
suffix: "s",
|
|
42
42
|
},
|
|
43
43
|
},
|
|
44
|
-
hoverStop !==undefined && {
|
|
45
|
-
rule: [[
|
|
46
|
-
name:
|
|
47
|
-
displayName:
|
|
44
|
+
hoverStop !== undefined && {
|
|
45
|
+
rule: [["show", "$eq", true]],
|
|
46
|
+
name: "hover",
|
|
47
|
+
displayName: "悬停暂停动画",
|
|
48
48
|
value: hoverStop,
|
|
49
|
-
type:
|
|
50
|
-
}
|
|
51
|
-
].filter(d
|
|
49
|
+
type: "boolean",
|
|
50
|
+
},
|
|
51
|
+
].filter((d) => !!d),
|
|
52
52
|
});
|
|
53
53
|
|
|
54
54
|
const defaultDataAnimation = {
|
|
@@ -59,24 +59,24 @@ export const dataAnimation = ({
|
|
|
59
59
|
show = defaultDataAnimation.show,
|
|
60
60
|
duration = defaultDataAnimation.duration,
|
|
61
61
|
} = defaultDataAnimation) => ({
|
|
62
|
-
name:
|
|
63
|
-
displayName:
|
|
62
|
+
name: "dataAnimation",
|
|
63
|
+
displayName: "数据动画",
|
|
64
64
|
value: [
|
|
65
65
|
{
|
|
66
|
-
name:
|
|
67
|
-
displayName:
|
|
66
|
+
name: "show",
|
|
67
|
+
displayName: "",
|
|
68
68
|
value: show,
|
|
69
|
-
type:
|
|
69
|
+
type: "boolean",
|
|
70
70
|
},
|
|
71
71
|
{
|
|
72
|
-
rule: [[
|
|
73
|
-
name:
|
|
74
|
-
displayName:
|
|
72
|
+
rule: [["show", "$eq", true]],
|
|
73
|
+
name: "duration",
|
|
74
|
+
displayName: "滚动时长",
|
|
75
75
|
value: duration,
|
|
76
|
-
type:
|
|
76
|
+
type: "number",
|
|
77
77
|
config: {
|
|
78
78
|
span: 12,
|
|
79
|
-
suffix:
|
|
79
|
+
suffix: "s",
|
|
80
80
|
},
|
|
81
81
|
},
|
|
82
82
|
],
|
|
@@ -86,7 +86,8 @@ const defaultAnimationOfPie = {
|
|
|
86
86
|
show: true,
|
|
87
87
|
current: { heighten: 10, opacity: 60 },
|
|
88
88
|
interval: 3,
|
|
89
|
-
interactive:
|
|
89
|
+
interactive: "",
|
|
90
|
+
canCancel: false,
|
|
90
91
|
};
|
|
91
92
|
export const animationOfPie = ({
|
|
92
93
|
show = defaultAnimationOfPie.show,
|
|
@@ -97,82 +98,91 @@ export const animationOfPie = ({
|
|
|
97
98
|
} = defaultAnimationOfPie.current,
|
|
98
99
|
interval = defaultAnimationOfPie.interval,
|
|
99
100
|
interactive = defaultAnimationOfPie.interactive,
|
|
100
|
-
|
|
101
|
+
canCancel = defaultAnimationOfPie.canCancel,
|
|
102
|
+
hoverStop,
|
|
101
103
|
} = defaultAnimationOfPie) => ({
|
|
102
|
-
name:
|
|
103
|
-
displayName:
|
|
104
|
+
name: "animation",
|
|
105
|
+
displayName: "轮播动画",
|
|
104
106
|
value: [
|
|
105
107
|
{
|
|
106
|
-
name:
|
|
107
|
-
displayName:
|
|
108
|
+
name: "on",
|
|
109
|
+
displayName: "开启",
|
|
108
110
|
value: show,
|
|
109
|
-
type:
|
|
111
|
+
type: "boolean",
|
|
110
112
|
},
|
|
111
113
|
{
|
|
112
|
-
rule: [[
|
|
113
|
-
name:
|
|
114
|
-
displayName:
|
|
114
|
+
rule: [["on", "$eq", true]],
|
|
115
|
+
name: "current",
|
|
116
|
+
displayName: "当前值",
|
|
115
117
|
value: [
|
|
116
118
|
{
|
|
117
|
-
name:
|
|
118
|
-
displayName:
|
|
119
|
+
name: "heighten",
|
|
120
|
+
displayName: "高度增长",
|
|
119
121
|
value: heighten,
|
|
120
|
-
type:
|
|
122
|
+
type: "number",
|
|
121
123
|
},
|
|
122
|
-
widthen!=undefined
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
124
|
+
widthen != undefined
|
|
125
|
+
? {
|
|
126
|
+
name: "widthen",
|
|
127
|
+
displayName: "半径增长",
|
|
128
|
+
value: widthen,
|
|
129
|
+
type: "number",
|
|
130
|
+
}
|
|
131
|
+
: undefined,
|
|
128
132
|
{
|
|
129
|
-
name:
|
|
130
|
-
displayName:
|
|
133
|
+
name: "opacity",
|
|
134
|
+
displayName: "透明度",
|
|
131
135
|
value: opacity,
|
|
132
|
-
type:
|
|
136
|
+
type: "range",
|
|
133
137
|
config: {
|
|
134
138
|
min: 0,
|
|
135
139
|
max: 100,
|
|
136
|
-
suffix:
|
|
140
|
+
suffix: "%",
|
|
137
141
|
},
|
|
138
142
|
},
|
|
139
|
-
].filter(d
|
|
143
|
+
].filter((d) => !!d),
|
|
140
144
|
config: {
|
|
141
145
|
defaultOpen: true,
|
|
142
146
|
},
|
|
143
147
|
},
|
|
144
148
|
{
|
|
145
|
-
rule: [[
|
|
146
|
-
name:
|
|
147
|
-
displayName:
|
|
149
|
+
rule: [["on", "$eq", true]],
|
|
150
|
+
name: "interval",
|
|
151
|
+
displayName: "间隔时长",
|
|
148
152
|
value: interval,
|
|
149
|
-
type:
|
|
153
|
+
type: "number",
|
|
150
154
|
config: {
|
|
151
|
-
suffix:
|
|
155
|
+
suffix: "s",
|
|
152
156
|
},
|
|
153
157
|
},
|
|
154
158
|
{
|
|
155
|
-
tip:
|
|
156
|
-
name:
|
|
157
|
-
displayName:
|
|
159
|
+
tip: "选择点击或悬浮,鼠标点击/悬浮各数据块时停止轮播仅显示当前数据信息",
|
|
160
|
+
name: "interactive",
|
|
161
|
+
displayName: "交互方式",
|
|
158
162
|
value: interactive,
|
|
159
|
-
type:
|
|
163
|
+
type: "radio",
|
|
160
164
|
config: {
|
|
161
165
|
options: [
|
|
162
|
-
{ name:
|
|
163
|
-
{ name:
|
|
164
|
-
{ name:
|
|
166
|
+
{ name: "无", value: "" },
|
|
167
|
+
{ name: "点击", value: "click" },
|
|
168
|
+
{ name: "悬停", value: "hover" },
|
|
165
169
|
],
|
|
166
170
|
},
|
|
167
171
|
},
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
+
{
|
|
173
|
+
name: "canCancel",
|
|
174
|
+
displayName: "允许取消",
|
|
175
|
+
type: "boolean",
|
|
176
|
+
value: canCancel,
|
|
177
|
+
},
|
|
178
|
+
hoverStop !== undefined && {
|
|
179
|
+
rule: [["on", "$eq", true]],
|
|
180
|
+
name: "hoverStop",
|
|
181
|
+
displayName: "悬停暂停动画",
|
|
172
182
|
value: hoverStop,
|
|
173
|
-
type:
|
|
174
|
-
}
|
|
175
|
-
].filter(d
|
|
183
|
+
type: "boolean",
|
|
184
|
+
},
|
|
185
|
+
].filter((d) => !!d),
|
|
176
186
|
});
|
|
177
187
|
|
|
178
188
|
const defaultAnimationOfCarousel = {
|
|
@@ -198,48 +208,48 @@ export const animationOfCarousel = ({
|
|
|
198
208
|
interval = defaultAnimationOfCarousel.interval,
|
|
199
209
|
rotate = defaultAnimationOfCarousel.rotate,
|
|
200
210
|
interactive = defaultAnimationOfCarousel.interactive,
|
|
201
|
-
hoverStop
|
|
211
|
+
hoverStop,
|
|
202
212
|
} = defaultAnimationOfCarousel) => ({
|
|
203
|
-
name:
|
|
204
|
-
displayName:
|
|
213
|
+
name: "animation",
|
|
214
|
+
displayName: "轮播动画",
|
|
205
215
|
value: [
|
|
206
216
|
{
|
|
207
|
-
name:
|
|
208
|
-
displayName:
|
|
217
|
+
name: "on",
|
|
218
|
+
displayName: "开启",
|
|
209
219
|
value: show,
|
|
210
|
-
type:
|
|
220
|
+
type: "boolean",
|
|
211
221
|
},
|
|
212
222
|
{
|
|
213
|
-
rule: [[
|
|
214
|
-
name:
|
|
215
|
-
displayName:
|
|
223
|
+
rule: [["on", "$eq", true]],
|
|
224
|
+
name: "current",
|
|
225
|
+
displayName: "当前值",
|
|
216
226
|
value: [
|
|
217
227
|
{
|
|
218
|
-
name:
|
|
219
|
-
displayName:
|
|
228
|
+
name: "width",
|
|
229
|
+
displayName: "弧宽增长",
|
|
220
230
|
value: width,
|
|
221
|
-
type:
|
|
231
|
+
type: "number",
|
|
222
232
|
},
|
|
223
233
|
{
|
|
224
|
-
name:
|
|
225
|
-
displayName:
|
|
234
|
+
name: "color",
|
|
235
|
+
displayName: "颜色",
|
|
226
236
|
value: multiColor(color),
|
|
227
|
-
type:
|
|
237
|
+
type: "multicolor",
|
|
228
238
|
},
|
|
229
239
|
{
|
|
230
|
-
name:
|
|
231
|
-
displayName:
|
|
240
|
+
name: "textStyle",
|
|
241
|
+
displayName: "类目文本样式",
|
|
232
242
|
value: font(textStyle),
|
|
233
|
-
type:
|
|
234
|
-
markColorType:
|
|
243
|
+
type: "textStyle",
|
|
244
|
+
markColorType: "textColor",
|
|
235
245
|
},
|
|
236
246
|
{
|
|
237
|
-
name:
|
|
238
|
-
displayName:
|
|
247
|
+
name: "gap",
|
|
248
|
+
displayName: "类目文本间距",
|
|
239
249
|
value: gap,
|
|
240
|
-
type:
|
|
250
|
+
type: "number",
|
|
241
251
|
config: {
|
|
242
|
-
suffix:
|
|
252
|
+
suffix: "px",
|
|
243
253
|
},
|
|
244
254
|
},
|
|
245
255
|
],
|
|
@@ -248,39 +258,39 @@ export const animationOfCarousel = ({
|
|
|
248
258
|
},
|
|
249
259
|
},
|
|
250
260
|
{
|
|
251
|
-
rule: [[
|
|
252
|
-
name:
|
|
253
|
-
displayName:
|
|
261
|
+
rule: [["on", "$eq", true]],
|
|
262
|
+
name: "interval",
|
|
263
|
+
displayName: "间隔时长",
|
|
254
264
|
value: interval,
|
|
255
|
-
type:
|
|
265
|
+
type: "number",
|
|
256
266
|
config: {
|
|
257
|
-
suffix:
|
|
267
|
+
suffix: "s",
|
|
258
268
|
},
|
|
259
269
|
},
|
|
260
270
|
{
|
|
261
|
-
rule: [[
|
|
262
|
-
name:
|
|
263
|
-
displayName:
|
|
271
|
+
rule: [["on", "$eq", true]],
|
|
272
|
+
name: "rotate",
|
|
273
|
+
displayName: "旋转",
|
|
264
274
|
value: rotate,
|
|
265
|
-
type:
|
|
275
|
+
type: "number",
|
|
266
276
|
config: {
|
|
267
277
|
min: 0,
|
|
268
278
|
max: 360,
|
|
269
|
-
suffix:
|
|
279
|
+
suffix: "°",
|
|
270
280
|
},
|
|
271
281
|
},
|
|
272
282
|
{
|
|
273
|
-
name:
|
|
274
|
-
displayName:
|
|
283
|
+
name: "interactive",
|
|
284
|
+
displayName: "点击交互",
|
|
275
285
|
value: interactive,
|
|
276
|
-
type:
|
|
286
|
+
type: "boolean",
|
|
277
287
|
},
|
|
278
|
-
hoverStop !==undefined && {
|
|
279
|
-
rule: [[
|
|
280
|
-
name:
|
|
281
|
-
displayName:
|
|
288
|
+
hoverStop !== undefined && {
|
|
289
|
+
rule: [["on", "$eq", true]],
|
|
290
|
+
name: "hoverStop",
|
|
291
|
+
displayName: "悬停暂停动画",
|
|
282
292
|
value: hoverStop,
|
|
283
|
-
type:
|
|
284
|
-
}
|
|
285
|
-
].filter(d
|
|
293
|
+
type: "boolean",
|
|
294
|
+
},
|
|
295
|
+
].filter((d) => !!d),
|
|
286
296
|
});
|
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/sc.js
CHANGED
|
@@ -1,12 +1,18 @@
|
|
|
1
|
+
export default (
|
|
2
|
+
name,
|
|
3
|
+
displayName,
|
|
4
|
+
type = "",
|
|
5
|
+
value,
|
|
6
|
+
config = "",
|
|
7
|
+
rule = ""
|
|
8
|
+
) => {
|
|
9
|
+
let res = { name, displayName, value };
|
|
10
|
+
if (type) res["type"] = type;
|
|
11
|
+
if (config) {
|
|
12
|
+
if (config.other) res = { ...res, ...config.other };
|
|
13
|
+
res["config"] = config;
|
|
14
|
+
}
|
|
15
|
+
if (rule) res = { ...rule, ...res };
|
|
1
16
|
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
if(type) res["type"]=type;
|
|
5
|
-
if(config){
|
|
6
|
-
if(config.other) res={...res,...config.other};
|
|
7
|
-
res['config']=config;
|
|
8
|
-
}
|
|
9
|
-
if(rule) res={...rule,...res}
|
|
10
|
-
|
|
11
|
-
return res;
|
|
12
|
-
}
|
|
17
|
+
return res;
|
|
18
|
+
};
|