kui-vue 3.2.4 → 3.2.5

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 (162) hide show
  1. package/components/_tool/utils.js +2 -2
  2. package/components/alert/styles/index.less +19 -19
  3. package/components/avatar/styles/index.less +3 -3
  4. package/components/backtop/styles/index.less +2 -2
  5. package/components/badge/demo/dot.md +1 -1
  6. package/components/badge/demo/dynamic.md +1 -1
  7. package/components/badge/demo/max.md +1 -1
  8. package/components/badge/styles/index.less +21 -21
  9. package/components/base/input.jsx +16 -10
  10. package/components/breadcrumb/styles/index.less +4 -4
  11. package/components/button/button.jsx +14 -8
  12. package/components/button/buttonGroup.jsx +6 -6
  13. package/components/button/demo/base.md +2 -1
  14. package/components/button/demo/disabled.md +14 -16
  15. package/components/button/demo/group.md +2 -2
  16. package/components/button/demo/index.vue +6 -2
  17. package/components/button/demo/light.md +26 -0
  18. package/components/button/demo/loading.md +1 -1
  19. package/components/button/demo/normal.md +25 -0
  20. package/components/button/demo/size.md +2 -2
  21. package/components/button/demo/solid.md +16 -0
  22. package/components/button/demo/with-icon.md +4 -3
  23. package/components/button/index.md +3 -3
  24. package/components/button/styles/index.less +106 -45
  25. package/components/card/demo/base.md +1 -1
  26. package/components/card/demo/border.md +2 -2
  27. package/components/card/styles/index.less +6 -6
  28. package/components/carousel/styles/index.less +1 -1
  29. package/components/checkbox/demo/group-vertical.md +47 -0
  30. package/components/checkbox/demo/index.vue +4 -0
  31. package/components/checkbox/demo/options.md +46 -0
  32. package/components/checkbox/group.jsx +9 -3
  33. package/components/checkbox/index.md +8 -7
  34. package/components/checkbox/styles/index.less +30 -20
  35. package/components/collapse/styles/index.less +10 -10
  36. package/components/colorPicker/styles/index.less +14 -14
  37. package/components/datePicker/datepicker.jsx +11 -3
  38. package/components/datePicker/demo/index.vue +2 -0
  39. package/components/datePicker/demo/theme.md +34 -0
  40. package/components/datePicker/index.md +4 -1
  41. package/components/datePicker/styles/calendar.less +39 -38
  42. package/components/datePicker/styles/datepicker.less +37 -20
  43. package/components/divider/styles/index.less +6 -6
  44. package/components/drawer/styles/index.less +12 -10
  45. package/components/dropdown/demo/base.md +4 -4
  46. package/components/dropdown/demo/cascading.md +3 -3
  47. package/components/dropdown/demo/divider.md +3 -3
  48. package/components/dropdown/styles/index.less +4 -4
  49. package/components/empty/styles/index.less +2 -2
  50. package/components/form/demo/base.md +25 -2
  51. package/components/form/demo/index.vue +1 -1
  52. package/components/form/demo/valid.md +9 -0
  53. package/components/form/form.jsx +2 -0
  54. package/components/form/formitem.jsx +18 -10
  55. package/components/form/styles/index.less +17 -13
  56. package/components/grid/styles/index.less +1 -1
  57. package/components/icon/demo/base.md +4 -4
  58. package/components/icon/demo/search.vue +6 -9
  59. package/components/image/styles/index.less +18 -18
  60. package/components/index.js +3 -1
  61. package/components/input/demo/index.vue +3 -1
  62. package/components/input/demo/theme.md +39 -0
  63. package/components/input/index.md +9 -6
  64. package/components/input/input.jsx +10 -3
  65. package/components/input/styles/index.less +120 -78
  66. package/components/input/textarea.jsx +1 -0
  67. package/components/layout/demo/base.md +5 -3
  68. package/components/layout/demo/index.vue +0 -2
  69. package/components/layout/demo/info.md +0 -2
  70. package/components/layout/demo/layout1.md +40 -47
  71. package/components/layout/demo/layout2.md +42 -49
  72. package/components/layout/demo/layout3.md +44 -22
  73. package/components/layout/demo/layout4.md +19 -18
  74. package/components/layout/demo/layout5.md +47 -44
  75. package/components/layout/styles/index.less +1 -6
  76. package/components/loading/styles/index.less +4 -4
  77. package/components/menu/demo/accrodion.md +2 -2
  78. package/components/menu/demo/base.md +5 -13
  79. package/components/menu/demo/collapsed.md +2 -2
  80. package/components/menu/demo/index.vue +0 -2
  81. package/components/menu/demo/inline.md +6 -10
  82. package/components/menu/demo/mode.md +2 -2
  83. package/components/menu/demo/theme.md +2 -2
  84. package/components/menu/demo/vertical.md +2 -2
  85. package/components/menu/index.md +0 -3
  86. package/components/menu/menu.jsx +4 -4
  87. package/components/menu/menuitem.jsx +1 -13
  88. package/components/menu/styles/dropmenu.less +28 -20
  89. package/components/menu/styles/index.less +148 -251
  90. package/components/menu/submenu.jsx +4 -64
  91. package/components/message/group.jsx +1 -1
  92. package/components/message/styles/index.less +13 -8
  93. package/components/modal/demo/base.md +15 -2
  94. package/components/modal/demo/custom.md +2 -2
  95. package/components/modal/demo/more.md +6 -6
  96. package/components/modal/modal.jsx +11 -5
  97. package/components/modal/styles/index.less +24 -17
  98. package/components/notice/styles/index.less +14 -13
  99. package/components/page/styles/index.less +16 -16
  100. package/components/popconfirm/styles/index.less +6 -6
  101. package/components/poptip/styles/index.less +10 -9
  102. package/components/progress/styles/index.less +13 -13
  103. package/components/radio/button.jsx +2 -2
  104. package/components/radio/demo/button.md +3 -3
  105. package/components/radio/demo/group-vertical.md +46 -0
  106. package/components/radio/demo/index.vue +4 -0
  107. package/components/radio/demo/options.md +43 -0
  108. package/components/radio/group.jsx +14 -8
  109. package/components/radio/index.md +11 -9
  110. package/components/radio/styles/index.less +33 -22
  111. package/components/rate/styles/index.less +2 -2
  112. package/components/select/demo/icon.md +40 -0
  113. package/components/select/demo/index.vue +4 -0
  114. package/components/select/demo/size.md +5 -5
  115. package/components/select/demo/theme.md +46 -0
  116. package/components/select/index.md +5 -2
  117. package/components/select/select.jsx +20 -13
  118. package/components/select/styles/index.less +113 -49
  119. package/components/slider/slider.jsx +9 -4
  120. package/components/slider/styles/index.less +7 -7
  121. package/components/space/demo/align.md +1 -1
  122. package/components/spin/styles/index.less +7 -11
  123. package/components/steps/styles/index.less +11 -11
  124. package/components/styles/color.less +158 -0
  125. package/components/styles/index.less +3 -1
  126. package/components/styles/sys.less +34 -0
  127. package/components/styles/var.less +150 -0
  128. package/components/switch/styles/index.less +11 -11
  129. package/components/table/styles/index.less +29 -32
  130. package/components/tabs/styles/index.less +20 -19
  131. package/components/tag/styles/index.less +45 -45
  132. package/components/timeline/styles/index.less +5 -5
  133. package/components/tooltip/styles/index.less +19 -18
  134. package/components/tree/styles/index.less +15 -15
  135. package/components/treeselect/styles/index.less +5 -5
  136. package/components/upload/demo/accept.md +68 -0
  137. package/components/upload/demo/avatar.md +40 -0
  138. package/components/upload/demo/base.md +40 -0
  139. package/components/upload/demo/custom.md +47 -0
  140. package/components/upload/demo/directory.md +36 -0
  141. package/components/upload/demo/drag.md +0 -0
  142. package/components/upload/demo/draggable.md +45 -0
  143. package/components/upload/demo/exceed.md +42 -0
  144. package/components/upload/demo/file-list.md +42 -0
  145. package/components/upload/demo/form.md +120 -0
  146. package/components/upload/demo/index.vue +37 -0
  147. package/components/upload/demo/info.md +10 -0
  148. package/components/upload/demo/picture.md +54 -0
  149. package/components/upload/index.md +26 -0
  150. package/components/upload/styles/index.less +258 -0
  151. package/components/upload/upload.jsx +336 -0
  152. package/dist/k-ui.css +1 -1
  153. package/dist/k-ui.js +2 -2
  154. package/package.json +9 -4
  155. package/components/button/demo/hollow.md +0 -15
  156. package/components/layout/demo/layout6.md +0 -142
  157. package/components/menu/demo/vertical-affix.md +0 -69
  158. package/components/styles/dark.less +0 -70
  159. package/components/styles/global-dark.less +0 -36
  160. package/components/styles/global.less +0 -44
  161. package/components/upload/upload.vue +0 -137
  162. package/dist/k-ui-dark.css +0 -1
