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
@@ -7,7 +7,7 @@
7
7
  <template>
8
8
  <Dropdown>
9
9
  <Button theme="light">
10
- 多级菜单 <Icon type="chevron-down" />
10
+ 多级菜单 <Icon :type="ChevronDown" />
11
11
  </Button>
12
12
  <Menu slot="content">
13
13
  <MenuItem>1st menu item</MenuItem>
@@ -23,4 +23,14 @@
23
23
  </Menu>
24
24
  </Dropdown>
25
25
  </template>
26
+ <script>
27
+ import { ChevronDown } from 'kui-icons'
28
+ export default{
29
+ data() {
30
+ return {
31
+ ChevronDown
32
+ }
33
+ }
34
+ }
35
+ </script>
26
36
  ```
@@ -7,7 +7,7 @@
7
7
  <template>
8
8
  <Dropdown v-model="visible">
9
9
  <a>
10
- Hover me <Icon type="chevron-down" />
10
+ Hover me <Icon :type="ChevronDown" />
11
11
  </a>
12
12
  <Menu slot="content" @click="handleMenuClick">
13
13
  <MenuItem key="1">
@@ -24,9 +24,11 @@
24
24
  </template>
25
25
 
26
26
  <script>
27
+ import { ChevronDown } from 'kui-icons'
27
28
  export default {
28
29
  data() {
29
30
  return {
31
+ ChevronDown,
30
32
  visible: false,
31
33
  };
32
34
  },
@@ -7,7 +7,7 @@
7
7
  <template>
8
8
  <Dropdown>
9
9
  <Button theme="light">
10
- 分隔线 <Icon type="chevron-down" />
10
+ 分隔线 <Icon :type="ChevronDown" />
11
11
  </Button>
12
12
  <Menu slot="content">
13
13
  <MenuItem key="0">
@@ -23,6 +23,14 @@
23
23
  </Menu>
24
24
  </Dropdown>
25
25
  </template>
26
-
27
-
26
+ <script>
27
+ import { ChevronDown } from 'kui-icons'
28
+ export default{
29
+ data() {
30
+ return {
31
+ ChevronDown
32
+ }
33
+ }
34
+ }
35
+ </script>
28
36
  ```
@@ -15,8 +15,8 @@
15
15
  <Menu slot="content">
16
16
  <MenuItem key="news">New file</MenuItem>
17
17
  <MenuItem key="edit">Edit</MenuItem>
18
- <MenuItem key="save" icon="save">Save</MenuItem>
19
- <MenuItem key="cut" icon="cut">Cut</MenuItem>
18
+ <MenuItem key="save" :icon="Save">Save</MenuItem>
19
+ <MenuItem key="cut" :icon="Cut">Cut</MenuItem>
20
20
  <MenuDivider />
21
21
  <MenuItem key="exit">Exit</MenuItem>
22
22
  </Menu>
@@ -24,7 +24,13 @@
24
24
  </template>
25
25
 
26
26
  <script>
