eoss-ui 0.5.60 → 0.5.61

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 (44) hide show
  1. package/lib/button-group.js +116 -40
  2. package/lib/calendar.js +3 -3
  3. package/lib/card.js +6 -6
  4. package/lib/eoss-ui.common.js +206 -100
  5. package/lib/icon.js +17 -5
  6. package/lib/index.js +1 -1
  7. package/lib/theme-chalk/base.css +1 -1
  8. package/lib/theme-chalk/button.css +1 -1
  9. package/lib/theme-chalk/calendar.css +1 -0
  10. package/lib/theme-chalk/card.css +1 -1
  11. package/lib/theme-chalk/cascader.css +0 -1
  12. package/lib/theme-chalk/icon.css +1 -1
  13. package/lib/theme-chalk/index.css +1 -1
  14. package/lib/theme-chalk/main.css +1 -1
  15. package/lib/theme-chalk/menu.css +1 -1
  16. package/lib/theme-chalk/sizer.css +1 -1
  17. package/lib/theme-chalk/toolbar.css +1 -1
  18. package/lib/theme-chalk/upload.css +1 -1
  19. package/lib/toolbar.js +43 -25
  20. package/package.json +1 -1
  21. package/packages/button-group/src/main.vue +47 -16
  22. package/packages/calendar/src/main.vue +1 -1
  23. package/packages/card/src/main.vue +6 -6
  24. package/packages/icon/src/main.vue +9 -3
  25. package/packages/theme-chalk/lib/base.css +1 -1
  26. package/packages/theme-chalk/lib/button.css +1 -1
  27. package/packages/theme-chalk/lib/calendar.css +1 -0
  28. package/packages/theme-chalk/lib/card.css +1 -1
  29. package/packages/theme-chalk/lib/cascader.css +0 -1
  30. package/packages/theme-chalk/lib/icon.css +1 -1
  31. package/packages/theme-chalk/lib/index.css +1 -1
  32. package/packages/theme-chalk/lib/main.css +1 -1
  33. package/packages/theme-chalk/lib/menu.css +1 -1
  34. package/packages/theme-chalk/lib/sizer.css +1 -1
  35. package/packages/theme-chalk/lib/toolbar.css +1 -1
  36. package/packages/theme-chalk/lib/upload.css +1 -1
  37. package/packages/theme-chalk/src/button.scss +3 -0
  38. package/packages/theme-chalk/src/calendar.scss +110 -0
  39. package/packages/theme-chalk/src/card.scss +3 -0
  40. package/packages/theme-chalk/src/cascader.scss +0 -109
  41. package/packages/theme-chalk/src/icon.scss +1 -0
  42. package/packages/theme-chalk/src/toolbar.scss +8 -0
  43. package/packages/toolbar/src/main.vue +56 -32
  44. package/src/index.js +1 -1
package/packages/toolbar/src/main.vue CHANGED
@@ -134,7 +134,8 @@ export default {
134
134
  let filter = [];
135
135
 
136
136
  this.contents.forEach((items) => {
137
- let { config, type, reset, multiCondition, contents, ...other } = items;
137
+ let { config, type, reset, multiCondition, contents, group, ...other } =
138
+ items;
138
139
  if (type === 'text') {
139
140
  text = [
140
141
  h(
@@ -151,41 +152,64 @@ export default {
151
152
  )
152
153
  ];
153
154
  }
154
- if (type === 'button') {
155
- contents.forEach((item) => {
156
- if (!item.hide && (item.upload || (item.code && item.ownId))) {
157
- buttons.push(
158
- h('es-upload', {
159
- class: 'el-button',
160
- attrs: {
161
- ...item,
162
- method: 'post',
163
- btnSize: 'medium',
164
- showFileList: false,
165
- selectType: item.type ? item.type : ''
155
+ if (
156
+ type === 'button' ||
157
+ type === 'button-group' ||
158
+ type === 'buttonGroup'
159
+ ) {
160
+ if (type === 'button-group' || type === 'buttonGroup' || group) {
161
+ buttons = [
162
+ h('es-button-group', {
163
+ class: 'es-toolbar-button-group',
164
+ props: {
165
+ moreText: '更多',
166
+ size: 'medium',
167
+ ...other,
168
+ contents: contents
169
+ },
170
+ on: {
171
+ handleClick: (res) => {
172
+ this.handleClick(res.handle);
166
173
  }
167
- })
168
- );
169
- } else {
170
- buttons.push(
171
- h(
172
- 'es-button',
173
- {
174
+ }
175
+ })
176
+ ];
177
+ } else {
178
+ contents.forEach((item) => {
179
+ if (!item.hide && (item.upload || (item.code && item.ownId))) {
180
+ buttons.push(
181
+ h('es-upload', {
182
+ class: 'el-button',
174
183
  attrs: {
175
184
  ...item,
176
- size: 'medium'
177
- },
178
- on: {
179
- click: () => {
180
- this.handleClick(item);
181
- }
185
+ method: 'post',
186
+ btnSize: 'medium',
187
+ showFileList: false,
188
+ selectType: item.type ? item.type : ''
182
189
  }
183
- },
184
- item.text
185
- )
186
- );
187
- }
188
- });
190
+ })
191
+ );
192
+ } else {
193
+ buttons.push(
194
+ h(
195
+ 'es-button',
196
+ {
197
+ attrs: {
198
+ ...item,
199
+ size: 'medium'
200
+ },
201
+ on: {
202
+ click: () => {
203
+ this.handleClick(item);
204
+ }
205
+ }
206
+ },
207
+ item.text
208
+ )
209
+ );
210
+ }
211
+ });
212
+ }
189
213
  }
190
214
  if (type === 'tabs') {
191
215
  buttons = buttons.concat([
package/src/index.js CHANGED
@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
121
121
  }
122
122
 
123
123
  export default {
124
- version: '0.5.60',
124
+ version: '0.5.61',
125
125
  install,
126
126
  Button,
127
127
  ButtonGroup,