zartui 0.1.113 → 2.0.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.
Files changed (159) hide show
  1. package/es/action-sheet/index.css +1 -1
  2. package/es/action-sheet/index.js +3 -3
  3. package/es/action-sheet/index.less +12 -8
  4. package/es/area/style/index.js +1 -0
  5. package/es/area/style/less.js +1 -0
  6. package/es/avatar/index.css +1 -1
  7. package/es/button/index.css +1 -1
  8. package/es/button/index.js +28 -13
  9. package/es/button/index.less +60 -27
  10. package/es/calendar/components/Header.js +1 -6
  11. package/es/calendar/index.css +1 -1
  12. package/es/calendar/index.js +31 -8
  13. package/es/calendar/index.less +16 -10
  14. package/es/cell/index.css +1 -1
  15. package/es/cell/index.js +60 -38
  16. package/es/cell/index.less +67 -12
  17. package/es/cell/shared.js +2 -0
  18. package/es/checkbox/index.css +1 -1
  19. package/es/checkbox/index.less +18 -6
  20. package/es/checkbox-group/index.js +1 -0
  21. package/es/datetime-picker/style/index.js +1 -0
  22. package/es/datetime-picker/style/less.js +1 -0
  23. package/es/field/index.css +1 -1
  24. package/es/field/index.js +80 -7
  25. package/es/field/index.less +60 -8
  26. package/es/icon/index.css +1 -1
  27. package/es/image/index.css +1 -1
  28. package/es/image-preview/ImagePreview.js +1 -1
  29. package/es/image-preview/index.css +1 -1
  30. package/es/image-preview/index.less +4 -2
  31. package/es/index.js +1 -1
  32. package/es/loading/index.css +1 -1
  33. package/es/loading/index.js +3 -3
  34. package/es/loading/index.less +1 -1
  35. package/es/media-picker/image/PickFileIcon.js +2 -9
  36. package/es/media-picker/image/PickPhotoIcon.js +2 -9
  37. package/es/media-picker/image/TakeAudioIcon.js +2 -9
  38. package/es/media-picker/image/TakePhotoIcon.js +2 -9
  39. package/es/media-picker/image/TakeVideoIcon.js +2 -9
  40. package/es/media-picker/index.css +1 -1
  41. package/es/media-picker/index.less +6 -4
  42. package/es/mixins/checkbox.js +12 -30
  43. package/es/multiple-picker/index.css +1 -1
  44. package/es/multiple-picker/index.js +18 -11
  45. package/es/multiple-picker/index.less +11 -5
  46. package/es/multiple-picker/style/index.js +1 -0
  47. package/es/multiple-picker/style/less.js +1 -0
  48. package/es/pdf-viewer/style/index.js +1 -0
  49. package/es/pdf-viewer/style/less.js +1 -0
  50. package/es/picker/index.css +1 -1
  51. package/es/picker/index.js +18 -9
  52. package/es/picker/index.less +18 -2
  53. package/es/picker/style/index.js +1 -0
  54. package/es/picker/style/less.js +1 -0
  55. package/es/popup/index.css +1 -1
  56. package/es/popup/index.js +1 -1
  57. package/es/popup/index.less +2 -2
  58. package/es/radio/index.css +1 -1
  59. package/es/radio/index.less +23 -22
  60. package/es/radio-group/index.js +1 -0
  61. package/es/signature/index.js +7 -6
  62. package/es/signature/index.less +1 -1
  63. package/es/step/index.css +1 -1
  64. package/es/step/index.js +3 -5
  65. package/es/step/index.less +3 -1
  66. package/es/stepper/index.css +1 -1
  67. package/es/steps/index.css +1 -1
  68. package/es/steps/index.less +3 -3
  69. package/es/style/reset.css +1 -1
  70. package/es/style/var.less +92 -53
  71. package/es/switch-cell/index.css +1 -1
  72. package/es/tabs/Title.js +6 -1
  73. package/es/tabs/index.css +1 -1
  74. package/es/tabs/index.js +2 -4
  75. package/es/tabs/index.less +18 -15
  76. package/es/toast/index.css +1 -1
  77. package/es/uploader/index.css +1 -1
  78. package/lib/action-sheet/index.css +1 -1
  79. package/lib/action-sheet/index.js +3 -3
  80. package/lib/action-sheet/index.less +12 -8
  81. package/lib/area/style/index.js +1 -0
  82. package/lib/area/style/less.js +1 -0
  83. package/lib/avatar/index.css +1 -1
  84. package/lib/button/index.css +1 -1
  85. package/lib/button/index.js +28 -13
  86. package/lib/button/index.less +60 -27
  87. package/lib/calendar/components/Header.js +1 -6
  88. package/lib/calendar/index.css +1 -1
  89. package/lib/calendar/index.js +31 -8
  90. package/lib/calendar/index.less +16 -10
  91. package/lib/cell/index.css +1 -1
  92. package/lib/cell/index.js +60 -38
  93. package/lib/cell/index.less +67 -12
  94. package/lib/cell/shared.js +2 -0
  95. package/lib/checkbox/index.css +1 -1
  96. package/lib/checkbox/index.less +18 -6
  97. package/lib/checkbox-group/index.js +1 -0
  98. package/lib/datetime-picker/style/index.js +1 -0
  99. package/lib/datetime-picker/style/less.js +1 -0
  100. package/lib/field/index.css +1 -1
  101. package/lib/field/index.js +80 -7
  102. package/lib/field/index.less +60 -8
  103. package/lib/icon/index.css +1 -1
  104. package/lib/image/index.css +1 -1
  105. package/lib/image-preview/ImagePreview.js +1 -1
  106. package/lib/image-preview/index.css +1 -1
  107. package/lib/image-preview/index.less +4 -2
  108. package/lib/index.css +1 -1
  109. package/lib/index.js +1 -1
  110. package/lib/index.less +1 -1
  111. package/lib/loading/index.css +1 -1
  112. package/lib/loading/index.js +3 -3
  113. package/lib/loading/index.less +1 -1
  114. package/lib/media-picker/image/PickFileIcon.js +2 -9
  115. package/lib/media-picker/image/PickPhotoIcon.js +2 -9
  116. package/lib/media-picker/image/TakeAudioIcon.js +2 -9
  117. package/lib/media-picker/image/TakePhotoIcon.js +2 -9
  118. package/lib/media-picker/image/TakeVideoIcon.js +2 -9
  119. package/lib/media-picker/index.css +1 -1
  120. package/lib/media-picker/index.less +6 -4
  121. package/lib/mixins/checkbox.js +12 -30
  122. package/lib/multiple-picker/index.css +1 -1
  123. package/lib/multiple-picker/index.js +19 -11
  124. package/lib/multiple-picker/index.less +11 -5
  125. package/lib/multiple-picker/style/index.js +1 -0
  126. package/lib/multiple-picker/style/less.js +1 -0
  127. package/lib/pdf-viewer/style/index.js +1 -0
  128. package/lib/pdf-viewer/style/less.js +1 -0
  129. package/lib/picker/index.css +1 -1
  130. package/lib/picker/index.js +19 -9
  131. package/lib/picker/index.less +18 -2
  132. package/lib/picker/style/index.js +1 -0
  133. package/lib/picker/style/less.js +1 -0
  134. package/lib/popup/index.css +1 -1
  135. package/lib/popup/index.js +1 -1
  136. package/lib/popup/index.less +2 -2
  137. package/lib/radio/index.css +1 -1
  138. package/lib/radio/index.less +23 -22
  139. package/lib/radio-group/index.js +1 -0
  140. package/lib/signature/index.js +7 -6
  141. package/lib/signature/index.less +1 -1
  142. package/lib/step/index.css +1 -1
  143. package/lib/step/index.js +3 -5
  144. package/lib/step/index.less +3 -1
  145. package/lib/stepper/index.css +1 -1
  146. package/lib/steps/index.css +1 -1
  147. package/lib/steps/index.less +3 -3
  148. package/lib/style/reset.css +1 -1
  149. package/lib/style/var.less +92 -53
  150. package/lib/switch-cell/index.css +1 -1
  151. package/lib/tabs/Title.js +6 -1
  152. package/lib/tabs/index.css +1 -1
  153. package/lib/tabs/index.js +2 -4
  154. package/lib/tabs/index.less +18 -15
  155. package/lib/toast/index.css +1 -1
  156. package/lib/uploader/index.css +1 -1
  157. package/lib/zart.js +547 -450
  158. package/lib/zart.min.js +1 -1
  159. package/package.json +3 -3
