eoss-ui 0.4.76 → 0.4.77

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 (77) hide show
  1. package/CHANGELOG.md +929 -0
  2. package/lib/button.js +7 -2
  3. package/lib/eoss-ui.common.js +293 -43
  4. package/lib/form.js +223 -23
  5. package/lib/index.js +1 -1
  6. package/lib/table-form.js +55 -10
  7. package/lib/theme-chalk/form.css +1 -1
  8. package/lib/theme-chalk/index.css +1 -1
  9. package/lib/theme-chalk/input.css +1 -1
  10. package/package.json +1 -1
  11. package/packages/button/src/main.vue +17 -2
  12. package/packages/form/src/main.vue +79 -15
  13. package/packages/form/src/table.vue +22 -4
  14. package/packages/layout/index.js +5 -0
  15. package/packages/layout/src/main.vue +1428 -0
  16. package/packages/layout/src/resetPassword.vue +338 -0
  17. package/packages/theme-chalk/lib/base.css +1 -0
  18. package/packages/theme-chalk/lib/button-group.css +1 -0
  19. package/packages/theme-chalk/lib/button.css +0 -0
  20. package/packages/theme-chalk/lib/card.css +1 -0
  21. package/packages/theme-chalk/lib/cascader.css +0 -0
  22. package/packages/theme-chalk/lib/checkbox-group.css +1 -0
  23. package/packages/theme-chalk/lib/clients.css +1 -0
  24. package/packages/theme-chalk/lib/data-table-form.css +1 -0
  25. package/packages/theme-chalk/lib/data-table.css +1 -0
  26. package/packages/theme-chalk/lib/date-picker.css +1 -0
  27. package/packages/theme-chalk/lib/dialog.css +1 -0
  28. package/packages/theme-chalk/lib/enterprise.css +1 -0
  29. package/packages/theme-chalk/lib/error-page.css +1 -0
  30. package/packages/theme-chalk/lib/flow-chart.css +0 -0
  31. package/packages/theme-chalk/lib/flow-group.css +1 -0
  32. package/packages/theme-chalk/lib/flow-list.css +1 -0
  33. package/packages/theme-chalk/lib/flow.css +1 -0
  34. package/packages/theme-chalk/lib/fonts/iconfont.ttf +0 -0
  35. package/packages/theme-chalk/lib/fonts/iconfont.woff +0 -0
  36. package/packages/theme-chalk/lib/form.css +1 -0
  37. package/packages/theme-chalk/lib/handle-user.css +1 -0
  38. package/packages/theme-chalk/lib/handler.css +1 -0
  39. package/packages/theme-chalk/lib/icon.css +1 -0
  40. package/packages/theme-chalk/lib/icons.css +1 -0
  41. package/packages/theme-chalk/lib/index.css +1 -0
  42. package/packages/theme-chalk/lib/input-number.css +0 -0
  43. package/packages/theme-chalk/lib/input.css +1 -0
  44. package/packages/theme-chalk/lib/label.css +1 -0
  45. package/packages/theme-chalk/lib/login.css +1 -0
  46. package/packages/theme-chalk/lib/main.css +1 -0
  47. package/packages/theme-chalk/lib/mainComp.css +0 -0
  48. package/packages/theme-chalk/lib/menu.css +1 -0
  49. package/packages/theme-chalk/lib/nav.css +1 -0
  50. package/packages/theme-chalk/lib/notify.css +0 -0
  51. package/packages/theme-chalk/lib/page.css +1 -0
  52. package/packages/theme-chalk/lib/pagination.css +1 -0
  53. package/packages/theme-chalk/lib/player.css +1 -0
  54. package/packages/theme-chalk/lib/qr-code.css +1 -0
  55. package/packages/theme-chalk/lib/radio-group.css +1 -0
  56. package/packages/theme-chalk/lib/retrial-auth.css +1 -0
  57. package/packages/theme-chalk/lib/select-ganged.css +1 -0
  58. package/packages/theme-chalk/lib/select.css +0 -0
  59. package/packages/theme-chalk/lib/selector-panel.css +1 -0
  60. package/packages/theme-chalk/lib/selector.css +1 -0
  61. package/packages/theme-chalk/lib/sizer.css +1 -0
  62. package/packages/theme-chalk/lib/steps.css +1 -0
  63. package/packages/theme-chalk/lib/switch.css +1 -0
  64. package/packages/theme-chalk/lib/table-form.css +0 -0
  65. package/packages/theme-chalk/lib/tabs-panel.css +0 -0
  66. package/packages/theme-chalk/lib/tabs.css +1 -0
  67. package/packages/theme-chalk/lib/tips.css +1 -0
  68. package/packages/theme-chalk/lib/toolbar.css +1 -0
  69. package/packages/theme-chalk/lib/tree-group.css +1 -0
  70. package/packages/theme-chalk/lib/tree.css +1 -0
  71. package/packages/theme-chalk/lib/upload.css +1 -0
  72. package/packages/theme-chalk/lib/wujie.css +0 -0
  73. package/packages/theme-chalk/lib/wxlogin.css +1 -0
  74. package/packages/theme-chalk/src/form.scss +12 -5
  75. package/packages/theme-chalk/src/input.scss +8 -3
  76. package/src/index.js +1 -1
  77. package/packages/theme-chalk/gulpfile.js +0 -25
