kui-vue 3.2.2 → 3.2.4

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 (111) hide show
  1. package/components/affix/affix.jsx +23 -75
  2. package/components/affix/demo/container.md +14 -7
  3. package/components/affix/index.md +7 -5
  4. package/components/alert/styles/index.less +13 -8
  5. package/components/avatar/avatar.jsx +63 -0
  6. package/components/avatar/demo/base.md +24 -0
  7. package/components/avatar/demo/change.md +40 -0
  8. package/components/avatar/demo/index.vue +20 -0
  9. package/components/avatar/demo/info.md +7 -0
  10. package/components/avatar/demo/types.md +23 -0
  11. package/components/avatar/index.js +2 -0
  12. package/components/avatar/index.md +7 -0
  13. package/components/avatar/styles/index.less +61 -0
  14. package/components/badge/styles/index.less +1 -2
  15. package/components/base/pop.jsx +1 -1
  16. package/components/breadcrumb/styles/index.less +2 -2
  17. package/components/button/demo/hollow.md +1 -1
  18. package/components/button/styles/index.less +5 -5
  19. package/components/card/demo/border.md +1 -1
  20. package/components/card/styles/index.less +4 -3
  21. package/components/checkbox/checkbox.jsx +4 -2
  22. package/components/checkbox/styles/index.less +49 -44
  23. package/components/collapse/styles/index.less +3 -10
  24. package/components/colorPicker/styles/index.less +5 -3
  25. package/components/datePicker/styles/calendar.less +6 -5
  26. package/components/datePicker/styles/datepicker.less +3 -3
  27. package/components/divider/styles/index.less +7 -6
  28. package/components/drawer/drawer.jsx +10 -8
  29. package/components/drawer/styles/index.less +2 -1
  30. package/components/dropdown/demo/rightmenu.md +2 -3
  31. package/components/dropdown/styles/index.less +2 -2
  32. package/components/empty/styles/index.less +1 -1
  33. package/components/form/styles/index.less +1 -0
  34. package/components/grid/demo/align.md +3 -3
  35. package/components/grid/demo/fill.md +3 -3
  36. package/components/grid/demo/flex.md +5 -5
  37. package/components/grid/demo/index.vue +0 -1
  38. package/components/icon/demo/search.vue +2 -2
  39. package/components/image/instance.js +1 -1
  40. package/components/image/preview.jsx +50 -20
  41. package/components/image/styles/index.less +7 -5
  42. package/components/index.js +7 -1
  43. package/components/input/styles/index.less +2 -1
  44. package/components/layout/demo/base.md +3 -4
  45. package/components/layout/demo/layout1.md +4 -4
  46. package/components/layout/demo/layout2.md +5 -6
  47. package/components/layout/demo/layout3.md +3 -4
  48. package/components/layout/demo/layout4.md +4 -4
  49. package/components/layout/demo/layout5.md +8 -8
  50. package/components/layout/demo/layout6.md +2 -2
  51. package/components/layout/styles/index.less +2 -3
  52. package/components/loading/styles/index.less +1 -1
  53. package/components/menu/styles/dropmenu.less +7 -6
  54. package/components/menu/styles/index.less +13 -9
  55. package/components/message/styles/index.less +1 -1
  56. package/components/modal/modal.jsx +10 -8
  57. package/components/modal/styles/index.less +7 -6
  58. package/components/notice/styles/index.less +1 -1
  59. package/components/page/styles/index.less +1 -1
  60. package/components/popconfirm/styles/index.less +3 -2
  61. package/components/poptip/styles/index.less +4 -3
  62. package/components/progress/styles/index.less +3 -3
  63. package/components/radio/radio.jsx +3 -5
  64. package/components/radio/styles/index.less +60 -55
  65. package/components/rate/index.md +3 -3
  66. package/components/rate/styles/index.less +1 -1
  67. package/components/select/styles/index.less +8 -7
  68. package/components/slider/demo/base.md +35 -0
  69. package/components/slider/demo/index.vue +18 -0
  70. package/components/slider/demo/info.md +7 -0
  71. package/components/slider/demo/vertical.md +13 -0
  72. package/components/slider/index.md +7 -0
  73. package/components/slider/slider.jsx +58 -0
  74. package/components/slider/styles/index.less +60 -32
  75. package/components/space/demo/align.md +46 -0
  76. package/components/space/demo/base.md +20 -0
  77. package/components/space/demo/custom-size.md +35 -0
  78. package/components/space/demo/index.vue +25 -0
  79. package/components/space/demo/info.md +11 -0
  80. package/components/space/demo/size.md +35 -0
  81. package/components/space/demo/vertical.md +19 -0
  82. package/components/space/index.js +2 -0
  83. package/components/space/index.md +6 -0
  84. package/components/space/space.jsx +57 -0
  85. package/components/space/styles/index.less +23 -0
  86. package/components/spin/demo/container.md +1 -2
  87. package/components/spin/demo/mode.md +1 -2
  88. package/components/spin/styles/index.less +1 -1
  89. package/components/styles/dark.less +70 -0
  90. package/components/styles/global-dark.less +36 -0
  91. package/components/styles/global.less +22 -12
  92. package/components/styles/index.less +8 -10
  93. package/components/switch/styles/index.less +4 -3
  94. package/components/table/demo/base-render.md +1 -1
  95. package/components/table/demo/base.md +5 -2
  96. package/components/table/styles/index.less +11 -7
  97. package/components/table/table.jsx +10 -7
  98. package/components/tabs/demo/sample.md +1 -1
  99. package/components/tabs/styles/index.less +7 -10
  100. package/components/tag/styles/index.less +40 -39
  101. package/components/timeline/styles/index.less +3 -2
  102. package/components/tooltip/styles/index.less +22 -3
  103. package/components/tree/styles/index.less +8 -8
  104. package/dist/k-ui-dark.css +1 -0
  105. package/dist/k-ui.css +1 -7
  106. package/dist/k-ui.js +2 -2
  107. package/package.json +11 -9
  108. package/components/slider/demo/slider.js +0 -5
  109. package/components/slider/slider.vue +0 -21
  110. package/components/slider/sliderButton.vue +0 -76
  111. package/components/styles.js +0 -43
