eoss-ui 0.5.26 → 0.5.28
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 -9
- package/lib/eoss-ui.common.js +170 -167
- package/lib/index.js +1 -1
- package/lib/main.js +9 -2
- package/lib/selector-panel.js +114 -104
- package/lib/selector.js +16 -34
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/toolbar.css +1 -1
- package/package.json +1 -1
- package/packages/data-table/src/main.vue +7 -4
- package/packages/main/src/main.vue +7 -0
- package/packages/selector/src/main.vue +14 -2
- package/packages/selector-panel/src/main.vue +2 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/toolbar.css +1 -1
- package/packages/theme-chalk/src/toolbar.scss +12 -1
- package/src/index.js +1 -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-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:
|
|
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-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-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 .el-form-item__content{line-height:32px!important}.es-toolbar .el-form-item__label{line-height:32px!important;height:32px}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
|
package/package.json
CHANGED
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
:is="tag"
|
|
4
4
|
class="es-data-table"
|
|
5
5
|
label-width="0"
|
|
6
|
+
ref="component"
|
|
6
7
|
v-loading="tableLoading"
|
|
7
8
|
:model="tag === 'div' ? '' : datas"
|
|
8
9
|
:element-loading-text="tableLoadingText"
|
|
@@ -1308,10 +1309,12 @@ export default {
|
|
|
1308
1309
|
});
|
|
1309
1310
|
},
|
|
1310
1311
|
validate(callback) {
|
|
1311
|
-
|
|
1312
|
-
|
|
1313
|
-
|
|
1314
|
-
|
|
1312
|
+
if (this.form) {
|
|
1313
|
+
let form = this.elForm || this.$children[0];
|
|
1314
|
+
form.validate((valid) => {
|
|
1315
|
+
callback(valid);
|
|
1316
|
+
});
|
|
1317
|
+
}
|
|
1315
1318
|
},
|
|
1316
1319
|
changeLoading(show, text) {
|
|
1317
1320
|
this.tableLoading = show;
|
|
@@ -927,6 +927,9 @@ export default {
|
|
|
927
927
|
if (i === 'subsystemName') {
|
|
928
928
|
document.title = results[i];
|
|
929
929
|
}
|
|
930
|
+
if (i === 'loginPage' && results[i]) {
|
|
931
|
+
util.setStorage('loginPage', results[i]);
|
|
932
|
+
}
|
|
930
933
|
if (i === 'sysLogoIco' && results[i]) {
|
|
931
934
|
sessionStorage.setItem('sysLogoIco', results[i]);
|
|
932
935
|
util.setFavicon(results[i]);
|
|
@@ -938,6 +941,10 @@ export default {
|
|
|
938
941
|
util.win.top.webPageWatermark = results[i].webPageWatermark;
|
|
939
942
|
util.watermark(results[i].webPageWatermark);
|
|
940
943
|
}
|
|
944
|
+
|
|
945
|
+
if (i === 'subsystemExtend' && results[i].loginPage) {
|
|
946
|
+
util.setStorage('loginPage', results[i].loginPage);
|
|
947
|
+
}
|
|
941
948
|
store.set(i, results[i]);
|
|
942
949
|
}
|
|
943
950
|
this.userModel = results.userModel;
|
|
@@ -88,7 +88,6 @@
|
|
|
88
88
|
:tabindex="multiple ? '-1' : null"
|
|
89
89
|
v-popover:popover
|
|
90
90
|
@dblclick.native="openDialog"
|
|
91
|
-
@keyup.enter.native="handleSearch"
|
|
92
91
|
@focus="handleFocus"
|
|
93
92
|
@blur="handleBlur"
|
|
94
93
|
>
|
|
@@ -131,7 +130,6 @@
|
|
|
131
130
|
}"
|
|
132
131
|
:tabindex="multiple ? '-1' : null"
|
|
133
132
|
@dblclick.native="openDialog"
|
|
134
|
-
@keyup.enter.native="handleSearch"
|
|
135
133
|
@clear="handleClear"
|
|
136
134
|
>
|
|
137
135
|
<template slot="append">
|
|
@@ -426,6 +424,7 @@ export default {
|
|
|
426
424
|
this.$refs.reference &&
|
|
427
425
|
(this.minWidth = this.$refs.reference.$el.children[0].offsetWidth);
|
|
428
426
|
});
|
|
427
|
+
this.$el.addEventListener('keyup', this.doSearch);
|
|
429
428
|
}
|
|
430
429
|
if (this.$refs.openDialog) {
|
|
431
430
|
this.$refs.openDialog.$el.parentNode.addEventListener('click', () => {
|
|
@@ -434,6 +433,16 @@ export default {
|
|
|
434
433
|
}
|
|
435
434
|
},
|
|
436
435
|
methods: {
|
|
436
|
+
doSearch(e) {
|
|
437
|
+
if (util.win.event == undefined) {
|
|
438
|
+
var key = e.keyCode;
|
|
439
|
+
} else {
|
|
440
|
+
var key = util.win.event.keyCode;
|
|
441
|
+
}
|
|
442
|
+
if (key == 13) {
|
|
443
|
+
this.handleSearch();
|
|
444
|
+
}
|
|
445
|
+
},
|
|
437
446
|
isObject(obj) {
|
|
438
447
|
return util.isObject(obj);
|
|
439
448
|
},
|
|
@@ -611,6 +620,9 @@ export default {
|
|
|
611
620
|
: res.label || res[this.valueKey])
|
|
612
621
|
);
|
|
613
622
|
}
|
|
623
|
+
},
|
|
624
|
+
beforeDestroy() {
|
|
625
|
+
this.$el.removeEventListener('keyup', this.doSearch);
|
|
614
626
|
}
|
|
615
627
|
};
|
|
616
628
|
</script>
|
|
@@ -28,6 +28,7 @@
|
|
|
28
28
|
:inline="true"
|
|
29
29
|
:model="form"
|
|
30
30
|
class="es-selector-selection-toolbar"
|
|
31
|
+
v-if="multiple || isShowTree"
|
|
31
32
|
>
|
|
32
33
|
<el-form-item>
|
|
33
34
|
<el-checkbox
|
|
@@ -38,7 +39,7 @@
|
|
|
38
39
|
全选
|
|
39
40
|
</el-checkbox>
|
|
40
41
|
</el-form-item>
|
|
41
|
-
<div class="es-float-right">
|
|
42
|
+
<div class="es-float-right" v-if="isShowTree">
|
|
42
43
|
<el-form-item v-if="showSelect && activeName == 'enterprise'">
|
|
43
44
|
<es-select
|
|
44
45
|
v-model="selectValue"
|