package/lib/theme-chalk/input.css CHANGED
@@ -1 +1 @@
1
- div.es-textarea__inner{min-height:70px}
1
+ div.es-textarea__inner{min-height:70px}.es-input-button-suffix .el-input__suffix{line-height:2.8}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.4.76",
3
+ "version": "0.4.77",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
package/packages/button/src/main.vue CHANGED
@@ -18,6 +18,10 @@ export default {
18
18
  },
19
19
  props: {
20
20
  icon: String,
21
+ iconPlacement: {
22
+ type: String,
23
+ default: 'start'
24
+ },
21
25
  link: String,
22
26
  hide: Boolean,
23
27
  param: Object,
@@ -38,7 +42,8 @@ export default {
38
42
  useCaseCode: String,
39
43
  closed: Function,
40
44
  stop: Boolean,
41
- syncKeys: Object
45
+ syncKeys: Object,
46
+ text: String
42
47
  },
43
48
  data() {
44
49
  return {};
@@ -268,7 +273,17 @@ export default {
268
273
  }
269
274
  ]
270
275
  },
271
- [this.icon ? h('i', { class: this.icon }) : '', this.$slots.default]
276
+ this.iconPlacement === 'start'
277
+ ? [
278
+ this.text,
279
+ this.$slots.default,
280
+ this.icon ? h('i', { class: this.icon }) : ''
281
+ ]
282
+ : [
283
+ this.icon ? h('i', { class: this.icon }) : '',
284
+ this.text,
285
+ this.$slots.default
286
+ ]
272
287
  );
273
288
  }
274
289
  };
package/packages/form/src/main.vue CHANGED
@@ -3,6 +3,7 @@
3
3
  v-if="refresh"
4
4
  ref="esForm"
5
5
  v-bind="$attrs"
6
+ :disabled="disabled"
6
7
  :label-position="labelPosition"
7
8
  :model="models"
8
9
  :label-width="labelWidth"
@@ -601,10 +602,21 @@
601
602
  <template v-if="item.inline">
602
603
  <template v-if="Array.isArray(item.inline)">
603
604
  <template v-for="(inline, k) in item.inline">
605
+ <es-button
606
+ v-if="inline.type == 'button' && !inline.hide"
607
+ class="es-button-inline"
608
+ :disabled="disabled || inline.disabled"
609
+ v-bind="
610
+ handleExclAttribute({
611
+ data: inline,
612
+ attrs: ['disabled']
613
+ })
614
+ "
615
+ ></es-button>
604
616
  <div