@@ -8,16 +8,14 @@
8
8
  <div class="k-demo-layout">
9
9
  <Layout class="layout-back">
10
10
  <Sider class="demo-sider">
11
- <div class="logo" />
12
- <Menu mode="inline" theme="dark" v-model="top" class="demo-top-menu">
13
- <MenuItem key="t1" icon="home">nav1</MenuItem>
14
- <MenuItem key="t2" icon="logo-buffer">nav2</MenuItem>
15
- <MenuItem key="t3" icon="heart">nav3</MenuItem>
16
- <MenuItem key="t5" icon="albums">nav4</MenuItem>
17
- <MenuItem key="t6" icon="calculator">nav5</MenuItem>
18
- <MenuItem key="t7" icon="call">nav6</MenuItem>
19
- <MenuItem key="t8" icon="cloud">nav7</MenuItem>
20
- <MenuItem key="t9" icon="color-palette">nav8</MenuItem>
11
+ <div class="logo-box">
12
+ <Icon type="logo-kui" size="30" class="logo"/>
13
+ KUI运营后台
14
+ </div>
15
+ <Menu mode="inline" v-model="top" class="demo-top-menu">
16
+ <MenuItem key="t1" icon="home-outline">首页</MenuItem>
17
+ <MenuItem key="t2" icon="bar-chart">数据统计</MenuItem>
18
+ <MenuItem key="t3" icon="settings">能源管理</MenuItem>
21
19
  </Menu>
