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
@@ -1,23 +1,68 @@
1
- @import '../../styles/global.less';
1
+ @import '../../styles/var.less';
2
2
  .k-input-wrapper {
3
3
  position: relative;
4
- display: inline-block;
4
+ display: inline-flex;
5
5
  width: 100%;
6
6
  max-width: 100%;
7
- color: @color;
7
+ color: var(--kui-color-font);
8
+ align-items: center;
9
+ border: 1px solid var(--kui-color-border);
10
+ border-radius: var(--kui-border-radius);
11
+ transition: all .3s ease-in-out;
12
+ box-sizing: border-box;
13
+ &:hover {
14
+ border-color: var(--kui-color-main);
15
+ }
8
16
  .k-input-icon {
9
- position: absolute;
10
- top: 0;
11
- left: 7px;
12
- top: 50%;
13
- transform: translateY(-50%);
14
- font-size: 20px;
15
- color: @icon-color;
17
+ // position: absolute;
18
+ // top: 0;
19
+ // left: 7px;
20
+ // top: 50%;
21
+ // transform: translateY(-50%);
22
+ margin: 0 7px;
23
+ font-size: 16px;
24
+ color: var(--kui-color-icon);
16
25
  z-index: 1;
17
- &+.k-input {
18
- padding-left: 32px;
26
+ // &+.k-input {
27
+ // padding-left: 32px;
28
+ // }
29
+ }
30
+ .k-input {
31
+ border: none;
32
+ }
33
+ .k-input:focus {
34
+ border: none;
35
+ box-shadow: none;
36
+ }
37
+ &.k-input-focus {
38
+ border-color: var(--kui-color-main);
39
+ box-shadow: 0 0 5px var(--kui-color-main-30);
40
+ }
41
+ .k-input-suffix {
42
+ // position: absolute;
43
+ // right: 12px;
44
+ // top: 50%;
45
+ font-size: 12px;
46
+ // transform: translateY(-50%);
47
+ white-space: nowrap;
48
+ line-height: 1;
49
+ cursor: pointer;
50
+ user-select: none;
51
+ // background: #fff;
52
+ transition: all .2s ease-in-out;
53
+ margin-right: 8px;
54
+ &:hover {
55
+ color: var(--kui-color-font);
56
+ }
57
+ .k-icon {
58
+ font-size: 16px;
59
+ transition: all .2s ease-in-out;
60
+ color: var(--kui-color-icon);
19
61
  }
20
62
  }
63
+ .k-input-icon + .k-input {
64
+ padding-left: 0;
65
+ }
21
66
  }
22
67
 
23
68
  .k-input, .k-textarea {
@@ -26,12 +71,12 @@
26
71
  width: 100%;
27
72
  height: 32px;
28
73
  line-height: 1.5;
29
- padding: 4px 7px;
30
- font-size: 12px;
74
+ padding: 4px 10px;
75
+ font-size: 14px;
31
76
  margin: 0;
32
- border: 1px solid @border-color;
33
- border-radius: @radius;
34
- color: @color;
77
+ border: 1px solid var(--kui-color-border);
78
+ border-radius: var(--kui-border-radius);
79
+ color: var(--kui-color-font);
35
80
  background-color: transparent;
36
81
  background-image: none;
37
82
  position: relative;
@@ -39,73 +84,59 @@
39
84
  transition: all .3s ease-in-out;
40
85
  &:focus {
41
86
  // box-shadow: 0 0 5px rgba(59, 180, 242, 0.55);
42
- box-shadow: 0 0 5px fade(@main, 75%);
43
- border-color: @main;
87
+ box-shadow: 0 0 5px var(--kui-color-main-30);
88
+ border-color: var(--kui-color-main);
44
89
  outline: none;
45
90
  }
46
91
  &:hover {
47
- border-color: @main;
92
+ border-color: var(--kui-color-main);
48
93
  }
49
94
  &:disabled {
50
95
  cursor: not-allowed;
51
- color: @disable-color;
52
- background: @disable-back;
53
- border-color: @disable-border;
54
- &::placeholder {
55
- color: @disable-color;
56
- }
96
+ color: var(--kui-color-disable-color);
97
+ background: var(--kui-color-disable-back);
98
+ border-color: var(--kui-color-disable-border);
57
99
  &:hover {
58
- border-color: @disable-border;
100
+ border-color: var(--kui-color-disable-border);
59
101
  }
60
102
  }
103
+ &::placeholder {
104
+ color: var(--kui-color-disable-color);
105
+ }
106
+ &:-webkit-autofill {
107
+ box-shadow: 0 0 0px 1000px white inset !important;
108
+ }
109
+ &:-webkit-autofill:focus {
110
+ box-shadow: 0 0 0px 1000px white inset !important;
111
+ }
61
112
  }
62
113
 
63
114
  .k-textarea {
64
115
  max-width: 100%;
65
116
  height: auto;
66
117
  vertical-align: bottom;
67
- font-size: 12px;
118
+ font-size: 14px;
68
119
  resize: none;
69
120
  outline: none;
70
121
  }
71
122
 
72
- .k-input-has-suffix, .k-input-has-clear {
73
- .k-input {
74
- padding-right: 32px;
75
- }
76
- }
77
-
78
- .k-input-suffix {
79
- position: absolute;
80
- right: 12px;
81
- top: 50%;
82
- font-size: 12px;
83
- transform: translateY(-50%);
84
- line-height: 1;
85
- cursor: pointer;
86
- user-select: none;
87
- // background: #fff;
88
- transition: all .2s ease-in-out;
89
- &:hover {
90
- color: @color;
91
- }
92
- .k-icon {
93
- font-size: 16px;
94
- transition: all .2s ease-in-out;
95
- }
96
- }
97
-
123
+ // .k-input-has-suffix, .k-input-has-clear {
124
+ // .k-input {
125
+ // padding-right: 32px;
126
+ // }
127
+ // }
98
128
  .k-input-clearable {
99
- position: absolute;
100
- right: 8px;
129
+ // position: absolute;
130
+ // right: 8px;
101
131
  cursor: pointer;
102
- z-index: 10;
103
- top: 50%;
132
+ // z-index: 10;
133
+ // top: 50%;
104
134
  font-size: 15px;
105
- transform: translateY(-50%);
106
- color: @gray;
135
+ // transform: translateY(-50%);
136
+ margin-right: 8px;
137
+ color: var(--kui-color-gray);
107
138
  &:hover {
108
- color: @color;
139
+ color: var(--kui-color-font);
109
140
  }
110
141
  }
111
142
 
@@ -122,21 +153,20 @@ input.k-input-sm {
122
153
  line-height: 23px;
123
154
  }
124
155
  .k-input-clearable {
125
- right: 9px;
126
- font-size: 11px;
156
+ // right: 9px;
157
+ font-size: 14px;
127
158
  }
128
159
  .k-input-icon {
129
- left: 5px;
160
+ // left: 5px;
130
161
  font-size: 16px;
131
- &+.k-input {
132
- padding-left: 24px;
133
- }
162
+ // &+.k-input {
163
+ // padding-left: 24px;
164
+ // }
134
165
  }
135
166
  &.k-input-has-clear .k-input {
136
- padding-right: 25px;
167
+ // padding-right: 25px;
137
168
  }
138
169
  .k-input-suffix {
139
- right: 5px;
140
170
  .k-icon {
141
171
  font-size: 12px;
142
172
  }
@@ -144,7 +174,7 @@ input.k-input-sm {
144
174
  }
145
175
 
146
176
  input.k-input-lg {
147
- padding: 2px 7px;
177
+ padding: 2px 10px;
148
178
  height: 40px;
149
179
  line-height: 38px;
150
180
  font-size: 14px;
@@ -152,27 +182,26 @@ input.k-input-lg {
152
182
 
153
183
  .k-input-lg {
154
184
  .k-input {
155
- padding: 2px 7px;
185
+ padding: 2px 10px;
156
186
  height: 40px;
157
187
  line-height: 38px;
158
188
  font-size: 14px;
159
189
  }
160
190
  .k-input-clearable {
161
- right: 10px;
191
+ // right: 10px;
162
192
  font-size: 18px;
163
193
  }
164
194
  .k-input-icon {
165
195
  font-size: 25px;
166
- left: 8px;
167
- &+.k-input {
168
- padding-left: 40px;
169
- }
196
+ // left: 8px;
197
+ // &+.k-input {
198
+ // padding-left: 40px;
199
+ // }
170
200
  }
171
201
  &.k-input-has-clear .k-input {
172
- padding-right: 40px;
202
+ // padding-right: 40px;
173
203
  }
174
204
  .k-input-suffix {
175
- right: 15px;
176
205
  .k-icon {
177
206
  font-size: 18px;
178
207
  }
@@ -185,4 +214,17 @@ input.k-input-lg {
185
214
 
186
215
  ::-ms-reveal {
187
216
  display: none;
217
+ }
218
+
219
+ .k-input-light {
220
+ border: none;
221
+ background-color: var(--kui-color-gray-80);
222
+ &:focus, &.k-input-focus {
223
+ box-shadow: none;
224
+ }
225
+ }
226
+
227
+ .k-input-circle {
228
+ border-radius: 20px;
229
+ padding: 0 10px;
188
230
  }
@@ -3,6 +3,7 @@ export default {
3
3
  name: 'TextArea',
4
4
  props: {
5
5
  value: [String, Number],
6
+ theme: String
6
7
  },
7
8
  render() {
8
9
  const props = {
@@ -46,16 +46,18 @@
46
46
  color: #fff
47
47
  }
48
48
  .demo-k-layout .k-layout-footer,.demo-k-layout .k-layout-header {
49
- background-color: fadeout(#3a95ff,50%);
49
+ background-color: var(--kui-color-main-60);
50
+ height:64px;
51
+ line-height:64px;
50
52
  }
51
53
  .demo-k-layout .k-layout-content {
52
54
  min-height: 120px;
53
55
  line-height: 120px;
54
- background-color: fadeout(#3a95ff,30%);
56
+ background-color: var(--kui-color-main-30);
55
57
  }
56
58
  .demo-k-layout .k-layout-sider {
57
59
  line-height: 120px;
58
- background-color: fadeout(#3a95ff,20%);
60
+ background-color: var(--kui-color-main-10);
59
61
  width:200px;
60
62
  }
61
63
  </style>
@@ -6,7 +6,6 @@ import Layout2 from "./layout2.md";
6
6
  import Layout3 from "./layout3.md";
7
7
  import Layout4 from "./layout4.md";
8
8
  import Layout5 from "./layout5.md";
9
- import Layout6 from "./layout6.md";
10
9
  export default {
11
10
  render() {
12
11
  return (
@@ -18,7 +17,6 @@ export default {
18
17
  <Layout3 />
19
18
  <Layout4 />
20
19
  <Layout5 />
21
- <Layout6 />
22
20
  </div>
23
21
  );
24
22
  },
@@ -35,6 +35,4 @@
35
35
  - `Content`:内容部分,自带默认样式,其下可嵌套任何元素,只能放在 `Layout` 中。
36
36
  - `Footer`:底部布局,自带默认样式,其下可嵌套任何元素,只能放在 `Layout` 中。
37
37
 
38
-
39
- <s>功能不多,他就是简单的布局。未采用 `flex`</s>
40
38
  >3.0 版本以后使用 `flex` 布局,请注意[浏览器兼容性](http://caniuse.com/#search=flex)
@@ -7,44 +7,33 @@
7
7
  <template>
8
8
  <div class="k-demo-layout">
9
9
  <Layout class="layout-back">
10
- <Header>
11
- <div class="logo" />
12
- <Menu mode="horizontal" theme="dark" :value="['t1']" 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
- </Menu>
10
+ <Header class="demo-header">
11
+ <Row type="flex" align="middle">
12
+ <Col style="width:194px">
13
+ <div class="logo-box">
14
+ <Icon type="logo-kui" size="30" class="logo"/>
15
+ K UIKIT
16
+ </div>
17
+ </Col>
18
+ <Col flex="1">
19
+ <Input icon="search" placeholder="搜索功能" style="width:200px;" theme="light" shape="circle">
20
+ </Col>
21
+ <Col>
22
+ <Tooltip title="全屏显示" placement="bottom">
23
+ <Button icon="scan-outline" theme="normal"/>
24
+ </Tooltip>
25
+ <Button type="link">帮助文档</Button>
26
+ <Button icon="notifications-outline" theme="normal"/>
27
+ <Avatar style="background:#3a95ff" :size="40">K</Avatar>
28
+ </Col>
29
+ </Row>
17
30
  </Header>
18
31
  <Layout>
19
32
  <Sider class="demo-back">
20
- <Menu :value="['0-1']" class="demo-left-menu" mode="inline" :openKeys="['al0']">
21
- <SubMenu key="al0">
22
- <template slot="title">
23
- <Icon type="newspaper" />subnav1
24
- </template>
25
- <MenuItem key="0-1">option1</MenuItem>
26
- <MenuItem key="0-2">option2</MenuItem>
27
- <MenuItem key="0-3">option3</MenuItem>
28
- <MenuItem key="0-4">option4</MenuItem>
29
- </SubMenu>
30
- <SubMenu key="al1">
31
- <template slot="title">
32
- <Icon type="keypad" />subnav2
33
- </template>
34
- <MenuItem key="1-1">option1</MenuItem>
35
- <MenuItem key="1-2">option2</MenuItem>
36
- <MenuItem key="1-3">option3</MenuItem>
37
- <MenuItem key="1-4">option4</MenuItem>
38
- </SubMenu>
39
- <SubMenu key="al2">
40
- <template slot="title">
41
- <Icon type="settings" />subnav3
42
- </template>
43
- <MenuItem key="2-1">option1</MenuItem>
44
- <MenuItem key="2-2">option2</MenuItem>
45
- <MenuItem key="2-3">option3</MenuItem>
46
- <MenuItem key="2-4">option4</MenuItem>
47
- </SubMenu>
33
+ <Menu :value="['t1']" class="demo-left-menu" mode="inline" style="padding-top:20px;">
34
+ <MenuItem key="t1" icon="home-outline">首页</MenuItem>
35
+ <MenuItem key="t2" icon="bar-chart">数据统计</MenuItem>
36
+ <MenuItem key="t3" icon="settings">能源管理</MenuItem>
48
37
  </Menu>
49
38
  </Sider>
50
39
  <Layout class="k-demo-main">
@@ -61,23 +50,27 @@
61
50
  </Layout>
62
51
  </div>
63
52
  </template>
64
- <style scoped>
65
- .k-demo-layout .logo{
66
- width: 120px;
67
- height: 31px;
68
- background: rgb(132, 139, 156);
69
- float: left;
70
- margin: 15px 30px 15px 0;
53
+ <style scoped lang="less">
54
+ .k-demo-layout{
55
+ .demo-header{
56
+ border-bottom:1px solid var(--kui-color-border);
57
+ padding:15px 20px 15px 30px;
58
+ min-width:700px;
59
+ }
60
+ .logo-box {
61
+ /* width: 190px; */
71
62
  position:relative;
72
63
  z-index:801;
73
- }
74
- .k-demo-layout .demo-top-menu{
75
- line-height:64px;
76
- height:64px;
64
+ box-sizing: border-box;
65
+ display:flex;
66
+ align-items:center;
67
+ .logo{
68
+ margin-right:8px;
69
+ }
70
+ }
77
71
  }
78
72
  .k-demo-layout .demo-left-menu{
79
73
  height:100%;
80
- border-right:0px;
81
74
  }
82
75
  .k-demo-layout .k-demo-main{
83
76
  padding:0 24px 24px;
@@ -7,50 +7,39 @@
7
7
  <template>
8
8
  <div class="k-demo-layout">
9
9
  <Layout class="layout-back">
10
- <Header>
11
- <div class="logo" />
12
- <Menu mode="horizontal" 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
- </Menu>
17
- </Header>
10
+ <Header class="demo-header">
11
+ <Row type="flex" align="middle">
12
+ <Col style="width:220px">
13
+ <div class="logo-box">
14
+ <Icon type="logo-kui" size="30" class="logo"/>
15
+ K UIKIT
16
+ </div>
17
+ </Col>
18
+ <Col flex="1">
19
+ <Input icon="search" placeholder="搜索功能" style="width:200px;" theme="light" shape="circle">
20
+ </Col>
21
+ <Col>
22
+ <Tooltip title="全屏显示" placement="bottom">
23
+ <Button icon="scan-outline" theme="normal"/>
24
+ </Tooltip>
25
+ <Button type="link">帮助文档</Button>
26
+ <Button icon="notifications-outline" theme="normal"/>
27
+ <Avatar style="background:#3a95ff" :size="40">K</Avatar>
28
+ </Col>
29
+ </Row>
30
+ </Header>
18
31
  <Content class="k-demo-main" class="demo-back">
19
32
  <Breadcrumb class="nav">
20
33
  <BreadcrumbItem>Home</BreadcrumbItem>
21
34
  <BreadcrumbItem>List</BreadcrumbItem>
22
35
  <BreadcrumbItem>App</BreadcrumbItem>
23
36
  </Breadcrumb>
24
- <Layout style="padding:24px 0;" class="demo-back">
37
+ <Layout class="demo-back">
25
38
  <Sider style="background:transparent;">
26
39
  <Menu v-model="left" class="demo-left-menu" mode="inline">
27
- <SubMenu key="l0">
28
- <template slot="title">
29
- <Icon type="newspaper" />subnav1
30
- </template>
31
- <MenuItem key="0-1">option1</MenuItem>
32
- <MenuItem key="0-2">option2</MenuItem>
33
- <MenuItem key="0-3">option3</MenuItem>
34
- <MenuItem key="0-4">option4</MenuItem>
35
- </SubMenu>
36
- <SubMenu key="l1">
37
- <template slot="title">
38
- <Icon type="keypad" />subnav2
39
- </template>
40
- <MenuItem key="1-1">option1</MenuItem>
41
- <MenuItem key="1-2">option2</MenuItem>
42
- <MenuItem key="1-3">option3</MenuItem>
43
- <MenuItem key="1-4">option4</MenuItem>
44
- </SubMenu>
45
- <SubMenu key="l2">
46
- <template slot="title">
47
- <Icon type="settings" />subnav3
48
- </template>
49
- <MenuItem key="2-1">option1</MenuItem>
50
- <MenuItem key="2-2">option2</MenuItem>
51
- <MenuItem key="2-3">option3</MenuItem>
52
- <MenuItem key="2-4">option4</MenuItem>
53
- </SubMenu>
40
+ <MenuItem key="t1" icon="home-outline">首页</MenuItem>
41
+ <MenuItem key="t2" icon="bar-chart">数据统计</MenuItem>
42
+ <MenuItem key="t3" icon="settings">能源管理</MenuItem>
54
43
  </Menu>
55
44
  </Sider>
56
45
  <Content>Conent</Content>
@@ -60,19 +49,24 @@
60
49
  </Layout>
61
50
  </div>
62
51
  </template>
63
- <style scoped>
64
- .k-demo-layout .logo{
65
- width: 120px;
66
- height: 31px;
67
- background: rgb(132, 139, 156);
68
- float: left;
69
- margin: 15px 30px 0px 0px;
52
+ <style scoped lang="less">
53
+ .k-demo-layout{
54
+ .demo-header{
55
+ border-bottom:1px solid var(--kui-color-border);
56
+ padding:15px 20px 15px 30px;
57
+ min-width:700px;
58
+ }
59
+ .logo-box {
60
+ /* width: 190px; */
70
61
  position:relative;
71
62
  z-index:801;
72
- }
73
- .k-demo-layout .demo-top-menu{
74
- line-height:64px;
75
- height:64px;
63
+ box-sizing: border-box;
64
+ display:flex;
65
+ align-items:center;
66
+ .logo{
67
+ margin-right:8px;
68
+ }
69
+ }
76
70
  }
77
71
  .k-demo-layout .demo-left-menu{
78
72
  height:100%;
@@ -99,8 +93,7 @@
99
93
  export default{
100
94
  data(){
101
95
  return{
102
- top:['t1'],
103
- left:['0-1']
96
+ left:['t1']
104
97
  }
105
98
  }
106
99
  }
@@ -8,13 +8,30 @@
8
8
  <template>
9
9
  <div class="k-demo-layout">
10
10
  <Layout class="layout-back">
11
- <Header>
12
- <div class="logo" />
13
- <Menu mode="horizontal" theme="dark" v-model="top" class="demo-top-menu">
14
- <MenuItem key="t1" icon="home">nav1</MenuItem>
15
- <MenuItem key="t2" icon="logo-buffer">nav2</MenuItem>
16
- <MenuItem key="t3" icon="heart">nav3</MenuItem>
17
- </Menu>
11
+ <Header class="demo-header">
12
+ <Row type="flex" align="middle">
13
+ <Col style="width:194px">
14
+ <div class="logo-box">
15
+ <Icon type="logo-kui" size="30" class="logo"/>
16
+ K UIKIT
17
+ </div>
18
+ </Col>
19
+ <Col flex="1">
20
+ <Menu mode="horizontal" v-model="top" class="demo-top-menu">
21
+ <MenuItem key="t1">首页</MenuItem>
22
+ <MenuItem key="t2">新闻</MenuItem>
23
+ <MenuItem key="t3">知识库</MenuItem>
24
+ </Menu>
25
+ </Col>
26
+ <Col>
27
+ <Space :size="30">
28
+ <Input icon="search" theme="light" shape="circle" placeholder="搜索" style="width:200px"/>
29
+ <Button icon="notifications-outline" theme="normal"/>
30
+ <Button icon="ellipsis-horizontal-circle-outline" theme="normal"/>
31
+ <Avatar style="background:#3a95ff" :size="40" shape="square">K</Avatar>
32
+ </Space>
33
+ </Col>
34
+ </Row>
18
35
  </Header>
19
36
  <Content class="k-demo-main">
20
37
  <Breadcrumb class="nav">
@@ -28,22 +45,30 @@
28
45
  </Layout>
29
46
  </div>
30
47
  </template>
31
- <style scoped>
32
- .k-demo-layout .logo{
33
- width: 120px;
34
- height: 31px;
35
- background: rgb(132, 139, 156);
36
- float: left;
37
- margin: 15px 30px 0px 0px;
48
+ <style scoped lang="less">
49
+ .k-demo-layout{
50
+ .demo-header{
51
+ border-bottom:1px solid var(--kui-color-border);
52
+ padding:15px 20px 0px 30px;
53
+ min-width:900px;
54
+ }
55
+ .logo-box {
56
+ /* width: 190px; */
38
57
  position:relative;
39
58
  z-index:801;
59
+ box-sizing: border-box;
60
+ display:flex;
61
+ align-items:center;
62
+ .logo{
63
+ margin-right:8px;
64
+ }
65
+ }
40
66
  }
41
67
  .k-demo-layout .demo-top-menu{
42
- line-height:64px;
43
- height:64px;
44
- }
45
- .k-demo-layout .demo-left-menu{
46
- height:100%;
68
+ border:none;
69
+ li {
70
+ line-height:31px;
71
+ }
47
72
  }
48
73
  .k-demo-layout .k-demo-main{
49
74
  padding:0 50px;
@@ -55,9 +80,6 @@
55
80
  padding:24px;
56
81
  min-height:300px;
57
82
  }
58
- .k-demo-layout .k-layout-sider{
59
- width:200px;
60
- }
61
83
  .k-demo-layout .k-layout-footer{
62
84
  text-align:center;
63
85
  color:#999;