605
- class="es-form-inline"
617
+ class="es-form-inline es-form-item-inline"
606
618
  :key="k"
607
- v-if="!inline.hide"
619
+ v-else-if="!inline.hide"
608
620
  >
609
621
  <div
610
622
  class="es-range"
@@ -614,8 +626,8 @@
614
626
  </div>
615
627
  <el-form-item
616
628
  label-width="0"
617
- :prop="item.inline.name"
618
- :rules="getRules(item.inline)"
629
+ :prop="inline.name"
630
+ :rules="getRules(inline)"
619
631
  >
620
632
  <es-input-number
621
633
  v-if="inline.type == 'number'"
@@ -1501,18 +1513,29 @@
1501
1513
  <template v-if="item.inline">
1502
1514
  <template v-if="Array.isArray(item.inline)">
1503
1515
  <template v-for="(inline, k) in item.inline">
1516
+ <es-button
1517
+ v-if="inline.type == 'button' && !inline.hide"
1518
+ class="es-button-inline"
1519
+ :disabled="disabled || inline.disabled"
1520
+ v-bind="
1521
+ handleExclAttribute({
1522
+ data: inline,
1523
+ attrs: ['disabled']
1524
+ })
1525
+ "
1526
+ ></es-button>
1504
1527
  <div
1505
- class="es-form-inline"
1528
+ class="es-form-inline es-form-item-inline"
1506
1529
  :key="k"
1507
- v-if="!inline.hide"
1530
+ v-else-if="!inline.hide"
1508
1531
  >
1509
1532
  <div class="es-range" v-if="inline.range !== false">
1510
1533
  —
1511
1534
  </div>
1512
1535
  <el-form-item
1513
1536
  label-width="0"
1514
- :prop="item.inline.name"
1515
- :rules="getRules(item.inline)"
1537
+ :prop="inline.name"
1538
+ :rules="getRules(inline)"
1516
1539
  >
1517
1540
  <es-input-number
1518
1541
  v-if="inline.type == 'number'"
@@ -2450,18 +2473,29 @@
2450
2473
  <template v-if="item.inline">
2451
2474
  <template v-if="Array.isArray(item.inline)">
2452
2475
  <template v-for="(inline, k) in item.inline">
2476
+ <es-button
2477
+ v-if="inline.type == 'button' && !inline.hide"
2478
+ class="es-button-inline"
2479
+ :disabled="disabled || inline.disabled"
2480
+ v-bind="
2481
+ handleExclAttribute({
2482
+ data: inline,
2483
+ attrs: ['disabled']
2484
+ })
2485
+ "
2486
+ ></es-button>
2453
2487
  <div
2454
- v-if="!inline.hide"
2455
- class="es-form-inline"
2488
+ class="es-form-inline es-form-item-inline"
2456
2489
  :key="k"
2490
+ v-else-if="!inline.hide"
2457
2491
  >
2458
2492
  <div class="es-range" v-if="inline.range !== false">
2459
2493
  —
2460
2494
  </div>
2461
2495
  <el-form-item
2462
2496
  label-width="0"
2463
- :prop="item.inline.name"
2464
- :rules="getRules(item.inline)"
2497
+ :prop="inline.name"
2498
+ :rules="getRules(inline)"
2465
2499
  >
2466
2500
  <es-input-number
2467
2501
  v-if="inline.type == 'number'"
@@ -3307,14 +3341,43 @@
3307
3341
  <template v-if="item.inline">
3308
3342
  <template v-if="Array.isArray(item.inline)">
3309
3343
  <template v-for="(inline, k) in item.inline">
