kui-vue 3.2.11 → 3.3.0

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 (260) hide show
  1. package/components/_tool/scroll.js +1 -1
  2. package/components/alert/alert.jsx +10 -8
  3. package/components/avatar/AvatarGroup.jsx +22 -0
  4. package/components/avatar/avatar.jsx +10 -3
  5. package/components/avatar/demo/base.md +8 -8
  6. package/components/avatar/demo/types.md +17 -4
  7. package/components/avatar/styles/index.less +6 -2
  8. package/components/backtop/backtop.jsx +2 -1
  9. package/components/badge/demo/color.md +2 -2
  10. package/components/badge/demo/dot.md +11 -1
  11. package/components/badge/demo/dynamic.md +5 -3
  12. package/components/base/input.jsx +6 -5
  13. package/components/base/pop.jsx +2 -1
  14. package/components/breadcrumb/breadcrumbItem.jsx +1 -1
  15. package/components/breadcrumb/demo/icon.md +13 -3
  16. package/components/breadcrumb/demo/separator.md +13 -3
  17. package/components/breadcrumb/styles/index.less +3 -1
  18. package/components/button/button.jsx +3 -2
  19. package/components/button/demo/group.md +12 -2
  20. package/components/button/demo/light.md +18 -8
  21. package/components/button/demo/loading.md +8 -6
  22. package/components/button/demo/normal.md +18 -8
  23. package/components/button/demo/size.md +8 -6
  24. package/components/button/demo/with-icon.md +17 -7
  25. package/components/button/styles/index.less +5 -5
  26. package/components/card/card.jsx +1 -1
  27. package/components/card/demo/base.md +11 -1
  28. package/components/card/demo/border.md +11 -1
  29. package/components/carousel/carousel.jsx +4 -2
  30. package/components/carousel/styles/index.less +7 -1
  31. package/components/checkbox/checkbox.jsx +2 -1
  32. package/components/checkbox/demo/base.md +2 -2
  33. package/components/checkbox/demo/disabled.md +2 -2
  34. package/components/collapse/demo/accrodion.md +1 -1
  35. package/components/collapse/demo/base.md +1 -1
  36. package/components/collapse/demo/extra.md +6 -4
  37. package/components/collapse/demo/nesting.md +1 -1
  38. package/components/collapse/demo/sample.md +1 -1
  39. package/components/collapse/panel.jsx +2 -1
  40. package/components/collapse/styles/index.less +2 -2
  41. package/components/colorPicker/colorpicker.jsx +5 -5
  42. package/components/colorPicker/demo/shape.md +3 -1
  43. package/components/colorPicker/styles/index.less +13 -1
  44. package/components/datePicker/datecalendar.jsx +9 -5
  45. package/components/datePicker/datepicker.jsx +6 -6
  46. package/components/datePicker/demo/format.md +2 -2
  47. package/components/datePicker/demo/inside.md +4 -2
  48. package/components/datePicker/demo/size.md +2 -2
  49. package/components/datePicker/demo/theme.md +6 -4
  50. package/components/datePicker/styles/datepicker.less +5 -6
  51. package/components/descriptions/demo/size.md +2 -2
  52. package/components/drawer/demo/base.md +2 -2
  53. package/components/drawer/demo/custom.md +2 -2
  54. package/components/drawer/demo/form.md +2 -2
  55. package/components/drawer/demo/target.md +2 -2
  56. package/components/drawer/drawer.jsx +2 -1
  57. package/components/dropdown/demo/base.md +16 -6
  58. package/components/dropdown/demo/cascading.md +11 -1
  59. package/components/dropdown/demo/custom.md +3 -1
  60. package/components/dropdown/demo/divider.md +11 -3
  61. package/components/dropdown/demo/rightmenu.md +9 -3
  62. package/components/empty/demo/custom.md +12 -2
  63. package/components/empty/demo/use.md +2 -2
  64. package/components/empty/empty.jsx +2 -1
  65. package/components/form/demo/align.md +1 -1
  66. package/components/form/demo/base.md +3 -3
  67. package/components/form/demo/customvalid.md +1 -1
  68. package/components/form/demo/dynamicvalid.md +4 -2
  69. package/components/form/styles/index.less +0 -5
  70. package/components/grid/col.jsx +34 -5
  71. package/components/grid/demo/gutter.md +52 -11
  72. package/components/grid/index.md +7 -7
  73. package/components/grid/row.jsx +24 -4
  74. package/components/grid/styles/index.less +9 -23
  75. package/components/icon/demo/base.md +14 -4
  76. package/components/icon/demo/info.md +25 -1
  77. package/components/icon/demo/search.vue +43 -21
  78. package/components/icon/demo/stroke.md +17 -4
  79. package/components/icon/icon.jsx +6 -4
  80. package/components/icon/index.md +1 -1
  81. package/components/icon/lib/dist.json +1 -1
  82. package/components/icon/lib/kui-icons.js +1 -1
  83. package/components/icon/lib/sprite.svg +1 -1
  84. package/components/image/demo/errors.md +1 -1
  85. package/components/image/demo/extra.md +16 -14
  86. package/components/image/demo/extra_globle.md +8 -7
  87. package/components/image/image.jsx +3 -13
  88. package/components/image/preview.jsx +12 -12
  89. package/components/image/styles/index.less +8 -3
  90. package/components/input/demo/icon.md +10 -4
  91. package/components/input/demo/size.md +13 -3
  92. package/components/input/demo/suffix.md +7 -5
  93. package/components/input/demo/theme.md +5 -3
  94. package/components/input/input.jsx +1 -1
  95. package/components/inputNumber/demo/ffix.md +12 -2
  96. package/components/inputNumber/demo/format.md +1 -1
  97. package/components/inputNumber/demo/size.md +13 -3
  98. package/components/inputNumber/inputNumber.jsx +13 -7
  99. package/components/inputNumber/styles/index.less +7 -0
  100. package/components/layout/demo/layout1.md +17 -7
  101. package/components/layout/demo/layout2.md +18 -17
  102. package/components/layout/demo/layout3.md +15 -15
  103. package/components/layout/demo/layout4.md +16 -15
  104. package/components/layout/demo/layout5.md +90 -67
  105. package/components/layout/styles/index.less +12 -12
  106. package/components/menu/demo/accrodion.md +6 -4
  107. package/components/menu/demo/base.md +7 -5
  108. package/components/menu/demo/collapsed.md +8 -6
  109. package/components/menu/demo/inline.md +6 -4
  110. package/components/menu/demo/mode.md +7 -5
  111. package/components/menu/demo/theme.md +7 -5
  112. package/components/menu/demo/vertical.md +7 -5
  113. package/components/menu/menuitem.jsx +3 -2
  114. package/components/menu/styles/dropmenu.less +12 -4
  115. package/components/menu/styles/index.less +501 -495
  116. package/components/menu/submenu.jsx +4 -3
  117. package/components/message/demo/icon.md +8 -2
  118. package/components/message/inner.jsx +8 -7
  119. package/components/modal/demo/base.md +2 -2
  120. package/components/modal/demo/custom.md +5 -3
  121. package/components/modal/demo/global.md +9 -3
  122. package/components/modal/demo/more.md +2 -2
  123. package/components/modal/modal.jsx +3 -3
  124. package/components/notice/demo/icon.md +10 -4
  125. package/components/page/demo/sizer.md +2 -2
  126. package/components/page/page.jsx +5 -4
  127. package/components/page/styles/index.less +21 -7
  128. package/components/popconfirm/demo/placement.md +2 -2
  129. package/components/poptip/demo/closeinside.md +2 -2
  130. package/components/poptip/demo/placement.md +2 -2
  131. package/components/progress/demo/color.md +5 -3
  132. package/components/progress/demo/dashboard.md +3 -3
  133. package/components/progress/demo/dynamic.md +5 -3
  134. package/components/progress/demo/size.md +4 -4
  135. package/components/progress/progress.jsx +6 -5
  136. package/components/radio/demo/base.md +2 -2
  137. package/components/radio/demo/button.md +2 -2
  138. package/components/radio/demo/disabled.md +2 -2
  139. package/components/radio/styles/index.less +3 -0
  140. package/components/rate/demo/base.md +12 -2
  141. package/components/rate/demo/character.md +11 -1
  142. package/components/rate/demo/custom.md +7 -6
  143. package/components/rate/demo/disabled.md +11 -1
  144. package/components/rate/demo/tips.md +1 -1
  145. package/components/rate/rate.jsx +2 -2
  146. package/components/rate/star.jsx +4 -3
  147. package/components/select/demo/clearable.md +2 -2
  148. package/components/select/demo/filterable.md +2 -2
  149. package/components/select/demo/icon.md +5 -3
  150. package/components/select/demo/multiple.md +2 -2
  151. package/components/select/demo/search.md +2 -2
  152. package/components/select/demo/size.md +7 -5
  153. package/components/select/demo/theme.md +6 -4
  154. package/components/select/option.jsx +2 -12
  155. package/components/select/select.jsx +9 -12
  156. package/components/select/styles/index.less +4 -15
  157. package/components/skeleton/demo/child.md +2 -2
  158. package/components/skeleton/demo/custom.md +1 -1
  159. package/components/skeleton/demo/list.md +1 -1
  160. package/components/skeleton/skeletonAvatar.jsx +1 -0
  161. package/components/skeleton/skeletonButton.jsx +1 -0
  162. package/components/skeleton/skeletonImage.jsx +1 -0
  163. package/components/skeleton/skeletonText.jsx +1 -0
  164. package/components/slider/demo/base.md +11 -6
  165. package/components/slider/demo/marks.md +37 -26
  166. package/components/slider/demo/reverse.md +1 -1
  167. package/components/slider/slider.jsx +79 -35
  168. package/components/slider/styles/index.less +6 -3
  169. package/components/slider/thumb.jsx +23 -39
  170. package/components/space/demo/base.md +11 -1
  171. package/components/space/demo/custom-size.md +1 -6
  172. package/components/space/demo/size.md +2 -2
  173. package/components/space/demo/vertical.md +12 -2
  174. package/components/space/space.jsx +2 -2
  175. package/components/spin/demo/container.md +2 -2
  176. package/components/spin/demo/mode.md +2 -2
  177. package/components/steps/step.vue +1 -1
  178. package/components/styles/sys.less +22 -20
  179. package/components/styles/var.less +140 -149
  180. package/components/switch/demo/base.md +2 -2
  181. package/components/switch/demo/disabled.md +2 -2
  182. package/components/switch/demo/text.md +10 -8
  183. package/components/switch/switch.jsx +2 -1
  184. package/components/table/demo/base-render.md +41 -38
  185. package/components/table/demo/base.md +3 -1
  186. package/components/table/demo/bordered.md +1 -1
  187. package/components/table/demo/custom-header.md +10 -8
  188. package/components/table/demo/edit.md +2 -2
  189. package/components/table/demo/ellipsis.md +5 -3
  190. package/components/table/demo/embed.md +2 -2
  191. package/components/table/demo/expand.md +5 -3
  192. package/components/table/demo/filter.md +2 -2
  193. package/components/table/demo/fixed-col.md +5 -5
  194. package/components/table/demo/fixed-head.md +3 -3
  195. package/components/table/demo/fixed.md +14 -6
  196. package/components/table/demo/fixedspan.md +2 -7
  197. package/components/table/demo/index.vue +1 -1
  198. package/components/table/demo/selection.md +6 -4
  199. package/components/table/demo/size.md +3 -1
  200. package/components/table/demo/span.md +2 -2
  201. package/components/table/extend.jsx +157 -55
  202. package/components/table/index.md +1 -0
  203. package/components/table/styles/index.less +85 -101
  204. package/components/table/table.jsx +37 -176
  205. package/components/table/utils.js +17 -13
  206. package/components/tabs/demo/base.md +2 -2
  207. package/components/tabs/demo/card.md +2 -2
  208. package/components/tabs/demo/centered.md +2 -2
  209. package/components/tabs/demo/closable.md +4 -2
  210. package/components/tabs/demo/disabled.md +2 -2
  211. package/components/tabs/demo/extra.md +2 -2
  212. package/components/tabs/demo/icon.md +6 -4
  213. package/components/tabs/demo/sample.md +2 -2
  214. package/components/tabs/styles/index.less +3 -2
  215. package/components/tabs/tabpane.jsx +1 -1
  216. package/components/tabs/tabs.jsx +4 -3
  217. package/components/tag/demo/color.md +2 -2
  218. package/components/tag/demo/dynamic.md +3 -1
  219. package/components/tag/tag.jsx +2 -1
  220. package/components/timeline/demo/icon.md +12 -2
  221. package/components/timeline/demo/mode.md +6 -4
  222. package/components/timeline/styles/index.less +8 -0
  223. package/components/timeline/timelineitem.jsx +2 -3
  224. package/components/tooltip/demo/base.md +2 -2
  225. package/components/tooltip/demo/color.md +2 -2
  226. package/components/tooltip/demo/placement.md +2 -2
  227. package/components/tree/demo/custom-render.md +8 -7
  228. package/components/tree/demo/directory.md +59 -47
  229. package/components/tree/demo/icon.md +13 -11
  230. package/components/tree/demo/treenode.md +3 -1
  231. package/components/tree/node.jsx +3 -3
  232. package/components/tree/styles/index.less +2 -2
  233. package/components/upload/demo/accept.md +6 -4
  234. package/components/upload/demo/avatar.md +4 -2
  235. package/components/upload/demo/base.md +4 -2
  236. package/components/upload/demo/custom.md +4 -2
  237. package/components/upload/demo/directory.md +4 -2
  238. package/components/upload/demo/draggable.md +4 -2
  239. package/components/upload/demo/exceed.md +4 -2
  240. package/components/upload/demo/file-list.md +4 -2
  241. package/components/upload/demo/form.md +5 -3
  242. package/components/upload/demo/picture.md +1 -1
  243. package/components/upload/upload.jsx +9 -5
  244. package/dist/k-ui.css +2 -3
  245. package/dist/k-ui.js +2 -3
  246. package/dist/locale/de.js +7 -0
  247. package/dist/locale/el.js +7 -0
  248. package/dist/locale/en.js +7 -0
  249. package/dist/locale/fr.js +7 -0
  250. package/dist/locale/it.js +7 -0
  251. package/dist/locale/ja.js +7 -0
  252. package/dist/locale/ko.js +7 -0
  253. package/dist/locale/ru.js +7 -0
  254. package/dist/locale/th.js +7 -0
  255. package/dist/locale/ua.js +7 -0
  256. package/dist/locale/vi.js +7 -0
  257. package/dist/locale/zhCN.js +7 -0
  258. package/dist/locale/zhTW.js +7 -0
  259. package/package.json +3 -2
  260. package/readme.md +39 -22
