eoss-ui 0.6.87 → 0.6.89
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/lib/data-table.js +13 -17
- package/lib/eoss-ui.common.js +177 -187
- package/lib/flow.js +14 -11
- package/lib/index.js +1 -1
- package/lib/main.js +40 -64
- package/lib/selector.js +99 -84
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/selector.css +1 -1
- package/package.json +1 -1
- package/packages/data-table/src/column.vue +4 -3
- package/packages/flow/src/main.vue +1 -1
- package/packages/flow/src/selectUser.vue +1 -1
- package/packages/main/src/default/userinfo.vue +18 -18
- package/packages/main/src/simplicity/user.vue +2 -2
- package/packages/main/src/simplicity/userinfo.vue +0 -4
- package/packages/selector/src/main.vue +11 -9
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/selector.css +1 -1
- package/packages/theme-chalk/src/selector.scss +1 -0
- package/src/index.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
@charset "UTF-8";.es-selector
|
|
1
|
+
@charset "UTF-8";.es-selector{line-height:normal;position:relative}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px)}.es-selector .es-selector-tags{position:relative;display:-webkit-box;display:-ms-flexbox;display:flex}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector-dropdown-item.hover,.es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector-popover{padding:0}.es-selector-popover .es-selector-dropdown__list{padding:12px}.es-selector-popover .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector-popover .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}
|
package/package.json
CHANGED
|
@@ -445,9 +445,8 @@
|
|
|
445
445
|
v-html="format(scope.row, true)"
|
|
446
446
|
:style="styles ? styles[scope.row[prop]] : {}"
|
|
447
447
|
></span>
|
|
448
|
-
<span v-else :style="styles ? styles[scope.row[prop]] : {}">
|
|
449
|
-
|
|
450
|
-
}}</span>
|
|
448
|
+
<span v-else :style="styles ? styles[scope.row[prop]] : {}" v-html="format(scope.row)"></span>
|
|
449
|
+
<!-- {{ format(scope.row) }} -->
|
|
451
450
|
<es-button-group
|
|
452
451
|
v-if="type === 'handle' && !scope.row.hideHandle"
|
|
453
452
|
v-bind="
|
|
@@ -811,6 +810,8 @@ export default {
|
|
|
811
810
|
},
|
|
812
811
|
format(rows, flag) {
|
|
813
812
|
const field = this.field || this.prop;
|
|
813
|
+
console.log('field', field);
|
|
814
|
+
console.log('rows', rows);
|
|
814
815
|
let data = this.option;
|
|
815
816
|
let str = '';
|
|
816
817
|
if (util.isObject(rows[field])) {
|
|
@@ -26,10 +26,10 @@ import util from 'eoss-ui/src/utils/util';
|
|
|
26
26
|
|
|
27
27
|
export default {
|
|
28
28
|
props: {
|
|
29
|
-
showNotify: {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
},
|
|
29
|
+
// showNotify: {
|
|
30
|
+
// type: Boolean,
|
|
31
|
+
// default: true
|
|
32
|
+
// },
|
|
33
33
|
secret: {
|
|
34
34
|
type: Boolean,
|
|
35
35
|
default: true
|
|
@@ -223,20 +223,20 @@ export default {
|
|
|
223
223
|
}
|
|
224
224
|
}
|
|
225
225
|
}
|
|
226
|
-
if (this.showNotify) {
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
}
|
|
226
|
+
// if (this.showNotify) {
|
|
227
|
+
// page.push({
|
|
228
|
+
// title: '接收消息类型',
|
|
229
|
+
// contents: [
|
|
230
|
+
// {
|
|
231
|
+
// type: 'checkbox',
|
|
232
|
+
// labelHide: true,
|
|
233
|
+
// name: 'notify',
|
|
234
|
+
// col: 12,
|
|
235
|
+
// data: store.get('notifyList')
|
|
236
|
+
// }
|
|
237
|
+
// ]
|
|
238
|
+
// });
|
|
239
|
+
// }
|
|
240
240
|
page.push({
|
|
241
241
|
type: 'submit',
|
|
242
242
|
contents: [
|
|
@@ -51,7 +51,7 @@
|
|
|
51
51
|
:src="qrcode"
|
|
52
52
|
></el-image>
|
|
53
53
|
</div>
|
|
54
|
-
<div class="es-simplicity-notice-type">
|
|
54
|
+
<!-- <div class="es-simplicity-notice-type">
|
|
55
55
|
<div class="es-simplicity-notice-title">接收消息类型：</div>
|
|
56
56
|
<es-checkbox-group
|
|
57
57
|
class="es-simplicity-notice-list"
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
:data="notifyList"
|
|
61
61
|
@change="handleCheckboxChange"
|
|
62
62
|
></es-checkbox-group>
|
|
63
|
-
</div>
|
|
63
|
+
</div> -->
|
|
64
64
|
<div class="es-simplicity-password" @click="handleOpen">
|
|
65
65
|
修改密码 <i class="es-icon-arrow-right"></i>
|
|
66
66
|
</div>
|
|
@@ -32,16 +32,18 @@
|
|
|
32
32
|
class="es-selector-tags"
|
|
33
33
|
:class="{ 'es-selector-more': selected.length > 1 }"
|
|
34
34
|
>
|
|
35
|
-
|
|
36
|
-
|
|
35
|
+
<el-tag
|
|
36
|
+
v-for="(item, index) in selected.slice(0,collapseTags===true?1 : collapseTags)"
|
|
37
|
+
:key="getValueKey(item)"
|
|
38
|
+
:closable="
|
|
39
|
+
!selectorDisabled && !readonly "
|
|
37
40
|
type="info"
|
|
38
41
|
disable-transitions
|
|
39
|
-
@close="deleteTag($event,
|
|
42
|
+
@close="deleteTag($event, item, index)"
|
|
40
43
|
>
|
|
41
|
-
<span class="el-select__tags-text">
|
|
42
|
-
{{ getLabel(selected[0]) }}
|
|
43
|
-
</span>
|
|
44
|
+
<span class="el-select__tags-text">{{ getLabel(item) }}</span>
|
|
44
45
|
</el-tag>
|
|
46
|
+
|
|
45
47
|
<el-tag
|
|
46
48
|
v-if="selected.length > 1"
|
|
47
49
|
:closable="false"
|
|
@@ -50,11 +52,11 @@
|
|
|
50
52
|
class="es-tags-more"
|
|
51
53
|
>
|
|
52
54
|
<span class="el-select__tags-text"
|
|
53
|
-
>+ {{ selected.length - 1 }}</span
|
|
55
|
+
>+ {{ selected.length - 1 -(collapseTags===true?1 : collapseTags) }}</span
|
|
54
56
|
>
|
|
55
57
|
</el-tag>
|
|
56
58
|
</div>
|
|
57
|
-
<transition-group @after-leave="resetInputHeight">
|
|
59
|
+
<transition-group v-else @after-leave="resetInputHeight">
|
|
58
60
|
<el-tag
|
|
59
61
|
v-for="(item, index) in selected"
|
|
60
62
|
:key="getValueKey(item)"
|
|
@@ -307,7 +309,7 @@ export default {
|
|
|
307
309
|
},
|
|
308
310
|
name: String,
|
|
309
311
|
readonly: Boolean,
|
|
310
|
-
collapseTags: Boolean,
|
|
312
|
+
collapseTags: [Boolean,Number],
|
|
311
313
|
plain: Boolean,
|
|
312
314
|
types: {
|
|
313
315
|
type: Array,
|