@@ -17,6 +17,8 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
17
17
  disabled: Boolean,
18
18
  iconSize: [Number, String],
19
19
  checkedColor: String,
20
+ boxShadow: String,
21
+ border: String,
20
22
  iconColor: String,
21
23
  labelPosition: String,
22
24
  labelDisabled: Boolean,
@@ -41,12 +43,15 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
41
43
  },
42
44
  iconStyle: function iconStyle() {
43
45
  var checkedColor = this.checkedColor || this.parent && this.parent.checkedColor;
46
+ var boxShadow = this.boxShadow || this.parent && this.parent.boxShadow;
47
+ var border = this.border || this.parent && this.parent.border;
44
48
  var iconColor = this.iconColor || this.parent && this.parent.iconColor;
45
49
 
46
- if (checkedColor && this.checked && !this.isDisabled) {
50
+ if ((boxShadow || checkedColor) && this.checked && !this.isDisabled) {
47
51
  return {
48
52
  color: iconColor,
49
- borderColor: checkedColor,
53
+ boxShadow: boxShadow,
54
+ border: border,
50
55
  backgroundColor: checkedColor
51
56
  };
52
57
  }
@@ -93,35 +98,11 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
93
98
  }
94
99
  }, [this.slots('icon', {
95
100
  checked: checked
96
- }) || (role === 'radio' && checked ? this.genRadioIcon() : h(Icon, {
101
+ }) || h(Icon, {
97
102
  "attrs": {
98
- "name": "success"
103
+ "name": role === 'radio' ? "radio-round" : "checkBox-select"
99
104
  },
100
105
  "style": this.iconStyle
101
- }))]);
102
- },
103
- genRadioIcon: function genRadioIcon() {
104
- var h = this.$createElement;
105
- var iconSize = this.iconSize || this.parent && this.parent.iconSize;
106
- return h("svg", {
107
- "attrs": {
108
- "xmlns": "http://www.w3.org/2000/svg",
109
- "viewBox": "0 0 24 24"
110
- },
111
- "class": bem("custom-svg"),
112
- "style": {
113
- width: iconSize,
114
- height: iconSize
115
- }
116
- }, [h("path", {
117
- "style": {
118
- fill: this.checkedColor
119
- },
120
- "attrs": {
121
- "d": "M12,2 C17.5228475,2 22,6.4771525 22,12 C22,17.5228475 17.5228475,22 12,22 C6.4771525,22 2,17.5228475 2,12 C2,6.4771525 6.4771525,2 12,2 Z M12,7 C9.23857625,7 7,9.23857625 7,12 C7,14.7614237 9.23857625,17 12,17 C14.7614237,17 17,14.7614237 17,12 C17,9.23857625 14.7614237,7 12,7 Z",
122
- "fill": "#0091FA",
123
- "fill-rule": "nonzero"
124
- }
125
106
  })]);
126
107
  },