22
20
  </Sider>
23
21
  <Content class="k-demo-main">
@@ -32,23 +30,26 @@
32
30
  </Layout>
33
31
  </div>
34
32
  </template>
35
- <style scoped>
33
+ <style scoped lang="less">
36
34
  .k-demo-layout{
37
35
  height:360px;
38
36
  overflow:hidden;
39
37
  }
40
38
  .k-demo-layout .demo-sider{
41
- overflow: auto;
42
39
  height: 360px; /*这里是例子,实际中请适当修改*/
43
40
  left: 0;
44
41
  width:200px;
45
- background:#22303f;
46
- }
47
- .k-demo-layout .logo{
48
- height: 32px;
49
- background:rgb(132 139 156 / 50%);
50
- margin: 16px;
42
+ border-right:1px solid var(--kui-color-border);
51
43
  }
44
+ .k-demo-layout .logo-box {
45
+ box-sizing: border-box;
46
+ display:flex;
47
+ align-items:center;
48
+ padding:20px 0 20px 20px;
49
+ .logo{
50
+ margin-right:8px;
51
+ }
52
+ }
52
53
  .k-demo-layout .k-demo-main{
53
54
  overflow:auto;
54
55
  height:360px;
@@ -8,31 +8,32 @@
8
8
  <template>
9
9
  <div class="k-demo-layout">
10
10
  <Layout class="layout-back">
11
- <Sider class="demo-sider demo-back" :style="{width:collapsed?'80px':'200px'}">
12
- <div class="logo" />
13
- <Menu mode="inline" v-model="left" :open-keys="open" :inline-collapsed="collapsed" style="border:none;">
14
- <MenuItem key="1-1" icon="home"><span>option1</span></MenuItem>
15
- <MenuItem key="1-2" icon="logo-buffer"><span>option2</span></MenuItem>
16
- <MenuItem key="1-3" icon="heart"><span>option3</span></MenuItem>
17
- <MenuItem key="1-4" icon="albums"><span>option4</span></MenuItem>
18
- <SubMenu key="l0">
19
- <template slot="title">
20
- <Icon type="newspaper" /><span>subnav1</span>
21
- </template>
22
- <MenuItem key="0-1">option1</MenuItem>
23
- <MenuItem key="0-2">option2</MenuItem>
24
- <MenuItem key="0-3">option3</MenuItem>
25
- <MenuItem key="0-4">option4</MenuItem>
26
- </SubMenu>
11
+ <Sider class="demo-sider" :style="{width:collapsed?'60px':'200px'}">
12
+ <div class="logo-box">
13
+ <Icon type="logo-kui" size="30" class="logo"/>
14
+ <transition>
15
+ <span v-show="!collapsed">KUI运营后台</span>
16
+ </transition>
17
+ </div>
18
+ <Menu mode="inline" v-model="left" :inline-collapsed="collapsed" style="border:none;">
19
+ <MenuItem key="1-1" icon="home-outline"><span>首页</span></MenuItem>
20
+ <MenuItem key="1-2" icon="bar-chart"><span>数据统计</span></MenuItem>
21
+ <MenuItem key="1-3" icon="settings"><span>能源管理</span></MenuItem>
27
22
  </Menu>
28
- <div class="toggle-menu demo-back" @click="toggle"><Icon :type="!collapsed?'chevron-back':'chevron-forward'" /></div>
23
+ <Button theme="light" :icon="!collapsed?'chevron-back':'chevron-forward'" @click="toggle" class="btn-expand"/>
29
24
  </Sider>
30
25
  <Content class="k-demo-main">
31
- <Menu mode="horizontal" theme="dark" v-model="top" class="demo-top-menu">
32
- <MenuItem key="t1" icon="home">nav1</MenuItem>
33
- <MenuItem key="t2" icon="logo-buffer">nav2</MenuItem>
34
- <MenuItem key="t3" icon="heart">nav3</MenuItem>
35
- </Menu>
26
+ <Row type="flex" align="middle" class="header-nav">
27
+ <Col flex="1"></Col>
28
+ <Col>
29
+ <Space :size="20">
30
+ <Input icon="search" theme="light" shape="circle" placeholder="搜索" style="width:200px"/>
31
+ <Button icon="notifications-outline" theme="normal"/>
32
+ <Button icon="ellipsis-horizontal-circle-outline" theme="normal"/>
33
+ <Avatar style="background:#3a95ff" :size="40" shape="square">K</Avatar>
34
+ </Space>
35
+ </Col>
36
+ </Row>
36
37
  <Breadcrumb class="nav">
37
38
  <BreadcrumbItem>Home</BreadcrumbItem>
38
39
  <BreadcrumbItem>List</BreadcrumbItem>
@@ -44,38 +45,42 @@
44
45
  </Layout>
45
46
  </div>
46
47
  </template>
47
- <style scoped>
48
+ <style scoped lang="less">
48
49
  .k-demo-layout{
49
-
50
+ .logo-box {
51
+ box-sizing: border-box;
52
+ display:flex;
53
+ align-items:center;
54
+ padding:16px 0 17px 16px;
55
+ /* background:var(--kui-color-gray-90); */
56
+ white-space:nowrap;
57
+ overflow:hidden;
58
+ .logo{
59
+ margin-right:8px;
60
+ }
61
+ }
62
+ .header-nav{
63
+ border-bottom:1px solid var(--kui-color-border);
64
+ padding-bottom:10px;
65
+ }
50
66
  }
51
- .toggle-menu{
67
+ .btn-expand{
52
68
  position:absolute;
53
- bottom:0;
54
- left:0;
55
- text-align:center;
56
- padding:10px 0;
57
- color:#fff;
58
- /* background:#4e5965; */
59
- width:100%;
60
- cursor:pointer;
69
+ bottom:10px;
70
+ left:12px;
61
71
  }
62
72
  .k-demo-layout .demo-sider{
63
- /* background:#22303f; */
64
73
  left: 0;
65
74
  position:relative;
75
+ border-right:1px solid var(--kui-color-border);
76
+ transition: all 0.3s ease 0s;
66
77
  }
67
78
  .k-demo-layout .k-demo-main .nav{
68
79
  padding:16px 0 0 16px;
69
80
  }
70
81
  .k-demo-layout .demo-top-menu{
71
- line-height:64px;
72
- height:64px;
82
+ line-height:61px;
73
83
  }
74
- .k-demo-layout .logo{
75
- height: 32px;
76
- background: rgb(132 139 156 / 50%);
77
- margin: 16px;
78
- }
79
84
  .k-demo-layout .k-demo-main{
80
85
  overflow:auto;
81
86
  }
@@ -88,9 +93,7 @@
88
93
  export default{
89
94
  data(){
90
95
  return{
91
- top:['t1'],
92
- left:['0-1'],
93
- open:['l0'],
96
+ left:['1-1'],
94
97
  collapsed:false
95
98
  }
96
99
  },
@@ -15,10 +15,6 @@
15
15
  height: 0;
16
16
  }
17
17
  .k-layout-header {
18
- height: 64px;
19
- line-height: 64px;
20
- padding: 0 50px;
21
- background: #22303f;
22
18
  box-sizing: border-box;
23
19
  }
24
20
  .k-layout-content {
@@ -28,11 +24,10 @@
28
24
  .k-layout-sider {
29
25
  position: relative;
30
26
  min-width: 0;
31
- transition: all 0.2s;
27
+ // transition: all 0.2s;
32
28
  // background: #646d82;
33
29
  }
34
30
  .k-layout-footer {
35
- // background: @hover-color;
36
31
  padding: 24px 50px;
37
32
  font-size: 14px;
38
33
  }
@@ -1,4 +1,4 @@
1
- @import '../../styles/global.less';
1
+ @import '../../styles/var.less';
2
2
  .k-loading-warp {
3
3
  position: fixed;
4
4
  z-index: 1001;
@@ -6,16 +6,16 @@
6
6
  top: 0;
7
7
  bottom: 0;
8
8
  right: 0;
9
- background: @border-color;
9
+ background: var(--kui-color-border);
10
10
  height: 2px;
11
11
  .k-loading-line {
12
12
  height: 100%;
13
13
  transition: width .2s ease-in-out;
14
- background-color: @main;
14
+ background-color: var(--kui-color-main);
15
15
  height: 2px;
16
16
  }
17
17
  .k-loading-line-error {
18
- background-color: @danger !important;
18
+ background-color: var(--kui-color-danger) !important;
19
19
  }
20
20
  .k-loading-inner {
21
21
  margin: 0 auto;
@@ -13,10 +13,10 @@
13
13
  <MenuItem key="1-3">Option 3</MenuItem>
14
14
  <MenuItem key="1-4">Option 4</MenuItem>
15
15
  </SubMenu>
16
- <SubMenu key="sub2" icon="keypad" title="Navigation Two">
16
+ <SubMenu key="sub2" icon="bar-chart" title="Navigation Two">
17
17
  <MenuItem key="2-1">Option 5</MenuItem>
18
18
  <MenuItem key="2-2">Option 6</MenuItem>
19
- <SubMenu key="sub2-1" icon="keypad" title="SubMenu">
19
+ <SubMenu key="sub2-1" icon="bar-chart" title="SubMenu">
20
20
  <MenuItem key="2-3">Option 7</MenuItem>
21
21
  <MenuItem key="2-4">Option 8</MenuItem>
22
22
  </SubMenu>
@@ -8,26 +8,18 @@
8
8
  <div>
9
9
  <Menu mode="horizontal" v-model="current">
10
10
  <MenuItem key="1" icon="mail">Navigation One</MenuItem>
11
- <MenuItem key="2" icon="keypad" disabled>Navigation Two</MenuItem>
11
+ <MenuItem key="2" icon="bar-chart" disabled>Navigation Two</MenuItem>
12
12
  <SubMenu key="3" icon="settings" title="Navigation - Submenu">
13
- <MenuGroup title="Item 1">
14
13
  <MenuItem key="3-1">Option 1</MenuItem>
15
14
  <MenuItem key="3-2">Option 2</MenuItem>
16
- </MenuGroup>
17
- <MenuGroup title="Item 2">
18
15
  <MenuItem key="3-3">Option 1</MenuItem>
19
16
  <MenuItem key="3-4">Option 2</MenuItem>
20
17
  <SubMenu key="3-5" icon="settings" title="Submenu">
21
- <MenuGroup title="Item 1">
22
- <MenuItem key="3-5-1">Option 1</MenuItem>
23
- <MenuItem key="3-5-2">Option 2</MenuItem>
24
- </MenuGroup>
25
- <MenuGroup title="Item 2">
26
- <MenuItem key="3-5-3">Option 1</MenuItem>
27
- <MenuItem key="3-5-4">Option 2</MenuItem>
28
- </MenuGroup>
18
+ <MenuItem key="3-5-1">Option 1</MenuItem>
19
+ <MenuItem key="3-5-2">Option 2</MenuItem>
20
+ <MenuItem key="3-5-3">Option 1</MenuItem>
21
+ <MenuItem key="3-5-4">Option 2</MenuItem>
29
22
  </SubMenu>
30
- </MenuGroup>
31
23
  </SubMenu>
32
24
  <MenuItem key="4">
33
25
  <a href="https://k-ui.cn" target="_blank">Navigation -Link</a>
@@ -12,10 +12,10 @@
12
12
  <Menu v-model="current" :open-keys="openKeys" theme="dark" :inline-collapsed="!collapsed" mode="inline">
13
13
  <MenuItem key="1-1" icon="mail">Option 1<span>sss</span></MenuItem>
14
14
  <MenuItem key="1-2" icon="calendar"><span>Option 2</span></MenuItem>
15
- <SubMenu key="sub2" icon="keypad" title="Navigation Two">
15
+ <SubMenu key="sub2" icon="bar-chart" title="Navigation Two">
16
16
  <MenuItem key="2-1">Option 5</MenuItem>
17
17
  <MenuItem key="2-2">Option 6</MenuItem>
18
- <SubMenu title="SubMenu" key="sub2-1" icon="keypad">
18
+ <SubMenu title="SubMenu" key="sub2-1" icon="bar-chart">
19
19
  <MenuItem key="2-3">Option 7</MenuItem>
20
20
  <MenuItem key="2-4">Option 8</MenuItem>
21
21
  </SubMenu>
@@ -4,7 +4,6 @@ import Base from "./base.md";
4
4
  import InLine from "./inline.md";
5
5
  import Accrodion from "./accrodion.md";
6
6
  import Vertical from "./vertical.md";
7
- import VerticalAffix from "./vertical-affix.md";
8
7
  import Theme from "./theme.md";
9
8
  import Collapsed from "./collapsed.md";
10
9
  import Mode from "./mode.md";
@@ -19,7 +18,6 @@ export default {
19
18
  <InLine />
20
19
  <Accrodion />
21
20
  <Vertical />
22
- <VerticalAffix />
23
21
  <Theme />
24
22
  <Mode />
25
23
  <Collapsed />
@@ -8,19 +8,15 @@
8
8
  <div style="width:256px">
9
9
  <Menu v-model="current" :open-keys="openKeys" mode="inline">
10
10
  <SubMenu key="sub1" icon="mail" title="Navigation One">
11
- <MenuGroup title="Item 1">
12
- <MenuItem key="1-1">Option 1</MenuItem>
13
- <MenuItem key="1-2">Option 2</MenuItem>
14
- </MenuGroup>
15
- <MenuGroup title="Item 2">
16
- <MenuItem key="1-3">Option 3</MenuItem>
17
- <MenuItem key="1-4">Option 4</MenuItem>
18
- </MenuGroup>
11
+ <MenuItem key="1-1">Option 1</MenuItem>
12
+ <MenuItem key="1-2">Option 2</MenuItem>
13
+ <MenuItem key="1-3">Option 3</MenuItem>
14
+ <MenuItem key="1-4">Option 4</MenuItem>
19
15
  </SubMenu>
20
- <SubMenu key="sub2" icon="keypad" title="Navigation Two">
16
+ <SubMenu key="sub2" icon="bar-chart" title="Navigation Two">
21
17
  <MenuItem key="2-1">Option 5</MenuItem>
22
18
  <MenuItem key="2-2">Option 6</MenuItem>
23
- <SubMenu key="sub2-1" icon="keypad" title="SubMenu">
19
+ <SubMenu key="sub2-1" icon="bar-chart" title="SubMenu">
24
20
  <MenuItem key="2-3">Option 7</MenuItem>
25
21
  <MenuItem key="2-4">Option 8</MenuItem>
26
22
  </SubMenu>
@@ -13,10 +13,10 @@
13
13
  <Menu v-model="current" :open-keys="openKeys" :theme="theme" :mode="mode" style="width:256px">
14
14
  <MenuItem key="1-1" icon="mail">Option 1</MenuItem>
15
15
  <MenuItem key="1-2" icon="calendar"><span>Option 2</span></MenuItem>
16
- <SubMenu key="sub2" icon="keypad" title="Navigation Two">
16
+ <SubMenu key="sub2" icon="bar-chart" title="Navigation Two">
17
17
  <MenuItem key="2-1">Option 5</MenuItem>
18
18
  <MenuItem key="2-2">Option 6</MenuItem>
19
- <SubMenu key="sub2-1" icon="keypad" title="SubMenu">
19
+ <SubMenu key="sub2-1" icon="bar-chart" title="SubMenu">
20
20
  <MenuItem key="2-3">Option 7</MenuItem>
21
21
  <MenuItem key="2-4">Option 8</MenuItem>
22
22
  </SubMenu>
@@ -12,10 +12,10 @@
12
12
  <Menu v-model="current" :open-keys="openKeys" :theme="theme" mode="inline">
13
13
  <MenuItem key="1-1" icon="mail">Option 1</MenuItem>
14
14
  <MenuItem key="1-2" icon="calendar">Option 2</MenuItem>
15
- <SubMenu key="sub2" icon="keypad" title="Navigation Two">
15
+ <SubMenu key="sub2" icon="bar-chart" title="Navigation Two">
16
16
  <MenuItem key="2-1">Option 5</MenuItem>
17
17
  <MenuItem key="2-2">Option 6</MenuItem>
18
- <SubMenu key="sub2-1" icon="keypad" title="SubMenu">
18
+ <SubMenu key="sub2-1" icon="bar-chart" title="SubMenu">
19
19
  <MenuItem key="2-3">Option 7</MenuItem>
20
20
  <MenuItem key="2-4">Option 8</MenuItem>
21
21
  </SubMenu>
@@ -9,10 +9,10 @@
9
9
  <Menu v-model="current" mode="vertical">
10
10
  <MenuItem key="1-1" icon="mail">Option 1</MenuItem>
11
11
  <MenuItem key="1-2" icon="calendar">Option 2</MenuItem>
12
- <SubMenu key="sub2" icon="keypad" title="Navigation Two">
12
+ <SubMenu key="sub2" icon="bar-chart" title="Navigation Two">
13
13
  <MenuItem key="2-1">Option 5</MenuItem>
14
14
  <MenuItem key="2-2">Option 6</MenuItem>
15
- <SubMenu key="sub2-1" icon="keypad" title="SubMenu">
15
+ <SubMenu key="sub2-1" icon="bar-chart" title="SubMenu">
16
16
  <MenuItem key="2-3">Option 7</MenuItem>
17
17
  <MenuItem key="2-4">Option 8</MenuItem>
18
18
  </SubMenu>
@@ -9,11 +9,9 @@
9
9
  | value | 当前选中的菜单项,可使用v-model绑定 | String[] | - |
10
10
  | mode | 菜单类型,支持垂直、水平、和内嵌模式三种 | String: vertical vertical-right horizontal inline | vertical |
11
11
  | click | 点击 MenuItem 调用此函数 | Fun({key, keyPath, item }) | - |
12
- | affixed | 点击 MenuItem 收藏调用此函数 | Fun({key, keyPath, item },affixed) | - |
13
12
  | openChange | SubMenu 展开/关闭的回调 | Fun(openKeys: String[]) | - |
14
13
  | accordion | 是否只允许菜单展开一项 | Boolean | false |
15
14
  | inline-collapsed | inline 时菜单是否收起状态 | Boolean | false |
16
- | vertical-affixed | 菜单是否支持收藏 (vertical模式有效) | Boolean | false |
17
15
 
18
16
  ### Menu.Item
19
17
 
@@ -21,7 +19,6 @@
21
19
  |----------|--------------------------|---------|--------|
22
20
  | icon | item的图标 | String | - |
23
21
  | disabled | 是否禁用 | Boolean | false |
24
- | affixed | 是否收藏 | Boolean | false |
25
22
  | key | item 的唯一标志 | String | - |
26
23
  | title | 设置收缩时展示的悬浮标题 | String | - |
27
24
 
@@ -2,12 +2,11 @@
2
2
  export default {
3
3
  name: "Menu",
4
4
  props: {
5
- theme: { type: String, default: "light" },
5
+ theme: String,
6
6
  mode: { type: String, default: "vertical" },
7
7
  value: { type: Array, default: () => [] },
8
8
  accordion: Boolean,
9
9
  inlineCollapsed: Boolean,
10
- verticalAffixed: Boolean,
11
10
  openKeys: { type: Array, default: () => [] },
12
11
  },
13
12
  inject: {
@@ -49,10 +48,11 @@ export default {
49
48
  render() {
50
49
  const { theme, currentMode, Dropdown } = this
51
50
  const preCls = Dropdown ? 'dropdown-menu' : 'menu';
52
- const cls = [`k-${preCls} k-${preCls}-${theme} k-${preCls}-${currentMode}`, {
51
+ const cls = [`k-${preCls} k-${preCls}-${currentMode}`,
52
+ {
53
53
  [`k-${preCls}-inline-collapased`]: this.inlineCollapsed
54
54
  }];
55
- return (<ul class={cls}>{this.$slots.default}</ul>)
55
+ return (<ul class={cls} theme-mode={theme}>{this.$slots.default}</ul>)
56
56
  },
57
57
  methods: {
58
58
  openChange(openKeys) {
@@ -8,7 +8,6 @@ export default {
8
8
  icon: String,
9
9
  title: String,
10
10
  disabled: Boolean,
11
- affixed: Boolean
12
11
  },
13
12
  inject: {
14
13
  Menu: { default: null },
@@ -18,18 +17,9 @@ export default {
18
17
  data() {
19
18
  return {
20
19
  active: false,
21
- currentAffixed: this.affixed,
22
20
  };
23
21
  },
24
22
  methods: {
25
- starClick(e) {
26
- if (!this.disabled) {
27
- e.stopPropagation();
28
- this.currentAffixed = !this.currentAffixed
29
- let item = this
30
- this.SubMenu.affixed(item, e)
31
- }
32
- }
33
23
  },
34
24
 
35
25
  mounted() {
@@ -89,10 +79,8 @@ export default {
89
79
  return (
90
80
  <Tooltip placement="right">
91
81
  <li {...props}>
92
- {icon ? <Icon type={icon} class={`k-${preCls}-item-icon`} /> : null}
82
+ {icon ? <Icon type={icon} class={`k-${preCls}-item-icon`} /> : <span class={`k-${preCls}-icon-temp`}/>}
93
83
  {titleNode}
94
- {Menu.mode == 'vertical' && Menu.verticalAffixed && SubMenu ?
95
- <Icon onClick={this.starClick} class="k-menu-item-icon-affix" type={this.currentAffixed ? "star" : "star-outline"} /> : null}
96
84
  </li>
97
85
  {showTooltip ? <template slot="title">{this.$slots.default}</template> : null}
98
86
  </Tooltip>
@@ -6,57 +6,65 @@
6
6
  font-size: 14px;
7
7
  position: relative;
8
8
  zoom: 1;
9
- background: @back-color;
9
+ background: var(--kui-color-control-10);
10
10
  list-style: none;
11
- padding: @radius 0;
12
- border-radius: @radius;
11
+ padding: var(--kui-border-radius) 0;
12
+ border-radius: var(--kui-border-radius);
13
13
  min-width: 100px;
14
14
  box-shadow: 0 1px 6px rgba(0, 0, 0, .2);
15
- color: @color;
15
+ color: var(--kui-color-font);
16
16
  .k-menu-item-divider {
17
17
  height: 1px;
18
18
  margin: 4px 0;
19
19
  overflow: hidden;
20
20
  line-height: 0;
21
- background-color: @border-color;
21
+ background-color: var(--kui-color-border);
22
+ }
23
+ .k-dropdown-menu-icon-temp {
24
+ // width: 20px;
25
+ // height: 20px;
26
+ // display: inline-block;
27
+ // margin-right: 8px;
28
+ display: none;
22
29
  }
23
30
  .k-dropdown-menu-item, .k-dropdown-menu-submenu {
24
- line-height: 22px;
31
+ line-height: 1;
25
32
  font-size: 14px;
26
33
  list-style: none;
27
- padding: 5px 12px 5px 24px;
34
+ padding: 10px 12px;
28
35
  box-sizing: border-box;
29
36
  position: relative;
30
37
  cursor: pointer;
38
+ display: flex;
39
+ align-items: center;
40
+ // border-radius: var(--kui-border-radius);
41
+ // margin: 8px;
31
42
  a {
32
- color: @color;
43
+ color: var(--kui-color-font);
33
44
  display: block;
34
- margin: -5px -12px -5px -24px;
35
- padding: 5px 12px 5px 24px;
45
+ // margin: -5px -12px -5px -24px;
46
+ // padding: 5px 12px 5px 24px;
36
47
  }
37
48
  &.k-dropdown-menu-item-active {
38
- background-color: @hover-color;
49
+ background-color: var(--kui-color-hover);
39
50
  }
40
51
  .k-dropdown-menu-item-icon {
41
- position: absolute;
42
- left: 8px;
43
- top: 50%;
44
- transform: translateY(-50%);
45
- font-size: 12px;
52
+ font-size: 16px;
53
+ margin-right: 8px;
46
54
  }
47
55
  }
48
56
  .k-dropdown-menu-submenu-active {
49
- background-color: @hover-color;
57
+ background-color: var(--kui-color-hover);
50
58
  }
51
59
  .k-dropdown-menu-item-divider {
52
60
  height: 1px;
53
61
  margin: 2px 0;
54
62
  overflow: hidden;
55
63
  line-height: 0;
56
- background-color: @border-color;
64
+ background-color: var(--kui-color-border);
57
65
  }
58
66
  .k-dropdown-menu-item-disabled, .k-dropdown-menu-submenu-disabled {
59
- color: @disable-color;
67
+ color: var(--kui-color-disable-color);
60
68
  cursor: not-allowed;
61
69
  }
62
70
  .k-dropdown-menu-submenu-popup {
@@ -66,7 +74,7 @@
66
74
  position: absolute;
67
75
  z-index: 1001;
68
76
  min-width: 160px;
69
- border-radius: @radius;
77
+ border-radius: var(--kui-border-radius);
70
78
  padding-left: 5px;
71
79
  left: 100%;
72
80
  }