3310
- <div v-if="!inline.hide" class="es-form-inline" :key="k">
3344
+ <es-button
3345
+ v-if="
3346
+ inline.type == 'button' &&
3347
+ !inline.readonly &&
3348
+ !readonly
3349
+ "
3350
+ class="es-button-inline"
3351
+ :disabled="disabled || inline.disabled"
3352
+ v-bind="
3353
+ handleExclAttribute({
3354
+ data: inline,
3355
+ attrs: ['disabled']
3356
+ })
3357
+ "
3358
+ ></es-button>
3359
+ <div
3360
+ class="es-form-inline es-form-item-inline"
3361
+ :key="k"
3362
+ v-else-if="!inline.hide"
3363
+ >
3311
3364
  <div class="es-range" v-if="inline.range !== false">
3312
3365
  —
3313
3366
  </div>
3367
+ <es-button
3368
+ v-if="inline.type == 'button'"
3369
+ v-bind="
3370
+ handleExclAttribute({
3371
+ data: inline,
3372
+ attrs: ['text']
3373
+ })
3374
+ "
3375
+ >{{ inline.text }}</es-button
3376
+ >
3314
3377
  <el-form-item
3315
3378
  label-width="0"
3316
- :prop="item.inline.name"
3317
- :rules="getRules(item.inline)"
3379
+ :prop="inline.name"
3380
+ :rules="getRules(inline)"
3318
3381
  >
3319
3382
  <es-input-number
3320
3383
  v-if="inline.type == 'number'"
@@ -3798,6 +3861,7 @@ export default {
3798
3861
  type: String,
3799
3862
  default: 'post'
3800
3863
  },
3864
+ disabled: Boolean,
3801
3865
  modelMethod: {
3802
3866
  type: String,
3803
3867
  default: 'get'
package/packages/form/src/table.vue CHANGED
@@ -488,9 +488,20 @@
488
488
  <template v-if="item.inline">
489
489
  <template v-if="Array.isArray(item.inline)">
490
490
  <template v-for="(inline, k) in item.inline">
491
+ <es-button
492
+ v-if="inline.type == 'button' && !inline.hide"
493
+ class="es-button-inline"
494
+ :disabled="isDisabled || inline.disabled"
495
+ v-bind="
496
+ handleExclAttribute({
497
+ data: inline,
498
+ attrs: ['disabled']
499
+ })
500
+ "
501
+ ></es-button>
491
502
  <div
492
- v-if="!inline.hide"
493
- class="es-form-inline"
503
+ v-else-if="!inline.hide"
504
+ class="es-form-inline es-form-item-inline"
494
505
  :key="k"
495
506
  >
496
507
  <div class="es-range" v-if="inline.range !== false">
@@ -498,8 +509,8 @@
498
509
  </div>
499
510
  <el-form-item
500
511
  label-width="0"
501
- :prop="item.inline.name"
502
- :rules="getRules(item.inline)"
512
+ :prop="inline.name"
513
+ :rules="getRules(inline)"
503
514
  >
504
515
  <es-input-number
505
516
  v-if="inline.type == 'number'"
@@ -1059,6 +1070,9 @@ export default {
1059
1070
  inject: {
1060
1071
  scale: {
1061
1072
  default: ''
1073
+ },
1074
+ esForm: {
1075
+ default: ''
1062
1076
  }
1063
1077
  },
1064
1078
  props: {
@@ -1068,6 +1082,7 @@ export default {
1068
1082
  return {};
1069
1083
  }
1070
1084
  },
1085
+ disabled: Boolean,
1071
1086
  span: Number,
1072
1087
  contents: {
1073
1088
  type: Array,
@@ -1166,6 +1181,9 @@ export default {
1166
1181
  set(val) {
1167
1182
  return val;
1168
1183
  }
1184
+ },
1185
+ isDisabled() {
1186
+ return this.disabled || (this.esForm || {}).disabled;
1169
1187
  }
1170
1188
  },
1171
1189
  watch: {
package/packages/layout/index.js ADDED
@@ -0,0 +1,5 @@
1
+ import EsLogin from './src/main';
2
+
3
+ EsLogin.install = Vue => Vue.component(EsLogin.name, EsLogin);
4
+
5
+ export default EsLogin;