127
108
  genLabel: function genLabel() {
@@ -147,16 +128,17 @@ export var CheckboxMixin = function CheckboxMixin(_ref) {
147
128
  Children.push(this.genLabel());
148
129
  }
149
130
 
131
+ var checked = this.checked;
150
132
  return h("div", {
151
133
  "attrs": {
152
134
  "role": role,
153
135
  "tabindex": this.tabindex,
154
136
  "aria-checked": String(this.checked)
155
137
  },
156
- "class": bem([{
138
+ "class": [bem([{
157
139
  disabled: this.isDisabled,
158
140
  'label-disabled': this.labelDisabled
159
- }, this.direction]),
141
+ }, this.direction]), checked ? '' : bem('disable-icon')],
160
142
  "on": {
161
143
  "click": this.onClick
162
144
  }
@@ -1 +1 @@
1
- [class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-multiple-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-multiple-picker__toolbar{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;height:44px}.zt-multiple-picker__border{position:relative}.zt-multiple-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-multiple-picker__cancel,.zt-multiple-picker__confirm{height:100%;padding:0 16px;font-size:16px;background-color:transparent;border:none;cursor:pointer}.zt-multiple-picker__cancel:active,.zt-multiple-picker__confirm:active{opacity:.7}.zt-multiple-picker__confirm{color:#0091fa;font-weight:700}.zt-multiple-picker__cancel{color:#000;font-weight:400}.zt-multiple-picker__title{max-width:50%;font-weight:400;font-size:14px;line-height:20px;text-align:center;color:rgba(0,0,0,.4)}.zt-multiple-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-multiple-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-multiple-picker__options{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-multiple-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-multiple-picker-options{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:scroll;font-size:16px}.zt-multiple-picker-options__wrapper{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;background-color:#fff;padding:12px 16px 4px 16px}.zt-multiple-picker-options__item{color:rgba(0,0,0,.6);padding:0 4px 8px 0;box-sizing:border-box;border-radius:2px;text-align:center;font-size:14px}.zt-multiple-picker-options__item .zt-ellipsis{height:28px;line-height:28px;background-color:rgba(0,0,0,.04)}.zt-multiple-picker-options__item--disabled{cursor:not-allowed;opacity:.3}.zt-multiple-picker-options__item--last{padding-right:0}.zt-multiple-picker-options__item--selected .zt-ellipsis{background:rgba(0,145,250,.1);border:1px solid #0091fa;border-radius:2px;color:#0091fa}
1
+ [class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-multiple-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-multiple-picker__toolbar{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;height:44px;padding:8px 16px;border-top:1px solid rgba(45,75,115,.1)}.zt-multiple-picker__border{position:relative}.zt-multiple-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-multiple-picker__cancel,.zt-multiple-picker__confirm{height:100%;padding:0 16px;font-size:14px;background-color:transparent;border:none;cursor:pointer}.zt-multiple-picker__cancel:active,.zt-multiple-picker__confirm:active{opacity:.7}.zt-multiple-picker__confirm{color:#0091fa;font-weight:700}.zt-multiple-picker__cancel{color:#000;font-weight:400}.zt-multiple-picker__title{font-weight:400;font-size:14px;line-height:20px;text-align:center;color:#2d4b73;opacity:.4;padding:12px 0;border-bottom:1px solid rgba(45,75,115,.1)}.zt-multiple-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-multiple-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-multiple-picker__options{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-multiple-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-multiple-picker-options{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:scroll;font-size:14px}.zt-multiple-picker-options__wrapper{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap;background-color:#fff;padding:12px 16px 4px 16px}.zt-multiple-picker-options__item{color:rgba(0,0,0,.6);padding:0 4px 8px 0;box-sizing:border-box;border-radius:2px;text-align:center;font-size:14px}.zt-multiple-picker-options__item .zt-ellipsis{height:28px;line-height:28px;border:1px solid rgba(45,75,115,.2);border-radius:18px}.zt-multiple-picker-options__item--disabled{cursor:not-allowed;opacity:.3}.zt-multiple-picker-options__item--last{padding-right:0}.zt-multiple-picker-options__item--selected .zt-ellipsis{background:rgba(0,145,250,.1);border:1px solid rgba(0,145,250,.6);border-radius:18px;color:#0091fa}
@@ -9,6 +9,7 @@ import MultiplePickerOptions from './MultiplePickerOptions';
9
9
  import Popup from '../popup';
10
10
  import { PopupMixin } from '../mixins/popup';
11
11
  import { deepClone } from '../utils/deep-clone';
12
+ import Button from '../button';
12
13
 
13
14
  var _createNamespace = createNamespace('multiple-picker'),
14
15
  createComponent = _createNamespace[0],
@@ -36,7 +37,7 @@ export default createComponent({
36
37
  },
37
38
  toolbarPosition: {
38
39
  type: String,
39
- default: 'top'
40
+ default: 'bottom'
40
41
  },
41
42
  valueKey: {
42
43
  type: String,
@@ -125,11 +126,15 @@ export default createComponent({
125
126
  },
126
127
  genCancel: function genCancel() {
127
128
  var h = this.$createElement;
128
- return h("button", {
129
+ return h(Button, {
129
130
  "attrs": {
130
- "type": "button"
131
+ "size": "normal",
132
+ "block": true
133
+ },
134
+ "style": {
135
+ marginRigth: "4px",
136
+ backgroundColor: "white"
131
137
  },
132
- "class": bem('cancel'),
133
138
  "on": {
134
139
  "click": this.cancel
135
140
  }
@@ -137,11 +142,15 @@ export default createComponent({
137
142
  },
138
143
  genConfirm: function genConfirm() {
139
144
  var h = this.$createElement;
140
- return h("button", {
145
+ return h(Button, {
141
146
  "attrs": {
142
- "type": "button"
147
+ "type": "primary",
148
+ "size": "normal",
149
+ "block": true
150
+ },
151
+ "style": {
152
+ marginLeft: "4px"
143
153
  },
144
- "class": bem('confirm'),
145
154
  "on": {
146
155
  "click": this.confirm
147
156
  }
@@ -153,7 +162,7 @@ export default createComponent({
153
162
  if (this.showToolbar) {
154
163
  return h("div", {
155
164
  "class": bem('toolbar')
156
- }, [this.slots() || [this.genCancel(), this.genTitle(), this.genConfirm()]]);
165
+ }, [this.slots() || [this.genCancel(), this.genConfirm()]]);
157
166
  }
158
167
  },
159
168
  genOptions: function genOptions() {
@@ -225,9 +234,7 @@ export default createComponent({
225
234
  }, [h("div", {
226
235
  "class": bem(),
227
236
  "ref": 'columnParent'
228
- }, [this.toolbarPosition === 'top' ? this.genToolbar() : h(), this.toolbarPosition === 'top' ? h("div", {
229
- "class": bem('border')
230
- }) : h(), this.loading ? h(Loading, {
237
+ }, [this.genTitle(), this.loading ? h(Loading, {
231
238
  "class": bem('loading')
232
239
  }) : h(), this.genOptions(), this.toolbarPosition === 'bottom' ? this.genToolbar() : h()])]);
233
240
  }
@@ -11,6 +11,8 @@
11
11
  align-items: center;
12
12
  justify-content: space-between;
13
13
  height: @picker-toolbar-height;
14
+ padding: 8px 16px;
15
+ border-top: 1px solid rgba(45,75,115,0.10);
14
16
  }
15
17
 
16
18
  &__border {
@@ -46,12 +48,14 @@
46
48
  }
47
49
 
48
50
  &__title {
49
- max-width: 50%;
50
51
  font-weight: @plain-font-weight;
51
52
  font-size: @picker-title-font-size;
52
53
  line-height: @picker-title-line-height;
53
54
  text-align: center;
54
- color: rgba(0, 0, 0, 0.4);
55
+ color: #2D4B73;
56
+ opacity: 0.4;
57
+ padding: 12px 0;
58
+ border-bottom: 1px solid rgba(45,75,115,0.10);
55
59
  }
56
60
 
57
61
  &__header {
@@ -107,10 +111,12 @@
107
111
  border-radius: 2px;
108
112
  text-align: center;
109
113
  font-size: 14px;
114
+
110
115
  .zt-ellipsis {
111
116
  height: 28px;
112
117
  line-height: 28px;
113
- background-color: rgba(0,0,0,.04);
118
+ border: 1px solid rgba(45,75,115,0.20);
119
+ border-radius: 18px;
114
120
  }
115
121
 
116
122
  &--disabled {
@@ -125,8 +131,8 @@
125
131
  &--selected {
126
132
  .zt-ellipsis {
127
133
  background: rgba(0,145,250,0.10);
128
- border: 1px solid #0091FA;
129
- border-radius: 2px;
134
+ border: 1px solid rgba(0,145,250,0.60);
135
+ border-radius: 18px;
130
136
  color: #0091FA;
131
137
  }
132
138
  }
@@ -4,4 +4,5 @@ import '../../info/index.css';
4
4
  import '../../icon/index.css';
5
5
  import '../../popup/index.css';
6
6
  import '../../loading/index.css';
7
+ import '../../button/index.css';
7
8
  import '../index.css';
@@ -4,4 +4,5 @@ import '../../info/index.less';
4
4
  import '../../icon/index.less';
5
5
  import '../../popup/index.less';
6
6
  import '../../loading/index.less';
7
+ import '../../button/index.less';
7
8
  import '../index.less';
@@ -5,5 +5,6 @@ import '../../icon/index.css';
5
5
  import '../../popup/index.css';
6
6
  import '../../loading/index.css';
7
7
  import '../../toast/index.css';
8
+ import '../../button/index.css';
8
9
  import '../../picker/index.css';
9
10
  import '../index.css';
@@ -5,5 +5,6 @@ import '../../icon/index.less';
5
5
  import '../../popup/index.less';
6
6
  import '../../loading/index.less';
7
7
  import '../../toast/index.less';
8
+ import '../../button/index.less';
8
9
  import '../../picker/index.less';
9
10
  import '../index.less';
@@ -1 +1 @@
1
- [class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-picker__toolbar{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;height:44px}.zt-picker__border{position:relative}.zt-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-picker__cancel,.zt-picker__confirm{height:100%;padding:0 16px;font-size:16px;background-color:transparent;border:none;cursor:pointer}.zt-picker__cancel:active,.zt-picker__confirm:active{opacity:.7}.zt-picker__confirm{color:#0091fa;font-weight:700}.zt-picker__cancel{color:#000;font-weight:400}.zt-picker__title{max-width:50%;font-weight:400;font-size:14px;line-height:20px;text-align:center;color:rgba(0,0,0,.4)}.zt-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-picker__columns{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-picker__frame{position:absolute;top:50%;right:16px;left:16px;z-index:2;-webkit-transform:translateY(-50%);transform:translateY(-50%);pointer-events:none}.zt-picker__background{position:absolute;width:100%;height:100%;opacity:.04;background-color:#000}.zt-picker__mask{position:absolute;top:0;left:0;z-index:1;width:100%;height:100%;background-image:-webkit-linear-gradient(top,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),-webkit-linear-gradient(bottom,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-image:linear-gradient(180deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),linear-gradient(0deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-repeat:no-repeat;background-position:top,bottom;-webkit-transform:translateZ(0);transform:translateZ(0);pointer-events:none}.zt-picker-column{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:hidden;font-size:16px}.zt-picker-column__wrapper{-webkit-transition-timing-function:cubic-bezier(.23,1,.68,1);transition-timing-function:cubic-bezier(.23,1,.68,1)}.zt-picker-column__item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;padding:0 4px;color:#000}.zt-picker-column__item--disabled{cursor:not-allowed;opacity:.3}.zt-picker-column__item--selected{font-weight:700}
1
+ [class*=zt-hairline]::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;top:-50%;right:-50%;bottom:-50%;left:-50%;border:0 solid rgba(0,0,0,.1);-webkit-transform:scale(.5);transform:scale(.5)}.zt-hairline,.zt-hairline--bottom,.zt-hairline--left,.zt-hairline--right,.zt-hairline--surround,.zt-hairline--top,.zt-hairline--top-bottom{position:relative}.zt-hairline--top::after{border-top-width:1px}.zt-hairline--left::after{border-left-width:1px}.zt-hairline--right::after{border-right-width:1px}.zt-hairline--bottom::after{border-bottom-width:1px}.zt-hairline--top-bottom::after,.zt-hairline-unset--top-bottom::after{border-width:1px 0}.zt-hairline--surround::after{border-width:1px}.zt-picker{position:relative;background-color:#fff;-webkit-user-select:none;user-select:none}.zt-picker__toolbar{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:justify;-webkit-justify-content:space-between;justify-content:space-between;height:44px;padding:8px 16px 8px 16px;border-top:1px solid rgba(45,75,115,.1);position:relative}.zt-picker__border{position:relative}.zt-picker__border::after{position:absolute;box-sizing:border-box;content:' ';pointer-events:none;right:0;bottom:0;left:0;border-bottom:1px solid rgba(0,0,0,.1);-webkit-transform:scaleY(.5);transform:scaleY(.5)}.zt-picker__cancel,.zt-picker__confirm{height:100%;padding:0 16px;font-size:14px;background-color:transparent;border:none;cursor:pointer}.zt-picker__cancel:active,.zt-picker__confirm:active{opacity:.7}.zt-picker__confirm{color:#0091fa;font-weight:700}.zt-picker__cancel{color:#000;font-weight:400}.zt-picker__title{font-weight:400;font-size:14px;line-height:20px;text-align:center;color:#2d4b73;opacity:.4;padding:12px 0;border-bottom:1px solid rgba(45,75,115,.1)}.zt-picker__header{width:100%;height:40px;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;font-size:14px;font-weight:400}.zt-picker__header>li{-webkit-box-flex:1;-webkit-flex:auto;flex:auto;text-align:center}.zt-picker__columns{position:relative;display:-webkit-box;display:-webkit-flex;display:flex;cursor:grab}.zt-picker__loading{position:absolute;top:0;right:0;bottom:0;left:0;z-index:3;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;color:#0091fa;background-color:rgba(255,255,255,.9)}.zt-picker__frame{position:absolute;top:50%;right:16px;left:16px;z-index:2;-webkit-transform:translateY(-50%);transform:translateY(-50%);pointer-events:none}.zt-picker__background{position:absolute;width:100%;height:100%;opacity:.04;background-color:#000}.zt-picker__mask{position:absolute;top:0;left:0;z-index:1;width:100%;height:100%;background-image:-webkit-linear-gradient(top,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),-webkit-linear-gradient(bottom,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-image:linear-gradient(180deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4)),linear-gradient(0deg,hsla(0,0%,100%,.9),hsla(0,0%,100%,.4));background-repeat:no-repeat;background-position:top,bottom;-webkit-transform:translateZ(0);transform:translateZ(0);pointer-events:none}.zt-picker-column{-webkit-box-flex:1;-webkit-flex:1;flex:1;overflow:hidden;font-size:14px}.zt-picker-column__wrapper{-webkit-transition-timing-function:cubic-bezier(.23,1,.68,1);transition-timing-function:cubic-bezier(.23,1,.68,1)}.zt-picker-column__item{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;padding:0 4px;color:#000}.zt-picker-column__item--disabled{cursor:not-allowed;opacity:.3}.zt-picker-column__item--selected{font-weight:700}
@@ -8,6 +8,7 @@ import { unitToPx } from '../utils/format/unit'; // Components
8
8
  import Loading from '../loading';
9
9
  import PickerColumn from './PickerColumn';
10
10
  import Popup from '../popup';
11
+ import Button from '../button';
11
12
  import { PopupMixin } from '../mixins/popup';
12
13
 
13
14
  var _createNamespace = createNamespace('picker'),
@@ -38,7 +39,7 @@ export default createComponent({
38
39
  },
39
40
  toolbarPosition: {
40
41
  type: String,
41
- default: 'top'
42
+ default: 'bottom'
42
43
  },
43
44
  valueKey: {
44
45
  type: String,
@@ -322,11 +323,15 @@ export default createComponent({
322
323
  },
323
324
  genCancel: function genCancel() {
324
325
  var h = this.$createElement;
325
- return h("button", {
326
+ return h(Button, {
326
327
  "attrs": {
327
- "type": "button"
328
+ "size": "normal",
329
+ "block": true
330
+ },
331
+ "style": {
332
+ marginRigth: "4px",
333
+ backgroundColor: "white"
328
334
  },
329
- "class": bem('cancel'),
330
335
  "on": {
331
336
  "click": this.cancel
332
337
  }
@@ -334,11 +339,15 @@ export default createComponent({
334
339
  },
335
340
  genConfirm: function genConfirm() {
336
341
  var h = this.$createElement;
337
- return h("button", {
342
+ return h(Button, {
338
343
  "attrs": {
339
- "type": "button"
344
+ "type": "primary",
345
+ "size": "normal",
346
+ "block": true
347
+ },
348
+ "style": {
349
+ marginLeft: "4px"
340
350
  },
341
- "class": bem('confirm'),
342
351
  "on": {
343
352
  "click": this.confirm
344
353
  }
@@ -350,7 +359,7 @@ export default createComponent({
350
359
  if (this.showToolbar) {
351
360
  return h("div", {
352
361
  "class": bem('toolbar')
353
- }, [this.slots() || [this.genCancel(), this.genTitle(), this.genConfirm()]]);
362
+ }, [this.slots() || [this.genCancel(), this.genConfirm()]]);
354
363
  }
355
364
  },
356
365
  genHeaders: function genHeaders() {
@@ -439,7 +448,7 @@ export default createComponent({
439
448
  }, [h("div", {
440
449
  "class": bem(),
441
450
  "ref": 'columnParent'
442
- }, [this.toolbarPosition === 'top' ? this.genToolbar() : h(), this.toolbarPosition === 'top' ? h("div", {
451
+ }, [this.toolbarPosition === 'top' ? this.genToolbar() : h(), this.toolbarPosition === 'top' ? h() : this.genTitle(), this.toolbarPosition === 'top' ? h("div", {
443
452
  "class": bem('border')
444
453
  }) : h(), this.loading ? h(Loading, {
445
454
  "class": bem('loading')
@@ -11,6 +11,20 @@
11
11
  align-items: center;
12
12
  justify-content: space-between;
13
13
  height: @picker-toolbar-height;
14
+ padding: 8px 16px 8px 16px;
15
+ border-top: 1px solid rgba(45,75,115,0.10);
16
+ position: relative;
17
+
18
+ // &::before {
19
+ // content: '';
20
+ // display: inline-block;
21
+ // width: 100%;
22
+ // height: 1px;
23
+ // box-shadow: inset 0 0 0 0 rgba(45,75,115,0.10);
24
+ // position: absolute;
25
+ // top: 0;
26
+ // right: 0;
27
+ // }
14
28
  }
15
29
 
16
30
  &__border {
@@ -46,12 +60,14 @@
46
60
  }
47
61
 
48
62
  &__title {
49
- max-width: 50%;
50
63
  font-weight: @plain-font-weight;
51
64
  font-size: @picker-title-font-size;
52
65
  line-height: @picker-title-line-height;
53
66
  text-align: center;
54
- color: rgba(0, 0, 0, 0.4);
67
+ color: #2D4B73;
68
+ opacity: 0.4;
69
+ padding: 12px 0;
70
+ border-bottom: 1px solid rgba(45,75,115,0.10);
55
71
  }
56
72
 
57
73
  &__header {
@@ -4,4 +4,5 @@ import '../../info/index.css';
4
4
  import '../../icon/index.css';
5
5
  import '../../popup/index.css';
6
6
  import '../../loading/index.css';
7
+ import '../../button/index.css';
7
8
  import '../index.css';
@@ -4,4 +4,5 @@ import '../../info/index.less';
4
4
  import '../../icon/index.less';
5
5
  import '../../popup/index.less';
6
6
  import '../../loading/index.less';
7
+ import '../../button/index.less';
7
8
  import '../index.less';
@@ -1 +1 @@
1
- .zt-overflow-hidden{overflow:hidden!important}.zt-popup{position:fixed;max-height:100%;overflow-y:auto;background-color:#fff;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;-webkit-overflow-scrolling:touch}.zt-popup--center{top:50%;left:50%;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.zt-popup--center.zt-popup--round{border-radius:8px}.zt-popup--top{top:0;left:0;width:100%}.zt-popup--top.zt-popup--round{border-radius:0 0 8px 8px}.zt-popup--right{top:50%;right:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--right.zt-popup--round{border-radius:8px 0 0 8px}.zt-popup--bottom{bottom:0;left:0;width:100%}.zt-popup--bottom.zt-popup--round{border-radius:8px 8px 0 0}.zt-popup--left{top:50%;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--left.zt-popup--round{border-radius:0 8px 8px 0}.zt-popup--safe-area-inset-bottom{padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}.zt-popup-slide-bottom-enter-active,.zt-popup-slide-left-enter-active,.zt-popup-slide-right-enter-active,.zt-popup-slide-top-enter-active{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.zt-popup-slide-bottom-leave-active,.zt-popup-slide-left-leave-active,.zt-popup-slide-right-leave-active,.zt-popup-slide-top-leave-active{-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}.zt-popup-slide-top-enter,.zt-popup-slide-top-leave-active{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}.zt-popup-slide-right-enter,.zt-popup-slide-right-leave-active{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}.zt-popup-slide-bottom-enter,.zt-popup-slide-bottom-leave-active{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.zt-popup-slide-left-enter,.zt-popup-slide-left-leave-active{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.zt-popup__close-icon{position:absolute;z-index:1;color:#c8c9cc;font-size:20px;cursor:pointer}.zt-popup__close-icon:active{color:#969799}.zt-popup__close-icon--top-left{top:16px;left:16px}.zt-popup__close-icon--top-right{top:16px;right:16px}.zt-popup__close-icon--bottom-left{bottom:16px;left:16px}.zt-popup__close-icon--bottom-right{right:16px;bottom:16px}
1
+ .zt-overflow-hidden{overflow:hidden!important}.zt-popup{position:fixed;max-height:100%;overflow-y:auto;background-color:#fff;-webkit-transition:-webkit-transform .3s;transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;-webkit-overflow-scrolling:touch}.zt-popup--center{top:50%;left:50%;-webkit-transform:translate3d(-50%,-50%,0);transform:translate3d(-50%,-50%,0)}.zt-popup--center.zt-popup--round{border-radius:16px}.zt-popup--top{top:0;left:0;width:100%}.zt-popup--top.zt-popup--round{border-radius:0 0 16px 16px}.zt-popup--right{top:50%;right:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--right.zt-popup--round{border-radius:16px 0 0 16px}.zt-popup--bottom{bottom:0;left:0;width:100%}.zt-popup--bottom.zt-popup--round{border-radius:16px 16px 0 0}.zt-popup--left{top:50%;left:0;-webkit-transform:translate3d(0,-50%,0);transform:translate3d(0,-50%,0)}.zt-popup--left.zt-popup--round{border-radius:0 16px 16px 0}.zt-popup--safe-area-inset-bottom{padding-bottom:constant(safe-area-inset-bottom);padding-bottom:env(safe-area-inset-bottom)}.zt-popup-slide-bottom-enter-active,.zt-popup-slide-left-enter-active,.zt-popup-slide-right-enter-active,.zt-popup-slide-top-enter-active{-webkit-transition-timing-function:ease-out;transition-timing-function:ease-out}.zt-popup-slide-bottom-leave-active,.zt-popup-slide-left-leave-active,.zt-popup-slide-right-leave-active,.zt-popup-slide-top-leave-active{-webkit-transition-timing-function:ease-in;transition-timing-function:ease-in}.zt-popup-slide-top-enter,.zt-popup-slide-top-leave-active{-webkit-transform:translate3d(0,-100%,0);transform:translate3d(0,-100%,0)}.zt-popup-slide-right-enter,.zt-popup-slide-right-leave-active{-webkit-transform:translate3d(100%,-50%,0);transform:translate3d(100%,-50%,0)}.zt-popup-slide-bottom-enter,.zt-popup-slide-bottom-leave-active{-webkit-transform:translate3d(0,100%,0);transform:translate3d(0,100%,0)}.zt-popup-slide-left-enter,.zt-popup-slide-left-leave-active{-webkit-transform:translate3d(-100%,-50%,0);transform:translate3d(-100%,-50%,0)}.zt-popup__close-icon{position:absolute;z-index:1;color:rgba(45,75,115,.6);font-size:24px;cursor:pointer}.zt-popup__close-icon:active{color:#969799}.zt-popup__close-icon--top-left{top:12px;left:16px}.zt-popup__close-icon--top-right{top:12px;right:16px}.zt-popup__close-icon--bottom-left{bottom:16px;left:16px}.zt-popup__close-icon--bottom-right{right:16px;bottom:16px}
package/es/popup/index.js CHANGED
@@ -16,7 +16,7 @@ export default createComponent({
16
16
  safeAreaInsetBottom: Boolean,
17
17
  closeIcon: {
18
18
  type: String,
19
- default: 'cross'
19
+ default: 'clear'
20
20
  },
21
21
  closeIconPosition: {
22
22
  type: String,
@@ -114,12 +114,12 @@
114
114
  }
115
115
 
116
116
  &--top-left {
117
- top: @popup-close-icon-margin;
117
+ top: @popup-close-icon-z-margin-top;
118
118
  left: @popup-close-icon-margin;
119
119
  }
120
120
 
121
121
  &--top-right {
122
- top: @popup-close-icon-margin;
122
+ top: @popup-close-icon-z-margin-top;
123
123
  right: @popup-close-icon-margin;
124
124
  }
125
125
 
@@ -1 +1 @@
1
- .zt-radio{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;overflow:hidden;cursor:pointer;-webkit-user-select:none;user-select:none;padding:10px 0}.zt-radio__custom-svg{width:24px;height:24px;border-radius:50%}.zt-radio__icon--disabled .zt-radio__custom-svg{opacity:.2}.zt-radio--disabled{cursor:not-allowed}.zt-radio--label-disabled{cursor:default}.zt-radio--horizontal{margin-left:12px}.zt-radio__icon{-webkit-box-flex:0;-webkit-flex:none;flex:none;height:1em;font-size:24px;line-height:1em;cursor:pointer}.zt-radio__icon i,.zt-radio__icon img{-webkit-transform:scale(.8333);transform:scale(.8333);-webkit-transform-origin:center;transform-origin:center}.zt-radio__icon img{width:1em;height:1em}.zt-radio__icon .zt-icon{display:block;box-sizing:border-box;width:1em;height:1em;color:transparent;font-size:1em;line-height:1.25;text-align:center;border:1px solid #c8c9cc;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:color,border-color,background-color;transition-property:color,border-color,background-color}.zt-radio__icon--round .zt-icon{border-radius:100%}.zt-radio__icon--checked .zt-icon{color:#fff;background-color:#0091fa;border-color:#0091fa}.zt-radio__icon--disabled{cursor:not-allowed}.zt-radio__icon--disabled .zt-icon{background-color:rgba(0,0,0,.1);border-color:#c8c9cc}.zt-radio__icon--disabled.zt-radio__icon--checked .zt-icon{color:#c8c9cc}.zt-radio__label{margin-left:8px;color:#000;line-height:24px}.zt-radio__label--left{margin:0 8px 0 0}.zt-radio__label--disabled{color:#c8c9cc}
1
+ .zt-radio{display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-align:center;-webkit-align-items:center;align-items:center;overflow:hidden;cursor:pointer;-webkit-user-select:none;user-select:none;padding:10px 0}.zt-radio--disabled{cursor:not-allowed}.zt-radio--label-disabled{cursor:default}.zt-radio--horizontal{margin-left:12px}.zt-radio__icon{-webkit-box-flex:0;-webkit-flex:none;flex:none;height:1em;font-size:24px;line-height:1em;cursor:pointer}.zt-radio__icon i,.zt-radio__icon img{-webkit-transform:scale(.8333);transform:scale(.8333);-webkit-transform-origin:center;transform-origin:center}.zt-radio__icon .zt-icon{display:block;box-sizing:border-box;width:1.25em;height:1.25em;color:transparent;font-size:.8em;line-height:1.15em;text-align:center;-webkit-transition-duration:.2s;transition-duration:.2s;-webkit-transition-property:color,border-color,background-color;transition-property:color,border-color,background-color}.zt-radio__icon--round .zt-icon{border-radius:100%}.zt-radio__icon--checked .zt-icon{color:#fff;background-color:#0091fa;border:1px solid rgba(255,255,255,.5);box-shadow:inset 1px 1px 2px 0 rgba(0,0,0,.2)}.zt-radio__icon--disabled{cursor:not-allowed}.zt-radio__icon--disabled .zt-icon{background-image:-webkit-linear-gradient(316deg,#e1e6eb 0,#e5edf5 100%);background-image:linear-gradient(134deg,#e1e6eb 0,#e5edf5 100%);border:1px solid rgba(45,75,115,.08);box-shadow:-1px -1px 2px 0 #fff,0 0 3px 0 rgba(45,75,115,.2)}.zt-radio__icon--disabled.zt-radio__icon--checked .zt-icon{opacity:.4;background:#0091fa;color:#fff}.zt-radio__label{margin-left:8px;color:#000;line-height:24px}.zt-radio__label--left{margin:0 8px 0 0}.zt-radio__label--disabled{color:#c8c9cc}.zt-radio__disable-icon .zt-radio__icon--round:not(.zt-radio__icon--disabled,.zt-radio__icon--checked){width:18px;height:18px;border-radius:100%;background-image:-webkit-linear-gradient(315deg,#e6ebf0 0,#fff 100%);background-image:linear-gradient(135deg,#e6ebf0 0,#fff 100%);border:1px solid rgba(45,75,115,.13);box-shadow:-1px -1px 2px 0 #fff,0 0 3px 0 rgba(45,75,115,.2)}
@@ -8,15 +8,6 @@
8
8
  user-select: none;
9
9
  padding: @radio-padding;
10
10
 
11
- &__custom-svg {
12
- width: @radio-size;
13
- height: @radio-size;
14
- border-radius: 50%;
15
- }
16
- &__icon--disabled &__custom-svg {
17
- opacity: .2;
18
- }
19
-
20
11
  &--disabled {
21
12
  cursor: not-allowed;
22
13
  }
@@ -39,21 +30,16 @@
39
30
  transform: scale(0.8333);
40
31
  transform-origin: center;
41
32
  }
42
- img {
43
- width: 1em;
44
- height: 1em;
45
- }
46
33
 
47
34
  .zt-icon {
48
35
  display: block;
49
36
  box-sizing: border-box;
50
- width: 1em;
51
- height: 1em;
37
+ width: 1.25em;
38
+ height: 1.25em;
52
39
  color: transparent;
53
- font-size: 1em;
54
- line-height: 1.25;
40
+ font-size: 0.8em;
41
+ line-height: 1.15em;
55
42
  text-align: center;
56
- border: 1px solid @radio-border-color;
57
43
  transition-duration: @radio-transition-duration;
58
44
  transition-property: color, border-color, background-color;
59
45
  }
@@ -68,7 +54,8 @@
68
54
  .zt-icon {
69
55
  color: @white;
70
56
  background-color: @radio-checked-icon-color;
71
- border-color: @radio-checked-icon-color;
57
+ border: 1px solid @checkbox-disabled-border-color;
58
+ box-shadow: inset 1px 1px 2px 0 @gray-a2;
72
59
  }
73
60
  }
74
61
 
@@ -76,14 +63,17 @@
76
63
  cursor: not-allowed;
77
64
 
78
65
  .zt-icon {
79
- background-color: @radio-disabled-background-color;
80
- border-color: @radio-disabled-icon-color;
66
+ background-image: @radio-disabled-background-color;
67
+ border: 1px solid @radio-disabled-border-color;
68
+ box-shadow: -1px -1px 2px 0 #fff, 0 0 3px 0 rgba(45,75,115,0.20);
81
69
  }
82
70
  }
83
71
 
84
72
  &--disabled&--checked {
85
73
  .zt-icon {
86
- color: @radio-disabled-icon-color;
74
+ opacity: .4;
75
+ background: @checkbox-checked-icon-color;
76
+ color: @white;
87
77
  }
88
78
  }
89
79
  }
@@ -102,3 +92,14 @@
102
92
  }
103
93
  }
104
94
  }
95
+
96
+ .zt-radio__disable-icon {
97
+ .zt-radio__icon--round:not(.zt-radio__icon--disabled,.zt-radio__icon--checked){
98
+ width: 18px;
99
+ height: 18px;
100
+ border-radius: 100%;
101
+ background-image: @gradient-white-1;
102
+ border: 1px solid @radio-border-color;
103
+ box-shadow: -1px -1px 2px 0 #FFF, 0 0 3px 0 rgba(45,75,115,0.20);
104
+ }
105
+ }
@@ -13,6 +13,7 @@ export default createComponent({
13
13
  disabled: Boolean,
14
14
  direction: String,
15
15
  checkedColor: String,
16
+ boxShadow: String,
16
17
  iconSize: [Number, String]
17
18
  },
18
19
  watch: {
@@ -26,7 +26,7 @@ export default createComponent({
26
26
  },
27
27
  backgroundStyle: {
28
28
  type: String,
29
- default: '#f5f5f5'
29
+ default: '#FFFFFF'
30
30
  },
31
31
  imageType: {
32
32
  type: String,
@@ -255,23 +255,24 @@ export default createComponent({
255
255
  "class": bem('actions')
256
256
  }, [h(Button, {
257
257
  "attrs": {
258
- "plain": true,
259
- "type": "warning"
258
+ "border-color": "#FF8700",
259
+ "color": "#FF8700",
260
+ "background-color": "#fff"
260
261
  },
261
262
  "on": {
262
263
  "click": this.clear
263
264
  }
264
265
  }, [t('reSign')]), h(Button, {
265
266
  "attrs": {
266
- "plain": true,
267
- "type": "default"
267
+ "border-color": "rgba(45,75,115,0.20)",
268
+ "color": "#2D4B73",
269
+ "background-color": "#fff"
268
270
  },
269
271
  "on": {
270
272
  "click": this.cancel
271
273
  }
272
274
  }, [t('cancel')]), h(Button, {
273
275
  "attrs": {
274
- "block": true,
275
276
  "type": "primary",
276
277
  "disabled": this.isCompleteButtonDisabled
277
278
  },
@@ -37,7 +37,7 @@
37
37
  &__actions {
38
38
  z-index: @signature-actions-z-index;
39
39
  position: absolute;
40
- right: 0px;
40
+ right: 0;
41
41
  bottom: 16px;
42
42
  width: 320px;
43
43
  float: right;
package/es/step/index.css CHANGED
@@ -1 +1 @@
1
- .zt-step{position:relative;-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt-step__circle{display:block;width:18px;height:18px;line-height:18px;border-radius:50%;text-align:center}.zt-step__line{position:absolute;background-color:rgba(0,0,0,.1);-webkit-transition:background-color .3s;transition:background-color .3s}.zt-step--horizontal{float:left}.zt-step--horizontal .zt-step__circle-container{position:absolute;top:10px;left:calc(50% - 10px);z-index:1;background-color:#fff;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.zt-step--horizontal .zt-step__title{display:inline-block;margin-top:26px;font-size:14px;width:100%;text-align:center}@media (max-width:321px){.zt-step--horizontal .zt-step__title{font-size:13px}}.zt-step--horizontal .zt-step__line{top:10px;left:calc(50% + 10px + 4px);width:calc(100% - 20px - 8px);height:1px}.zt-step--horizontal .zt-step__icon{display:block;font-size:12px;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.zt-step--vertical{display:block;float:none;padding:10px 16px 10px 8px;line-height:18px}.zt-step--vertical .zt-step__circle-container{position:absolute;top:20px;left:0;z-index:1;font-size:12px;line-height:1;-webkit-transform:translate(-100%,-50%);transform:translate(-100%,-50%)}.zt-step--vertical .zt-step__line{left:-10px;top:34px;height:calc(100% - 28px);width:1px}.zt-step--vertical .zt-step__icon{display:block;font-size:12px;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.zt-step:last-child .zt-step__line{width:0}.zt-step__icon,.zt-step__title{-webkit-transition:color .3s;transition:color .3s}
1
+ .zt-step{position:relative;-webkit-box-flex:1;-webkit-flex:1;flex:1}.zt-step__circle{display:block;width:20px;height:20px;line-height:20px;border-radius:50%;text-align:center;font-size:14px}.zt-step__line{position:absolute;background-color:rgba(0,0,0,.1);-webkit-transition:background-color .3s;transition:background-color .3s}.zt-step--horizontal{float:left}.zt-step--horizontal .zt-step__circle-container{position:absolute;top:10px;left:calc(50% - 10px);z-index:1;background-color:#fff;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.zt-step--horizontal .zt-step__title{display:inline-block;margin-top:26px;font-size:14px;width:100%;text-align:center;color:#2d4b73}@media (max-width:321px){.zt-step--horizontal .zt-step__title{font-size:13px}}.zt-step--horizontal .zt-step__line{top:10px;left:calc(50% + 10px + 4px);width:calc(100% - 20px - 8px);height:1px}.zt-step--horizontal .zt-step__icon{display:block;font-size:14px;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.zt-step--vertical{display:block;float:none;padding:10px 16px 10px 8px;line-height:18px}.zt-step--vertical .zt-step__circle-container{position:absolute;top:20px;left:0;z-index:1;font-size:14px;line-height:1;-webkit-transform:translate(-100%,-50%);transform:translate(-100%,-50%)}.zt-step--vertical .zt-step__line{left:-10px;top:34px;height:calc(100% - 28px);width:1px}.zt-step--vertical .zt-step__icon{display:block;font-size:14px;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.zt-step:last-child .zt-step__line{width:0}.zt-step__icon,.zt-step__title{-webkit-transition:color .3s;transition:color .3s}
package/es/step/index.js CHANGED
@@ -22,14 +22,12 @@ export default createComponent({
22
22
  if (this.active) {
23
23
  return {
24
24
  background: "" + (this.parent.activeBgColor || 'rgba(0,145,250,0.20)'),
25
- border: "1px solid " + (this.parent.activeBorderColor || '#0091FA'),
26
25
  'font-weight': 'bold',
27
26
  color: "" + (this.parent.activeColor || '#0091FA')
28
27
  };
29
28
  } else {
30
29
  return {
31
- background: "" + (this.parent.inactiveBgColor || 'rgba(0,0,0,0.20)'),
32
- border: "1px solid " + (this.parent.inactiveBorderColor || 'rgba(0,0,0,0)'),
30
+ background: "" + (this.parent.inactiveBgColor || 'rgba(45,75,115,0.20)'),
33
31
  'font-weight': 'normal',
34
32
  color: "" + (this.parent.inactiveColor || '#FFFFFF')
35
33
  };
@@ -38,11 +36,11 @@ export default createComponent({
38
36
  titleStyle: function titleStyle() {
39
37
  if (this.active) {
40
38
  return {
41
- color: this.parent.titleActiveColor || 'rgba(0,0,0,1)'
39
+ color: this.parent.titleActiveColor || 'rgba(45, 75, 115, 1)'
42
40
  };
43
41
  } else {
44
42
  return {
45
- color: this.parent.titleInactiveColor || 'rgba(0,0,0,0.4)'
43
+ color: this.parent.titleInactiveColor || 'rgba(45, 75, 115, 0.6)'
46
44
  };
47
45
  }
48
46
  }