eoss-ui 0.5.81-beta12 → 0.5.81-beta14

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 (83) hide show
  1. package/lib/button-group.js +27 -8
  2. package/lib/button.js +2 -1
  3. package/lib/data-table.js +16 -16
  4. package/lib/eoss-ui.common.js +90 -73
  5. package/lib/index.js +1 -1
  6. package/lib/main.js +32 -35
  7. package/lib/theme-chalk/button-group.css +1 -1
  8. package/lib/theme-chalk/data-table.css +1 -1
  9. package/lib/theme-chalk/index.css +1 -1
  10. package/lib/theme-chalk/toolbar.css +1 -1
  11. package/package.json +1 -1
  12. package/packages/button/src/main.vue +2 -1
  13. package/packages/button-group/src/main.vue +8 -6
  14. package/packages/data-table/src/column.vue +2 -0
  15. package/packages/data-table/src/main.vue +1 -5
  16. package/packages/main/src/default/index.vue +3 -1
  17. package/packages/main/src/main.vue +2 -1
  18. package/packages/main/src/simplicity/index.vue +5 -5
  19. package/packages/theme-chalk/gulpfile.js +25 -0
  20. package/packages/theme-chalk/src/button-group.scss +16 -2
  21. package/packages/theme-chalk/src/data-table.scss +0 -1
  22. package/packages/theme-chalk/src/toolbar.scss +14 -3
  23. package/src/index.js +157 -157
  24. package/CHANGELOG.md +0 -929
  25. package/packages/theme-chalk/lib/base.css +0 -1
  26. package/packages/theme-chalk/lib/button-group.css +0 -1
  27. package/packages/theme-chalk/lib/button.css +0 -1
  28. package/packages/theme-chalk/lib/calendar.css +0 -1
  29. package/packages/theme-chalk/lib/card.css +0 -1
  30. package/packages/theme-chalk/lib/cascader.css +0 -0
  31. package/packages/theme-chalk/lib/checkbox-group.css +0 -1
  32. package/packages/theme-chalk/lib/clients.css +0 -1
  33. package/packages/theme-chalk/lib/data-table-form.css +0 -1
  34. package/packages/theme-chalk/lib/data-table.css +0 -1
  35. package/packages/theme-chalk/lib/date-picker.css +0 -1
  36. package/packages/theme-chalk/lib/dialog.css +0 -1
  37. package/packages/theme-chalk/lib/enterprise.css +0 -1
  38. package/packages/theme-chalk/lib/error-page.css +0 -1
  39. package/packages/theme-chalk/lib/flow-chart.css +0 -0
  40. package/packages/theme-chalk/lib/flow-group.css +0 -1
  41. package/packages/theme-chalk/lib/flow-list.css +0 -1
  42. package/packages/theme-chalk/lib/flow.css +0 -1
  43. package/packages/theme-chalk/lib/fonts/iconfont.ttf +0 -0
  44. package/packages/theme-chalk/lib/fonts/iconfont.woff +0 -0
  45. package/packages/theme-chalk/lib/form.css +0 -1
  46. package/packages/theme-chalk/lib/handle-user.css +0 -1
  47. package/packages/theme-chalk/lib/handler.css +0 -1
  48. package/packages/theme-chalk/lib/icon.css +0 -1
  49. package/packages/theme-chalk/lib/icons.css +0 -1
  50. package/packages/theme-chalk/lib/index.css +0 -1
  51. package/packages/theme-chalk/lib/input-number.css +0 -0
  52. package/packages/theme-chalk/lib/input.css +0 -1
  53. package/packages/theme-chalk/lib/label.css +0 -1
  54. package/packages/theme-chalk/lib/layout.css +0 -1
  55. package/packages/theme-chalk/lib/login.css +0 -1
  56. package/packages/theme-chalk/lib/main.css +0 -1
  57. package/packages/theme-chalk/lib/menu.css +0 -1
  58. package/packages/theme-chalk/lib/nav.css +0 -1
  59. package/packages/theme-chalk/lib/notify.css +0 -0
  60. package/packages/theme-chalk/lib/page.css +0 -1
  61. package/packages/theme-chalk/lib/pagination.css +0 -1
  62. package/packages/theme-chalk/lib/player.css +0 -1
  63. package/packages/theme-chalk/lib/qr-code.css +0 -1
  64. package/packages/theme-chalk/lib/radio-group.css +0 -1
  65. package/packages/theme-chalk/lib/retrial-auth.css +0 -1
  66. package/packages/theme-chalk/lib/select-ganged.css +0 -1
  67. package/packages/theme-chalk/lib/select.css +0 -1
  68. package/packages/theme-chalk/lib/selector-panel.css +0 -1
  69. package/packages/theme-chalk/lib/selector.css +0 -1
  70. package/packages/theme-chalk/lib/simplicity.css +0 -1
  71. package/packages/theme-chalk/lib/sizer.css +0 -1
  72. package/packages/theme-chalk/lib/steps.css +0 -1
  73. package/packages/theme-chalk/lib/switch.css +0 -1
  74. package/packages/theme-chalk/lib/table-form.css +0 -0
  75. package/packages/theme-chalk/lib/tabs-panel.css +0 -0
  76. package/packages/theme-chalk/lib/tabs.css +0 -1
  77. package/packages/theme-chalk/lib/tips.css +0 -1
  78. package/packages/theme-chalk/lib/toolbar.css +0 -1
  79. package/packages/theme-chalk/lib/tree-group.css +0 -1
  80. package/packages/theme-chalk/lib/tree.css +0 -1
  81. package/packages/theme-chalk/lib/upload.css +0 -1
  82. package/packages/theme-chalk/lib/wujie.css +0 -0
  83. package/packages/theme-chalk/lib/wxlogin.css +0 -1
