eoss-ui 0.4.28 → 0.4.29
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/lib/button-group.js +5 -3
- package/lib/button.js +33 -22
- package/lib/data-table.js +15 -18
- package/lib/eoss-ui.common.js +129 -118
- package/lib/form.js +26 -26
- package/lib/{icon.js → icons.js} +10 -9
- package/lib/index.js +1 -1
- package/lib/table-form.js +11 -11
- package/lib/theme-chalk/index.css +1 -1
- package/package.json +1 -1
- package/packages/button/src/main.vue +43 -32
- package/packages/button-group/src/main.vue +3 -1
- package/packages/data-table/src/column.vue +47 -46
- package/packages/data-table/src/main.vue +1 -6
- package/packages/form/src/main.vue +24 -24
- package/packages/form/src/table.vue +6 -6
- package/packages/icons/index.js +5 -0
- package/packages/{icon → icons}/src/main.vue +2 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/src/index.scss +1 -0
- package/src/index.js +4 -4
- package/packages/data-table/src/main copy.vue +0 -1383
- package/packages/icon/index.js +0 -5
- /package/packages/{icon → icons}/src/icon.json +0 -0
package/package.json
CHANGED
|
@@ -35,7 +35,10 @@ export default {
|
|
|
35
35
|
message: [Object, Boolean],
|
|
36
36
|
alert: [Object, Boolean],
|
|
37
37
|
mapFields: Object,
|
|
38
|
-
useCaseCode: String
|
|
38
|
+
useCaseCode: String,
|
|
39
|
+
closed: Function,
|
|
40
|
+
stop: Boolean,
|
|
41
|
+
syncKeys: Object
|
|
39
42
|
},
|
|
40
43
|
data() {
|
|
41
44
|
return {};
|
|
@@ -45,21 +48,23 @@ export default {
|
|
|
45
48
|
if (this.open && this.link) {
|
|
46
49
|
let windows;
|
|
47
50
|
let fields = [];
|
|
48
|
-
let param = {};
|
|
51
|
+
let param = this.param ? this.param : {};
|
|
49
52
|
evt.stopPropagation();
|
|
50
53
|
evt.preventDefault();
|
|
51
54
|
let width = util.win.top.screen.availWidth - 10;
|
|
52
55
|
let height = util.win.top.screen.availHeight - 60;
|
|
56
|
+
let flag = true;
|
|
53
57
|
if (this.esForm) {
|
|
54
58
|
let params = util.getParams({ url: this.link });
|
|
55
59
|
let modal = this.esForm.models;
|
|
56
60
|
let models = util.extend({}, params || {}, modal);
|
|
57
|
-
let flag = true;
|
|
58
61
|
if (this.required) {
|
|
59
62
|
if (Array.isArray(this.required)) {
|
|
60
63
|
this.esForm.validateField(this.required, (res) => {
|
|
61
64
|
if (res) {
|
|
62
65
|
flag = false;
|
|
66
|
+
} else {
|
|
67
|
+
flag = true;
|
|
63
68
|
}
|
|
64
69
|
});
|
|
65
70
|
if (flag) {
|
|
@@ -76,12 +81,16 @@ export default {
|
|
|
76
81
|
this.esForm.validateField(fields, (res) => {
|
|
77
82
|
if (res) {
|
|
78
83
|
flag = false;
|
|
84
|
+
} else {
|
|
85
|
+
flag = true;
|
|
79
86
|
}
|
|
80
87
|
});
|
|
81
88
|
} else {
|
|
82
89
|
this.esForm.validateField(this.required, (res) => {
|
|
83
90
|
if (res) {
|
|
84
91
|
flag = false;
|
|
92
|
+
} else {
|
|
93
|
+
flag = true;
|
|
85
94
|
}
|
|
86
95
|
});
|
|
87
96
|
if (flag) {
|
|
@@ -169,53 +178,55 @@ export default {
|
|
|
169
178
|
}
|
|
170
179
|
}
|
|
171
180
|
}
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
util.urlJoinParams({ url: this.link, param: param }),
|
|
183
|
-
this.name,
|
|
184
|
-
this.specs
|
|
185
|
-
);
|
|
186
|
-
}
|
|
187
|
-
} else {
|
|
188
|
-
windows = util.win.top.open(
|
|
189
|
-
util.urlJoinParams({ url: this.link, param: param })
|
|
190
|
-
);
|
|
181
|
+
}
|
|
182
|
+
if (this.btnGroup && this.syncKeys) {
|
|
183
|
+
let data = this.btnGroup.data;
|
|
184
|
+
if (
|
|
185
|
+
data &&
|
|
186
|
+
Object.keys(data).length &&
|
|
187
|
+
Object.keys(this.syncKeys).length
|
|
188
|
+
) {
|
|
189
|
+
for (let i in this.syncKeys) {
|
|
190
|
+
param[i] = data[this.syncKeys[i]];
|
|
191
191
|
}
|
|
192
192
|
}
|
|
193
|
-
}
|
|
193
|
+
}
|
|
194
|
+
if (flag) {
|
|
194
195
|
if (this.specs) {
|
|
195
196
|
if (typeof this.specs === 'boolean') {
|
|
196
197
|
windows = util.win.top.open(
|
|
197
|
-
this.link,
|
|
198
|
+
util.urlJoinParams({ url: this.link, param: param }),
|
|
198
199
|
this.name,
|
|
199
200
|
`width=${width}px,height=${height}px,resizable=yes,status=yes,menubar=no,scrollbars=yes`
|
|
200
201
|
);
|
|
201
202
|
} else {
|
|
202
|
-
windows = util.win.top.open(
|
|
203
|
+
windows = util.win.top.open(
|
|
204
|
+
util.urlJoinParams({ url: this.link, param: param }),
|
|
205
|
+
this.name,
|
|
206
|
+
this.specs
|
|
207
|
+
);
|
|
203
208
|
}
|
|
204
209
|
} else {
|
|
205
|
-
windows = util.win.top.open(
|
|
210
|
+
windows = util.win.top.open(
|
|
211
|
+
util.urlJoinParams({ url: this.link, param: param })
|
|
212
|
+
);
|
|
206
213
|
}
|
|
207
214
|
}
|
|
208
215
|
if (windows) {
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
216
|
+
let times = setInterval(() => {
|
|
217
|
+
if (windows.closed) {
|
|
218
|
+
clearInterval(times);
|
|
219
|
+
this.closed && this.closed(param);
|
|
220
|
+
if (this.reload) {
|
|
213
221
|
this.esSelect && this.esSelect.reload(null, param, true);
|
|
214
222
|
this.esTable && this.esTable.reload(param);
|
|
215
223
|
}
|
|
216
|
-
}
|
|
217
|
-
}
|
|
224
|
+
}
|
|
225
|
+
}, 1000);
|
|
218
226
|
}
|
|
227
|
+
} else if (this.stop) {
|
|
228
|
+
evt.stopPropagation();
|
|
229
|
+
evt.preventDefault();
|
|
219
230
|
}
|
|
220
231
|
this.$emit('click', evt);
|
|
221
232
|
}
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
<template v-for="(item, index) in btns">
|
|
4
4
|
<es-button
|
|
5
5
|
v-if="item && !item.hide && index < length"
|
|
6
|
+
:stop="stop"
|
|
6
7
|
v-bind="item"
|
|
7
8
|
:key="index"
|
|
8
9
|
:size="size"
|
|
@@ -51,6 +52,7 @@ export default {
|
|
|
51
52
|
default: 3
|
|
52
53
|
},
|
|
53
54
|
rules: Function,
|
|
55
|
+
stop: Boolean,
|
|
54
56
|
trigger: {
|
|
55
57
|
type: String,
|
|
56
58
|
default: 'click'
|
|
@@ -78,7 +80,7 @@ export default {
|
|
|
78
80
|
methods: {
|
|
79
81
|
getBtns() {
|
|
80
82
|
let useCaseCodes = util.getStorage('useCaseCodes');
|
|
81
|
-
let arry = this.contents.filter(item => {
|
|
83
|
+
let arry = this.contents.filter((item) => {
|
|
82
84
|
if (Object.prototype.hasOwnProperty.call(item, 'rules')) {
|
|
83
85
|
if (useCaseCodes && item.useCaseCode) {
|
|
84
86
|
return (
|
|
@@ -81,7 +81,7 @@
|
|
|
81
81
|
: optionDatas[item.field || item.prop]
|
|
82
82
|
"
|
|
83
83
|
@blur="
|
|
84
|
-
event => {
|
|
84
|
+
(event) => {
|
|
85
85
|
handleBlur({
|
|
86
86
|
item: item,
|
|
87
87
|
event: event,
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
}
|
|
92
92
|
"
|
|
93
93
|
@focus="
|
|
94
|
-
event => {
|
|
94
|
+
(event) => {
|
|
95
95
|
handleFocus({
|
|
96
96
|
item: item,
|
|
97
97
|
event: event,
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
}
|
|
102
102
|
"
|
|
103
103
|
@change="
|
|
104
|
-
value => {
|
|
104
|
+
(value) => {
|
|
105
105
|
handleChange({
|
|
106
106
|
item: item,
|
|
107
107
|
name: item.field || item.prop,
|
|
@@ -124,7 +124,7 @@
|
|
|
124
124
|
: optionDatas[item.field || item.prop]
|
|
125
125
|
"
|
|
126
126
|
@blur="
|
|
127
|
-
event => {
|
|
127
|
+
(event) => {
|
|
128
128
|
handleBlur({
|
|
129
129
|
item: item,
|
|
130
130
|
event: event,
|
|
@@ -134,7 +134,7 @@
|
|
|
134
134
|
}
|
|
135
135
|
"
|
|
136
136
|
@focus="
|
|
137
|
-
event => {
|
|
137
|
+
(event) => {
|
|
138
138
|
handleFocus({
|
|
139
139
|
item: item,
|
|
140
140
|
event: event,
|
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
}
|
|
145
145
|
"
|
|
146
146
|
@change="
|
|
147
|
-
value => {
|
|
147
|
+
(value) => {
|
|
148
148
|
handleChange({
|
|
149
149
|
item: item,
|
|
150
150
|
name: item.field || item.prop,
|
|
@@ -177,7 +177,7 @@
|
|
|
177
177
|
)
|
|
178
178
|
"
|
|
179
179
|
@change="
|
|
180
|
-
value => {
|
|
180
|
+
(value) => {
|
|
181
181
|
handleChange({
|
|
182
182
|
name: item.field || item.prop,
|
|
183
183
|
value: value,
|
|
@@ -200,7 +200,7 @@
|
|
|
200
200
|
"
|
|
201
201
|
:ajax="false"
|
|
202
202
|
@change="
|
|
203
|
-
value => {
|
|
203
|
+
(value) => {
|
|
204
204
|
handleChange({
|
|
205
205
|
item: item,
|
|
206
206
|
name: item.field || item.prop,
|
|
@@ -223,7 +223,7 @@
|
|
|
223
223
|
"
|
|
224
224
|
:ajax="false"
|
|
225
225
|
@change="
|
|
226
|
-
value => {
|
|
226
|
+
(value) => {
|
|
227
227
|
handleChange({
|
|
228
228
|
item: item,
|
|
229
229
|
name: item.field || item.prop,
|
|
@@ -245,7 +245,7 @@
|
|
|
245
245
|
: optionDatas[item.field || item.prop]
|
|
246
246
|
"
|
|
247
247
|
@change="
|
|
248
|
-
value => {
|
|
248
|
+
(value) => {
|
|
249
249
|
handleChange({
|
|
250
250
|
item: item,
|
|
251
251
|
name: item.field || item.prop,
|
|
@@ -258,23 +258,23 @@
|
|
|
258
258
|
<es-date-picker
|
|
259
259
|
v-else-if="
|
|
260
260
|
item.date ||
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
261
|
+
item.type == 'date' ||
|
|
262
|
+
item.type == 'year' ||
|
|
263
|
+
item.type == 'month' ||
|
|
264
|
+
item.type == 'date' ||
|
|
265
|
+
item.type == 'dates' ||
|
|
266
|
+
item.type == 'week' ||
|
|
267
|
+
item.type == 'datetime' ||
|
|
268
|
+
item.type == 'datetimerange' ||
|
|
269
|
+
item.type == 'daterange' ||
|
|
270
|
+
item.type == 'monthrange' ||
|
|
271
|
+
item.type == 'quarter' ||
|
|
272
|
+
item.type == 'halfyear'
|
|
273
273
|
"
|
|
274
274
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
275
275
|
v-model="scope.row[item.field]"
|
|
276
276
|
@blur="
|
|
277
|
-
event => {
|
|
277
|
+
(event) => {
|
|
278
278
|
handleBlur({
|
|
279
279
|
item: item,
|
|
280
280
|
event: event,
|
|
@@ -284,7 +284,7 @@
|
|
|
284
284
|
}
|
|
285
285
|
"
|
|
286
286
|
@focus="
|
|
287
|
-
event => {
|
|
287
|
+
(event) => {
|
|
288
288
|
handleFocus({
|
|
289
289
|
item: item,
|
|
290
290
|
event: event,
|
|
@@ -294,7 +294,7 @@
|
|
|
294
294
|
}
|
|
295
295
|
"
|
|
296
296
|
@change="
|
|
297
|
-
value => {
|
|
297
|
+
(value) => {
|
|
298
298
|
handleChange({
|
|
299
299
|
item: item,
|
|
300
300
|
name: item.field || item.prop,
|
|
@@ -310,7 +310,7 @@
|
|
|
310
310
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
311
311
|
v-model="scope.row[item.field]"
|
|
312
312
|
@blur="
|
|
313
|
-
event => {
|
|
313
|
+
(event) => {
|
|
314
314
|
handleBlur({
|
|
315
315
|
item: item,
|
|
316
316
|
event: event,
|
|
@@ -320,7 +320,7 @@
|
|
|
320
320
|
}
|
|
321
321
|
"
|
|
322
322
|
@focus="
|
|
323
|
-
event => {
|
|
323
|
+
(event) => {
|
|
324
324
|
handleFocus({
|
|
325
325
|
item: item,
|
|
326
326
|
event: event,
|
|
@@ -330,7 +330,7 @@
|
|
|
330
330
|
}
|
|
331
331
|
"
|
|
332
332
|
@change="
|
|
333
|
-
value => {
|
|
333
|
+
(value) => {
|
|
334
334
|
handleChange({
|
|
335
335
|
item: item,
|
|
336
336
|
name: item.field || item.prop,
|
|
@@ -346,7 +346,7 @@
|
|
|
346
346
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
347
347
|
v-model="scope.row[item.field]"
|
|
348
348
|
@change="
|
|
349
|
-
value => {
|
|
349
|
+
(value) => {
|
|
350
350
|
handleChange({
|
|
351
351
|
item: item,
|
|
352
352
|
name: item.field || item.prop,
|
|
@@ -366,7 +366,7 @@
|
|
|
366
366
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
367
367
|
v-model.lazy="scope.row[item.field]"
|
|
368
368
|
@blur="
|
|
369
|
-
event => {
|
|
369
|
+
(event) => {
|
|
370
370
|
handleBlur({
|
|
371
371
|
item: item,
|
|
372
372
|
event: event,
|
|
@@ -376,7 +376,7 @@
|
|
|
376
376
|
}
|
|
377
377
|
"
|
|
378
378
|
@focus="
|
|
379
|
-
event => {
|
|
379
|
+
(event) => {
|
|
380
380
|
handleFocus({
|
|
381
381
|
item: item,
|
|
382
382
|
event: event,
|
|
@@ -386,7 +386,7 @@
|
|
|
386
386
|
}
|
|
387
387
|
"
|
|
388
388
|
@change="
|
|
389
|
-
value => {
|
|
389
|
+
(value) => {
|
|
390
390
|
handleChange({
|
|
391
391
|
item: item,
|
|
392
392
|
name: item.field || item.prop,
|
|
@@ -403,7 +403,7 @@
|
|
|
403
403
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
404
404
|
v-model.lazy="scope.row[item.field]"
|
|
405
405
|
@blur="
|
|
406
|
-
event => {
|
|
406
|
+
(event) => {
|
|
407
407
|
handleBlur({
|
|
408
408
|
item: item,
|
|
409
409
|
event: event,
|
|
@@ -413,7 +413,7 @@
|
|
|
413
413
|
}
|
|
414
414
|
"
|
|
415
415
|
@focus="
|
|
416
|
-
event => {
|
|
416
|
+
(event) => {
|
|
417
417
|
handleFocus({
|
|
418
418
|
item: item,
|
|
419
419
|
event: event,
|
|
@@ -423,7 +423,7 @@
|
|
|
423
423
|
}
|
|
424
424
|
"
|
|
425
425
|
@change="
|
|
426
|
-
value => {
|
|
426
|
+
(value) => {
|
|
427
427
|
handleChange({
|
|
428
428
|
item: item,
|
|
429
429
|
name: item.field || item.prop,
|
|
@@ -440,7 +440,7 @@
|
|
|
440
440
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
441
441
|
v-model="scope.row[item.field]"
|
|
442
442
|
@blur="
|
|
443
|
-
event => {
|
|
443
|
+
(event) => {
|
|
444
444
|
handleBlur({
|
|
445
445
|
item: item,
|
|
446
446
|
event: event,
|
|
@@ -450,7 +450,7 @@
|
|
|
450
450
|
}
|
|
451
451
|
"
|
|
452
452
|
@focus="
|
|
453
|
-
event => {
|
|
453
|
+
(event) => {
|
|
454
454
|
handleFocus({
|
|
455
455
|
item: item,
|
|
456
456
|
event: event,
|
|
@@ -460,7 +460,7 @@
|
|
|
460
460
|
}
|
|
461
461
|
"
|
|
462
462
|
@change="
|
|
463
|
-
value => {
|
|
463
|
+
(value) => {
|
|
464
464
|
handleChange({
|
|
465
465
|
item: item,
|
|
466
466
|
name: item.field || item.prop,
|
|
@@ -478,6 +478,7 @@
|
|
|
478
478
|
<!-- 按钮区域 -->
|
|
479
479
|
<es-button-group
|
|
480
480
|
v-if="item.type === 'handle' && !scope.row.hideHandle"
|
|
481
|
+
stop
|
|
481
482
|
:contents="item.contents || item.events"
|
|
482
483
|
:data="scope.row"
|
|
483
484
|
@handleClick="handleClick"
|
|
@@ -652,7 +653,7 @@ export default {
|
|
|
652
653
|
let lists = [];
|
|
653
654
|
if (option) {
|
|
654
655
|
let v = val[item.valueKey] || val.value;
|
|
655
|
-
lists = option.filter(list => {
|
|
656
|
+
lists = option.filter((list) => {
|
|
656
657
|
return list[item.filtrateKey] == v;
|
|
657
658
|
});
|
|
658
659
|
}
|
|
@@ -677,7 +678,7 @@ export default {
|
|
|
677
678
|
params: params,
|
|
678
679
|
data: params
|
|
679
680
|
})
|
|
680
|
-
.then(res => {
|
|
681
|
+
.then((res) => {
|
|
681
682
|
if (res.rCode === 0) {
|
|
682
683
|
let options = JSON.parse(JSON.stringify(data));
|
|
683
684
|
if (options[index + 1]) {
|
|
@@ -700,7 +701,7 @@ export default {
|
|
|
700
701
|
this.$message.error(msg);
|
|
701
702
|
}
|
|
702
703
|
})
|
|
703
|
-
.catch(err => {
|
|
704
|
+
.catch((err) => {
|
|
704
705
|
if (err.message && err.message !== 'canceled') {
|
|
705
706
|
this.$message.error(err.message);
|
|
706
707
|
}
|
|
@@ -731,7 +732,7 @@ export default {
|
|
|
731
732
|
rows[field]['shortName']
|
|
732
733
|
);
|
|
733
734
|
} else if (Array.isArray(rows[field])) {
|
|
734
|
-
const vals = rows[field].map(item => {
|
|
735
|
+
const vals = rows[field].map((item) => {
|
|
735
736
|
if (util.isObject(item)) {
|
|
736
737
|
return (
|
|
737
738
|
item[col.labelKey] ||
|
|
@@ -749,7 +750,7 @@ export default {
|
|
|
749
750
|
return vals.join(col.symbol ? col.symbol : '-');
|
|
750
751
|
} else {
|
|
751
752
|
if (col.valueToString || col['value-to-string']) {
|
|
752
|
-
const vals = rows[field].split(',').map(item => {
|
|
753
|
+
const vals = rows[field].split(',').map((item) => {
|
|
753
754
|
if (data && data.length && util.isObject(data[0])) {
|
|
754
755
|
return this.getLabel(data, item, col);
|
|
755
756
|
}
|
|
@@ -812,7 +813,7 @@ export default {
|
|
|
812
813
|
let datas = [];
|
|
813
814
|
if (this.optionDatas[item.field || item.prop][index + 1]) {
|
|
814
815
|
datas = this.optionDatas[item.field || item.prop][index + 1].filter(
|
|
815
|
-
items => {
|
|
816
|
+
(items) => {
|
|
816
817
|
return filte == items[item.filtrateKey];
|
|
817
818
|
}
|
|
818
819
|
);
|
|
@@ -838,7 +839,7 @@ export default {
|
|
|
838
839
|
params: params,
|
|
839
840
|
data: params
|
|
840
841
|
})
|
|
841
|
-
.then(res => {
|
|
842
|
+
.then((res) => {
|
|
842
843
|
if (res.rCode === 0) {
|
|
843
844
|
let options = JSON.parse(
|
|
844
845
|
JSON.stringify(this.optionDatas[item.field || item.prop])
|
|
@@ -856,7 +857,7 @@ export default {
|
|
|
856
857
|
this.$message.error(msg);
|
|
857
858
|
}
|
|
858
859
|
})
|
|
859
|
-
.catch(err => {
|
|
860
|
+
.catch((err) => {
|
|
860
861
|
if (err.message && err.message !== 'canceled') {
|
|
861
862
|
this.$message.error(err.message);
|
|
862
863
|
}
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
v-bind="{
|
|
40
40
|
...$attrs,
|
|
41
41
|
data: datas,
|
|
42
|
-
emptyText:
|
|
42
|
+
emptyText: emptyText,
|
|
43
43
|
showSummary: showTotal,
|
|
44
44
|
sumText: sumText || totalText,
|
|
45
45
|
totalRow: restotalRow || totalRow,
|
|
@@ -302,11 +302,6 @@ export default {
|
|
|
302
302
|
default: true
|
|
303
303
|
},
|
|
304
304
|
// 无数据时显示的文本
|
|
305
|
-
text: {
|
|
306
|
-
type: String,
|
|
307
|
-
default: ''
|
|
308
|
-
},
|
|
309
|
-
// 无数据时显示的文本
|
|
310
305
|
emptyText: {
|
|
311
306
|
type: String,
|
|
312
307
|
default: ''
|