kui-vue 3.2.10 → 3.2.11

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 (109) hide show
  1. package/components/_tool/number.js +177 -0
  2. package/components/_tool/utils.js +9 -3
  3. package/components/base/input.jsx +82 -54
  4. package/components/base/pop.jsx +22 -8
  5. package/components/button/button.jsx +1 -1
  6. package/components/button/styles/index.less +6 -2
  7. package/components/checkbox/checkbox.jsx +6 -11
  8. package/components/checkbox/demo/check-all.md +6 -6
  9. package/components/checkbox/group.jsx +0 -1
  10. package/components/checkbox/styles/index.less +17 -11
  11. package/components/divider/styles/index.less +1 -1
  12. package/components/dropdown/demo/rightmenu.md +2 -2
  13. package/components/dropdown/styles/index.less +23 -34
  14. package/components/form/demo/base.md +7 -1
  15. package/components/form/demo/valid.md +13 -4
  16. package/components/form/styles/index.less +1 -5
  17. package/components/icon/demo/base.md +2 -2
  18. package/components/icon/demo/search.vue +31 -14
  19. package/components/icon/icon.jsx +3 -1
  20. package/components/icon/styles/index.less +1 -1
  21. package/components/index.js +2 -0
  22. package/components/input/demo/icon.md +2 -2
  23. package/components/input/demo/size.md +3 -3
  24. package/components/input/demo/suffix.md +13 -6
  25. package/components/input/demo/theme.md +11 -6
  26. package/components/input/index.md +2 -1
  27. package/components/input/input.jsx +5 -0
  28. package/components/input/styles/index.less +52 -63
  29. package/components/inputNumber/demo/base.md +34 -0
  30. package/components/inputNumber/demo/ffix.md +27 -0
  31. package/components/inputNumber/demo/format.md +80 -0
  32. package/components/inputNumber/demo/index.vue +23 -0
  33. package/components/inputNumber/demo/info.md +7 -0
  34. package/components/inputNumber/demo/size.md +18 -0
  35. package/components/inputNumber/index.js +2 -0
  36. package/components/inputNumber/index.md +16 -0
  37. package/components/inputNumber/inputNumber.jsx +169 -0
  38. package/components/inputNumber/styles/index.less +172 -0
  39. package/components/menu/demo/collapsed.md +1 -1
  40. package/components/menu/styles/dropmenu.less +2 -2
  41. package/components/menu/styles/index.less +31 -14
  42. package/components/message/demo/icon.md +33 -0
  43. package/components/message/demo/index.vue +2 -0
  44. package/components/message/index.md +9 -7
  45. package/components/message/inner.jsx +5 -3
  46. package/components/modal/modal.jsx +31 -31
  47. package/components/notice/demo/icon.md +27 -11
  48. package/components/notice/demo/index.vue +2 -0
  49. package/components/notice/demo/types.md +28 -0
  50. package/components/notice/index.js +3 -0
  51. package/components/notice/index.md +8 -6
  52. package/components/popconfirm/styles/index.less +64 -83
  53. package/components/poptip/demo/base.md +7 -0
  54. package/components/poptip/demo/placement.md +12 -13
  55. package/components/poptip/styles/index.less +60 -79
  56. package/components/progress/demo/circle.md +2 -2
  57. package/components/radio/button.jsx +4 -2
  58. package/components/radio/demo/button.md +32 -28
  59. package/components/radio/group.jsx +4 -2
  60. package/components/radio/radio.jsx +7 -7
  61. package/components/radio/styles/index.less +61 -29
  62. package/components/rate/demo/base.md +7 -1
  63. package/components/rate/rate.jsx +8 -3
  64. package/components/rate/star.jsx +4 -3
  65. package/components/rate/styles/index.less +5 -3
  66. package/components/select/select.jsx +2 -0
  67. package/components/skeleton/demo/custom.md +62 -0
  68. package/components/skeleton/demo/index.vue +2 -0
  69. package/components/skeleton/demo/items.md +6 -2
  70. package/components/skeleton/index.md +32 -12
  71. package/components/skeleton/skeleton.jsx +1 -3
  72. package/components/skeleton/skeletonAvatar.jsx +33 -7
  73. package/components/skeleton/skeletonButton.jsx +29 -4
  74. package/components/skeleton/skeletonImage.jsx +43 -6
  75. package/components/skeleton/skeletonText.jsx +29 -4
  76. package/components/slider/demo/base.md +7 -15
  77. package/components/slider/demo/formatter.md +19 -0
  78. package/components/slider/demo/index.vue +10 -1
  79. package/components/slider/demo/marks.md +42 -0
  80. package/components/slider/demo/reverse.md +26 -0
  81. package/components/slider/demo/vertical.md +26 -3
  82. package/components/slider/demo/withNumber.md +43 -0
  83. package/components/slider/index.md +15 -6
  84. package/components/slider/slider.jsx +173 -41
  85. package/components/slider/styles/index.less +109 -44
  86. package/components/slider/thumb.jsx +165 -0
  87. package/components/space/demo/align.md +22 -21
  88. package/components/space/demo/base.md +0 -1
  89. package/components/space/demo/index.vue +2 -0
  90. package/components/space/demo/size.md +34 -22
  91. package/components/space/demo/vertical.md +1 -1
  92. package/components/space/demo/wrap.md +12 -0
  93. package/components/space/index.md +6 -5
  94. package/components/space/space.jsx +40 -35
  95. package/components/space/styles/index.less +15 -0
  96. package/components/spin/demo/mode.md +6 -4
  97. package/components/spin/spin.jsx +1 -1
  98. package/components/styles/index.less +1 -0
  99. package/components/switch/demo/loading.md +1 -1
  100. package/components/switch/demo/text.md +3 -1
  101. package/components/switch/styles/index.less +31 -20
  102. package/components/table/styles/index.less +9 -10
  103. package/components/tooltip/styles/index.less +103 -76
  104. package/components/tooltip/tooltip.jsx +3 -0
  105. package/components/upload/styles/index.less +7 -0
  106. package/components/upload/upload.jsx +22 -12
  107. package/dist/k-ui.css +2 -2
  108. package/dist/k-ui.js +2 -2
  109. package/package.json +1 -1