@@ -1 +1 @@
1
- @charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-form-search-small .el-form-item__content{line-height:32px!important}.es-toolbar .es-form-search-small .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .es-toolbar-button-group .el-button--medium{border-radius:3px!important}.es-toolbar .es-toolbar-button-group .el-dropdown{margin-left:6px}
1
+ @charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-button-content .el-button{padding:4px 8px}.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-button,.es-toolbar .es-toolbar-content .es-button-content .el-button+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .el-button+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-button-badge+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-selector+.es-upload,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.el-button,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.el-dropdown,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-button-badge,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-selector,.es-toolbar .es-toolbar-content .es-button-content .es-upload+.es-upload{margin-left:6px}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:6px;height:32px}.es-toolbar .es-toolbar-content .es-advanced-btn .es-advanced-icon{margin-right:-8px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-form-search-small .el-form-item__content{line-height:32px!important}.es-toolbar .es-form-search-small .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .es-toolbar-button-group .el-button--medium{border-radius:3px!important}.es-toolbar .es-toolbar-button-group .el-dropdown{margin-left:6px}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "eoss-ui",
3
- "version": "0.5.81-beta12",
3
+ "version": "0.5.81-beta14",
4
4
  "description": "eoss内部业务组件",
5
5
  "main": "lib/eoss-ui.common.js",
6
6
  "files": [
@@ -261,7 +261,7 @@ export default {
261
261
  }
262
262
  }
263
263
  let tag = 'el-button';
264
- let clas = ['es-button'];
264
+ let clas = '';
265
265
  let props = {};
266
266
  let attrs = {};
267
267
  let listeners = {};
@@ -283,6 +283,7 @@ export default {
283
283
  size: this.size
284
284
  };
285
285
  } else {
286
+ clas = ['es-button'];
286
287
  props = { ...this.$attrs, type: this._type, size: this.size };
287
288
  listeners = { ...this.$listeners, click: this.handleClick };
288
289
  if (this.link && !this.open) {
@@ -5,7 +5,6 @@
5
5
  <template v-if="item && !item.hide">
6
6
  <es-upload
7
7
  v-if="item.upload || (item.code && item.ownId)"
8
- class="el-button"
9
8
  v-bind="{
10
9
  ...exclAttribute({
11
10
  data: item,
@@ -15,7 +14,7 @@
15
14
  method: 'post',
16
15
  btnSize: size,
17
16
  showFileList: false,
18
- selectType: item.type ? item.type : ''
17
+ selectType: mode == 'plus' ? 'text' : item.type
19
18
  }"
20
19
  v-on="item.events"
21
20
  ></es-upload>
@@ -30,7 +29,7 @@
30
29
  "
31
30
  :key="index"
32
31
  :size="size"
33
- :type="item.type"
32
+ :type="mode == 'plus' ? 'text' : item.type"
34
33
  v-on="item.events"
35
34
  @click="handleClick({ ...data, handle: item })"
36
35
  >
@@ -50,8 +49,9 @@
50
49
  @visible-change="handleChange"
51
50
  :trigger="trigger"
52
51
  >
53
- <el-button :size="size">
54
- <template v-if="moreText">
52
+ <el-button :size="size" :type="mode == 'plus' ? 'text' : ''">
53
+ <template v-if="mode == 'plus'">更多</template>
54
+ <template v-else-if="moreText">
55
55
  {{ moreText }}
56
56
  <i
57
57
  :class="{
@@ -68,6 +68,7 @@
68
68
  :key="index"
69
69
  :command="item"
70
70
  :class="{ 'es-dropdown-padding': item.upload || item.selector }"
71
+ v-show="!item.hide"
71
72
  >
72
73
  <es-upload
73
74
  v-if="item.upload || (item.code && item.ownId)"
@@ -128,6 +129,7 @@ export default {
128
129
  };
129
130
  },
130
131
  props: {
132
+ mode: String,
131
133
  value: String,
132
134
  data: Object,
133
135
  contents: { type: Array, default: [] },
@@ -139,7 +141,7 @@ export default {
139
141
  stop: Boolean,
140
142
  trigger: {
141
143
  type: String,
142
- default: 'click'
144
+ default: 'hover'
143
145
  },
144
146
  useCaseCodeKey: String,
145
147
  moreText: String,
@@ -402,6 +402,7 @@
402
402
  })
403
403
  "
404
404
  stop
405
+ :mode="mode"
405
406
  :contents="contents || events"
406
407
  :data="scope"
407
408
  @handleClick="handleClick"
@@ -459,6 +460,7 @@ export default {
459
460
  }
460
461
  },
461
462
  props: {
463
+ mode: String,
462
464
  service: String,
463
465
  form: Boolean,
464
466
  readonly: Boolean,
@@ -77,11 +77,6 @@
77
77
  (theadBorder && border != 'none' ? ' es-thead-border' : '')
78
78
  "
79
79
  >
80
- <!-- <el-table-column v-if="dragSort" width="32" fixed>
81
- <template slot-scope="scope">
82
- <es-icon :contents="dragSortIcon"></es-icon>
83
- </template>
84
- </el-table-column> -->
85
80
  <slot name="prepend"></slot>
86
81
  <slot></slot>
87
82
  <template v-for="(item, index) in theads">
@@ -106,6 +101,7 @@
106
101
  v-else
107
102
  :key="item.label || item.title"
108
103
  v-bind="{
104
+ mode: mode,
109
105
  name: name,
110
106
  indexs: index,
111
107
  form: form,
@@ -675,7 +675,9 @@ export default {
675
675
  let mainConfig = util.getStorage('mainConfig');
676
676
  if (mainConfig) {
677
677
  const results = JSON.parse(mainConfig);
678
- this.init(results);
678
+ if (Object.keys(results).length) {
679
+ this.init(results);
680
+ }
679
681
  }
680
682
  },
681
683
  mounted() {
@@ -64,7 +64,8 @@ export default {
64
64
  ) {
65
65
  return false;
66
66
  }
67
- if (!util.getStorage('mainConfig')) {
67
+ let mainConfig = util.getStorage('mainConfig');
68
+ if (!mainConfig || mainConfig == '{}') {
68
69
  util.getMainConfig((res) => {
69
70
  this.$refs.main.init(res);
70
71
  });
@@ -62,15 +62,13 @@
62
62
  :class="{ 'is-active': active == item.id }"
63
63
  :key="item.id"
64
64
  :title="item.text || item.name"
65
+ @click.stop="handlerClickApp(item)"
65
66
  >
66
67
  <i
67
68
  class="el-icon-circle-close"
68
69
  @click.stop="handleDelete(index)"
69
70
  ></i>
70
- <el-badge
71
- v-bind="getBadge(item)"
72
- @click.stop="handlerClickApp(item)"
73
- >
71
+ <el-badge v-bind="getBadge(item)">
74
72
  <es-icon
75
73
  class="es-simplicity-side-app-icon"
76
74
  :contents="item.icons || item.icon || menuIcon"
@@ -633,7 +631,9 @@ export default {
633
631
  let mainConfig = util.getStorage('mainConfig');
634
632
  if (mainConfig) {
635
633
  const results = JSON.parse(mainConfig);
636
- this.init(results);
634
+ if (Object.keys(results).length) {
635
+ this.init(results);
636
+ }
637
637
  }
638
638
  this.doorIndex = sessionStorage.getItem('doorIndex');
639
639
  },
@@ -0,0 +1,25 @@
1
+ 'use strict';
2
+
3
+ const { series, src, dest } = require('gulp');
4
+ const sass = require('gulp-sass');
5
+ const autoprefixer = require('gulp-autoprefixer');
6
+ const cssmin = require('gulp-cssmin');
7
+
8
+ function compile() {
9
+ return src('./src/*.scss')
10
+ .pipe(sass.sync())
11
+ .pipe(autoprefixer({
12
+ overrideBrowserslist: ['ie > 9', 'last 2 versions'],
13
+ cascade: false
14
+ }))
15
+ .pipe(cssmin())
16
+ .pipe(dest('./lib'));
17
+ }
18
+
19
+ function copyfont() {
20
+ return src('./src/fonts/**')
21
+ .pipe(cssmin())
22
+ .pipe(dest('./lib/fonts'));
23
+ }
24
+
25
+ exports.build = series(compile, copyfont);
@@ -2,7 +2,8 @@
2
2
  .es-button-group {
3
3
  display: flex;
4
4
  & > .el-dropdown {
5
- & > .el-button {
5
+ margin-left: 10px;
6
+ & > .el-button:not(.el-button--text) {
6
7
  border-color: $--border-color-base;
7
8
  }
8
9
  }
@@ -11,7 +12,10 @@
11
12
  .el-button-group {
12
13
  & > .el-button:not(.el-button--text) + .es-button:not(.el-button--text),
13
14
  & > .es-button:not(.el-button--text) + .el-button:not(.el-button--text),
14
- & > .es-button:not(.el-button--text) + .es-button:not(.el-button--text) {
15
+ & > .es-button:not(.el-button--text) + .es-button:not(.el-button--text),
16
+ & > .es-button:not(.el-button--text) + .es-selector,
17
+ & > .es-button:not(.el-button--text) + .es-upload,
18
+ & > .es-button:not(.el-button--text) + .el-dropdown {
15
19
  margin-left: 0;
16
20
  }
17
21
  & > .es-selector {
@@ -30,6 +34,7 @@
30
34
  }
31
35
  }
32
36
  &:not(:first-child):not(:last-child) {
37
+ margin-left: 10px;
33
38
  & > .el-button {
34
39
  border-radius: 0;
35
40
  &.el-button--danger,
@@ -60,6 +65,10 @@
60
65
  margin-right: -1px;
61
66
  }
62
67
  }
68
+ & + .el-button--text,
69
+ & + .el-dropdown {
70
+ margin-left: 10px;
71
+ }
63
72
  }
64
73
  & > .es-upload {
65
74
  float: left;
@@ -79,6 +88,7 @@
79
88
  }
80
89
  }
81
90
  &:not(:first-child):not(:last-child) {
91
+ margin-left: 10px;
82
92
  & > .el-upload--handle > .el-upload {
83
93
  & > .el-button {
84
94
  border-radius: 0;
@@ -115,6 +125,10 @@
115
125
  }
116
126
  }
117
127
  }
128
+ & + .el-button--text,
129
+ & + .el-dropdown {
130
+ margin-left: 10px;
131
+ }
118
132
  }
119
133
  }
120
134
  .es-dropdown-padding {
@@ -72,7 +72,6 @@
72
72
  min-height: 28px;
73
73
  align-items: center;
74
74
  align-content: center;
75
- line-height: 28px;
76
75
  &:not(.el-tooltip) {
77
76
  display: flex;
78
77
  }
@@ -12,12 +12,23 @@
12
12
  .el-button {
13
13
  padding: 4px 8px;
14
14
  & + .el-button,
15
- & + .es-button-badge {
15
+ & + .es-button-badge,
16
+ & + .es-upload,
17
+ & + .el-dropdown,
18
+ & + .es-selector {
16
19
  margin-left: 6px;
17
20
  }
18
21
  }
19
- .es-button-badge + .el-button {
20
- margin-left: 6px;
22
+ .es-button-badge,
23
+ .es-upload,
24
+ .es-selector {
25
+ & + .el-button,
26
+ & + .es-button-badge,
27
+ & + .es-upload,
28
+ & + .el-dropdown,
29
+ & + .es-selector {
30
+ margin-left: 6px;
31
+ }
21
32
  }
22
33
  }
23
34
  .es-form {
package/src/index.js CHANGED
@@ -1,112 +1,112 @@
1
1
  /* Automatically generated by './build/bin/build-entry.js' */
2
2
 
3
- import Button from '../packages/button/index.js';
4
- import ButtonGroup from '../packages/button-group/index.js';
5
- import Calendar from '../packages/calendar/index.js';
6
- import Card from '../packages/card/index.js';
7
- import Cascader from '../packages/cascader/index.js';
8
- import CheckboxGroup from '../packages/checkbox-group/index.js';
9
- import Clients from '../packages/clients/index.js';
10
- import DataTable from '../packages/data-table/index.js';
11
- import DataTableForm from '../packages/data-table-form/index.js';
12
- import DatePicker from '../packages/date-picker/index.js';
13
- import Dialog from '../packages/dialog/index.js';
14
- import Enterprise from '../packages/enterprise/index.js';
15
- import ErrorPage from '../packages/error-page/index.js';
16
- import Form from '../packages/form/index.js';
17
- import Flow from '../packages/flow/index.js';
18
- import FlowGroup from '../packages/flow-group/index.js';
19
- import FlowList from '../packages/flow-list/index.js';
20
- import HandleUser from '../packages/handle-user/index.js';
21
- import Handler from '../packages/handler/index.js';
22
- import Icon from '../packages/icon/index.js';
23
- import Icons from '../packages/icons/index.js';
24
- import Input from '../packages/input/index.js';
25
- import InputNumber from '../packages/input-number/index.js';
26
- import Label from '../packages/label/index.js';
27
- import Layout from '../packages/layout/index.js';
28
- import Login from '../packages/login/index.js';
29
- import Main from '../packages/main/index.js';
30
- import Menu from '../packages/menu/index.js';
31
- import Nav from '../packages/nav/index.js';
32
- import Notify from '../packages/notify/index.js';
33
- import Pagination from '../packages/pagination/index.js';
34
- import Page from '../packages/page/index.js';
35
- import Player from '../packages/player/index.js';
36
- import QrCode from '../packages/qr-code/index.js';
37
- import RadioGroup from '../packages/radio-group/index.js';
38
- import RetrialAuth from '../packages/retrial-auth/index.js';
39
- import Select from '../packages/select/index.js';
40
- import SelectGanged from '../packages/select-ganged/index.js';
41
- import Selector from '../packages/selector/index.js';
42
- import SelectorPanel from '../packages/selector-panel/index.js';
43
- import Sizer from '../packages/sizer/index.js';
44
- import Steps from '../packages/steps/index.js';
45
- import Switch from '../packages/switch/index.js';
46
- import Tabs from '../packages/tabs/index.js';
47
- import TabsPanel from '../packages/tabs-panel/index.js';
48
- import Tips from '../packages/tips/index.js';
49
- import Tree from '../packages/tree/index.js';
50
- import TreeGroup from '../packages/tree-group/index.js';
51
- import Toolbar from '../packages/toolbar/index.js';
52
- import TableForm from '../packages/table-form/index.js';
53
- import Upload from '../packages/upload/index.js';
54
- import Wujie from '../packages/wujie/index.js';
3
+ import Button from '../packages/button/index.js';
4
+ import ButtonGroup from '../packages/button-group/index.js';
5
+ import Calendar from '../packages/calendar/index.js';
6
+ import Card from '../packages/card/index.js';
7
+ import Cascader from '../packages/cascader/index.js';
8
+ import CheckboxGroup from '../packages/checkbox-group/index.js';
9
+ import Clients from '../packages/clients/index.js';
10
+ import DataTable from '../packages/data-table/index.js';
11
+ import DataTableForm from '../packages/data-table-form/index.js';
12
+ import DatePicker from '../packages/date-picker/index.js';
13
+ import Dialog from '../packages/dialog/index.js';
14
+ import Enterprise from '../packages/enterprise/index.js';
15
+ import ErrorPage from '../packages/error-page/index.js';
16
+ import Form from '../packages/form/index.js';
17
+ import Flow from '../packages/flow/index.js';
18
+ import FlowGroup from '../packages/flow-group/index.js';
19
+ import FlowList from '../packages/flow-list/index.js';
20
+ import HandleUser from '../packages/handle-user/index.js';
21
+ import Handler from '../packages/handler/index.js';
22
+ import Icon from '../packages/icon/index.js';
23
+ import Icons from '../packages/icons/index.js';
24
+ import Input from '../packages/input/index.js';
25
+ import InputNumber from '../packages/input-number/index.js';
26
+ import Label from '../packages/label/index.js';
27
+ import Layout from '../packages/layout/index.js';
28
+ import Login from '../packages/login/index.js';
29
+ import Main from '../packages/main/index.js';
30
+ import Menu from '../packages/menu/index.js';
31
+ import Nav from '../packages/nav/index.js';
32
+ import Notify from '../packages/notify/index.js';
33
+ import Pagination from '../packages/pagination/index.js';
34
+ import Page from '../packages/page/index.js';
35
+ import Player from '../packages/player/index.js';
36
+ import QrCode from '../packages/qr-code/index.js';
37
+ import RadioGroup from '../packages/radio-group/index.js';
38
+ import RetrialAuth from '../packages/retrial-auth/index.js';
39
+ import Select from '../packages/select/index.js';
40
+ import SelectGanged from '../packages/select-ganged/index.js';
41
+ import Selector from '../packages/selector/index.js';
42
+ import SelectorPanel from '../packages/selector-panel/index.js';
43
+ import Sizer from '../packages/sizer/index.js';
44
+ import Steps from '../packages/steps/index.js';
45
+ import Switch from '../packages/switch/index.js';
46
+ import Tabs from '../packages/tabs/index.js';
47
+ import TabsPanel from '../packages/tabs-panel/index.js';
48
+ import Tips from '../packages/tips/index.js';
49
+ import Tree from '../packages/tree/index.js';
50
+ import TreeGroup from '../packages/tree-group/index.js';
51
+ import Toolbar from '../packages/toolbar/index.js';
52
+ import TableForm from '../packages/table-form/index.js';
53
+ import Upload from '../packages/upload/index.js';
54
+ import Wujie from '../packages/wujie/index.js';
55
55
  import Wxlogin from '../packages/wxlogin/index.js';
56
56
 
57
57
  const components = [
58
- Button,
59
- ButtonGroup,
60
- Calendar,
61
- Card,
62
- Cascader,
63
- CheckboxGroup,
64
- Clients,
65
- DataTable,
66
- DataTableForm,
67
- DatePicker,
68
- Dialog,
69
- Enterprise,
70
- ErrorPage,
71
- Form,
72
- Flow,
73
- FlowGroup,
74
- FlowList,
75
- HandleUser,
76
- Handler,
77
- Icon,
78
- Icons,
79
- Input,
80
- InputNumber,
81
- Label,
82
- Layout,
83
- Login,
84
- Main,
85
- Menu,
86
- Nav,
87
- Notify,
88
- Pagination,
89
- Page,
90
- Player,
91
- QrCode,
92
- RadioGroup,
93
- RetrialAuth,
94
- Select,
95
- SelectGanged,
96
- Selector,
97
- SelectorPanel,
98
- Sizer,
99
- Steps,
100
- Switch,
101
- Tabs,
102
- TabsPanel,
103
- Tips,
104
- Tree,
105
- TreeGroup,
106
- Toolbar,
107
- TableForm,
108
- Upload,
109
- Wujie,
58
+ Button,
59
+ ButtonGroup,
60
+ Calendar,
61
+ Card,
62
+ Cascader,
63
+ CheckboxGroup,
64
+ Clients,
65
+ DataTable,
66
+ DataTableForm,
67
+ DatePicker,
68
+ Dialog,
69
+ Enterprise,
70
+ ErrorPage,
71
+ Form,
72
+ Flow,
73
+ FlowGroup,
74
+ FlowList,
75
+ HandleUser,
76
+ Handler,
77
+ Icon,
78
+ Icons,
79
+ Input,
80
+ InputNumber,
81
+ Label,
82
+ Layout,
83
+ Login,
84
+ Main,
85
+ Menu,
86
+ Nav,
87
+ Notify,
88
+ Pagination,
89
+ Page,
90
+ Player,
91
+ QrCode,
92
+ RadioGroup,
93
+ RetrialAuth,
94
+ Select,
95
+ SelectGanged,
96
+ Selector,
97
+ SelectorPanel,
98
+ Sizer,
99
+ Steps,
100
+ Switch,
101
+ Tabs,
102
+ TabsPanel,
103
+ Tips,
104
+ Tree,
105
+ TreeGroup,
106
+ Toolbar,
107
+ TableForm,
108
+ Upload,
109
+ Wujie,
110
110
  Wxlogin
111
111
  ];
112
112
 
@@ -121,59 +121,59 @@ if (typeof window !== 'undefined' && window.Vue) {
121
121
  }
122
122
 
123
123
  export default {
124
- version: '0.5.81-beta12',
124
+ version: '0.5.81-beta14',
125
125
  install,
126
- Button,
127
- ButtonGroup,
128
- Calendar,
129
- Card,
130
- Cascader,
131
- CheckboxGroup,
132
- Clients,
133
- DataTable,
134
- DataTableForm,
135
- DatePicker,
136
- Dialog,
137
- Enterprise,
138
- ErrorPage,
139
- Form,
140
- Flow,
141
- FlowGroup,
142
- FlowList,
143
- HandleUser,
144
- Handler,
145
- Icon,
146
- Icons,
147
- Input,
148
- InputNumber,
149
- Label,
150
- Layout,
151
- Login,
152
- Main,
153
- Menu,
154
- Nav,
155
- Notify,
156
- Pagination,
157
- Page,
158
- Player,
159
- QrCode,
160
- RadioGroup,
161
- RetrialAuth,
162
- Select,
163
- SelectGanged,
164
- Selector,
165
- SelectorPanel,
166
- Sizer,
167
- Steps,
168
- Switch,
169
- Tabs,
170
- TabsPanel,
171
- Tips,
172
- Tree,
173
- TreeGroup,
174
- Toolbar,
175
- TableForm,
176
- Upload,
177
- Wujie,
126
+ Button,
127
+ ButtonGroup,
128
+ Calendar,
129
+ Card,
130
+ Cascader,
131
+ CheckboxGroup,
132
+ Clients,
133
+ DataTable,
134
+ DataTableForm,
135
+ DatePicker,
136
+ Dialog,
137
+ Enterprise,
138
+ ErrorPage,
139
+ Form,
140
+ Flow,
141
+ FlowGroup,
142
+ FlowList,
143
+ HandleUser,
144
+ Handler,
145
+ Icon,
146
+ Icons,
147
+ Input,
148
+ InputNumber,
149
+ Label,
150
+ Layout,
151
+ Login,
152
+ Main,
153
+ Menu,
154
+ Nav,
155
+ Notify,
156
+ Pagination,
157
+ Page,
158
+ Player,
159
+ QrCode,
160
+ RadioGroup,
161
+ RetrialAuth,
162
+ Select,
163
+ SelectGanged,
164
+ Selector,
165
+ SelectorPanel,
166
+ Sizer,
167
+ Steps,
168
+ Switch,
169
+ Tabs,
170
+ TabsPanel,
171
+ Tips,
172
+ Tree,
173
+ TreeGroup,
174
+ Toolbar,
175
+ TableForm,
176
+ Upload,
177
+ Wujie,
178
178
  Wxlogin
179
179
  };