@@ -24,7 +24,7 @@
24
24
  .k-image-error {
25
25
  font-size: 50px;
26
26
  opacity: .3;
27
- color: @border-color;
27
+ color: @disable-color;
28
28
  position: absolute;
29
29
  left: 50%;
30
30
  top: 50%;
@@ -82,7 +82,7 @@
82
82
  }
83
83
  .k-image-preview-action {
84
84
  margin: 12px;
85
- color: @border-color;
85
+ color: #999;
86
86
  font-size: 28px;
87
87
  cursor: pointer;
88
88
  list-style: none;
@@ -93,7 +93,8 @@
93
93
  justify-content: center;
94
94
  border-radius: 50%;
95
95
  &:hover {
96
- background-color: fade(@mask-color, 30%);
96
+ background-color: @back-color;
97
+ color:#666;
97
98
  }
98
99
  }
99
100
  .k-image-preview-action-divider {
@@ -122,7 +123,7 @@
122
123
  position: absolute;
123
124
  width: 44px;
124
125
  height: 44px;
125
- color: @border-color;
126
+ color: #999;
126
127
  font-size: 25px;
127
128
  border-radius: 50%;
128
129
  background-color: fade(@mask-color, 50%);
@@ -135,6 +136,7 @@
135
136
  cursor: pointer;
136
137
  &:hover {
137
138
  background-color: @main;
139
+ color:#fff;
138
140
  }
139
141
  }
