eoss-ui 0.6.70 → 0.6.72

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 (61) hide show
  1. package/lib/button-group.js +4 -2
  2. package/lib/button.js +4 -2
  3. package/lib/calogin.js +4 -2
  4. package/lib/checkbox-group.js +4 -2
  5. package/lib/data-table-form.js +4 -2
  6. package/lib/data-table.js +4 -2
  7. package/lib/date-picker.js +4 -2
  8. package/lib/dialog.js +4 -2
  9. package/lib/eoss-ui.common.js +1018 -384
  10. package/lib/flow-group.js +4 -2
  11. package/lib/flow-list.js +53 -16
  12. package/lib/flow.js +100 -51
  13. package/lib/form.js +567 -187
  14. package/lib/handle-user.js +4 -2
  15. package/lib/handler.js +4 -2
  16. package/lib/icon.js +4 -2
  17. package/lib/index.js +1 -1
  18. package/lib/input-number.js +4 -2
  19. package/lib/input.js +4 -2
  20. package/lib/login.js +4 -2
  21. package/lib/main.js +16 -14
  22. package/lib/nav.js +4 -2
  23. package/lib/page.js +4 -2
  24. package/lib/pagination.js +4 -2
  25. package/lib/player.js +4 -2
  26. package/lib/qr-code.js +4 -2
  27. package/lib/radio-group.js +4 -2
  28. package/lib/retrial-auth.js +4 -2
  29. package/lib/select-ganged.js +4 -2
  30. package/lib/select.js +4 -2
  31. package/lib/selector-panel.js +4 -2
  32. package/lib/selector.js +31 -13
  33. package/lib/sizer.js +4 -2
  34. package/lib/steps.js +4 -2
  35. package/lib/switch.js +4 -2
  36. package/lib/table-form.js +251 -93
  37. package/lib/tabs.js +4 -2
  38. package/lib/tips.js +4 -2
  39. package/lib/tree-group.js +4 -2
  40. package/lib/tree.js +4 -2
  41. package/lib/upload.js +4 -2
  42. package/lib/utils/util.js +4 -2
  43. package/lib/wujie.js +4 -2
  44. package/lib/wxlogin.js +4 -2
  45. package/package.json +1 -1
  46. package/packages/.DS_Store +0 -0
  47. package/packages/flow/.DS_Store +0 -0
  48. package/packages/flow/src/component/Circulate.vue +6 -1
  49. package/packages/flow/src/main.vue +54 -19
  50. package/packages/flow/src/processForm.vue +6 -1
  51. package/packages/flow/src/selectUser.vue +1 -1
  52. package/packages/flow-list/src/main.vue +41 -9
  53. package/{lib → packages/form}/.DS_Store +0 -0
  54. package/packages/form/src/main.vue +276 -61
  55. package/packages/form/src/table.vue +104 -28
  56. package/packages/main/.DS_Store +0 -0
  57. package/packages/main/src/public/search.vue +5 -9
  58. package/packages/selector/.DS_Store +0 -0
  59. package/packages/selector/src/main.vue +23 -7
  60. package/src/index.js +1 -1
  61. package/src/utils/util.js +2 -1
@@ -41,7 +41,9 @@
41
41
  :data="model[item.name]"
42
42
  :full="false"
43
43
  v-bind="item"
44
- :readonly="readonly ? readonly : item.readonly"
44
+ :readonly="
45
+ item.readonly !== undefined ? item.readonly : readonly
46
+ "
45
47
  @blur="
46
48
  (val, data) => {
47
49
  handleBlur(item, val, data);
@@ -74,7 +76,9 @@
74
76
  })
75
77
  "
76
78
  v-on="item.events"
77
- :readonly="readonly ? readonly : item.readonly"
79
+ :readonly="
80
+ item.readonly !== undefined ? item.readonly : readonly
81
+ "
78
82
  @blur="
