eoss-mobiles 0.2.19 → 0.2.21
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/CHANGELOG.md +7 -4
- package/lib/checkbox.js +34 -19
- package/lib/eoss-mobile.common.js +448 -175
- package/lib/flow.js +51 -38
- package/lib/index.js +1 -1
- package/lib/picker.js +18 -13
- package/lib/radio.js +32 -18
- package/lib/retrial-auth.js +5 -3
- package/lib/selector.js +5 -3
- package/lib/table-column.js +314 -80
- package/lib/table.js +5 -3
- package/lib/utils/axios.js +4 -3
- package/lib/utils/http.js +1 -0
- package/package.json +1 -1
- package/packages/checkbox/src/main.vue +27 -11
- package/packages/flow/src/components/Handle.vue +13 -4
- package/packages/flow/src/components/Reject.vue +17 -9
- package/packages/flow/src/components/StartFlow.vue +2 -1
- package/packages/flow/src/components/taskUnionExamine.vue +3 -1
- package/packages/picker/src/main.vue +28 -24
- package/packages/radio/src/main.vue +22 -9
- package/packages/table-column/src/main.vue +128 -48
- package/src/index.js +1 -1
- package/src/utils/axios.js +4 -3
- package/src/utils/http.js +4 -3
|
@@ -48,10 +48,25 @@
|
|
|
48
48
|
</section>
|
|
49
49
|
<em-picker
|
|
50
50
|
v-if="item.type === 'select'"
|
|
51
|
-
valueKey="
|
|
52
|
-
|
|
51
|
+
:valueKey="
|
|
52
|
+
item.valueKey
|
|
53
|
+
? item.valueKey
|
|
54
|
+
: !item.url && !item.sysAppCode
|
|
55
|
+
? 'value'
|
|
56
|
+
: 'cciValue'
|
|
57
|
+
"
|
|
58
|
+
:labelKey="
|
|
59
|
+
item.labelKey
|
|
60
|
+
? item.labelKey
|
|
61
|
+
: !item.url && !item.sysAppCode
|
|
62
|
+
? 'name'
|
|
63
|
+
: 'shortName'
|
|
64
|
+
"
|
|
53
65
|
v-bind="
|
|
54
|
-
exclAttribute({
|
|
66
|
+
exclAttribute({
|
|
67
|
+
data: item,
|
|
68
|
+
attrs: ['width', 'sysAppCode', 'url']
|
|
69
|
+
})
|
|
55
70
|
"
|
|
56
71
|
:sysAppCode="
|
|
57
72
|
item.sysAppCode &&
|
|
@@ -60,12 +75,15 @@
|
|
|
60
75
|
? item.sysAppCode
|
|
61
76
|
: ''
|
|
62
77
|
"
|
|
63
|
-
:url="
|
|
64
|
-
|
|
78
|
+
:url="
|
|
79
|
+
item.url &&
|
|
80
|
+
scope.$index == 0 &&
|
|
81
|
+
!optionList[item.name || item.field || item.prop]
|
|
82
|
+
? item.url
|
|
83
|
+
: ''
|
|
84
|
+
"
|
|
65
85
|
v-model="scope.row[item.name || item.field || item.prop]"
|
|
66
|
-
isTable
|
|
67
86
|
hideLabel
|
|
68
|
-
:ajax="false"
|
|
69
87
|
:columns="
|
|
70
88
|
optionList[item.name || item.field || item.prop]
|
|
71
89
|
? optionList[item.name || item.field || item.prop]
|
|
@@ -74,7 +92,7 @@
|
|
|
74
92
|
@confirm="
|
|
75
93
|
value => {
|
|
76
94
|
handleChange({
|
|
77
|
-
name: item.field || item.prop,
|
|
95
|
+
name: item.name || item.field || item.prop,
|
|
78
96
|
value: value,
|
|
79
97
|
data: scope.row
|
|
80
98
|
});
|
|
@@ -96,7 +114,7 @@
|
|
|
96
114
|
class="el-input__inner"
|
|
97
115
|
:label="item.title"
|
|
98
116
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
99
|
-
v-model.lazy="scope.row[item.field]"
|
|
117
|
+
v-model.lazy="scope.row[item.name || item.field || item.prop]"
|
|
100
118
|
@blur="
|
|
101
119
|
event => {
|
|
102
120
|
handleBlur({ item: item, event: event, data: scope.row });
|
|
@@ -114,7 +132,7 @@
|
|
|
114
132
|
@change="
|
|
115
133
|
value => {
|
|
116
134
|
handleChange({
|
|
117
|
-
name: item.field || item.prop,
|
|
135
|
+
name: item.name || item.field || item.prop,
|
|
118
136
|
value: value,
|
|
119
137
|
data: scope.row
|
|
120
138
|
});
|
|
@@ -125,7 +143,7 @@
|
|
|
125
143
|
v-else
|
|
126
144
|
class="el-textarea__inner"
|
|
127
145
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
128
|
-
v-model.lazy="scope.row[item.field]"
|
|
146
|
+
v-model.lazy="scope.row[item.name || item.field || item.prop]"
|
|
129
147
|
@blur="
|
|
130
148
|
event => {
|
|
131
149
|
handleBlur({ item: item, event: event, data: scope.row });
|
|
@@ -143,7 +161,7 @@
|
|
|
143
161
|
@change="
|
|
144
162
|
value => {
|
|
145
163
|
handleChange({
|
|
146
|
-
name: item.field || item.prop,
|
|
164
|
+
name: item.name || item.field || item.prop,
|
|
147
165
|
value: value,
|
|
148
166
|
data: scope.row
|
|
149
167
|
});
|
|
@@ -156,7 +174,7 @@
|
|
|
156
174
|
ref="emInput"
|
|
157
175
|
class="em-table-input"
|
|
158
176
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
159
|
-
v-model="scope.row[item.field]"
|
|
177
|
+
v-model="scope.row[item.name || item.field || item.prop]"
|
|
160
178
|
:label="item.title"
|
|
161
179
|
hideLabel
|
|
162
180
|
@blur="
|
|
@@ -172,7 +190,7 @@
|
|
|
172
190
|
@change="
|
|
173
191
|
value => {
|
|
174
192
|
handleChange({
|
|
175
|
-
name: item.field || item.prop,
|
|
193
|
+
name: item.name || item.field || item.prop,
|
|
176
194
|
value: value,
|
|
177
195
|
data: scope.row
|
|
178
196
|
});
|
|
@@ -193,13 +211,13 @@
|
|
|
193
211
|
item.type == 'datehour'
|
|
194
212
|
"
|
|
195
213
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
196
|
-
v-model="scope.row[item.field]"
|
|
214
|
+
v-model="scope.row[item.name || item.field || item.prop]"
|
|
197
215
|
hideLabel
|
|
198
216
|
:joinStr="item.joinStr || '-'"
|
|
199
217
|
@confirm="
|
|
200
218
|
value => {
|
|
201
219
|
handleChange({
|
|
202
|
-
name: item.field || item.prop,
|
|
220
|
+
name: item.name || item.field || item.prop,
|
|
203
221
|
value: value,
|
|
204
222
|
data: scope.row
|
|
205
223
|
});
|
|
@@ -208,16 +226,44 @@
|
|
|
208
226
|
/>
|
|
209
227
|
<em-radio-group
|
|
210
228
|
v-else-if="item.type === 'radio'"
|
|
211
|
-
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
212
|
-
v-model="scope.row[item.field]"
|
|
213
|
-
:data="
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
229
|
+
v-bind="exclAttribute({ data: item, attrs: ['width'] })"
|
|
230
|
+
v-model="scope.row[item.name || item.field || item.prop]"
|
|
231
|
+
:data="
|
|
232
|
+
optionList[item.name || item.field || item.prop] ||
|
|
233
|
+
newOptionData[item.name || item.field || item.prop]
|
|
234
|
+
"
|
|
235
|
+
:valueKey="
|
|
236
|
+
item.valueKey
|
|
237
|
+
? item.valueKey
|
|
238
|
+
: !item.url && !item.sysAppCode
|
|
239
|
+
? 'value'
|
|
240
|
+
: 'cciValue'
|
|
241
|
+
"
|
|
242
|
+
:labelKey="
|
|
243
|
+
item.labelKey
|
|
244
|
+
? item.labelKey
|
|
245
|
+
: !item.url && !item.sysAppCode
|
|
246
|
+
? 'name'
|
|
247
|
+
: 'shortName'
|
|
248
|
+
"
|
|
249
|
+
:sysAppCode="
|
|
250
|
+
item.sysAppCode &&
|
|
251
|
+
scope.$index == 0 &&
|
|
252
|
+
!optionList[item.name || item.field || item.prop]
|
|
253
|
+
? item.sysAppCode
|
|
254
|
+
: ''
|
|
255
|
+
"
|
|
256
|
+
:url="
|
|
257
|
+
item.url &&
|
|
258
|
+
scope.$index == 0 &&
|
|
259
|
+
!optionList[item.name || item.field || item.prop]
|
|
260
|
+
? item.url
|
|
261
|
+
: ''
|
|
262
|
+
"
|
|
217
263
|
@change="
|
|
218
264
|
value => {
|
|
219
265
|
handleChange({
|
|
220
|
-
name: item.field || item.prop,
|
|
266
|
+
name: item.name || item.field || item.prop,
|
|
221
267
|
value: value,
|
|
222
268
|
data: scope.row,
|
|
223
269
|
type: item.type
|
|
@@ -228,15 +274,43 @@
|
|
|
228
274
|
<em-checkbox-group
|
|
229
275
|
v-else-if="item.type === 'checkbox'"
|
|
230
276
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
231
|
-
v-model="scope.row[item.field]"
|
|
232
|
-
:data="
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
277
|
+
v-model="scope.row[item.name || item.field || item.prop]"
|
|
278
|
+
:data="
|
|
279
|
+
optionList[item.name || item.field || item.prop] ||
|
|
280
|
+
newOptionData[item.name || item.field || item.prop]
|
|
281
|
+
"
|
|
282
|
+
:valueKey="
|
|
283
|
+
item.valueKey
|
|
284
|
+
? item.valueKey
|
|
285
|
+
: !item.url && !item.sysAppCode
|
|
286
|
+
? 'value'
|
|
287
|
+
: 'cciValue'
|
|
288
|
+
"
|
|
289
|
+
:labelKey="
|
|
290
|
+
item.labelKey
|
|
291
|
+
? item.labelKey
|
|
292
|
+
: !item.url && !item.sysAppCode
|
|
293
|
+
? 'name'
|
|
294
|
+
: 'shortName'
|
|
295
|
+
"
|
|
296
|
+
:sysAppCode="
|
|
297
|
+
item.sysAppCode &&
|
|
298
|
+
scope.$index == 0 &&
|
|
299
|
+
!optionList[item.name || item.field || item.prop]
|
|
300
|
+
? item.sysAppCode
|
|
301
|
+
: ''
|
|
302
|
+
"
|
|
303
|
+
:url="
|
|
304
|
+
item.url &&
|
|
305
|
+
scope.$index == 0 &&
|
|
306
|
+
!optionList[item.name || item.field || item.prop]
|
|
307
|
+
? item.url
|
|
308
|
+
: ''
|
|
309
|
+
"
|
|
236
310
|
@change="
|
|
237
311
|
value => {
|
|
238
312
|
handleChange({
|
|
239
|
-
name: item.field || item.prop,
|
|
313
|
+
name: item.name || item.field || item.prop,
|
|
240
314
|
value: value,
|
|
241
315
|
data: scope.row,
|
|
242
316
|
type: item.type
|
|
@@ -247,11 +321,11 @@
|
|
|
247
321
|
<em-switch
|
|
248
322
|
v-else-if="item.type === 'switch'"
|
|
249
323
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
250
|
-
v-model="scope.row[item.field]"
|
|
324
|
+
v-model="scope.row[item.name || item.field || item.prop]"
|
|
251
325
|
@change="
|
|
252
326
|
value => {
|
|
253
327
|
handleChange({
|
|
254
|
-
name: item.field || item.prop,
|
|
328
|
+
name: item.name || item.field || item.prop,
|
|
255
329
|
value: value,
|
|
256
330
|
data: scope.row
|
|
257
331
|
});
|
|
@@ -261,13 +335,13 @@
|
|
|
261
335
|
<em-selector
|
|
262
336
|
v-else-if="item.type == 'selector'"
|
|
263
337
|
v-bind="exclAttribute({ data: item, attrs: 'width' })"
|
|
264
|
-
v-model="scope.row[item.field]"
|
|
338
|
+
v-model="scope.row[item.name || item.field || item.prop]"
|
|
265
339
|
:label="item.title"
|
|
266
340
|
hide-label
|
|
267
341
|
@change="
|
|
268
342
|
value => {
|
|
269
343
|
handleChange({
|
|
270
|
-
name: item.field || item.prop,
|
|
344
|
+
name: item.name || item.field || item.prop,
|
|
271
345
|
value: value.list,
|
|
272
346
|
data: scope.row
|
|
273
347
|
});
|
|
@@ -588,7 +662,10 @@
|
|
|
588
662
|
><div
|
|
589
663
|
v-html="
|
|
590
664
|
item.formatDate
|
|
591
|
-
? formatDate(
|
|
665
|
+
? formatDate(
|
|
666
|
+
scope.row[item.name || item.field || item.prop],
|
|
667
|
+
item.formatDate
|
|
668
|
+
)
|
|
592
669
|
: getValue(scope.row)
|
|
593
670
|
"
|
|
594
671
|
></div
|
|
@@ -637,9 +714,9 @@ export default {
|
|
|
637
714
|
};
|
|
638
715
|
},
|
|
639
716
|
mounted() {
|
|
640
|
-
const { field, prop, name,
|
|
717
|
+
const { field, prop, name, url, sysAppCode } = this.item;
|
|
641
718
|
this.selectStr.indexOf(sysAppCode) != -1 && (this.isSelect = false);
|
|
642
|
-
if (sysAppCode && !this.isSelect) {
|
|
719
|
+
if ((sysAppCode || url) && !this.isSelect) {
|
|
643
720
|
this.optionList[name || field || prop] = [];
|
|
644
721
|
this.getSelectValue(this.item);
|
|
645
722
|
this.selectStr += sysAppCode;
|
|
@@ -657,7 +734,9 @@ export default {
|
|
|
657
734
|
methods: {
|
|
658
735
|
getSelectValue(item) {
|
|
659
736
|
let params = {
|
|
660
|
-
url: item.
|
|
737
|
+
url: item.baseUrl
|
|
738
|
+
? item.baseUrl + (item.url || findSysCode)
|
|
739
|
+
: item.url || findSysCode,
|
|
661
740
|
type: item.method || 'get',
|
|
662
741
|
params: {
|
|
663
742
|
ccCode: item.sysAppCode,
|
|
@@ -666,9 +745,17 @@ export default {
|
|
|
666
745
|
}
|
|
667
746
|
};
|
|
668
747
|
request(params).then(res => {
|
|
669
|
-
const { data, status } = res;
|
|
670
|
-
if (status === 'success') {
|
|
671
|
-
this.optionList[
|
|
748
|
+
const { data, status, results, rCode } = res;
|
|
749
|
+
if (status === 'success' || rCode === 0) {
|
|
750
|
+
this.optionList[
|
|
751
|
+
item.name || item.field || item.prop
|
|
752
|
+
] = item.resultsName
|
|
753
|
+
? data
|
|
754
|
+
? data[item.resultsName]
|
|
755
|
+
: results[item.resultsName]
|
|
756
|
+
: data
|
|
757
|
+
? data
|
|
758
|
+
: results;
|
|
672
759
|
this.show = false;
|
|
673
760
|
setTimeout(() => {
|
|
674
761
|
this.show = true;
|
|
@@ -705,14 +792,7 @@ export default {
|
|
|
705
792
|
}
|
|
706
793
|
}
|
|
707
794
|
} else if (type === 'select') {
|
|
708
|
-
const {
|
|
709
|
-
name,
|
|
710
|
-
labelKey,
|
|
711
|
-
field,
|
|
712
|
-
prop,
|
|
713
|
-
valueKey,
|
|
714
|
-
optionData
|
|
715
|
-
} = this.item;
|
|
795
|
+
const { name, labelKey, field, prop, valueKey, optionData } = this.item;
|
|
716
796
|
if (this.optionList[name || field || prop]) {
|
|
717
797
|
let value = this.optionList[name || field || prop].filter(
|
|
718
798
|
x => x[valueKey || 'cciValue'] === row[name || field || prop]
|
package/src/index.js
CHANGED
package/src/utils/axios.js
CHANGED
|
@@ -15,8 +15,8 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
|
|
|
15
15
|
});
|
|
16
16
|
http.interceptors.request.use(
|
|
17
17
|
config => {
|
|
18
|
-
if (type === 'post' && format) {
|
|
19
|
-
config.
|
|
18
|
+
if (type === 'post' && !format) {
|
|
19
|
+
config.params = qs.stringify(params.params || params);
|
|
20
20
|
if (!config.headers['content-type'] && !headers['Content-Type']) {
|
|
21
21
|
config.headers['content-type'] =
|
|
22
22
|
'application/x-www-form-urlencoded;charset=UTF-8';
|
|
@@ -25,7 +25,7 @@ const ajax = (url, params = {}, headers = {}, format = true, type = 'get') => {
|
|
|
25
25
|
if (!config.headers['content-type'] && !headers['Content-Type']) {
|
|
26
26
|
config.headers['content-type'] = 'application/json;charset=UTF-8';
|
|
27
27
|
}
|
|
28
|
-
config.
|
|
28
|
+
config.params = params.params || params;
|
|
29
29
|
}
|
|
30
30
|
|
|
31
31
|
if ($.getStorage('token')) {
|
|
@@ -188,6 +188,7 @@ const base = {
|
|
|
188
188
|
);
|
|
189
189
|
},
|
|
190
190
|
post: (url, params, headers, format) => {
|
|
191
|
+
console.log(params, 'params');
|
|
191
192
|
if (params.params) {
|
|
192
193
|
params.params.userId = params.params.userId || $.getStorage('userId');
|
|
193
194
|
} else {
|
package/src/utils/http.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import base from './axios';
|
|
2
2
|
const request = options => {
|
|
3
|
+
console.log(options, 'options');
|
|
3
4
|
let fn;
|
|
4
5
|
switch (options.type) {
|
|
5
6
|
case 'post':
|
|
@@ -19,13 +20,13 @@ const request = options => {
|
|
|
19
20
|
);
|
|
20
21
|
break;
|
|
21
22
|
case 'get':
|
|
22
|
-
fn = base.get(options.url, options.params, options.headers = {});
|
|
23
|
+
fn = base.get(options.url, options.params, (options.headers = {}));
|
|
23
24
|
break;
|
|
24
25
|
case 'GET':
|
|
25
|
-
fn = base.get(options.url, options.params, options.headers = {});
|
|
26
|
+
fn = base.get(options.url, options.params, (options.headers = {}));
|
|
26
27
|
break;
|
|
27
28
|
default:
|
|
28
|
-
fn = base.get(options.url, options.params, options.headers = {});
|
|
29
|
+
fn = base.get(options.url, options.params, (options.headers = {}));
|
|
29
30
|
}
|
|
30
31
|
return fn;
|
|
31
32
|
};
|