kui-vue 3.2.6 → 3.2.8-rc2
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.
- package/components/_tool/directives.js +3 -1
- package/components/_tool/docClick.js +3 -1
- package/components/_tool/outsiteclick.js +2 -3
- package/components/_tool/resize.js +4 -4
- package/components/_tool/scroll.js +3 -4
- package/components/_tool/transfer.js +3 -1
- package/components/affix/affix.jsx +1 -1
- package/components/base/drop.jsx +3 -3
- package/components/bin/index.js +3 -0
- package/components/datePicker/datecalendar.jsx +143 -79
- package/components/datePicker/datepicker.jsx +6 -5
- package/components/datePicker/demo/base.md +2 -0
- package/components/datePicker/demo/index.vue +2 -0
- package/components/datePicker/demo/inside.md +76 -0
- package/components/datePicker/demo/size.md +3 -3
- package/components/datePicker/index.js +2 -1
- package/components/datePicker/index.md +1 -0
- package/components/datePicker/styles/calendar.less +149 -49
- package/components/datePicker/styles/datepicker.less +1 -1
- package/components/drawer/demo/base.md +2 -2
- package/components/drawer/demo/custom.md +1 -1
- package/components/drawer/demo/form.md +1 -1
- package/components/drawer/demo/target.md +14 -3
- package/components/drawer/drawer.jsx +6 -6
- package/components/drawer/index.md +1 -1
- package/components/drawer/styles/animal.less +2 -1
- package/components/drawer/styles/index.less +26 -10
- package/components/icon/demo/search.vue +2 -2
- package/components/image/preview.jsx +10 -8
- package/components/index.js +19 -15
- package/components/locale/lang/de.js +3 -2
- package/components/locale/lang/el.js +3 -2
- package/components/locale/lang/en.js +3 -2
- package/components/locale/lang/fr.js +3 -2
- package/components/locale/lang/it.js +3 -2
- package/components/locale/lang/ja.js +3 -2
- package/components/locale/lang/ko.js +3 -2
- package/components/locale/lang/ru.js +3 -2
- package/components/locale/lang/th.js +3 -2
- package/components/locale/lang/ua.js +3 -2
- package/components/locale/lang/vi.js +3 -2
- package/components/locale/lang/zh-CN.js +4 -3
- package/components/locale/lang/zh-TW.js +3 -2
- package/components/message/styles/index.less +4 -3
- package/components/modal/index.js +7 -5
- package/components/modal/modal.jsx +36 -32
- package/components/page/page.jsx +6 -0
- package/components/space/space.jsx +2 -2
- package/components/spin/demo/mode.md +2 -2
- package/components/table/extend.jsx +1 -1
- package/components/table/table.jsx +3 -3
- package/components/tabs/tabs.jsx +2 -2
- package/components/treeselect/treeselect.vue +36 -35
- package/components/upload/index.md +1 -1
- package/components/upload/styles/index.less +1 -1
- package/components/upload/upload.jsx +1 -1
- package/dist/k-ui.css +2 -2
- package/dist/k-ui.js +2 -2
- package/dist/locale/de.js +8 -0
- package/dist/locale/el.js +8 -0
- package/dist/locale/en.js +8 -0
- package/dist/locale/fr.js +8 -0
- package/dist/locale/it.js +8 -0
- package/dist/locale/ja.js +8 -0
- package/dist/locale/ko.js +8 -0
- package/dist/locale/ru.js +8 -0
- package/dist/locale/th.js +8 -0
- package/dist/locale/ua.js +8 -0
- package/dist/locale/vi.js +8 -0
- package/dist/locale/zhCN.js +8 -0
- package/dist/locale/zhTW.js +8 -0
- package/package.json +1 -1
- package/readme.md +1 -1
|
@@ -203,10 +203,10 @@ export default {
|
|
|
203
203
|
let target = document.body
|
|
204
204
|
if (!this.show && !cacheBodyOverflow.hasOwnProperty('overflow')) {
|
|
205
205
|
cacheBodyOverflow = {
|
|
206
|
-
width: target.width,
|
|
207
|
-
overflow: target.overflow,
|
|
208
|
-
overflowX: target.overflowX,
|
|
209
|
-
overflowY: target.overflowY,
|
|
206
|
+
width: target.style.width,
|
|
207
|
+
overflow: target.style.overflow,
|
|
208
|
+
overflowX: target.style.overflowX,
|
|
209
|
+
overflowY: target.style.overflowY,
|
|
210
210
|
}
|
|
211
211
|
}
|
|
212
212
|
if (opened) {
|
|
@@ -243,10 +243,12 @@ export default {
|
|
|
243
243
|
}
|
|
244
244
|
},
|
|
245
245
|
mounted() {
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
246
|
+
if (!this.$isServer) {
|
|
247
|
+
let touch = !!(('ontouchstart' in window) || window.DocumentTouch && document instanceof window.DocumentTouch)
|
|
248
|
+
this.touch = touch
|
|
249
|
+
let even = touch ? 'touchstart' : 'mousedown'
|
|
250
|
+
document.addEventListener(even, this.mousedown, { passive: false })
|
|
251
|
+
}
|
|
250
252
|
},
|
|
251
253
|
render(h) {
|
|
252
254
|
const { scale, rotate, visible, src, left, top, transfer, showSwitch, data, loading, panelRight, type } = this
|
package/components/index.js
CHANGED
|
@@ -10,7 +10,7 @@ import Card from './card'
|
|
|
10
10
|
import { Carousel, CarouselItem } from './carousel'
|
|
11
11
|
import { Collapse, Panel } from './collapse'
|
|
12
12
|
import { Checkbox, CheckboxGroup } from './checkbox'
|
|
13
|
-
import DatePicker from './datePicker'
|
|
13
|
+
import { DatePicker, DateCalendar } from './datePicker'
|
|
14
14
|
import Drawer from './drawer'
|
|
15
15
|
import Dropdown from './dropdown'
|
|
16
16
|
import Divider from './divider'
|
|
@@ -47,7 +47,7 @@ import Upload from './upload'
|
|
|
47
47
|
|
|
48
48
|
import { version } from '../package.json'
|
|
49
49
|
|
|
50
|
-
import './styles/index.less';
|
|
50
|
+
// import './styles/index.less';
|
|
51
51
|
|
|
52
52
|
import locale from './locale'
|
|
53
53
|
|
|
@@ -65,7 +65,7 @@ const components = {
|
|
|
65
65
|
Collapse, Panel,
|
|
66
66
|
ColorPicker,
|
|
67
67
|
Col, Row,
|
|
68
|
-
DatePicker,
|
|
68
|
+
DatePicker, DateCalendar,
|
|
69
69
|
Dropdown,
|
|
70
70
|
Drawer,
|
|
71
71
|
Divider,
|
|
@@ -116,23 +116,27 @@ const UI = {
|
|
|
116
116
|
kCol: Col,
|
|
117
117
|
kMenu: Menu,
|
|
118
118
|
Version: version,
|
|
119
|
-
install: function (Vue, opts = {}) {
|
|
120
|
-
locale.use(opts.locale);
|
|
121
|
-
locale.i18n(opts.i18n);
|
|
122
119
|
|
|
123
|
-
for (let key in UI) {
|
|
124
|
-
Vue.component(key, UI[key]);
|
|
125
|
-
}
|
|
126
|
-
Vue.prototype.$Message = Message;
|
|
127
|
-
Vue.prototype.$Notice = Notice;
|
|
128
|
-
Vue.prototype.$Modal = Modal;
|
|
129
|
-
Vue.prototype.$Loading = Loading;
|
|
130
|
-
Vue.prototype.$Image = Image;
|
|
131
|
-
},
|
|
132
120
|
locale: locale.use,
|
|
133
121
|
i18n: locale.i18n,
|
|
134
122
|
lang: {}
|
|
135
123
|
}
|
|
124
|
+
const install = function (Vue, opts = {}) {
|
|
125
|
+
locale.use(opts.locale);
|
|
126
|
+
locale.i18n(opts.i18n);
|
|
127
|
+
|
|
128
|
+
for (let key in UI) {
|
|
129
|
+
Vue.component(key, UI[key]);
|
|
130
|
+
}
|
|
131
|
+
Vue.prototype.$Message = Message;
|
|
132
|
+
Vue.prototype.$Notice = Notice;
|
|
133
|
+
Vue.prototype.$Modal = Modal;
|
|
134
|
+
Vue.prototype.$Loading = Loading;
|
|
135
|
+
Vue.prototype.$Image = Image;
|
|
136
|
+
}
|
|
137
|
+
|
|
138
|
+
UI.install = install
|
|
139
|
+
|
|
136
140
|
// auto install
|
|
137
141
|
if (typeof window !== 'undefined' && window.Vue) {
|
|
138
142
|
UI.install(window.Vue);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Startdatum',
|
|
@@ -13,7 +13,8 @@ export default {
|
|
|
13
13
|
now: 'aktuelle Zeit',
|
|
14
14
|
ok: 'Okay',
|
|
15
15
|
selectDate: 'bitte wählen',
|
|
16
|
-
selectTime: 'bitte wählen'
|
|
16
|
+
selectTime: 'bitte wählen',
|
|
17
|
+
back: 'zurück'
|
|
17
18
|
},
|
|
18
19
|
drawer: {
|
|
19
20
|
ok: 'Okay',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Ημερομηνία Έναρξης',
|
|
@@ -30,7 +30,8 @@ export default {
|
|
|
30
30
|
now: 'Τώρα',
|
|
31
31
|
ok: 'Εντάξει',
|
|
32
32
|
selectDate: 'Επιλέξτε ημέρα',
|
|
33
|
-
selectTime: 'Επιλέξτε ώρα'
|
|
33
|
+
selectTime: 'Επιλέξτε ώρα',
|
|
34
|
+
back: 'πίσω'
|
|
34
35
|
},
|
|
35
36
|
drawer: {
|
|
36
37
|
ok: 'Εντάξει',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Start date',
|
|
@@ -13,7 +13,8 @@ export default {
|
|
|
13
13
|
now: 'Now',
|
|
14
14
|
ok: 'Ok',
|
|
15
15
|
selectDate: 'Select date',
|
|
16
|
-
selectTime: 'Select time'
|
|
16
|
+
selectTime: 'Select time',
|
|
17
|
+
back: 'Back'
|
|
17
18
|
},
|
|
18
19
|
drawer: {
|
|
19
20
|
ok: 'Ok',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Horaire début',
|
|
@@ -30,7 +30,8 @@ export default {
|
|
|
30
30
|
now: 'Maintenant',
|
|
31
31
|
ok: 'OK',
|
|
32
32
|
selectDate: 'Choisir date',
|
|
33
|
-
selectTime: 'Choisir horaire'
|
|
33
|
+
selectTime: 'Choisir horaire',
|
|
34
|
+
back:'Derrière'
|
|
34
35
|
},
|
|
35
36
|
drawer: {
|
|
36
37
|
ok: 'OK',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Data inizio',
|
|
@@ -30,7 +30,8 @@ export default {
|
|
|
30
30
|
now: 'Ora',
|
|
31
31
|
ok: 'OK',
|
|
32
32
|
selectDate: 'Seleziona data',
|
|
33
|
-
selectTime: 'Seleziona ora'
|
|
33
|
+
selectTime: 'Seleziona ora',
|
|
34
|
+
back:'indietro'
|
|
34
35
|
},
|
|
35
36
|
drawer: {
|
|
36
37
|
ok: 'OK',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: '開始日',
|
|
@@ -30,7 +30,8 @@ export default {
|
|
|
30
30
|
now: '現在',
|
|
31
31
|
ok: 'OK',
|
|
32
32
|
selectDate: '日付を選択',
|
|
33
|
-
selectTime: '時間を選択'
|
|
33
|
+
selectTime: '時間を選択',
|
|
34
|
+
back:'返回'
|
|
34
35
|
},
|
|
35
36
|
drawer: {
|
|
36
37
|
ok: 'OK',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: '시작 날짜',
|
|
@@ -30,7 +30,8 @@ export default {
|
|
|
30
30
|
now: '지금',
|
|
31
31
|
ok: '확인',
|
|
32
32
|
selectDate: '날짜 선택',
|
|
33
|
-
selectTime: '시간 선택'
|
|
33
|
+
selectTime: '시간 선택',
|
|
34
|
+
back:'되돌아오다'
|
|
34
35
|
},
|
|
35
36
|
drawer: {
|
|
36
37
|
ok: '확인',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Выбрать дату',
|
|
@@ -13,7 +13,8 @@ export default {
|
|
|
13
13
|
now: 'Сейчас',
|
|
14
14
|
ok: 'OK',
|
|
15
15
|
selectDate: 'Выбрать дату',
|
|
16
|
-
selectTime: 'Выбрать время'
|
|
16
|
+
selectTime: 'Выбрать время',
|
|
17
|
+
back:'назад'
|
|
17
18
|
},
|
|
18
19
|
drawer: {
|
|
19
20
|
ok: 'OK',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'วันที่เริ่มต้น',
|
|
@@ -30,7 +30,8 @@ export default {
|
|
|
30
30
|
now: 'ตอนนี้',
|
|
31
31
|
ok: 'ตกลง',
|
|
32
32
|
selectDate: 'เลือกวันที่',
|
|
33
|
-
selectTime: 'เลือกเวลา'
|
|
33
|
+
selectTime: 'เลือกเวลา',
|
|
34
|
+
back: 'เบื้องหลัง'
|
|
34
35
|
},
|
|
35
36
|
drawer: {
|
|
36
37
|
ok: 'ตกลง',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Дата початку',
|
|
@@ -13,7 +13,8 @@ export default {
|
|
|
13
13
|
now: 'Зараз',
|
|
14
14
|
ok: 'Обрати',
|
|
15
15
|
selectDate: 'Вибрати дату',
|
|
16
|
-
selectTime: 'Вибрати час'
|
|
16
|
+
selectTime: 'Вибрати час',
|
|
17
|
+
back:'назад'
|
|
17
18
|
},
|
|
18
19
|
drawer: {
|
|
19
20
|
ok: 'Обрати',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: 'Ngày bắt đầu',
|
|
@@ -13,7 +13,8 @@ export default {
|
|
|
13
13
|
now: 'Hiện tại',
|
|
14
14
|
ok: 'Ok',
|
|
15
15
|
selectDate: 'Chọn ngày',
|
|
16
|
-
selectTime: 'Chọn giờ'
|
|
16
|
+
selectTime: 'Chọn giờ',
|
|
17
|
+
back:'Lùi'
|
|
17
18
|
},
|
|
18
19
|
drawer: {
|
|
19
20
|
ok: 'Ok',
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: '开始日期',
|
|
5
5
|
endDate: '结束日期',
|
|
6
6
|
placeholder: '请选择日期',
|
|
7
|
-
months: ['
|
|
7
|
+
months: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
|
|
8
8
|
weeks: ['一', '二', '三', '四', '五', '六', '日'],
|
|
9
9
|
year: '年',
|
|
10
10
|
month: '月',
|
|
@@ -13,7 +13,8 @@ export default {
|
|
|
13
13
|
now: '此刻',
|
|
14
14
|
ok: '确定',
|
|
15
15
|
selectDate: '选择日期',
|
|
16
|
-
selectTime: '选择时间'
|
|
16
|
+
selectTime: '选择时间',
|
|
17
|
+
back:'返回'
|
|
17
18
|
},
|
|
18
19
|
drawer: {
|
|
19
20
|
ok: '确定',
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
|
|
1
|
+
module.exports = {
|
|
2
2
|
k: {
|
|
3
3
|
datePicker: {
|
|
4
4
|
startDate: '開始日期',
|
|
@@ -13,7 +13,8 @@ export default {
|
|
|
13
13
|
now: '此刻',
|
|
14
14
|
ok: '確定',
|
|
15
15
|
selectDate: '選擇日期',
|
|
16
|
-
selectTime: '選擇時間'
|
|
16
|
+
selectTime: '選擇時間',
|
|
17
|
+
back:'返回'
|
|
17
18
|
},
|
|
18
19
|
drawer: {
|
|
19
20
|
ok: '確定',
|
|
@@ -21,17 +21,18 @@
|
|
|
21
21
|
}
|
|
22
22
|
.k-message-content {
|
|
23
23
|
box-sizing: content-box;
|
|
24
|
-
line-height: 1
|
|
24
|
+
line-height: 1;
|
|
25
25
|
padding: 10px 16px;
|
|
26
26
|
border-radius: var(--kui-border-radius);
|
|
27
27
|
box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
|
|
28
28
|
background: var(--kui-color-control-10);
|
|
29
|
-
display: inline-
|
|
29
|
+
display: inline-flex;
|
|
30
|
+
align-items: center;
|
|
30
31
|
pointer-events: all;
|
|
31
32
|
align-items: center;
|
|
32
33
|
.k-message-icon {
|
|
33
34
|
margin-right: 8px;
|
|
34
|
-
font-size:
|
|
35
|
+
font-size: 22px;
|
|
35
36
|
vertical-align: sub;
|
|
36
37
|
}
|
|
37
38
|
}
|
|
@@ -3,6 +3,8 @@ import Icon from '../icon'
|
|
|
3
3
|
import Vue from 'vue'
|
|
4
4
|
import Button from '../button'
|
|
5
5
|
import { t } from '../locale'
|
|
6
|
+
const SSR = Vue && Vue.prototype.$isServer
|
|
7
|
+
|
|
6
8
|
function isPromise(obj) {
|
|
7
9
|
return !!obj && (typeof obj === 'object' || typeof obj === 'function') && typeof obj.then === 'function';
|
|
8
10
|
}
|
|
@@ -11,7 +13,7 @@ let showPoint = {}
|
|
|
11
13
|
let mousedown = e => {
|
|
12
14
|
showPoint = { x: e.clientX, y: e.clientY }
|
|
13
15
|
}
|
|
14
|
-
if (typeof window !== undefined) {
|
|
16
|
+
if (!SSR && typeof window !== undefined) {
|
|
15
17
|
document.addEventListener('mousedown', mousedown)
|
|
16
18
|
}
|
|
17
19
|
|
|
@@ -45,7 +47,7 @@ let createInstance = (props = {}) => {
|
|
|
45
47
|
}, okText || t('k.modal.ok'))]
|
|
46
48
|
|
|
47
49
|
if (type == 'confirm') {
|
|
48
|
-
footerNode.unshift(h(Button, { on: { click: this.cancel } }, cancelText || t('k.modal.
|
|
50
|
+
footerNode.unshift(h(Button, { on: { click: this.cancel } }, cancelText || t('k.modal.cancel')))
|
|
49
51
|
}
|
|
50
52
|
let footer = h('div', { attrs: { class: 'k-toast-footer' } }, footerNode)
|
|
51
53
|
|
|
@@ -88,14 +90,14 @@ let createInstance = (props = {}) => {
|
|
|
88
90
|
setTimeout(() => {
|
|
89
91
|
modalList.splice(modalList.indexOf(instance), 1)
|
|
90
92
|
this.$destroy()
|
|
91
|
-
if (document.body.contains(this.$el))
|
|
93
|
+
if (!SSR && document.body.contains(this.$el))
|
|
92
94
|
document.body.removeChild(this.$el)
|
|
93
95
|
}, 300);
|
|
94
96
|
}
|
|
95
97
|
}
|
|
96
98
|
})
|
|
97
|
-
const component = instance.$mount()
|
|
98
|
-
document.body.appendChild(component.$el)
|
|
99
|
+
const component = instance.$mount();
|
|
100
|
+
!SSR && document.body.appendChild(component.$el);
|
|
99
101
|
let toast = component.$children[0]
|
|
100
102
|
toast.showPoint = showPoint
|
|
101
103
|
toast.tasks = modalList
|
|
@@ -66,30 +66,32 @@ export default {
|
|
|
66
66
|
this.resetBodyStyle(visible)
|
|
67
67
|
},
|
|
68
68
|
resetBodyStyle(opened) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
cacheBodyOverflow
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
69
|
+
if (!this.$isServer) {
|
|
70
|
+
let target = document.body;
|
|
71
|
+
if (!this.show && !cacheBodyOverflow.hasOwnProperty('overflow')) {
|
|
72
|
+
cacheBodyOverflow = {
|
|
73
|
+
width: target.style.width,
|
|
74
|
+
overflow: target.style.overflow,
|
|
75
|
+
overflowX: target.style.overflowX,
|
|
76
|
+
overflowY: target.style.overflowY,
|
|
77
|
+
}
|
|
76
78
|
}
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
79
|
+
if (opened) {
|
|
80
|
+
let barWidth = measureScrollBar(true)
|
|
81
|
+
let hasBar = target.scrollHeight > window.innerHeight || target.offsetHeight > window.innerHeight
|
|
82
|
+
if (barWidth && hasBar) {
|
|
83
|
+
target.style.width = `calc(100% - ${barWidth}px)`
|
|
84
|
+
target.style.overflow = `hidden`
|
|
85
|
+
}
|
|
86
|
+
} else {
|
|
87
|
+
setTimeout(() => {
|
|
88
|
+
let task = (this.tasks && this.tasks.length == 0) || !this.tasks
|
|
89
|
+
task && Object.keys(cacheBodyOverflow).forEach(key => {
|
|
90
|
+
target.style[key] = cacheBodyOverflow[key] || ''
|
|
91
|
+
delete cacheBodyOverflow[key]
|
|
92
|
+
})
|
|
93
|
+
}, 300)
|
|
84
94
|
}
|
|
85
|
-
} else {
|
|
86
|
-
setTimeout(() => {
|
|
87
|
-
let task = (this.tasks && this.tasks.length == 0) || !this.tasks
|
|
88
|
-
task && Object.keys(cacheBodyOverflow).forEach(key => {
|
|
89
|
-
target.style[key] = cacheBodyOverflow[key] || ''
|
|
90
|
-
delete cacheBodyOverflow[key]
|
|
91
|
-
})
|
|
92
|
-
}, 300)
|
|
93
95
|
}
|
|
94
96
|
},
|
|
95
97
|
setPos() {
|
|
@@ -150,21 +152,23 @@ export default {
|
|
|
150
152
|
}
|
|
151
153
|
},
|
|
152
154
|
beforeDestroy() {
|
|
153
|
-
document.removeEventListener('mousedown', this.mousedown)
|
|
155
|
+
!this.$isServer && document.removeEventListener('mousedown', this.mousedown);
|
|
154
156
|
this.resetBodyStyle(false)
|
|
155
157
|
},
|
|
156
158
|
|
|
157
159
|
mounted() {
|
|
158
|
-
|
|
160
|
+
if (!this.$isServer) {
|
|
161
|
+
document.addEventListener('mousedown', this.mousedown)
|
|
159
162
|
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
163
|
+
if (this.draggable) {
|
|
164
|
+
this.left = (document.body.offsetWidth - (this.width || 520)) / 2
|
|
165
|
+
}
|
|
166
|
+
// console.log(this.value)
|
|
167
|
+
if (this.value) {
|
|
168
|
+
this.$nextTick(() => {
|
|
169
|
+
this.updateProp(true)
|
|
170
|
+
})
|
|
171
|
+
}
|
|
168
172
|
}
|
|
169
173
|
},
|
|
170
174
|
render() {
|
package/components/page/page.jsx
CHANGED
|
@@ -47,8 +47,8 @@ export default {
|
|
|
47
47
|
return (
|
|
48
48
|
<div class={classes}>
|
|
49
49
|
{
|
|
50
|
-
childs.map((child) => {
|
|
51
|
-
return <div class="k-space-item" style={style}>{child}</div>
|
|
50
|
+
childs.map((child, i) => {
|
|
51
|
+
return <div class="k-space-item" style={i != childs.length - 1 ? style : null}>{child}</div>
|
|
52
52
|
})
|
|
53
53
|
}
|
|
54
54
|
</div>
|
|
@@ -23,7 +23,7 @@ export default {
|
|
|
23
23
|
},
|
|
24
24
|
mounted() {
|
|
25
25
|
let { thead } = this.$refs
|
|
26
|
-
if (thead) {
|
|
26
|
+
if (thead && this.$isServer) {
|
|
27
27
|
// thead.style.marginBottom = `-${thead.offsetHeight - thead.scrollHeight}px`
|
|
28
28
|
let size = measureScrollBar()
|
|
29
29
|
this.scrollBarHeight = size
|
|
@@ -34,10 +34,10 @@ export default {
|
|
|
34
34
|
mounted() {
|
|
35
35
|
this.renderEnd = true
|
|
36
36
|
this.resetHeight()
|
|
37
|
-
window.addEventListener('resize', this.autoResize)
|
|
37
|
+
this.$isServer && window.addEventListener('resize', this.autoResize)
|
|
38
38
|
},
|
|
39
39
|
beforeDestroy() {
|
|
40
|
-
window.removeEventListener('resize', this.autoResize)
|
|
40
|
+
this.$isServer && window.removeEventListener('resize', this.autoResize)
|
|
41
41
|
},
|
|
42
42
|
updated() {
|
|
43
43
|
this.autoResize()
|
|
@@ -261,7 +261,7 @@ export default {
|
|
|
261
261
|
}
|
|
262
262
|
|
|
263
263
|
if (!data || !data.length) {
|
|
264
|
-
content.push(<Empty description={this.emptyText}/>)
|
|
264
|
+
content.push(<Empty description={this.emptyText} />)
|
|
265
265
|
}
|
|
266
266
|
//custom footer
|
|
267
267
|
if (footer) {
|
package/components/tabs/tabs.jsx
CHANGED
|
@@ -31,13 +31,13 @@ export default {
|
|
|
31
31
|
}
|
|
32
32
|
},
|
|
33
33
|
mounted() {
|
|
34
|
-
window.addEventListener('resize', this.resetNavPosition)
|
|
34
|
+
this.$isServer && window.addEventListener('resize', this.resetNavPosition)
|
|
35
35
|
this.$nextTick(() => {
|
|
36
36
|
this.updateIndex()
|
|
37
37
|
})
|
|
38
38
|
},
|
|
39
39
|
beforeDestory() {
|
|
40
|
-
window.removeEventListener('resize', this.resetNavPosition)
|
|
40
|
+
this.$isServer && window.removeEventListener('resize', this.resetNavPosition)
|
|
41
41
|
},
|
|
42
42
|
methods: {
|
|
43
43
|
closeTab(key, e) {
|
|
@@ -153,44 +153,45 @@ export default {
|
|
|
153
153
|
this.$nextTick(() => this.setPosition());
|
|
154
154
|
},
|
|
155
155
|
setPosition() {
|
|
156
|
-
if (this.$isServer)
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
156
|
+
if (!this.$isServer) {
|
|
157
|
+
let m = 3;
|
|
158
|
+
let rel = this.$refs.rel;
|
|
159
|
+
let dom = this.$refs.dom;
|
|
160
|
+
if (!dom) return;
|
|
161
|
+
this.dropdownWith = rel.offsetWidth;
|
|
162
162
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
163
|
+
let relPos = this.getElementPos(rel);
|
|
164
|
+
let clientH = window.innerHeight;
|
|
165
|
+
let clientW = window.innerWidth;
|
|
166
|
+
// console.log(relPos)
|
|
167
|
+
let scrollTop = document.body.scrollTop || document.documentElement.scrollTop;
|
|
168
|
+
let scrollLeft = document.body.scrollLeft || document.documentElement.scrollLeft;
|
|
169
169
|
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
170
|
+
let domH = dom.offsetHeight;
|
|
171
|
+
let relH = rel.offsetHeight;
|
|
172
|
+
if (this.transfer) this.left = relPos.left + 1 + scrollLeft;
|
|
173
|
+
//new
|
|
174
|
+
if (clientH - relPos.top - relH - m < domH) {
|
|
175
|
+
//空出来的高度不足以放下dom
|
|
176
|
+
this.fadeInBottom = true;
|
|
177
|
+
this.top = this.transfer
|
|
178
|
+
? relPos.top - m - domH + scrollTop
|
|
179
|
+
: -(domH + m);
|
|
180
|
+
} else {
|
|
181
|
+
this.fadeInBottom = false;
|
|
182
|
+
this.top = this.transfer ? relPos.top + relH + m + scrollTop : relH + m;
|
|
183
|
+
}
|
|
184
|
+
// console.log(this.top)
|
|
185
|
+
// console.log(this.fadeInBottom, clientH, relPos.y, relH, m, domH)
|
|
186
|
+
//old
|
|
187
|
+
// if (h - (pos.y - s) - rh < dh) {
|
|
188
|
+
// this.fadeInBottom = true;
|
|
189
|
+
// this.top = !this.transfer ? -dh - m : pos.y - dh - m;
|
|
190
|
+
// } else {
|
|
191
|
+
// this.fadeInBottom = false;
|
|
192
|
+
// this.top = !this.transfer ? rh + m : pos.y + rh + m;
|
|
193
|
+
// }
|
|
183
194
|
}
|
|
184
|
-
// console.log(this.top)
|
|
185
|
-
// console.log(this.fadeInBottom, clientH, relPos.y, relH, m, domH)
|
|
186
|
-
//old
|
|
187
|
-
// if (h - (pos.y - s) - rh < dh) {
|
|
188
|
-
// this.fadeInBottom = true;
|
|
189
|
-
// this.top = !this.transfer ? -dh - m : pos.y - dh - m;
|
|
190
|
-
// } else {
|
|
191
|
-
// this.fadeInBottom = false;
|
|
192
|
-
// this.top = !this.transfer ? rh + m : pos.y + rh + m;
|
|
193
|
-
// }
|
|
194
195
|
},
|
|
195
196
|
|
|
196
197
|
}
|