79
83
  (val, data) => {
80
84
  handleBlur(item, val, data);
@@ -188,7 +192,9 @@
188
192
  "
189
193
  v-model="model[item.name]"
190
194
  :plain="item.plain"
191
- :readonly="readonly ? readonly : item.readonly"
195
+ :readonly="
196
+ item.readonly !== undefined ? item.readonly : readonly
197
+ "
192
198
  @blur="
193
199
  (event) => {
194
200
  handleBlur(item, event);
@@ -215,7 +221,9 @@
215
221
  "
216
222
  v-model="model[item.name]"
217
223
  :plain="item.plain"
218
- :readonly="readonly ? readonly : item.readonly"
224
+ :readonly="
225
+ item.readonly !== undefined ? item.readonly : readonly
226
+ "
219
227
  @change="
220
228
  (val) => {
221
229
  handleChange(item, val);
@@ -232,7 +240,9 @@
232
240
  "
233
241
  v-model="model[item.name]"
234
242
  :plain="item.plain"
235
- :readonly="readonly ? readonly : item.readonly"
243
+ :readonly="
244
+ item.readonly !== undefined ? item.readonly : readonly
245
+ "
236
246
  @change="
237
247
  (val) => {
238
248
  handleChange(item, val);
@@ -249,7 +259,9 @@
249
259
  "
250
260
  v-model="model[item.name]"
251
261
  :plain="item.plain"
252
- :readonly="readonly ? readonly : item.readonly"
262
+ :readonly="
263
+ item.readonly !== undefined ? item.readonly : readonly
264
+ "
253
265
  @blur="
254
266
  (event) => {
255
267
  handleBlur(item, event);
@@ -276,7 +288,9 @@
276
288
  "
277
289
  v-model="model[item.name]"
278
290
  :plain="item.plain || item.name === undefined"
279
- :readonly="readonly ? readonly : item.readonly"
291
+ :readonly="
292
+ item.readonly !== undefined ? item.readonly : readonly
293
+ "
280
294
  @blur="
281
295
  (event) => {
282
296
  handleBlur(item, event);
@@ -307,7 +321,9 @@
307
321
  "
308
322
  v-model="model[item.name]"
309
323
  :plain="item.plain"
310
- :readonly="readonly ? readonly : item.readonly"
324
+ :readonly="
325
+ item.readonly !== undefined ? item.readonly : readonly
326
+ "
311
327
  @change="
312
328
  (val) => {
313
329
  handleChange(item, val);
@@ -324,7 +340,9 @@
324
340
  "
325
341
  v-model="model[item.name]"
326
342
  :plain="item.plain"
327
- :readonly="readonly ? readonly : item.readonly"
343
+ :readonly="
344
+ item.readonly !== undefined ? item.readonly : readonly
345
+ "
328
346
  @change="
329
347
  (val) => {
330
348
  handleChange(item, val);
@@ -355,7 +373,9 @@
355
373
  "
356
374
  v-model="model[item.name]"
357
375
  :plain="item.plain"
358
- :readonly="readonly ? readonly : item.readonly"
376
+ :readonly="
377
+ item.readonly !== undefined ? item.readonly : readonly
378
+ "
359
379
  @blur="
360
380
  (event) => {
361
381
  handleBlur(item, event);
@@ -384,7 +404,9 @@
384
404
  v-else-if="
385
405
  item.type == 'attachment' || item.type == 'upload'
386
406
  "
387
- :readonly="readonly ? readonly : item.readonly"
407
+ :readonly="
408
+ item.readonly !== undefined ? item.readonly : readonly
409
+ "
388
410
  :rules="item.rules"
389
411
  btnSize="small"
390
412
  @change="
@@ -403,7 +425,9 @@
403
425
  "
404
426
  v-model="model[item.name]"
405
427
  v-else-if="item.type == 'selector'"
406
- :readonly="readonly ? readonly : item.readonly"
428
+ :readonly="
429
+ item.readonly !== undefined ? item.readonly : readonly
430
+ "
407
431
  :plain="item.plain"
408
432
  v-on="
409
433
  handleExclAttribute({
@@ -427,7 +451,9 @@
427
451
  "
428
452
  v-model="models[item.name]"
429
453
  :plain="item.plain || item.name === undefined"
430
- :readonly="readonly ? readonly : item.readonly"
454
+ :readonly="
455
+ item.readonly !== undefined ? item.readonly : readonly
456
+ "
431
457
  @change="
432
458
  (val) => {
433
459
  handleChange(item, val);
@@ -455,7 +481,9 @@
455
481
  "
456
482
  v-model="model[item.name]"
457
483
  :plain="item.plain"
458
- :readonly="readonly ? readonly : item.readonly"
484
+ :readonly="
485
+ item.readonly !== undefined ? item.readonly : readonly
486
+ "
459
487
  @blur="
460
488
  (event) => {
461
489
  handleBlur(item, event);
@@ -557,7 +585,11 @@
557
585
  inline.plain || inline.name === undefined
558
586
  "
559
587
  :readonly="
560
- readonly ? readonly : inline.readonly
588
+ inline.readonly !== undefined
589
+ ? inline.readonly
590
+ : item.readonly !== undefined
591
+ ? item.readonly
592
+ : readonly
561
593
  "
562
594
  @blur="
563
595
  (event) => {
@@ -588,7 +620,11 @@
588
620
  inline.plain || inline.name === undefined
589
621
  "
590
622
  :readonly="
591
- readonly ? readonly : inline.readonly
623
+ inline.readonly !== undefined
624
+ ? inline.readonly
625
+ : item.readonly !== undefined
626
+ ? item.readonly
627
+ : readonly
592
628
  "
593
629
  @blur="
594
630
  (event) => {
@@ -619,7 +655,11 @@
619
655
  inline.plain || inline.name === undefined
620
656
  "
621
657
  :readonly="
622
- readonly ? readonly : inline.readonly
658
+ inline.readonly !== undefined
659
+ ? inline.readonly
660
+ : item.readonly !== undefined
661
+ ? item.readonly
662
+ : readonly
623
663
  "
624
664
  @blur="
625
665
  (event) => {
@@ -665,7 +705,11 @@
665
705
  inline.plain || inline.name === undefined
666
706
  "
667
707
  :readonly="
668
- readonly ? readonly : inline.readonly
708
+ inline.readonly !== undefined
709
+ ? inline.readonly
710
+ : item.readonly !== undefined
711
+ ? item.readonly
712
+ : readonly
669
713
  "
670
714
  @blur="
671
715
  (event) => {
@@ -714,7 +758,11 @@
714
758
  inline.plain || inline.name === undefined
715
759
  "
716
760
  :readonly="
717
- readonly ? readonly : inline.readonly
761
+ inline.readonly !== undefined
762
+ ? inline.readonly
763
+ : item.readonly !== undefined
764
+ ? item.readonly
765
+ : readonly
718
766
  "
719
767
  @change="
720
768
  (val) => {
@@ -746,7 +794,11 @@
746
794
  inline.plain || inline.name === undefined
747
795
  "
748
796
  :readonly="
749
- readonly ? readonly : inline.readonly
797
+ inline.readonly !== undefined
798
+ ? inline.readonly
799
+ : item.readonly !== undefined
800
+ ? item.readonly
801
+ : readonly
750
802
  "
751
803
  @blur="
752
804
  (event) => {
@@ -795,7 +847,11 @@
795
847
  item.inline.name === undefined
796
848
  "
797
849
  :readonly="
798
- readonly ? readonly : item.inline.readonly
850
+ item.inline.readonly !== undefined
851
+ ? item.inline.readonly
852
+ : item.readonly !== undefined
853
+ ? item.readonly
854
+ : readonly
799
855
  "
800
856
  @blur="
801
857
  (event) => {
@@ -827,7 +883,11 @@
827
883
  item.inline.name === undefined
828
884
  "
829
885
  :readonly="
830
- readonly ? readonly : item.inline.readonly
886
+ item.inline.readonly !== undefined
887
+ ? item.inline.readonly
888
+ : item.readonly !== undefined
889
+ ? item.readonly
890
+ : readonly
831
891
  "
832
892
  @blur="
833
893
  (event) => {
@@ -859,7 +919,11 @@
859
919
  item.inline.name === undefined
860
920
  "
861
921
  :readonly="
862
- readonly ? readonly : item.inline.readonly
922
+ item.inline.readonly !== undefined
923
+ ? item.inline.readonly
924
+ : item.readonly !== undefined
925
+ ? item.readonly
926
+ : readonly
863
927
  "
864
928
  @blur="
865
929
  (event) => {
@@ -901,7 +965,11 @@
901
965
  item.inline.name === undefined
902
966
  "
903
967
  :readonly="
904
- readonly ? readonly : item.inline.readonly
968
+ item.inline.readonly !== undefined
969
+ ? item.inline.readonly
970
+ : item.readonly !== undefined
971
+ ? item.readonly
972
+ : readonly
905
973
  "
906
974
  @blur="
907
975
  (event) => {
@@ -933,7 +1001,11 @@
933
1001
  item.inline.name === undefined
934
1002
  "
935
1003
  :readonly="
936
- readonly ? readonly : item.inline.readonly
1004
+ item.inline.readonly !== undefined
1005
+ ? item.inline.readonly
1006
+ : item.readonly !== undefined
1007
+ ? item.readonly
1008
+ : readonly
937
1009
  "
938
1010
  @change="
939
1011
  (val) => {
@@ -961,7 +1033,11 @@
961
1033
  item.inline.name === undefined
962
1034
  "
963
1035
  :readonly="
964
- readonly ? readonly : item.inline.readonly
1036
+ item.inline.readonly !== undefined
1037
+ ? item.inline.readonly
1038
+ : item.readonly !== undefined
1039
+ ? item.readonly
1040
+ : readonly
965
1041
  "
966
1042
  @blur="
967
1043
  (event) => {
@@ -1041,7 +1117,7 @@
1041
1117
  :data="model[item.name]"
1042
1118
  :full="false"
1043
1119
  v-bind="item"
1044
- :readonly="readonly ? readonly : item.readonly"
1120
+ :readonly="item.readonly !== undefined ? item.readonly : readonly"
1045
1121
  @blur="
1046
1122
  (val, data) => {
1047
1123
  handleBlur(item, val, data);
@@ -1075,7 +1151,7 @@
1075
1151
  })
1076
1152
  "
1077
1153
  v-on="item.events"
1078
- :readonly="readonly ? readonly : item.readonly"
1154
+ :readonly="item.readonly !== undefined ? item.readonly : readonly"
1079
1155
  @blur="
1080
1156
  (val, data) => {
1081
1157
  handleBlur(item, val, data);
Binary file
@@ -131,7 +131,7 @@
131
131
  </el-tab-pane>
132
132
  </template>
133
133
  </el-tabs>
134
- <es-dialog :title="title" :visible.sync="visible" size="lg">
134
+ <es-dialog :title="title" :visible.sync="visible" size="max">
135
135
  <iframe width="100%" height="100%" frameborder="0" :src="url"></iframe>
136
136
  </es-dialog>
137
137
  </div>
@@ -325,20 +325,16 @@ export default {
325
325
  this.isLoading = false;
326
326
  this.types[i].records = this.searchData(this.menus, keyWords);
327
327
  this.types[i].totalCount = this.types[i].records.length;
328
- this.types[i].pageCount = Math.ceil(
329
- this.types[i].records.length / this.pageSize
330
- );
331
- this.types[i].pageNum = 0;
328
+ this.types[i].pageCount = 1;
329
+ this.types[i].pageNum = 1;
332
330
  this.$set(this.loadings, item.id || String(i), false);
333
331
  this.$set(this.noMore, item.id || String(i), true);
334
332
  } else if (item.name == '应用' && this.apps.length) {
335
333
  this.isLoading = false;
336
334
  this.types[i].records = this.searchData(this.apps, keyWords);
337
335
  this.types[i].totalCount = this.types[i].records.length;
338
- this.types[i].pageCount = Math.ceil(
339
- this.types[i].records.length / this.pageSize
340
- );
341
- this.types[i].pageNum = 0;
336
+ this.types[i].pageCount = 1;
337
+ this.types[i].pageNum = 1;
342
338
  this.$set(this.loadings, item.id || String(i), false);
343
339
  this.$set(this.noMore, item.id || String(i), true);
344
340
  } else if (item.dataRequestUrl) {
Binary file
@@ -39,9 +39,7 @@
39
39
  @close="deleteTag($event, selected[0])"
40
40
  >
41
41
  <span class="el-select__tags-text">
42
- {{
43
- isObject(selected[0]) ? selected[0][labelKey] : selected[0]
44
- }}
42
+ {{ getLabel(selected[0]) }}
45
43
  </span>
46
44
  </el-tag>
47
45
  <el-tag
@@ -181,7 +179,10 @@
181
179
  class="es-selector-dropdown-item"
182
180
  :class="{ 'es-selected': item.selected }"
183
181
  >
184
- <span>{{ item[labelKey] }}</span>
182
+ <span>
183
+ {{ getDep(item) }}
184
+ {{ item[labelKey] }}
185
+ </span>
185
186
  </li>
186
187
  </el-scrollbar>
187
188
  <p v-if="options.length == 0" class="el-select-dropdown__empty">
@@ -316,7 +317,14 @@ export default {
316
317
  type: [String, Number],
317
318
  default: -1
318
319
  },
320
+ //是否显示搜索框
319
321
  filterable: Boolean,
322
+ //搜索列表是否显示部门信息
323
+ showFilterListDep: {
324
+ type: Boolean,
325
+ default: true
326
+ },
327
+ //是否根据搜索值创建新的数据
320
328
  createable: Boolean,
321
329
  showButton: Boolean,
322
330
  button: Object,
@@ -503,8 +511,12 @@ export default {
503
511
  }
504
512
  });
505
513
  },
506
- isObject(obj) {
507
- return util.isObject(obj);
514
+ getDep(res) {
515
+ if (!this.showFilterListDep) {
516
+ return '';
517
+ }
518
+ const attr = res.attr ? JSON.parse(res.attr) : null;
519
+ return attr && attr.depShortName ? `[${attr.depShortName}]` : '';
508
520
  },
509
521
  getValueKey(obj) {
510
522
  return util.isObject(obj) ? obj[this.valueKey] : obj;
@@ -692,10 +704,14 @@ export default {
692
704
  let tag = '';
693
705
  if (this.mix) {
694
706
  tag = util.getTypeName(res.stype);
707
+ } else if (this.showFilterListDep) {
708
+ tag = this.getDep(res);
695
709
  }
696
710
  return (
697
711
  tag +
698
- (res[this.labelKey]
712
+ (typeof res == 'string'
713
+ ? res
714
+ : res[this.labelKey]
699
715
  ? res[this.labelKey]
700
716
  : res.label || res[this.valueKey])
701
717
  );
package/src/index.js CHANGED
@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
125
125
  }
126
126
 
127
127
  export default {
128
- version: '0.6.70',
128
+ version: '0.6.72',
129
129
  install,
130
130
  Button,
131
131
  ButtonGroup,
package/src/utils/util.js CHANGED
@@ -72,6 +72,7 @@ const ajax = function ({
72
72
  data = {},
73
73
  params = {},
74
74
  format = true,
75
+ formatConfig = {},
75
76
  mix = false,
76
77
  defaults = false,
77
78
  loading,
@@ -444,7 +445,7 @@ const ajax = function ({
444
445
  }
445
446
  }
446
447
  if (method === 'post' && format) {
447
- data = qs.stringify(data);
448
+ data = qs.stringify(data, formatConfig);
448
449
  if (!header['content-type'] && !header['Content-Type']) {
449
450
  header['content-type'] =
450
451
  'application/x-www-form-urlencoded;charset=UTF-8';