27
- export default{
27
+ import { Save, Cut } from 'kui-icons'
28
+ export default {
29
+ data() {
30
+ return {
31
+ Save, Cut
32
+ }
33
+ },
28
34
  methods:{
29
35
  handle({key}){
30
36
  this.$Message.info('Click on item '+key)
@@ -11,7 +11,7 @@
11
11
  image="https://www.chuchur.com/img/thumb.png"
12
12
  description="暂时没有图片"
13
13
  :imageStyle="{height:'60px'}">
14
- <Button type="primary" circle icon="add" size="small">上传图片</Button>
14
+ <Button type="primary" circle :icon="Add" size="small">上传图片</Button>
15
15
  </Empty>
16
16
  <br/>
17
17
  Use slot
@@ -19,8 +19,18 @@
19
19
  <Empty>
20
20
  <template slot="description">暂时没有<a>图片</a></template>
21
21
  <img slot="image" src="https://www.chuchur.com/img/thumb.png" style="height:60px" />
22
- <Button type="primary" circle icon="add" size="small">上传图片</Button>
22
+ <Button type="primary" circle :icon="Add" size="small">上传图片</Button>
23
23
  </Empty>
24
24
  </div>
25
25
  </template>
26
+ <script>
27
+ import { Add } from 'kui-icons'
28
+ export default{
29
+ data() {
30
+ return {
31
+ Add
32
+ }
33
+ }
34
+ }
35
+ </script>
26
36
  ```
@@ -17,8 +17,8 @@
17
17
  </template>
18
18
  <script>
19
19
  export default{
20
- data(){
21
- return{
20
+ data() {
21
+ return {
22
22
  columns:[
23
23
  { title:'Name' ,},
24
24
  { title:'Age'},
@@ -1,5 +1,6 @@
1
1
  import Icon from "../icon";
2
2
  import { t } from "../locale";
3
+ import { FileTrayOutline } from "kui-icons";
3
4
  export default {
4
5
  name: 'Empty',
5
6
  props: {
@@ -14,7 +15,7 @@ export default {
14
15
  // console.log(description, $slots.description)
15
16
 
16
17
  return (<div class="k-empty">
17
- {(!image && !$slots.image) ? <Icon type="file-tray-outline" class="k-empty-icon" /> : ($slots.image ? $slots.image : <img src={image} class="k-empty-image" style={imageStyle} />)}
18
+ {(!image && !$slots.image) ? <Icon type={FileTrayOutline} class="k-empty-icon" /> : ($slots.image ? $slots.image : <img src={image} class="k-empty-image" style={imageStyle} />)}
18
19
  {description !== null ? <p class="k-empty-description">{description || $slots.description || t('k.empty.description')}</p> : null}
19
20
  {$slots.default ? <div class="k-empty-footer">{$slots.default}</div> : null}
20
21
  </div>)
@@ -35,7 +35,7 @@
35
35
  </template>
36
36
  <script>
37
37
  export default{
38
- data(){
38
+ data() {
39
39
  return {
40
40
  layout:'horizontal'
41
41
  }
@@ -32,7 +32,7 @@
32
32
  </Select>
33
33
  </FormItem>
34
34
  <FormItem label="Slider">
35
- <Slider placeholder="slider..."/>
35
+ <Slider />
36
36
  </FormItem>
37
37
  <FormItem label="DatePicker">
38
38
  <DatePicker />
@@ -66,8 +66,8 @@
66
66
  </template>
67
67
  <script>
68
68
  export default{
69
- data(){
70
- return{
69
+ data() {
70
+ return {
71
71
  size:'default',
72
72
  theme:false,
73
73
  checked:false,
@@ -28,7 +28,7 @@
28
28
  </template>
29
29
  <script>
30
30
  export default{
31
- data(){
31
+ data() {
32
32
  var validateIDNumber = (rule,value,callback)=>{
33
33
  if(value && !/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(value)){
34
34
  return callback(new Error('请输入正确的身份证号码'))
@@ -46,7 +46,7 @@
46
46
  :rules="{required: true, message: '网址不能为空'}"
47
47
  >
48
48
  <Input style="width:230px"/>
49
- <Icon type="remove-circle-outline" @click="e=>remove(i)" v-if="i>0" style="font-size:25px;margin:0 10px" />
49
+ <Icon :type="RemoveCircleOutline" @click="e=>remove(i)" v-if="i>0" style="font-size:25px;margin:0 10px" />
50
50
  </FormItem>
51
51
  <FormItem :wrapperCol="{offset:5}">
52
52
  <Button type="primary" @click="submit">Submit</Button>
@@ -61,9 +61,11 @@
61
61
  </div>
62
62
  </template>
63
63
  <script>
64
+ import { RemoveCircleOutline } from 'kui-icons'
64
65
  export default{
65
- data(){
66
+ data() {
66
67
  return {
68
+ RemoveCircleOutline,
67
69
  labelCol:{span:5},
68
70
  wrapperCol:{span:16},
69
71
  count:2,
@@ -6,11 +6,6 @@
6
6
  zoom: 1;
7
7
  color: var(--kui-color-font);
8
8
  // margin-bottom: 5px;
9
- &::before, &::after {
10
- content: '';
11
- display: table;
12
- clear: both;
13
- }
14
9
  .k-form-item {
15
10
  margin-bottom: 0;
16
11
  flex: 1;
@@ -23,17 +23,46 @@ export default {
23
23
  render() {
24
24
  let { offset, span, $slots, flex } = this
25
25
  const gutter = this.Row.gutter
26
- const props = {
26
+ let props = {
27
27
  class: [`k-col`, {
28
28
  [`k-col-${span}`]: span,
29
- [`k-col-offset-${offset}`]: offset > 0 && offset <= 24
29
+ // [`k-col-offset-${offset}`]: offset > 0 && offset <= 24
30
30
  }],
31
31
  style: {
32
- paddingLeft: gutter ? `${gutter / 2}px` : null,
33
- paddingRight: gutter ? `${gutter / 2}px` : null,
34
- flex: flex ? this.parseFlex(flex) : null
32
+ // paddingLeft: gutter ? `${gutter / 2}px` : null,
33
+ // paddingRight: gutter ? `${gutter / 2}px` : null,
34
+ // flex: flex ? this.parseFlex(flex) : null
35
35
  }
36
36
  }
37
+ // console.log(gutter)
38
+ if (Array.isArray(gutter)) {
39
+ let [v = 0, h = 0] = gutter;
40
+ if ((v == h && v > 0)) {
41
+ props.style.padding = `${v / 2}px`
42
+ } else if (v > 0 && h > 0) {
43
+ props.style.padding = `${h / 2}px ${v / 2}px`
44
+ } else {
45
+ if (v > 0) {
46
+ props.style.paddingLeft = `${v / 2}px`
47
+ props.style.paddingRight = `${v / 2}px`
48
+ }
49
+ if (h > 0) {
50
+ props.style.paddingTop = `${v / 2}px`
51
+ props.style.paddingTop = `${v / 2}px`
52
+ }
53
+ }
54
+
55
+ } else if (!isNaN(Number(gutter)) && gutter > 0) {
56
+ props.style.paddingLeft = `${gutter / 2}px`
57
+ props.style.paddingRight = `${gutter / 2}px`
58
+ }
59
+ if (flex) {
60
+ props.style.flex = this.parseFlex(flex)
61
+ }
62
+ if (offset > 0 && offset <= 24) {
63
+ props.class.push(`k-col-offset-${offset}`)
64
+ }
65
+
37
66
  return (
38
67
  <div {...props}>
39
68
  {$slots.default}
@@ -1,25 +1,66 @@
1
1
  <cn>
2
2
  #### 分栏间隔
3
- 使用 `gutter` 熟悉来设置分栏的间隔
3
+ 使用 `gutter` 熟悉来设置分栏的间隔,如果需要垂直间距,可以写成数组形式 [水平间距, 垂直间距]
4
4
  </cn>
5
5
 
6
6
  ```vue
7
7
  <template>
8
8
  <div class="demo-grid">
9
+ gutter = 10
9
10
  <Row :gutter="10" class="row-gutter">
10
- <Col :span="6">
11
- <div>col-6</div>
12
- </Col>
13
- <Col :span="6">
14
- <div>col-6</div>
15
- </Col>
16
- <Col :span="6">
17
- <div>col-6</div>
11
+ <Col :span="12"><div>col-12</div></Col>
12
+ <Col :span="12"><div>col-12</div></Col>
13
+ </Row>
14
+ <br />
15
+ <br />
16
+ Horizontal Gutter (px):
17
+ <div style="width:55%;padding:10px;">
18
+ <Slider v-model="h"
19
+ :min="8"
20
+ :marks="{8:'8',16:'16',24:'24',32:'32',40:'40'}"
21
+ :max="40"
22
+ :step="null" />
23
+ </div>
24
+ Vertical Gutter (px):
25
+ <div style="width:55%;padding:10px;">
26
+ <Slider v-model="v"
27
+ :min="8"
28
+ :max="40"
29
+ :marks="{8:'8',16:'16',24:'24',32:'32',40:'40'}"
30
+ :step="null" />
31
+ </div>
32
+ Column Count:
33
+ <div style="width:55%;padding:10px;">
34
+ <Slider v-model="cols"
35
+ :min="2"
36
+ :marks="{2:'2',3:'3',4:'4',6:'6',8:'8',12:'12'}"
37
+ :max="12"
38
+ :step="null" />
39
+ </div>
40
+ <Row :gutter="[v,h]"
41
+ class="row-gutter">
42
+ <Col :span="24/cols"
43
+ v-for="c in cols"
44
+ :key="c">
45
+ <div>col-{{cols}}</div>
18
46
  </Col>
19
- <Col :span="6">
20
- <div>col-6</div>
47
+ <Col :span="24/cols"
48
+ v-for="x in cols"
49
+ :key="'_'+x">
50
+ <div>col-{{cols}}</div>
21
51
  </Col>
22
52
  </Row>
23
53
  </div>
24
54
  </template>
55
+ <script>
56
+ export default {
57
+ data() {
58
+ return {
59
+ h: 8,
60
+ v: 8,
61
+ cols: 4
62
+ }
63
+ }
64
+ }
65
+ </script>
25
66
  ```
@@ -1,13 +1,13 @@
1
1
  ### Row API
2
- | 属性 | 说明 | 类型 | 默认值 |
3
- |---------|----------------------------------------------------------------------------------|--------|---------|
4
- | align | flex 布局下的垂直对齐方式:`top` `middle` `bottom` | String | `top` |
5
- | justify | flex 布局下的水平排列方式:`start` `end` `center` `space-around` `space-between` | String | `start` |
6
- | gutter | 栅格间距,单位 px,左右平分 | Number | 0 |
7
- | type | 布局模式,可选 flex,现代浏览器 下有效 | String | |
2
+ | 属性 | 说明 | 类型 | 默认值 |
3
+ | ------- | -------------------------------------------------------------------------------- | ------------ | ------- |
4
+ | align | flex 布局下的垂直对齐方式:`top` `middle` `bottom` | String | `top` |
5
+ | justify | flex 布局下的水平排列方式:`start` `end` `center` `space-around` `space-between` | String | `start` |
6
+ | gutter | 栅格间距,单位 px,左右平分,使用数组形式同时设置 [水平间距, 垂直间距] | Number,Array | - |
7
+ | type | 布局模式,可选 flex,现代浏览器 下有效 | String | |
8
8
  ### Col API
9
9
  | 属性 | 说明 | 类型 | 默认值 |
10
- |--------|----------------------------------------|---------------|--------|
10
+ | ------ | -------------------------------------- | ------------- | ------ |
11
11
  | span | 栅格的占位格数,可选值为0~24的整数 | Number | - |
12
12
  | offset | 栅格左侧的间隔格数,可选值为1~24的整数 | Number | - |
13
13
  | flex | flex 布局填充 | Number,String | - |
@@ -2,8 +2,8 @@
2
2
  export default {
3
3
  name: "Row",
4
4
  props: {
5
- gutter: Number,
6
- type: String,
5
+ gutter: [Number, Array],
6
+ type: { type: String, default: 'flex' },
7
7
  justify: {
8
8
  type: String,
9
9
  validator: (value) => {
@@ -32,9 +32,29 @@ export default {
32
32
 
33
33
  }],
34
34
  style: {
35
- marginLeft: gutter ? gutter / -2 + "px" : null,
36
- marginRight: gutter ? gutter / -2 + "px" : null,
35
+
36
+ }
37
+ }
38
+ if (Array.isArray(gutter)) {
39
+ let [v = 0, h = 0] = gutter;
40
+ if ((v == h && v > 0)) {
41
+ props.style.margin = `-${v/2}px`
42
+ } else if (v > 0 && h > 0) {
43
+ props.style.margin = `-${h/2}px -${v/2}px`
44
+ } else {
45
+ if (v > 0) {
46
+ props.style.marginLeft = `-${v/2}px`
47
+ props.style.marginRight = `-${v/2}px`
48
+ }
49
+ if (h > 0) {
50
+ props.style.marginTop = `-${v/2}px`
51
+ props.style.marginTop = `-${v/2}px`
52
+ }
37
53
  }
54
+
55
+ } else if (!isNaN(Number(gutter)) && gutter > 0) {
56
+ props.style.marginLeft = `-${gutter / 2}px`
57
+ props.style.marginRight = `-${gutter / 2}px`
38
58
  }
39
59
  return (<div {...props}>{$slots.default}</div >)
40
60
  }
@@ -1,33 +1,22 @@
1
1
  @import '../../styles/var.less';
2
2
  .k-row {
3
- position: relative;
4
- margin-left: 0;
5
- margin-right: 0;
6
- height: auto;
7
- zoom: 1;
8
- display: block;
3
+ display: flex;
9
4
  box-sizing: border-box;
10
- &:after, &:before {
11
- content: "";
12
- display: table;
13
- box-sizing: border-box;
14
- }
15
- &:after {
16
- clear: both;
17
- visibility: hidden;
18
- font-size: 0;
19
- height: 0;
20
- }
5
+ flex-flow: row wrap;
6
+ }
7
+ .k-col{
8
+ position: relative;
9
+ max-width: 100%;
10
+ min-height: 1px;
21
11
  }
22
-
23
12
  @fix :~'k-col';
24
13
  @counts :24;
25
14
  .makecol(@index) when(@index>0) {
26
15
  .@{fix}-@{index} {
27
16
  display: block;
28
- float: left;
29
17
  box-sizing: border-box;
30
- width: percentage((@index / @counts));
18
+ max-width: percentage((@index / @counts));
19
+ flex:0 0 percentage((@index / @counts));
31
20
  }
32
21
  .@{fix}-offset-@{index} {
33
22
  margin-left: percentage((@index / @counts));
@@ -39,9 +28,6 @@
39
28
  .k-row-flex {
40
29
  display: flex;
41
30
  flex-flow: row wrap;
42
- &::after,&::before{
43
- display: none;
44
- }
45
31
  }
46
32
 
47
33
  .k-row-flex-top {
@@ -6,10 +6,20 @@
6
6
  ```vue
7
7
  <template>
8
8
  <div>
9
- <Icon type="heart" />
10
- <Icon type="logo-kui" size="25" />
11
- <Icon type="logo-kui" size="30" color="red" />
12
- <Icon type="logo-kui" spin size="25" />
9
+ <Icon :type="Heart" />
10
+ <Icon :type="LogoKui" size="25" />
11
+ <Icon :type="LogoKui" size="30" color="#00be83" />
12
+ <Icon :type="LogoKui" spin size="25" />
13
13
  </div>
14
14
  </template>
15
+ <script>
16
+ import { Heart, LogoKui } from 'kui-icons'
17
+ export default{
18
+ data() {
19
+ return{
20
+ Heart , LogoKui
21
+ }
22
+ }
23
+ }
24
+ </script>
15
25
  ```
@@ -7,6 +7,30 @@ kui 的图标使用开源项目 [ionicons](http://ionicons.com/) 前版本5.5
7
7
  ```bash
8
8
  npm install --save kui-icons
9
9
  ```
10
+
11
+ ## 使用
12
+
13
+ ```js
14
+ <template>
15
+ <div>
16
+ <Icon :type="Heart" />
17
+ </div>
18
+ </template>
19
+ <script>
20
+ import { Heart } from 'kui-icons'
21
+ export default{
22
+ data() {
23
+ return {
24
+ Heart
25
+ }
26
+ }
27
+ }
28
+ </script>
29
+ ```
30
+
31
+ 3.3 版本开始, 使用 Icon 需要单独引入,使用按需加载,这样在编译之后的体积会变得更小。
32
+
33
+
10
34
  3.1.1 版本之后 使用 `ionicons` 图标库 5.5 版本, 5.0 图标库请配合 `kui-vue@3.1.0`
11
35
 
12
36
  ## 使用Sprite模式
@@ -14,7 +38,7 @@ npm install --save kui-icons
14
38
  import sprite from 'kui-icons/lib/sprite.svg'
15
39
 
16
40
  <svg width="1em" height="1em">
17
- <use xlink:href={`${sprite}#logo-kui`}></use>
41
+ <use xlink:href={`${sprite}#LogoKui`}></use>
18
42
  </svg>
19
43
 
20
44
  ```