140
142
  .k-image-preview-switch-left {
@@ -187,7 +189,7 @@
187
189
  top: 50%;
188
190
  left: 50%;
189
191
  transform: translateX(-50%) translateY(-50%);
190
- color: fade(@border-color, 50%);
192
+ color: @disable-color;
191
193
  // filter: blur(1px);
192
194
  font-size: 50px;
193
195
  text-align: center;
@@ -1,5 +1,6 @@
1
1
  import Alert from './alert'
2
2
  import Affix from './affix'
3
+ import Avatar from './avatar'
3
4
  import { Breadcrumb, BreadcrumbItem } from './breadcrumb'
4
5
  import Button from './button'
5
6
  import Badge from './badge'
@@ -31,6 +32,8 @@ import Progress from './progress'
31
32
  import { Radio, RadioGroup, RadioButton } from './radio'
32
33
  import Rate from './rate'
33
34
  import Spin from './spin'
35
+ import Space from './space'
36
+ import Slider from './slider'
34
37
  import Switch from './switch'
35
38
  import { Select, Option } from './select'
36
39
  import Table from './table'
@@ -43,11 +46,12 @@ import { Row, Col } from './grid'
43
46
 
44
47
  import { version } from '../package.json'
45
48
 
46
- import './styles';
49
+ // import './styles/index.less';
47
50
 
48
51
  const components = {
49
52
  Affix,
50
53
  Alert,
54
+ Avatar,
51
55
  BackTop,
52
56
  Badge,
53
57
  Breadcrumb, BreadcrumbItem,
@@ -79,7 +83,9 @@ const components = {
79
83
  Progress,
80
84
  Radio, RadioGroup, RadioButton,
81
85
  Rate,
86
+ Space,
82
87
  Spin,
88
+ Slider,
83
89
  Select, Option,
84
90
  Table,
85
91
  Tabs, TabPane,
@@ -4,6 +4,7 @@
4
4
  display: inline-block;
5
5
  width: 100%;
6
6
  max-width: 100%;
7
+ color: @color;
7
8
  .k-input-icon {
8
9
  position: absolute;
9
10
  top: 0;
@@ -31,7 +32,7 @@
31
32
  border: 1px solid @border-color;
32
33
  border-radius: @radius;
33
34
  color: @color;
34
- background-color: #fff;
35
+ background-color: transparent;
35
36
  background-image: none;
36
37
  position: relative;
37
38
  cursor: text;
@@ -40,23 +40,22 @@
40
40
  <style scoped>
41
41
  .demo-k-layout {
42
42
  text-align: center;
43
- color: #fff
44
43
  }
45
44
  .demo-k-layout >.k-layout {
46
45
  margin-bottom: 20px;
47
46
  color: #fff
48
47
  }
49
48
  .demo-k-layout .k-layout-footer,.demo-k-layout .k-layout-header {
50
- background-color: #9dcaff;
49
+ background-color: fadeout(#3a95ff,50%);
51
50
  }
52
51
  .demo-k-layout .k-layout-content {
53
52
  min-height: 120px;
54
53
  line-height: 120px;
55
- background-color: #89bfff;
54
+ background-color: fadeout(#3a95ff,30%);
56
55
  }
57
56
  .demo-k-layout .k-layout-sider {
58
57
  line-height: 120px;
59
- background-color: #75b5ff;
58
+ background-color: fadeout(#3a95ff,20%);
60
59
  width:200px;
61
60
  }
62
61
  </style>
@@ -6,7 +6,7 @@
6
6
  ```vue
7
7
  <template>
8
8
  <div class="k-demo-layout">
9
- <Layout>
9
+ <Layout class="layout-back">
10
10
  <Header>
11
11
  <div class="logo" />
12
12
  <Menu mode="horizontal" theme="dark" :value="['t1']" class="demo-top-menu">
@@ -16,7 +16,7 @@
16
16
  </Menu>
17
17
  </Header>
18
18
  <Layout>
19
- <Sider>
19
+ <Sider class="demo-back">
20
20
  <Menu :value="['0-1']" class="demo-left-menu" mode="inline" :openKeys="['al0']">
21
21
  <SubMenu key="al0">
22
22
  <template slot="title">
@@ -53,7 +53,7 @@
53
53
  <BreadcrumbItem>List</BreadcrumbItem>
54
54
  <BreadcrumbItem>App</BreadcrumbItem>
55
55
  </Breadcrumb>
56
- <Content>
56
+ <Content class="demo-back">
57
57
  Content
58
58
  </Content>
59
59
  </Layout>
@@ -86,7 +86,7 @@
86
86
  padding:16px 0;
87
87
  }
88
88
  .k-demo-layout .k-demo-main .k-layout-content{
89
- background-color:#fff;
89
+ /* background-color:#fff; */
90
90
  padding:24px;
91
91
  min-height:300px;
92
92
  }
@@ -6,7 +6,7 @@
6
6
  ```vue
7
7
  <template>
8
8
  <div class="k-demo-layout">
9
- <Layout>
9
+ <Layout class="layout-back">
10
10
  <Header>
11
11
  <div class="logo" />
12
12
  <Menu mode="horizontal" theme="dark" v-model="top" class="demo-top-menu">
@@ -15,14 +15,14 @@
15
15
  <MenuItem key="t3" icon="heart">nav3</MenuItem>
16
16
  </Menu>
17
17
  </Header>
18
- <Content class="k-demo-main">
18
+ <Content class="k-demo-main" class="demo-back">
19
19
  <Breadcrumb class="nav">
20
20
  <BreadcrumbItem>Home</BreadcrumbItem>
21
21
  <BreadcrumbItem>List</BreadcrumbItem>
22
22
  <BreadcrumbItem>App</BreadcrumbItem>
23
23
  </Breadcrumb>
24
- <Layout style="padding:24px 0;background:#fff;">
25
- <Sider>
24
+ <Layout style="padding:24px 0;" class="demo-back">
25
+ <Sider style="background:transparent;">
26
26
  <Menu v-model="left" class="demo-left-menu" mode="inline">
27
27
  <SubMenu key="l0">
28
28
  <template slot="title">
@@ -56,7 +56,7 @@
56
56
  <Content>Conent</Content>
57
57
  </Layout>
58
58
  </Content>
59
- <Footer>KUI ©2018 Created by chuchur</Footer>
59
+ <Footer style="background:transparent;">KUI ©2018 Created by chuchur</Footer>
60
60
  </Layout>
61
61
  </div>
62
62
  </template>
@@ -84,7 +84,6 @@
84
84
  padding:16px 0;
85
85
  }
86
86
  .k-demo-layout .k-demo-main .k-layout-content{
87
- background-color:#fff;
88
87
  padding:24px;
89
88
  min-height:300px;
90
89
  }
@@ -7,7 +7,7 @@
7
7
  ```vue
8
8
  <template>
9
9
  <div class="k-demo-layout">
10
- <Layout>
10
+ <Layout class="layout-back">
11
11
  <Header>
12
12
  <div class="logo" />
13
13
  <Menu mode="horizontal" theme="dark" v-model="top" class="demo-top-menu">
@@ -22,9 +22,9 @@
22
22
  <BreadcrumbItem>List</BreadcrumbItem>
23
23
  <BreadcrumbItem>App</BreadcrumbItem>
24
24
  </Breadcrumb>
25
- <Content>Conent</Content>
25
+ <Content class="demo-back">Conent</Content>
26
26
  </Content>
27
- <Footer>KUI ©2018 Created by chuchur</Footer>
27
+ <Footer style="background:transparent;">KUI ©2018 Created by chuchur</Footer>
28
28
  </Layout>
29
29
  </div>
30
30
  </template>
@@ -52,7 +52,6 @@
52
52
  padding:16px 0;
53
53
  }
54
54
  .k-demo-layout .k-demo-main .k-layout-content{
55
- background-color:#fff;
56
55
  padding:24px;
57
56
  min-height:300px;
58
57
  }
@@ -6,7 +6,7 @@
6
6
  ```vue
7
7
  <template>
8
8
  <div class="k-demo-layout">
9
- <Layout>
9
+ <Layout class="layout-back">
10
10
  <Sider class="demo-sider">
11
11
  <div class="logo" />
12
12
  <Menu mode="inline" theme="dark" v-model="top" class="demo-top-menu">
@@ -26,7 +26,7 @@
26
26
  <BreadcrumbItem>List</BreadcrumbItem>
27
27
  <BreadcrumbItem>App</BreadcrumbItem>
28
28
  </Breadcrumb>
29
- <div style="padding:300px 0;text-align:center;color:#ddd;background:#fff;margin:20px;">我是打酱油的</div>
29
+ <div style="padding:300px 0;text-align:center;color:#ddd;margin:20px;" class="demo-back">我是打酱油的</div>
30
30
  <Footer>KUI ©2018 Created by chuchur</Footer>
31
31
  </Content>
32
32
  </Layout>
@@ -38,15 +38,15 @@
38
38
  overflow:hidden;
39
39
  }
40
40
  .k-demo-layout .demo-sider{
41
- background:#22303f;
42
41
  overflow: auto;
43
42
  height: 360px; /*这里是例子,实际中请适当修改*/
44
43
  left: 0;
45
44
  width:200px;
45
+ background:#22303f;
46
46
  }
47
47
  .k-demo-layout .logo{
48
48
  height: 32px;
49
- background: rgba(255, 255, 255, 0.2);
49
+ background:rgb(132 139 156 / 50%);
50
50
  margin: 16px;
51
51
  }
52
52
  .k-demo-layout .k-demo-main{
@@ -7,10 +7,10 @@
7
7
  ```vue
8
8
  <template>
9
9
  <div class="k-demo-layout">
10
- <Layout>
11
- <Sider class="demo-sider" :style="{width:collapsed?'80px':'200px'}">
10
+ <Layout class="layout-back">
11
+ <Sider class="demo-sider demo-back" :style="{width:collapsed?'80px':'200px'}">
12
12
  <div class="logo" />
13
- <Menu mode="inline" theme="dark" v-model="left" :open-keys="open" class="demo-top-menu" :inline-collapsed="collapsed">
13
+ <Menu mode="inline" v-model="left" :open-keys="open" :inline-collapsed="collapsed" style="border:none;">
14
14
  <MenuItem key="1-1" icon="home"><span>option1</span></MenuItem>
15
15
  <MenuItem key="1-2" icon="logo-buffer"><span>option2</span></MenuItem>
16
16
  <MenuItem key="1-3" icon="heart"><span>option3</span></MenuItem>
@@ -25,7 +25,7 @@
25
25
  <MenuItem key="0-4">option4</MenuItem>
26
26
  </SubMenu>
27
27
  </Menu>
28
- <div class="toggle-menu" @click="toggle"><Icon :type="!collapsed?'chevron-back':'chevron-forward'" /></div>
28
+ <div class="toggle-menu demo-back" @click="toggle"><Icon :type="!collapsed?'chevron-back':'chevron-forward'" /></div>
29
29
  </Sider>
30
30
  <Content class="k-demo-main">
31
31
  <Menu mode="horizontal" theme="dark" v-model="top" class="demo-top-menu">
@@ -38,7 +38,7 @@
38
38
  <BreadcrumbItem>List</BreadcrumbItem>
39
39
  <BreadcrumbItem>App</BreadcrumbItem>
40
40
  </Breadcrumb>
41
- <div style="padding:200px 0;text-align:center;color:#ddd;background:#fff;margin:20px;">我是打酱油的</div>
41
+ <div style="padding:200px 0;text-align:center;color:#ddd;margin:20px;" class="demo-back">我是打酱油的</div>
42
42
  <Footer>KUI ©2018 Created by chuchur</Footer>
43
43
  </Content>
44
44
  </Layout>
@@ -55,12 +55,12 @@
55
55
  text-align:center;
56
56
  padding:10px 0;
57
57
  color:#fff;
58
- background:#4e5965;
58
+ /* background:#4e5965; */
59
59
  width:100%;
60
60
  cursor:pointer;
61
61
  }
62
62
  .k-demo-layout .demo-sider{
63
- background:#22303f;
63
+ /* background:#22303f; */
64
64
  left: 0;
65
65
  position:relative;
66
66
  }
@@ -73,7 +73,7 @@
73
73
  }
74
74
  .k-demo-layout .logo{
75
75
  height: 32px;
76
- background: rgba(255, 255, 255, 0.2);
76
+ background: rgb(132 139 156 / 50%);
77
77
  margin: 16px;
78
78
  }
79
79
  .k-demo-layout .k-demo-main{
@@ -7,7 +7,7 @@
7
7
  ```vue
8
8
  <template>
9
9
  <div class="k-demo-layout">
10
- <Layout>
10
+ <Layout class="layout-back">
11
11
  <Sider class="demo-sider" :style="{width:'200px'}">
12
12
  <div class="logo" />
13
13
  <Menu v-model="left" mode="vertical" vertical-affixed theme="dark">
@@ -78,7 +78,7 @@
78
78
  <BreadcrumbItem>List</BreadcrumbItem>
79
79
  <BreadcrumbItem>App</BreadcrumbItem>
80
80
  </Breadcrumb>
81
- <div style="padding:200px 0;text-align:center;color:#ddd;background:#fff;margin:20px;">我是打酱油的</div>
81
+ <div style="padding:200px 0;text-align:center;color:#ddd;margin:20px;" class="demo-back">我是打酱油的</div>
82
82
  <Footer>KUI ©2018 Created by chuchur</Footer>
83
83
  </Content>
84
84
  </Layout>
@@ -1,5 +1,4 @@
1
1
  .k-layout {
2
- background: #f0f2f5;
3
2
  box-sizing: border-box;
4
3
  display: flex;
5
4
  flex-direction: column;
@@ -30,10 +29,10 @@
30
29
  position: relative;
31
30
  min-width: 0;
32
31
  transition: all 0.2s;
33
- background: #646d82;
32
+ // background: #646d82;
34
33
  }
35
34
  .k-layout-footer {
36
- background: #f0f2f5;
35
+ // background: @hover-color;
37
36
  padding: 24px 50px;
38
37
  font-size: 14px;
39
38
  }
@@ -6,7 +6,7 @@
6
6
  top: 0;
7
7
  bottom: 0;
8
8
  right: 0;
9
- background: rgba(255, 255, 255, 0.6);
9
+ background: @border-color;
10
10
  height: 2px;
11
11
  .k-loading-line {
12
12
  height: 100%;
@@ -6,18 +6,19 @@
6
6
  font-size: 14px;
7
7
  position: relative;
8
8
  zoom: 1;
9
- background: #fff;
9
+ background: @back-color;
10
10
  list-style: none;
11
11
  padding: @radius 0;
12
12
  border-radius: @radius;
13
- min-width: 150px;
13
+ min-width: 100px;
14
14
  box-shadow: 0 1px 6px rgba(0, 0, 0, .2);
15
+ color: @color;
15
16
  .k-menu-item-divider {
16
17
  height: 1px;
17
18
  margin: 4px 0;
18
19
  overflow: hidden;
19
20
  line-height: 0;
20
- background-color: #e8e8e8;
21
+ background-color: @border-color;
21
22
  }
22
23
  .k-dropdown-menu-item, .k-dropdown-menu-submenu {
23
24
  line-height: 22px;
@@ -34,7 +35,7 @@
34
35
  padding: 5px 12px 5px 24px;
35
36
  }
36
37
  &.k-dropdown-menu-item-active {
37
- background-color: tint(@main, 90%);
38
+ background-color: @hover-color;
38
39
  }
39
40
  .k-dropdown-menu-item-icon {
40
41
  position: absolute;
@@ -45,14 +46,14 @@
45
46
  }
46
47
  }
47
48
  .k-dropdown-menu-submenu-active {
48
- background-color: tint(@main, 90%);
49
+ background-color: @hover-color;
49
50
  }
50
51
  .k-dropdown-menu-item-divider {
51
52
  height: 1px;
52
53
  margin: 2px 0;
53
54
  overflow: hidden;
54
55
  line-height: 0;
55
- background-color: #e8e8e8;
56
+ background-color: @border-color;
56
57
  }
57
58
  .k-dropdown-menu-item-disabled, .k-dropdown-menu-submenu-disabled {
58
59
  color: @disable-color;
@@ -8,9 +8,10 @@
8
8
  font-size: 14px;
9
9
  position: relative;
10
10
  zoom: 1;
11
- background: #fff;
11
+ // background: @back-color;
12
12
  list-style: none;
13
- transition: background .3s cubic-bezier(.645, .045, .355, 1), width .3s cubic-bezier(.645, .045, .355, 1);
13
+ color: @color;
14
+ transition: background-color .3s cubic-bezier(.645, .045, .355, 1), width .3s cubic-bezier(.645, .045, .355, 1);
14
15
  ol, ul, li {
15
16
  list-style: none !important;
16
17
  margin: 0;
@@ -24,7 +25,7 @@
24
25
  margin: 4px 0;
25
26
  overflow: hidden;
26
27
  line-height: 0;
27
- background-color: #e8e8e8;
28
+ background-color: @border-color;
28
29
  }
29
30
  .k-menu-item-icon, .k-menu-submenu-inner .k-icon {
30
31
  margin-right: 8px;
@@ -303,6 +304,7 @@
303
304
  }
304
305
  .k-menu-item-active, .k-menu-item-selected {
305
306
  color: @main;
307
+ background-color: @hover-color;
306
308
  a {
307
309
  color: @main;
308
310
  }
@@ -315,19 +317,20 @@
315
317
  &.k-menu-horizontal {
316
318
  >.k-menu-item-selected, >.k-menu-submenu-selected, >.k-menu-item-active, >.k-menu-submenu-active {
317
319
  border-bottom-color: @main;
320
+ background-color: transparent;
318
321
  }
319
322
  .k-menu-submenu {
320
323
  .k-menu-item-selected {
321
- background-color: tint(@main, 90%);
324
+ background-color: @selected-color;
322
325
  }
323
326
  }
324
327
  }
325
328
  &.k-menu-inline {
326
329
  .k-menu-submenu-popup .k-menu {
327
- background-color: #f8f8f8;
330
+ background-color: fadeout(@border-color, 80%);
328
331
  }
329
332
  .k-menu-item-selected {
330
- background-color: tint(@main, 90%);
333
+ background-color: @selected-color;
331
334
  &::after {
332
335
  top: 0;
333
336
  height: 100%;
@@ -337,7 +340,7 @@
337
340
  &.k-menu-vertical {
338
341
  border-right: 1px solid @border-color;
339
342
  .k-menu-item-selected {
340
- background-color: tint(@main, 90%);
343
+ background-color: @selected-color;
341
344
  }
342
345
  .k-menu-submenu-affix-item-active {
343
346
  .k-menu-submenu-affix-item-text {
@@ -358,7 +361,7 @@
358
361
  }
359
362
  }
360
363
  &-dark {
361
- background-color: @dark-back;
364
+ background-color: @dark-back !important;
362
365
  color: @color-light;
363
366
  .k-menu-item-group-title {
364
367
  font-size: 12px;
@@ -387,7 +390,7 @@
387
390
  }
388
391
  }
389
392
  .k-menu-inline {
390
- background-color: #161f29;
393
+ background-color: #161f29 !important;
391
394
  }
392
395
  &.k-menu-vertical {
393
396
  border-right: 0;
@@ -491,6 +494,7 @@
491
494
  margin: 0;
492
495
  box-shadow: 0 1px 6px rgba(0, 0, 0, .2);
493
496
  border-radius: @radius;
497
+ background-color: @back-color;
494
498
  >.k-menu-item {
495
499
  line-height: 40px;
496
500
  &:first-child {
@@ -25,7 +25,7 @@
25
25
  padding: 10px 16px;
26
26
  border-radius: @radius;
27
27
  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
28
- background: #fff;
28
+ background: @back-color;
29
29
  display: inline-block;
30
30
  pointer-events: all;
31
31
  align-items: center;
@@ -66,25 +66,27 @@ export default {
66
66
  this.resetBodyStyle(visible)
67
67
  },
68
68
  resetBodyStyle(opened) {
69
+ let target = document.body;
69
70
  if (!this.show && !cacheBodyOverflow.hasOwnProperty('overflow')) {
70
71
  cacheBodyOverflow = {
71
- width: document.body.width,
72
- overflow: document.body.overflow,
73
- overflowX: document.body.overflowX,
74
- overflowY: document.body.overflowY,
72
+ width: target.width,
73
+ overflow: target.overflow,
74
+ overflowX: target.overflowX,
75
+ overflowY: target.overflowY,
75
76
  }
76
77
  }
77
78
  if (opened) {
78
79
  let barWidth = measureScrollBar(true)
79
- if (barWidth) {
80
- document.body.style.width = `calc(100% - ${barWidth}px)`
81
- document.body.style.overflow = `hidden`
80
+ let hasBar = target.scrollHeight > target.clientHeight || target.offsetHeight > target.clientHeight
81
+ if (barWidth && hasBar) {
82
+ target.style.width = `calc(100% - ${barWidth}px)`
83
+ target.style.overflow = `hidden`
82
84
  }
83
85
  } else {
84
86
  setTimeout(() => {
85
87
  let task = (this.tasks && this.tasks.length == 0) || !this.tasks
86
88
  task && Object.keys(cacheBodyOverflow).forEach(key => {
87
- document.body.style[key] = cacheBodyOverflow[key] || ''
89
+ target.style[key] = cacheBodyOverflow[key] || ''
88
90
  delete cacheBodyOverflow[key]
89
91
  })
90
92
  }, 300)
@@ -1,5 +1,6 @@
1
1
  @import '../../styles/global.less';
2
2
  .k-modal {
3
+ color: @color;
3
4
  .k-modal-wrap {
4
5
  position: fixed;
5
6
  top: 0;
@@ -24,7 +25,7 @@
24
25
  }
25
26
  .k-modal-inner {
26
27
  position: relative;
27
- background-color: #fff;
28
+ background-color: @back-color;
28
29
  z-index: 1001;
29
30
  outline: 0;
30
31
  border-radius: @radius;
@@ -32,7 +33,7 @@
32
33
  overflow: hidden;
33
34
  margin: 0 auto;
34
35
  box-shadow: 0 0 10px 3px rgba(55, 55, 55, .2);
35
- width: 520px; // animation: fadeIn .5s ease-in-out;
36
+ width: 520px; // animation: darken .5s ease-in-out;
36
37
  }
37
38
  .k-modal-content {
38
39
  position: relative;
@@ -62,7 +63,7 @@
62
63
  }
63
64
  }
64
65
  .k-modal-header {
65
- border-bottom: 1px solid #e9eaec;
66
+ border-bottom: 1px solid @border-color;
66
67
  padding: 14px 16px;
67
68
  line-height: 1;
68
69
  font-size: 14px;
@@ -84,7 +85,7 @@
84
85
  box-sizing: border-box;
85
86
  }
86
87
  .k-modal-footer {
87
- border-top: 1px solid #e9eaec;
88
+ border-top: 1px solid @border-color;
88
89
  padding: 6px 16px;
89
90
  text-align: right;
90
91
  display: inline-block;
@@ -145,7 +146,7 @@
145
146
  width: 100%;
146
147
  bottom: 0;
147
148
  left: 0;
148
- background: #fff;
149
+ background: @back-color;
149
150
  }
150
151
  }
151
152
  }
@@ -153,7 +154,7 @@
153
154
  .k-toast {
154
155
  .k-modal-inner {
155
156
  width: 416px;
156
- background: #fff;
157
+ background: @back-color;
157
158
  border-radius: @radius;
158
159
  padding: 16px;
159
160
  overflow: hidden;
@@ -23,7 +23,7 @@
23
23
  border-radius: @radius;
24
24
  -webkit-box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
25
25
  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
26
- background: #fff;
26
+ background: @back-color;
27
27
  line-height: 1.5;
28
28
  position: relative;
29
29
  margin-bottom: 16px;
@@ -9,7 +9,7 @@
9
9
  display: inline-block;
10
10
  vertical-align: middle;
11
11
  .k-pager-item {
12
- background: #fff;
12
+ background: transparent;
13
13
  color: @color;
14
14
  min-width: 30px;
15
15
  height: 30px;
@@ -11,8 +11,9 @@
11
11
  line-height: 1.5;
12
12
  position: absolute;
13
13
  z-index: 1001;
14
+ color: @color;
14
15
  .k-popconfirm-inner {
15
- background: #fff;
16
+ background: @back-color;
16
17
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
17
18
  border-radius: @radius;
18
19
  }
@@ -44,7 +45,7 @@
44
45
  align-items: center;
45
46
  width: 19px;
46
47
  .k-popconfirm-arrow-content {
47
- background-color: #fff;
48
+ background-color: @back-color;
48
49
  transform: rotate(45deg);
49
50
  width: 12px;
50
51
  height: 12px;