dolphin-weex-ui 2.2.1 → 2.2.3
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/CHANGELOG.md +10 -0
- package/dist/index.native.js +55 -33
- package/dist/index.native.js.map +1 -1
- package/dist/index.web.js +46 -36
- package/dist/index.web.js.map +1 -1
- package/package.json +1 -1
- package/packages/dof-button/index.vue +24 -1
- package/packages/dof-button/type.js +30 -30
- package/packages/dof-cell/index.vue +8 -0
- package/packages/dof-step-flow-h/index.vue +1 -1
package/package.json
CHANGED
|
@@ -91,8 +91,11 @@ export default {
|
|
|
91
91
|
type = 'colmo'
|
|
92
92
|
buttonStyle = COLMO_BUTTON_STYLE_MAP
|
|
93
93
|
}
|
|
94
|
+
|
|
95
|
+
let styleMap = { ...STYLE_MAP[type][pattern] }
|
|
96
|
+
if (!this._isColmo && pattern !== 'text' && !disabled) delete styleMap.backgroundColor
|
|
94
97
|
const mrBtnStyle = {
|
|
95
|
-
...
|
|
98
|
+
...styleMap,
|
|
96
99
|
...buttonStyle[size],
|
|
97
100
|
...btnStyle
|
|
98
101
|
}
|
|
@@ -338,6 +341,26 @@ export default {
|
|
|
338
341
|
.dof-btn-highlight-gray-plain:active {
|
|
339
342
|
background-color: rgba(124, 135, 155, 0.1);
|
|
340
343
|
}
|
|
344
|
+
.dof-btn-highlight-red-default {
|
|
345
|
+
background-color: #e61e1e;
|
|
346
|
+
}
|
|
347
|
+
.dof-btn-highlight-red-base {
|
|
348
|
+
background-color: #fffeb7;
|
|
349
|
+
}
|
|
350
|
+
.dof-btn-highlight-red-plain {
|
|
351
|
+
background-color: #fff;
|
|
352
|
+
}
|
|
353
|
+
|
|
354
|
+
.dof-btn-highlight-brown-default {
|
|
355
|
+
background-color: #86696b;
|
|
356
|
+
}
|
|
357
|
+
.dof-btn-highlight-red-base {
|
|
358
|
+
background-color: #ffd9cf;
|
|
359
|
+
}
|
|
360
|
+
.dof-btn-highlight-red-plain {
|
|
361
|
+
background-color: #fff;
|
|
362
|
+
}
|
|
363
|
+
|
|
341
364
|
.dof-btn-highlight-colmo-default {
|
|
342
365
|
background-color: #b35336;
|
|
343
366
|
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
export const STYLE_MAP = {
|
|
2
2
|
primary: {
|
|
3
3
|
default: {
|
|
4
|
-
|
|
4
|
+
backgroundColor: '#267AFF'
|
|
5
5
|
},
|
|
6
6
|
base: {
|
|
7
|
-
|
|
7
|
+
backgroundColor: '#E9F1FF'
|
|
8
8
|
},
|
|
9
9
|
plain: {
|
|
10
|
-
|
|
10
|
+
backgroundColor: '#FFFFFF',
|
|
11
11
|
borderWidth: '2px',
|
|
12
12
|
borderColor: '#267AFF'
|
|
13
13
|
},
|
|
@@ -18,13 +18,13 @@ export const STYLE_MAP = {
|
|
|
18
18
|
},
|
|
19
19
|
purple: {
|
|
20
20
|
default: {
|
|
21
|
-
|
|
21
|
+
backgroundColor: '#995EFC'
|
|
22
22
|
},
|
|
23
23
|
base: {
|
|
24
|
-
|
|
24
|
+
backgroundColor: '#EEE6FF'
|
|
25
25
|
},
|
|
26
26
|
plain: {
|
|
27
|
-
|
|
27
|
+
backgroundColor: '#FFFFFF',
|
|
28
28
|
borderWidth: '2px',
|
|
29
29
|
borderColor: '#995EFC'
|
|
30
30
|
},
|
|
@@ -35,13 +35,13 @@ export const STYLE_MAP = {
|
|
|
35
35
|
},
|
|
36
36
|
slate: {
|
|
37
37
|
default: {
|
|
38
|
-
|
|
38
|
+
backgroundColor: '#6575FF'
|
|
39
39
|
},
|
|
40
40
|
base: {
|
|
41
|
-
|
|
41
|
+
backgroundColor: '#E6E8FF'
|
|
42
42
|
},
|
|
43
43
|
plain: {
|
|
44
|
-
|
|
44
|
+
backgroundColor: '#FFFFFF',
|
|
45
45
|
borderWidth: '2px',
|
|
46
46
|
borderColor: '#6575FF'
|
|
47
47
|
},
|
|
@@ -52,13 +52,13 @@ export const STYLE_MAP = {
|
|
|
52
52
|
},
|
|
53
53
|
aqua: {
|
|
54
54
|
default: {
|
|
55
|
-
|
|
55
|
+
backgroundColor: '#29C3FF'
|
|
56
56
|
},
|
|
57
57
|
base: {
|
|
58
|
-
|
|
58
|
+
backgroundColor: '#E6F8FF'
|
|
59
59
|
},
|
|
60
60
|
plain: {
|
|
61
|
-
|
|
61
|
+
backgroundColor: '#FFFFFF',
|
|
62
62
|
borderWidth: '2px',
|
|
63
63
|
borderColor: '#29C3FF'
|
|
64
64
|
},
|
|
@@ -69,13 +69,13 @@ export const STYLE_MAP = {
|
|
|
69
69
|
},
|
|
70
70
|
turquoise: {
|
|
71
71
|
default: {
|
|
72
|
-
|
|
72
|
+
backgroundColor: '#00CBB8'
|
|
73
73
|
},
|
|
74
74
|
base: {
|
|
75
|
-
|
|
75
|
+
backgroundColor: '#E6FFFD'
|
|
76
76
|
},
|
|
77
77
|
plain: {
|
|
78
|
-
|
|
78
|
+
backgroundColor: '#FFFFFF',
|
|
79
79
|
borderWidth: '2px',
|
|
80
80
|
borderColor: '#00CBB8'
|
|
81
81
|
},
|
|
@@ -86,13 +86,13 @@ export const STYLE_MAP = {
|
|
|
86
86
|
},
|
|
87
87
|
yellow: {
|
|
88
88
|
default: {
|
|
89
|
-
|
|
89
|
+
backgroundColor: '#FFAA10'
|
|
90
90
|
},
|
|
91
91
|
base: {
|
|
92
|
-
|
|
92
|
+
backgroundColor: '#FFF4E0'
|
|
93
93
|
},
|
|
94
94
|
plain: {
|
|
95
|
-
|
|
95
|
+
backgroundColor: '#FFFFFF',
|
|
96
96
|
borderWidth: '2px',
|
|
97
97
|
borderColor: '#FFAA10'
|
|
98
98
|
},
|
|
@@ -103,13 +103,13 @@ export const STYLE_MAP = {
|
|
|
103
103
|
},
|
|
104
104
|
orange: {
|
|
105
105
|
default: {
|
|
106
|
-
|
|
106
|
+
backgroundColor: '#FF8225'
|
|
107
107
|
},
|
|
108
108
|
base: {
|
|
109
|
-
|
|
109
|
+
backgroundColor: '#FFF0E6'
|
|
110
110
|
},
|
|
111
111
|
plain: {
|
|
112
|
-
|
|
112
|
+
backgroundColor: '#FFFFFF',
|
|
113
113
|
borderWidth: '2px',
|
|
114
114
|
borderColor: '#FF8225'
|
|
115
115
|
},
|
|
@@ -120,13 +120,13 @@ export const STYLE_MAP = {
|
|
|
120
120
|
},
|
|
121
121
|
tomato: {
|
|
122
122
|
default: {
|
|
123
|
-
|
|
123
|
+
backgroundColor: '#FF6A4C'
|
|
124
124
|
},
|
|
125
125
|
base: {
|
|
126
|
-
|
|
126
|
+
backgroundColor: '#FFEaE6'
|
|
127
127
|
},
|
|
128
128
|
plain: {
|
|
129
|
-
|
|
129
|
+
backgroundColor: '#FFFFFF',
|
|
130
130
|
borderWidth: '2px',
|
|
131
131
|
borderColor: '#FF6A4C'
|
|
132
132
|
},
|
|
@@ -137,13 +137,13 @@ export const STYLE_MAP = {
|
|
|
137
137
|
},
|
|
138
138
|
gray: {
|
|
139
139
|
default: {
|
|
140
|
-
|
|
140
|
+
backgroundColor: '#7C879B'
|
|
141
141
|
},
|
|
142
142
|
base: {
|
|
143
|
-
|
|
143
|
+
backgroundColor: '#CFD7E6'
|
|
144
144
|
},
|
|
145
145
|
plain: {
|
|
146
|
-
|
|
146
|
+
backgroundColor: '#FFFFFF',
|
|
147
147
|
borderWidth: '2px',
|
|
148
148
|
borderColor: '#7C879B'
|
|
149
149
|
},
|
|
@@ -188,13 +188,13 @@ export const STYLE_MAP = {
|
|
|
188
188
|
},
|
|
189
189
|
colmo: {
|
|
190
190
|
default: {
|
|
191
|
-
|
|
191
|
+
backgroundColor: '#B35336'
|
|
192
192
|
},
|
|
193
193
|
base: {
|
|
194
|
-
|
|
194
|
+
backgroundColor: '#292c30'
|
|
195
195
|
},
|
|
196
196
|
plain: {
|
|
197
|
-
|
|
197
|
+
backgroundColor: 'transparent',
|
|
198
198
|
borderWidth: '2px',
|
|
199
199
|
borderColor: '#B35336'
|
|
200
200
|
},
|
|
@@ -759,6 +759,8 @@ export default {
|
|
|
759
759
|
width: '112px',
|
|
760
760
|
height: '112px',
|
|
761
761
|
borderRadius: '56px',
|
|
762
|
+
marginTop: this._isColmo ? '0px' : '16px',
|
|
763
|
+
marginBottom: this._isColmo ? '0px' : '16px',
|
|
762
764
|
backgroundColor: iconColor ? iconColor : 'transparent'
|
|
763
765
|
}
|
|
764
766
|
} else if (iconSize === 'medium') {
|
|
@@ -766,6 +768,8 @@ export default {
|
|
|
766
768
|
width: '76px',
|
|
767
769
|
height: '76px',
|
|
768
770
|
borderRadius: '38px',
|
|
771
|
+
marginTop: this._isColmo ? '0px' : '40px',
|
|
772
|
+
marginBottom: this._isColmo ? '0px' : '40px',
|
|
769
773
|
backgroundColor: iconColor ? iconColor : 'transparent'
|
|
770
774
|
}
|
|
771
775
|
} else if (iconSize === 'min') {
|
|
@@ -773,6 +777,8 @@ export default {
|
|
|
773
777
|
width: '40px',
|
|
774
778
|
height: '40px',
|
|
775
779
|
borderRadius: '20px',
|
|
780
|
+
marginTop: this._isColmo ? '0px' : '32px',
|
|
781
|
+
marginBottom: this._isColmo ? '0px' : '32px',
|
|
776
782
|
backgroundColor: iconColor ? iconColor : 'transparent'
|
|
777
783
|
}
|
|
778
784
|
} else {
|
|
@@ -780,6 +786,8 @@ export default {
|
|
|
780
786
|
width: '64px',
|
|
781
787
|
height: '64px',
|
|
782
788
|
borderRadius: '32px',
|
|
789
|
+
marginTop: this._isColmo ? '0px' : '48px',
|
|
790
|
+
marginBottom: this._isColmo ? '0px' : '48px',
|
|
783
791
|
backgroundColor: iconColor ? iconColor : 'transparent'
|
|
784
792
|
}
|
|
785
793
|
}
|