@@ -1,4 +1,5 @@
1
1
  import Thumb from './thumb'
2
+ import { times } from '../_tool/number'
2
3
  export default {
3
4
  props: {
4
5
  value: [Array, Number, String],
@@ -8,7 +9,7 @@ export default {
8
9
  step: {
9
10
  type: Number,
10
11
  default: 1,
11
- validator: (val) => val > 0
12
+ validator: (val) => val !== 0
12
13
  },
13
14
  range: Boolean,
14
15
  vertical: Boolean,
@@ -39,55 +40,91 @@ export default {
39
40
  }
40
41
  },
41
42
  methods: {
43
+ getMinStep(percent) {
44
+ let { marks, step, min } = this
45
+ if (!marks) return times(Math.round((percent + min) / step), step)
46
+ let steps = Object.keys(marks)//, values = []
47
+ steps = steps.map(x => x - min)
48
+ if (step) {
49
+ steps.push(times(Math.round((percent) / step), step))
50
+ }
51
+
52
+ let result = steps.reduce((x, y) => Math.abs(x - percent) > Math.abs(y - percent) ? y : x)
53
+ // let result = steps.reduce((x, y) => Math.abs(x - percent) > Math.abs(y - percent) ? y : x)
54
+ // console.log(percent, result, steps)
55
+ return result + min
56
+ },
42
57
  getValue() {
43
- let { value = 0, range, min, max } = this, v = value;
58
+ let { value = 0, range, min, max } = this, v;
59
+ let diff = max - min;
44
60
  if (!range) {
61
+ v = value
45
62
  if (value >= max) v = max
46
63
  else if (value <= min) v = min
64
+ // let percent = (v - min) * 100 / diff
65
+ // v = this.getMinStep(percent)
47
66
  } else {
48
- v = value
49
- if (!Array.isArray(v)) {
67
+
68
+ if (!Array.isArray(value)) {
50
69
  v = [0, 0]
70
+ } else {
71
+ v = [].concat(value)
51
72
  }
52
73
  let [x, y] = v
53
- x = Math.max(x, min)
54
- y = Math.min(y, max)
74
+
75
+ // let p1 = (x - min) * 100 / diff
76
+ // let p2 = (y - min) * 100 / diff
77
+ // x = this.getMinStep(p1)
78
+ // y = this.getMinStep(p2)
79
+ // console.log(p1 * 100, p2 * 100)
80
+
81
+ if (x >= max) x = max
82
+ else if (x <= min) x = min
83
+
84
+ if (y >= max) y = max
85
+ else if (y <= min) y = min
86
+
55
87
  v = [x, y]
56
88
  }
57
89
  return v
58
90
  },
59
91
  click(e) {
60
- let { disabled, range, vertical, step, max, defaultValue, reverse } = this
92
+ let { disabled, range, vertical, step, max, min, defaultValue, reverse } = this
61
93
  if (disabled) return;
62
94
  let { width, height } = e.target.getBoundingClientRect()
63
95
  let { layerX, layerY } = e
64
96
 
65
- let percent = 0
97
+ let percent = 0, diff = max - min;
66
98
  if (reverse) {
67
- percent = vertical ? (((height - layerY) / height) * max) : (((width - layerX) / width) * max);
99
+ percent = vertical ? (((height - layerY) / height) * diff) : (((width - layerX) / width) * diff);
68
100
  } else {
69
- percent = vertical ? ((layerY / height) * max) : ((layerX / width) * max);
101
+ percent = vertical ? ((layerY / height) * diff) : ((layerX / width) * diff);
70
102
  }
71
- let value = Math.round(percent / step) * step
103
+ let value = this.getMinStep(percent)
104
+ // let value = times(Math.round((percent + min) / step), step)
105
+ // console.log(value, step)
106
+
72
107
  if (range) {
73
108
  let [x, y] = defaultValue
74
- let half = (y - x) / 2 + x
75
- value = value >= half ? [x, value] : [value, y]
109
+ let half = y > x ? (y - x) / 2 + x : (x - y) / 2 + y
110
+ value = value >= half && y > x ? [x, value] : [value, y]
76
111
  }
77
112
 
78
113
  this.defaultValue = value
79
114
  this.$emit('input', value)
80
115
  },
81
116
  isActice(a) {
82
- let { defaultValue, reverse, max, vertical } = this
117
+ let { defaultValue, reverse, max, min, vertical } = this
83
118
  let active;
84
119
  if (this.range) {
85
120
  let [x, y] = defaultValue
86
- active = a >= x && a <= y
121
+ active = x < y ? (a >= x && a <= y) : (a <= x && a >= y)
122
+ // console.log(a, active, `${a} >= ${x} && ${a} <= ${y}`)
87
123
  } else {
88
124
  active = a <= defaultValue
89
125
  }
90
- let pos = (a / max) * 100 + '%'
126
+ let diff = max - min
127
+ let pos = ((a - min) / diff) * 100 + '%'
91
128
  let sty = {}
92
129
  if (reverse) {
93
130
  sty = vertical ?
@@ -109,7 +146,7 @@ export default {
109
146
  return <div div class="k-slider-marks" >
110
147
  {
111
148
  mks.map(v => {
112
- let { active, sty } = this.isActice(v);
149
+ const { active, sty } = this.isActice(v);
113
150
  return <div class={['k-slider-mark-symbol', { 'k-slider-mark-symbol-active': active }]} style={sty} />
114
151
  })
115
152
  }
@@ -122,37 +159,44 @@ export default {
122
159
  </div>
123
160
  },
124
161
  renderTrack() {
125
- let { vertical, max, defaultValue, range, included, marks, reverse } = this
126
- let percent1 = 0, percent2 = 0, x1 = 0, x2 = 0;
162
+ let { vertical, max, min, defaultValue, range, included, marks, reverse } = this
163
+ let percent1 = 0, percent2 = 0, diff = max - min;
164
+ let w, l;
127
165
 
128
166
  if (!range) {
129
- // console.log(defaultValue, max)
130
- x2 = defaultValue
131
- percent2 = (defaultValue / max) * 100
167
+ percent2 = ((defaultValue - min) / diff) * 100
168
+
132
169
  } else {
133
170
  let [x, y] = defaultValue
134
- percent1 = (x / max) * 100
135
- percent2 = (y / max) * 100
136
- x1 = x, x2 = y
171
+ percent1 = ((x - min) / diff) * 100
172
+ percent2 = ((y - min) / diff) * 100
137
173
  }
138
174
  let trackSty = {}
175
+ // console.log(percent1, percent2)
176
+ if (percent2 > percent1) {
177
+ w = percent2 - percent1
178
+ l = percent1
179
+ } else {
180
+ w = percent1 - percent2
181
+ l = percent2
182
+ }
139
183
  if (reverse) {
140
184
  trackSty = vertical ? {
141
- height: `${percent2 - percent1}%`,
185
+ height: `${w}%`,
142
186
  top: 'auto',
143
- bottom: `${percent1}%`
187
+ bottom: `${l}%`
144
188
  } : {
145
- width: `${percent2 - percent1}%`,
189
+ width: `${w}%`,
146
190
  left: 'auto',
147
- right: `${percent1}%`
191
+ right: `${l}%`
148
192
  }
149
193
  } else {
150
194
  trackSty = vertical ? {
151
- height: `${percent2 - percent1}%`,
152
- top: `${percent1}%`
195
+ height: `${w}%`,
196
+ top: `${l}%`
153
197
  } : {
154
- width: `${percent2 - percent1}%`,
155
- left: `${percent1}%`
198
+ width: `${w}%`,
199
+ left: `${l}%`
156
200
  }
157
201
  }
158
202
  return (included && marks) || !marks ?
@@ -160,10 +204,10 @@ export default {
160
204
 
161
205
  },
162
206
  thumbProps() {
163
- let { vertical, disabled, range, step, reverse, max, defaultValue, tooltipVisible, tipFormatter } = this
207
+ let { vertical, disabled, range, step, reverse, max, min, defaultValue, tooltipVisible, tipFormatter } = this
164
208
  return {
165
209
  props: {
166
- vertical, disabled, range, step, reverse,
210
+ vertical, disabled, range, step, reverse, min,
167
211
  max, tipFormatter, tooltipVisible,
168
212
  value: range ? [].concat(defaultValue) : defaultValue * 1
169
213
  },
@@ -72,10 +72,13 @@
72
72
  .k-slider-mark-text {
73
73
  position: absolute;
74
74
  transform: translateX(-50%);
75
- color: var(--kui-color-font);
75
+ color: var(--kui-color-disable-color);
76
76
  z-index: 0;
77
77
  line-height: 1;
78
78
  margin-top: 18px;
79
+ &-active {
80
+ color: var(--kui-color-font);
81
+ }
79
82
  }
80
83
  }
81
84
 
@@ -110,8 +113,8 @@
110
113
  .k-slider-mark-symbol, .k-slider-mark-text {
111
114
  transform: translateY(-50%);
112
115
  }
113
- .k-slider-mark-text{
114
- margin:0 0 0 18px;
116
+ .k-slider-mark-text {
117
+ margin: 0 0 0 18px;
115
118
  }
116
119
  }
117
120
 
@@ -1,5 +1,5 @@
1
1
  import Tooltip from "../tooltip"
2
- import { getMaxDigit, toNumber } from '../_tool/number'
2
+ import { times } from '../_tool/number'
3
3
  export default {
4
4
  props: {
5
5
  vertical: Boolean,
@@ -7,6 +7,7 @@ export default {
7
7
  range: Boolean,
8
8
  reverse: Boolean,
9
9
  max: Number,
10
+ min: Number,
10
11
  step: Number,
11
12
  value: [Number, Array],
12
13
  tipFormatter: [Function, Object],
@@ -22,19 +23,19 @@ export default {
22
23
  showTip: false
23
24
  }
24
25
  },
25
- computed: {
26
- rect() {
27
- return this.bar.$refs.rail.getBoundingClientRect()
28
- }
29
- },
30
26
  methods: {
31
27
  mouseMove(e) {
32
28
  if (this.isMouseDown) {
33
29
  let { clientX, clientY } = e
34
- let { width, height, left, right, top, bottom } = this.rect
35
- let { value, range, step, max, vertical, reverse } = this, v = value;
30
+ // let r = e.target.getBoundingClientRect()
31
+ // console.log(e)
32
+ // let clientX = r.left + r.width / 2, clientY = r.top + r.height / 2
33
+ // console.log(clientX, clientY, r)
36
34
 
37
- let percent = 0;
35
+ let { width, height, left, right, top, bottom } = this.bar.$refs.rail.getBoundingClientRect()
36
+ let { value, range, step, max, min, vertical, reverse, type } = this, v = value;
37
+
38
+ let percent = 0, diff = max - min;
38
39
  if (reverse) {
39
40
  percent = vertical ? ((height - (clientY - top)) / height) : ((width - (clientX - left)) / width)
40
41
  } else {
@@ -43,35 +44,18 @@ export default {
43
44
  if (percent >= 1) percent = 1
44
45
  else if (percent <= 0) percent = 0
45
46
  // this.defaultValue = value
47
+ // console.log(percent)
48
+ let x = range ? (type == 'right' ? v[1] : v[0]) : v
46
49
 
47
50
 
48
- if (this.type == 'right') {
49
- let x1 = 0;
50
- if (range) {
51
- let [x, y] = value
52
- v = y
53
- x1 = x
54
- } else {
55
- v = value
56
- }
57
-
58
- let digit = getMaxDigit(step, v)
59
- v = (((percent * max) / step) * step).toFixed(digit)
51
+ // x = times(Math.round((percent * diff + min) / step), step)
52
+ x = this.bar.getMinStep(percent * diff)
60
53
 
61
- v = toNumber(v)
62
- if (range) {
63
- v = Math.max(v, x1)
64
- v = [x1, v]
65
- }
66
- } else {
67
- let [x, y] = value
68
- let digit = getMaxDigit(step, x)
69
- v = ((percent * max / step) * step).toFixed(digit)
70
- v = toNumber(v)
54
+ if (x >= max) x = max
55
+ else if (x <= min) x = min
71
56
 
72
- v = Math.min(v, y)
73
- v = [v, y]
74
- }
57
+ v = range ? (type == 'right' ? [v[0], x] : [x, v[1]]) : x
58
+ // console.log(v)
75
59
  this.$emit('input', v)
76
60
  }
77
61
  },
@@ -91,13 +75,13 @@ export default {
91
75
  this.isMouseDown = true
92
76
  this.showTip = true
93
77
  this.index = 2
94
- this.mouseMove(e)
78
+ // this.mouseMove(e)
95
79
  document.addEventListener('mousemove', this.mouseMove)
96
80
  document.addEventListener('mouseup', this.mouseUp)
97
81
  }
98
82
  },
99
83
  render() {
100
- let { vertical, value, index, disabled, max, tipFormatter, range, type, reverse, tooltipVisible } = this
84
+ let { vertical, value, index, disabled, max, min, tipFormatter, range, type, reverse, tooltipVisible } = this
101
85
  const props = {
102
86
  class: 'k-slider-thumb',
103
87
  style: {
@@ -120,11 +104,11 @@ export default {
120
104
  }
121
105
  }
122
106
  }
123
- let percent;
107
+ let percent, diff = max - min;;
124
108
  if (type == 'right') {
125
- percent = ((range ? value[1] : value) / max) * 100
109
+ percent = (((range ? value[1] : value) - min) / diff) * 100
126
110
  } else {
127
- percent = (value[0] / max) * 100
111
+ percent = ((value[0] - min) / diff) * 100
128
112
  }
129
113
  let sty = {}
130
114
  if (vertical) {
@@ -7,7 +7,7 @@
7
7
  <template>
8
8
  <Space>
9
9
  <Button>Button</Button>
10
- <Button icon="search">Button</Button>
10
+ <Button :icon="Search">Button</Button>
11
11
  <Tooltip placement="top">
12
12
  <Button>Space</Button>
13
13
  <template slot="title">
@@ -16,4 +16,14 @@
16
16
  </Tooltip>
17
17
  </Space>
18
18
  </template>
19
+ <script>
20
+ import { Search } from 'kui-icons'
21
+ export default{
22
+ data() {
23
+ return {
24
+ Search
25
+ }
26
+ }
27
+ }
28
+ </script>
19
29
  ```
@@ -6,7 +6,7 @@
6
6
  ```vue
7
7
  <template>
8
8
  <div>
9
- <Slider v-model="size" max="50"/>
9
+ <Slider v-model="size" :max="50"/>
10
10
  <br/>
11
11
  <br/>
12
12
  <Space :size="size">
@@ -25,11 +25,6 @@ export default {
25
25
  size: 12,
26
26
  };
27
27
  },
28
- methods:{
29
- change(e){
30
- this.size =e.target.value*1
31
- }
32
- }
33
28
  };
34
29
  </script>
35
30
  ```
@@ -31,8 +31,8 @@
31
31
  </template>
32
32
  <script>
33
33
  export default{
34
- data(){
35
- return{
34
+ data() {
35
+ return {
36
36
  current:'1'
37
37
  }
38
38
  },
@@ -6,14 +6,24 @@
6
6
  ```vue
7
7
  <template>
8
8
  <Space vertical>
9
- <Card title="Card" icon="heart" style="width:256px">
9
+ <Card title="Card" :icon="Heart" style="width:256px">
10
10
  <p>card content</p>
11
11
  <p>card content</p>
12
12
  </Card>
13
- <Card title="Card" icon="heart" style="width:256px">
13
+ <Card title="Card" :icon="Heart" style="width:256px">
14
14
  <p>card content</p>
15
15
  <p>card content</p>
16
16
  </Card>
17
17
  </Space>
18
18
  </template>
19
+ <script>
20
+ import { Heart } from 'kui-icons'
21
+ export default{
22
+ data() {
23
+ return {
24
+ Heart
25
+ }
26
+ }
27
+ }
28
+ </script>
19
29
  ```
@@ -1,4 +1,4 @@
1
- import { getChild } from '../_tool/utils'
1
+ // import { getChild } from '../_tool/utils'
2
2
  export default {
3
3
  name: 'Space',
4
4
  props: {
@@ -25,7 +25,7 @@ export default {
25
25
  class: ['k-space', {
26
26
  [`k-space-vertical`]: vertical,
27
27
  [`k-space-lg`]: size == 'large',
28
- [`k-space-md`]: size == 'middle ',
28
+ [`k-space-md`]: size == 'middle',
29
29
  [`k-space-wrap`]: wrap,
30
30
  [`k-space-align-${align}`]: align,
31
31
  }]
@@ -23,8 +23,8 @@
23
23
  </style>
24
24
  <script>
25
25
  export default{
26
- data(){
27
- return{
26
+ data() {
27
+ return {
28
28
  spinning:false
29
29
  }
30
30
  },
@@ -32,8 +32,8 @@
32
32
  </style>
33
33
  <script>
34
34
  export default{
35
- data(){
36
- return{
35
+ data() {
36
+ return {
37
37
  spinning:false,
38
38
  mode:"bounce"
39
39
  }
@@ -34,7 +34,7 @@ export default {
34
34
  },
35
35
  default: 'wait'
36
36
  },
37
- icon: String
37
+ icon: [String, Array]
38
38
  },
39
39
  data() {
40
40
  return {
@@ -7,28 +7,30 @@
7
7
  ::-webkit-scrollbar-corner — 滚动条的底角,水平和垂直滚动条相交的地方 这通常是浏览器窗口的右下角。
8
8
  ::-webkit-resizer — 出现在某些元素底角的可拖动调整大小手柄。
9
9
  */
10
+
10
11
  ::selection {
11
12
  background-color: var(--kui-color-main);
12
13
  color: #fff;
13
14
  }
14
- ::-webkit-scrollbar {
15
- background-color: var(--kui-color-back);
16
- width: 8px;
17
- height: 8px;
18
- padding: 2px;
19
- }
20
- ::-webkit-scrollbar-track{
21
-
22
- }
23
- ::-webkit-scrollbar-thumb {
24
- border-radius: 8px;
25
- width: 6px;
26
- height: 6px;
27
- background-color: var(--kui-color-border);
28
- }
29
- ::-webkit-scrollbar-corner,::-webkit-resizer{
30
- background-color: transparent !important;
31
- }
32
- ::-webkit-scrollbar-track{
33
- background-color: transparent !important;
15
+
16
+ .k-scroll {
17
+ &::-webkit-scrollbar {
18
+ background-color: var(--kui-color-back);
19
+ width: 8px;
20
+ height: 8px;
21
+ padding: 2px;
22
+ }
23
+ &::-webkit-scrollbar-track {}
24
+ &::-webkit-scrollbar-thumb {
25
+ border-radius: 8px;
26
+ width: 6px;
27
+ height: 6px;
28
+ background-color: var(--kui-color-border);
29
+ }
30
+ &::-webkit-scrollbar-corner, ::-webkit-resizer {
31
+ background-color: transparent !important;
32
+ }
33
+ &::-webkit-scrollbar-track {
34
+ background-color: transparent !important;
35
+ }
34
36
  }