@@ -2,24 +2,61 @@ import Icon from '../icon'
2
2
  export default {
3
3
  props: {
4
4
  animated: Boolean,
5
+ loading: Boolean,
6
+ delay: { type: Number, default: 500 },
5
7
  radius: Number,
8
+ size: [Number, Array]
9
+ },
10
+ watch: {
11
+ loading(v) {
12
+ if (v) {
13
+ this.show = v
14
+ } else {
15
+ clearTimeout(this.timer)
16
+ this.timer = setTimeout(() => {
17
+ this.show = v
18
+ }, this.delay);
19
+ }
20
+ }
21
+ },
22
+ data() {
23
+ return {
24
+ show: this.loading
25
+ }
6
26
  },
7
27
  render() {
8
- let { animated, radius } = this
28
+ let { animated, radius, show, size } = this
9
29
  let props = {
10
30
  class: ['k-skeleton k-skeleton-ele', {
11
31
  'k-skeleton-animated': animated,
12
32
  }]
13
33
  }
14
- let btnProps = {
34
+ let innerProps = {
15
35
  class: ['k-skeleton-image'],
16
- style: {
17
- 'border-radius': radius ? radius + 'px' : ''
18
- }
36
+ // style: {
37
+ // 'border-radius': radius ? radius + 'px' : ''
38
+ // }
39
+ }
40
+ let child = this.$slots.default
41
+
42
+
43
+ if (radius) {
44
+ innerProps.style['border-radius'] = `${radius}px`
45
+ }
46
+
47
+ if (!isNaN(Number(size))) {
48
+ innerProps.style.width = `${size}px`
49
+ innerProps.style.height = `${size}px`
50
+ }
51
+
52
+ if (Array.isArray(size)) {
53
+ innerProps.style.width = `${size[0]}px`
54
+ innerProps.style.height = `${size[1]}px`
19
55
  }
56
+
20
57
  return (
21
58
  <div {...props}>
22
- <span {...btnProps}><Icon type="image-outline" class="k-skeleton-image-icon" /></span>
59
+ {child && !show ? child : <span {...innerProps}><Icon type="image-outline" class="k-skeleton-image-icon" /></span>}
23
60
  </div >
24
61
  )
25
62
  }
@@ -1,24 +1,49 @@
1
1
  export default {
2
2
  props: {
3
3
  animated: Boolean,
4
- size: String
4
+ loading: Boolean,
5
+ delay: { type: Number, default: 500 },
6
+ size: String,
7
+ width: Number,
8
+ },
9
+ watch: {
10
+ loading(v) {
11
+ if (v) {
12
+ this.show = v
13
+ } else {
14
+ clearTimeout(this.timer)
15
+ this.timer = setTimeout(() => {
16
+ this.show = v
17
+ }, this.delay);
18
+ }
19
+ }
20
+ },
21
+ data() {
22
+ return {
23
+ show: this.loading
24
+ }
5
25
  },
6
26
  render() {
7
- let { size, animated, block, shape } = this
27
+ let { size, animated, show, width } = this
8
28
  let props = {
9
29
  class: ['k-skeleton k-skeleton-ele', {
10
30
  'k-skeleton-animated': animated,
11
31
  }]
12
32
  }
13
- let btnProps = {
33
+ let innerProps = {
14
34
  class: ['k-skeleton-text', {
15
35
  'k-skeleton-text-lg': size == 'large',
16
36
  'k-skeleton-text-sm': size == 'small',
17
37
  }],
18
38
  }
39
+ let child = this.$slots.default
40
+
41
+ if (width) {
42
+ innerProps.style.width = `${width}px`
43
+ }
19
44
  return (
20
45
  <div {...props}>
21
- <span {...btnProps}></span>
46
+ {child && !show ? child : <span {...innerProps}></span>}
22
47
  </div >
23
48
  )
24
49
  }
@@ -5,29 +5,21 @@
5
5
 
6
6
  ```vue
7
7
  <template>
8
- <div>
9
- <Slider value="30"/>
10
- <Slider value="30" disabled/>
8
+ <div style="width:520px;">
9
+ <Slider v-model="v1" :step="10" :disabled="disabled"/>
10
+ <Slider v-model="v2" range :disabled="disabled"/>
11
11
  <br/>
12
12
  <br/>
13
- <Space>
14
- <Slider min="1" v-model="v" max="10"/>
15
- <Input v-model="v" size="small" style="width:60px">
16
- </Space>
17
- <br/>
18
- <br/>
19
- <Space>
20
- <Slider min="1" v-model="v2" max="10" :step="0.1"/>
21
- <Input v-model="v2" size="small" style="width:60px">
22
- </Space>
13
+ Disabled: <Switch v-model="disabled" />
23
14
  </div>
24
15
  </template>
25
16
  <script>
26
17
  export default{
27
18
  data(){
28
19
  return{
29
- v:3,
30
- v2:3.5
20
+ disabled: false ,
21
+ v1: 30,
22
+ v2: [30, 50]
31
23
  }
32
24
  }
33
25
  }
@@ -0,0 +1,19 @@
1
+ <cn>
2
+ #### 自定义提示
3
+ 使用 tipFormatter 可以设置 Tooltip 的显示的格式。设置 tipFormatter={null},则隐藏 Tooltip。
4
+ 当 tooltipVisible 为 true 时,将始终显示 ToolTip;反之则始终不显示,即使在拖动、移入时也是如此。
5
+ </cn>
6
+
7
+ ```vue
8
+ <template>
9
+ <div style="width:520px;">
10
+ <Slider :tipFormatter="v => (`${v}%`)" :value="20"/>
11
+ <br/>
12
+ <br/>
13
+ <Slider :tipFormatter="null" :value="10"/>
14
+ <br/>
15
+ <br/>
16
+ <Slider :value="10" :tooltipVisible="true"/>
17
+ </div>
18
+ </template>
19
+ ```
@@ -1,7 +1,11 @@
1
1
  <script>
2
2
  import Info from "./info";
3
3
  import Base from "./base";
4
- // import Vertical from "./vertical";
4
+ import WithNumber from "./withNumber";
5
+ import Formatter from "./formatter";
6
+ import Marks from "./marks";
7
+ import Vertical from "./vertical";
8
+ import Reverse from "./reverse";
5
9
 
6
10
  import CN from "../index.md";
7
11
  export default {
@@ -10,6 +14,11 @@ export default {
10
14
  <div class="switch-demo">
11
15
  <Info class="typo" />
12
16
  <Base />
17
+ <WithNumber />
18
+ <Formatter />
19
+ <Marks />
20
+ <Vertical />
21
+ <Reverse />
13
22
  <CN class="typo" />
14
23
  </div>
15
24
  );
@@ -0,0 +1,42 @@
1
+ <cn>
2
+ #### 带标签的
3
+ 使用 marks 属性标注滑块的刻度,使用 value 指定滑块位置。
4
+ </cn>
5
+
6
+ ```vue
7
+ <template>
8
+ <div style="width:520px;">
9
+ <div>step=10</div>
10
+ <Slider
11
+ :step="10"
12
+ :marks="{ 0: '0', 10: '10', 20: '20', 30: '30', 40: '40', 50: '50', 100: '100' }"
13
+ :value="[10, 100]"
14
+ :range="true"></Slider>
15
+ <br/>
16
+ <br/>
17
+ <div>step=0.1</div>
18
+ <Slider
19
+ :step="0.1"
20
+ :marks="{ 0.1: '0.1', 0.2: '0.2', 0.3: '0.3', 0.4: '0.4', 0.5: '0.5' }"
21
+ :min="0"
22
+ :max="1"
23
+ :value="[0.1, 0.5]"
24
+ :range="true"></Slider>
25
+ <br/>
26
+ <br/>
27
+ <div>Marks</div>
28
+ <Slider
29
+ :marks="{ 20: '20°C', 40: '40°C' }"
30
+ :value="[0, 100]"
31
+ :range="true" ></Slider>
32
+ <br/>
33
+ <br/>
34
+ <div>Inclued</div>
35
+ <Slider
36
+ :marks="{ 20: '20°C', 40: '40°C' }"
37
+ :included="false"
38
+ :value="[0, 100]"
39
+ :range="true"></Slider>
40
+ </div>
41
+ </template>
42
+ ```
@@ -0,0 +1,26 @@
1
+ <cn>
2
+ #### 反向
3
+ 设置 `reverse` 可以将滑动条置反。
4
+ </cn>
5
+
6
+ ```vue
7
+ <template>
8
+ <div style="width:520px;">
9
+ <Slider v-model="v1" :reverse="reverse" />
10
+ <Slider v-model="v2" range :reverse="reverse" :marks="{ 40: '40°C', 50: '50°C' }" />
11
+ Reversed:
12
+ <Switch v-model="reverse" size="small" />
13
+ </div>
14
+ </template>
15
+ <script>
16
+ export default{
17
+ data(){
18
+ return {
19
+ v1: 30,
20
+ v2: [35,60],
21
+ reverse: true ,
22
+ }
23
+ }
24
+ }
25
+ </script>
26
+ ```
@@ -5,9 +5,32 @@
5
5
 
6
6
  ```vue
7
7
  <template>
8
- <div style="height:256px">
9
- <Slider value="30" direction="vertical"/>
10
- <Slider value="30" direction="vertical" disabled/>
8
+ <div class="demo-slider-vertical">
9
+ <Slider vertical :value="35"></Slider>
10
+ </div>
11
+ <div class="demo-slider-vertical">
12
+ <Slider vertical reverse :value="35"></Slider>
13
+ </div>
14
+ <div class="demo-slider-vertical">
15
+ <Slider vertical range :value="[20, 60]"></Slider>
16
+ </div>
17
+ <div class="demo-slider-vertical">
18
+ <Slider vertical reverse range :value="[20, 60]"></Slider>
19
+ </div>
20
+ <div class="demo-slider-vertical">
21
+ <Slider vertical range :marks="{ 20: '20°C', 40: '40°C' }" :step="10" :value="[20, 60]"></Slider>
22
+ </div>
23
+ <div class="demo-slider-vertical">
24
+ <Slider vertical reverse range :marks="{ 20: '20°C', 40: '40°C' }" :step="10" :value="[20, 60]"></Slider>
11
25
  </div>
12
26
  </template>
27
+ <<style lang="less">
28
+ .demo-slider-vertical{
29
+ height: 300px;
30
+ margin-left: 30px;
31
+ margin-top: 10px;
32
+ padding-right: 30px;
33
+ display: inline-block
34
+ }
35
+ </style>>
13
36
  ```
@@ -0,0 +1,43 @@
1
+ <cn>
2
+ #### 受控
3
+ 受控和 Input 同步。
4
+ </cn>
5
+
6
+ ```vue
7
+ <template>
8
+ <div>
9
+ <Row>
10
+ <Col :span="12">
11
+ <Slider v-model="n1" :min="1" :max="20" />
12
+ </Col>
13
+ <Col :span="4">
14
+ <InputNumber v-model="n1" :min="1" :max="20" style="margin-left: 16px" />
15
+ </Col>
16
+ </Row>
17
+ <Row>
18
+ <Col :span="12">
19
+ <Slider v-model="n2" :min="0" :max="1" :step="0.01" />
20
+ </Col>
21
+ <Col :span="4">
22
+ <InputNumber
23
+ v-model="n2"
24
+ :min="0"
25
+ :max="1"
26
+ :step="0.01"
27
+ style="margin-left: 16px"
28
+ />
29
+ </Col>
30
+ </Row>
31
+ </div>
32
+ </template>
33
+ <script lang="ts">
34
+ export default ({
35
+ data() {
36
+ return {
37
+ n1:1,
38
+ n2:0,
39
+ };
40
+ },
41
+ });
42
+ </script>
43
+ ```
@@ -1,7 +1,16 @@
1
1
  ### Slider API
2
- | 属性 | 说明 | 类型 | 默认值 |
3
- | ------ | -------------------------------------------------------------------------- | ----------------------------------------------- | ------ |
4
- | min | 最小值 | number | 0 |
5
- | max | 最大值 | number | 100 |
6
- | step | 间距大小 | 步长,取值必须大于 0,并且可被 (max - min) 整除 | 1 |
7
- | change | 当 Slider 的值发生改变时,会触发 change 事件,并把改变后的值作为参数传入。 | Function | - |
2
+ | 属性 | 说明 | 类型 | 默认值 |
3
+ | -------------- | -------------------------------------------------------------------------- | ----------------------------------------------- | ------ |
4
+ | value | 设置当前取值 | Number,Array | 0 |
5
+ | min | 最小值 | Number | 0 |
6
+ | max | 最大值 | Number | 100 |
7
+ | range | 是否支持两边同时可滑动 | Boolean | false |
8
+ | disabled | 滑块是否禁用 | Boolean | false |
9
+ | step | 间距大小 | 步长,取值必须大于 0,并且可被 (max - min) 整除 | 1 |
10
+ | change | 当 Slider 的值发生改变时,会触发 change 事件,并把改变后的值作为参数传入。 | Function | - |
11
+ | afterChange | 与 onmouseup 触发时机一致,把当前值作为参数传入 | Function | - |
12
+ | tipFormatter | 设置Tooltip的展示格式,默认显示当前选值 | Function, null | - |
13
+ | vertical | 是否设置方向为垂直 | Boolean | false |
14
+ | marks | 刻度,key 的类型必须为 number 且取值在闭区间 [min, max] 内 | Object | - |
15
+ | included | marks 不为空对象时有效,值为 true 时表示值为包含关系,false 表示并列 | Boolean | true |
16
+ | tooltipVisible | 值为true时,Tooltip 将会始终显示;否则始终不显示,哪怕在拖拽及移入时。 | Boolean | false |
@@ -1,65 +1,197 @@
1
+ import Thumb from './thumb'
1
2
  export default {
2
3
  props: {
3
- value: [String, Number],
4
- min: { type: [Number, String], default: 0 },
5
- max: { type: [Number, String], default: 100 },
4
+ value: [Array, Number, String],
5
+ min: { type: Number, default: 0 },
6
+ max: { type: Number, default: 100 },
6
7
  disabled: Boolean,
7
8
  step: {
8
- type: [Number, String],
9
+ type: Number,
9
10
  default: 1,
10
11
  validator: (val) => val > 0
11
12
  },
12
- direction: {
13
- //todo:
14
- type: String,
15
- default: 'horizontal',
16
- validator: (val) => ['horizontal', 'vertical'].indexOf(val) >= 0
17
- }
13
+ range: Boolean,
14
+ vertical: Boolean,
15
+ reverse: Boolean,
16
+ marks: Object,
17
+ included: { type: Boolean, default: true },
18
+ tipFormatter: [Function, Object],
19
+ tooltipVisible: Boolean
18
20
  },
19
21
  watch: {
20
- value(v) {
21
- this.defaultValue = (v || this.min) * 1
22
+ value() {
23
+ this.defaultValue = this.getValue()
24
+ }
25
+ },
26
+ provide() {
27
+ return {
28
+ bar: this,
22
29
  }
23
30
  },
24
31
  data() {
25
32
  return {
26
- defaultValue: this.value || 0,
27
- timer: null,
33
+ defaultValue: this.getValue(),
34
+ // percent1: 0,
35
+ // percent2: 0,
36
+ // width: 0,
37
+ // left: 0,
38
+ isMouseDown: false
28
39
  }
29
40
  },
30
41
  methods: {
31
- change(e) {
32
- let value = e.target.value * 1
42
+ getValue() {
43
+ let { value = 0, range, min, max } = this, v = value;
44
+ if (!range) {
45
+ if (value >= max) v = max
46
+ else if (value <= min) v = min
47
+ } else {
48
+ v = value
49
+ if (!Array.isArray(v)) {
50
+ v = [0, 0]
51
+ }
52
+ let [x, y] = v
53
+ x = Math.max(x, min)
54
+ y = Math.min(y, max)
55
+ v = [x, y]
56
+ }
57
+ return v
58
+ },
59
+ click(e) {
60
+ let { disabled, range, vertical, step, max, defaultValue, reverse } = this
61
+ if (disabled) return;
62
+ let { width, height } = e.target.getBoundingClientRect()
63
+ let { layerX, layerY } = e
64
+
65
+ let percent = 0
66
+ if (reverse) {
67
+ percent = vertical ? (((height - layerY) / height) * max) : (((width - layerX) / width) * max);
68
+ } else {
69
+ percent = vertical ? ((layerY / height) * max) : ((layerX / width) * max);
70
+ }
71
+ let value = Math.round(percent / step) * step
72
+ if (range) {
73
+ let [x, y] = defaultValue
74
+ let half = (y - x) / 2 + x
75
+ value = value >= half ? [x, value] : [value, y]
76
+ }
77
+
33
78
  this.defaultValue = value
34
79
  this.$emit('input', value)
80
+ },
81
+ isActice(a) {
82
+ let { defaultValue, reverse, max, vertical } = this
83
+ let active;
84
+ if (this.range) {
85
+ let [x, y] = defaultValue
86
+ active = a >= x && a <= y
87
+ } else {
88
+ active = a <= defaultValue
89
+ }
90
+ let pos = (a / max) * 100 + '%'
91
+ let sty = {}
92
+ if (reverse) {
93
+ sty = vertical ?
94
+ { bottom: pos, transform: 'translateY(50%)' } :
95
+ { right: pos, transform: 'translateX(50%)' }
96
+ } else {
97
+ sty = vertical ?
98
+ { top: pos } :
99
+ { left: pos }
100
+ }
101
+ return { active, sty }
102
+ },
103
+ renderMark() {
104
+ let { marks } = this
105
+ if (!marks) return null
106
+ let mks = Object.keys(marks || {})
107
+ let txt = Object.values(marks || {})
108
+
109
+ return <div div class="k-slider-marks" >
110
+ {
111
+ mks.map(v => {
112
+ let { active, sty } = this.isActice(v);
113
+ return <div class={['k-slider-mark-symbol', { 'k-slider-mark-symbol-active': active }]} style={sty} />
114
+ })
115
+ }
116
+ {
117
+ mks.map((v, i) => {
118
+ let { active, sty } = this.isActice(v);
119
+ return <div class={['k-slider-mark-text', { 'k-slider-mark-text-active': active }]} style={sty}>{txt[i]}</div>
120
+ })
121
+ }
122
+ </div>
123
+ },
124
+ renderTrack() {
125
+ let { vertical, max, defaultValue, range, included, marks, reverse } = this
126
+ let percent1 = 0, percent2 = 0, x1 = 0, x2 = 0;
127
+
128
+ if (!range) {
129
+ // console.log(defaultValue, max)
130
+ x2 = defaultValue
131
+ percent2 = (defaultValue / max) * 100
132
+ } else {
133
+ let [x, y] = defaultValue
134
+ percent1 = (x / max) * 100
135
+ percent2 = (y / max) * 100
136
+ x1 = x, x2 = y
137
+ }
138
+ let trackSty = {}
139
+ if (reverse) {
140
+ trackSty = vertical ? {
141
+ height: `${percent2 - percent1}%`,
142
+ top: 'auto',
143
+ bottom: `${percent1}%`
144
+ } : {
145
+ width: `${percent2 - percent1}%`,
146
+ left: 'auto',
147
+ right: `${percent1}%`
148
+ }
149
+ } else {
150
+ trackSty = vertical ? {
151
+ height: `${percent2 - percent1}%`,
152
+ top: `${percent1}%`
153
+ } : {
154
+ width: `${percent2 - percent1}%`,
155
+ left: `${percent1}%`
156
+ }
157
+ }
158
+ return (included && marks) || !marks ?
159
+ <div class="k-slider-track" style={{ ...trackSty }}></div> : null
35
160
 
36
- clearTimeout(this.timer)
37
- this.timer = setTimeout(() => {
38
- this.$emit('change', value)
39
- }, 300);
161
+ },
162
+ thumbProps() {
163
+ let { vertical, disabled, range, step, reverse, max, defaultValue, tooltipVisible, tipFormatter } = this
164
+ return {
165
+ props: {
166
+ vertical, disabled, range, step, reverse,
167
+ max, tipFormatter, tooltipVisible,
168
+ value: range ? [].concat(defaultValue) : defaultValue * 1
169
+ },
170
+ on: {
171
+ input: (value) => {
172
+ this.defaultValue = value
173
+ this.$emit('input', value)
174
+ }
175
+ }
176
+ }
40
177
  }
41
178
  },
42
179
  render() {
43
- let { min, max, step, disabled, direction, defaultValue, groupContext } = this
44
- defaultValue = defaultValue * 1
45
- console.log(defaultValue)
46
- let props = {
47
- class: 'k-slider-bar',
48
- attrs: {
49
- min, max, step,
50
- value: defaultValue * 1,
51
- type: 'range',
52
- disabled,
53
- },
54
- style: {
55
- 'background': `linear-gradient(to right, var(--kui-color-main) ${(defaultValue - min) / (max - min) * 100}%, rgba(255, 255, 255, 0.3) 0%)`
56
- },
57
- on: {
58
- input: this.change
59
- }
60
- }
61
- // todo: 懒得写, 用input range 替代
62
- return <div class={['k-slider', { 'k-slider-disabled': disabled }]}><input {...props} /></div>
63
- }
180
+ let { disabled, vertical, range } = this
181
+ let leftProps = this.thumbProps()
182
+ let rightProps = this.thumbProps()
183
+ let trackNode = this.renderTrack()
184
+ let markNode = this.renderMark()
64
185
 
186
+ return <div class={['k-slider', { 'k-slider-disabled': disabled, 'k-slider-vertical': vertical }]}>
187
+ <div class="k-slider-bar">
188
+ <div class="k-slider-rail" ref="rail" onClick={this.click}></div>
189
+ {trackNode}
190
+ {range ? <Thumb {...leftProps} /> : null}
191
+ <Thumb {...rightProps} type="right" />
192
+ {markNode}
193
+ </div>
194
+ {/* {this.renderMark()} */}
195
+ </div>
196
+ }
65
197
  }