eoss-ui 0.5.63 → 0.5.65
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/button-group.js +43 -23
- package/lib/button.js +65 -39
- package/lib/calendar.js +13 -5
- package/lib/checkbox-group.js +4 -2
- package/lib/data-table-form.js +4 -2
- package/lib/data-table.js +112 -25
- package/lib/date-picker.js +4 -2
- package/lib/dialog.js +4 -2
- package/lib/eoss-ui.common.js +635 -393
- package/lib/flow-group.js +4 -2
- package/lib/flow-list.js +4 -2
- package/lib/flow.js +153 -123
- package/lib/form.js +9 -4
- package/lib/handle-user.js +4 -2
- package/lib/handler.js +4 -2
- package/lib/icon.js +4 -2
- package/lib/index.js +1 -1
- package/lib/input-number.js +4 -2
- package/lib/input.js +4 -2
- package/lib/login.js +23 -6
- package/lib/main.js +189 -128
- package/lib/nav.js +4 -2
- package/lib/page.js +4 -2
- package/lib/player.js +4 -2
- package/lib/qr-code.js +13 -13
- package/lib/radio-group.js +4 -2
- package/lib/retrial-auth.js +4 -2
- package/lib/select-ganged.js +4 -2
- package/lib/select.js +4 -2
- package/lib/selector-panel.js +4 -2
- package/lib/selector.js +4 -2
- package/lib/sizer.js +4 -2
- package/lib/steps.js +4 -2
- package/lib/switch.js +4 -2
- package/lib/table-form.js +4 -2
- package/lib/tabs.js +4 -2
- package/lib/theme-chalk/base.css +1 -1
- package/lib/theme-chalk/button-group.css +1 -1
- package/lib/theme-chalk/button.css +1 -1
- package/lib/theme-chalk/calendar.css +1 -1
- package/lib/theme-chalk/index.css +1 -1
- package/lib/theme-chalk/main.css +1 -1
- package/lib/theme-chalk/menu.css +1 -1
- package/lib/theme-chalk/qr-code.css +1 -1
- package/lib/theme-chalk/sizer.css +1 -1
- package/lib/theme-chalk/upload.css +1 -1
- package/lib/tips.js +4 -2
- package/lib/tree-group.js +4 -2
- package/lib/tree.js +4 -2
- package/lib/upload.js +12 -8
- package/lib/utils/util.js +4 -2
- package/lib/wujie.js +4 -2
- package/lib/wxlogin.js +4 -2
- package/package.json +2 -2
- package/packages/button/src/main.vue +92 -56
- package/packages/button-group/src/main.vue +10 -1
- package/packages/calendar/src/main.vue +11 -4
- package/packages/data-table/src/children.vue +3 -1
- package/packages/data-table/src/main.vue +55 -10
- package/packages/flow/src/processForm.vue +32 -4
- package/packages/form/src/main.vue +3 -0
- package/packages/login/src/main.vue +12 -1
- package/packages/main/src/main.vue +147 -101
- package/packages/qr-code/src/main.vue +10 -5
- package/packages/theme-chalk/lib/base.css +1 -1
- package/packages/theme-chalk/lib/button-group.css +1 -1
- package/packages/theme-chalk/lib/button.css +1 -1
- package/packages/theme-chalk/lib/calendar.css +1 -1
- package/packages/theme-chalk/lib/index.css +1 -1
- package/packages/theme-chalk/lib/main.css +1 -1
- package/packages/theme-chalk/lib/menu.css +1 -1
- package/packages/theme-chalk/lib/qr-code.css +1 -1
- package/packages/theme-chalk/lib/sizer.css +1 -1
- package/packages/theme-chalk/lib/upload.css +1 -1
- package/packages/theme-chalk/src/base.scss +3 -0
- package/packages/theme-chalk/src/button-group.scss +110 -0
- package/packages/theme-chalk/src/button.scss +6 -0
- package/packages/theme-chalk/src/calendar.scss +3 -0
- package/packages/theme-chalk/src/qr-code.scss +1 -1
- package/packages/upload/src/main.vue +3 -1
- package/src/index.js +1 -1
- package/src/utils/util.js +4 -1
|
@@ -7,3 +7,113 @@
|
|
|
7
7
|
}
|
|
8
8
|
}
|
|
9
9
|
}
|
|
10
|
+
|
|
11
|
+
.el-button-group {
|
|
12
|
+
& > .el-button + .es-button,
|
|
13
|
+
& > .es-button + .el-button,
|
|
14
|
+
& > .es-button + .es-button {
|
|
15
|
+
margin-left: 0;
|
|
16
|
+
}
|
|
17
|
+
& > .es-selector {
|
|
18
|
+
float: left;
|
|
19
|
+
&:first-child {
|
|
20
|
+
& > .el-button {
|
|
21
|
+
border-top-right-radius: 0;
|
|
22
|
+
border-bottom-right-radius: 0;
|
|
23
|
+
&.el-button--danger,
|
|
24
|
+
&.el-button--info,
|
|
25
|
+
&.el-button--primary,
|
|
26
|
+
&.el-button--success,
|
|
27
|
+
&.el-button--warning {
|
|
28
|
+
border-right-color: rgba(255, 255, 255, 0.5);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
&:not(:first-child):not(:last-child) {
|
|
33
|
+
& > .el-button {
|
|
34
|
+
border-radius: 0;
|
|
35
|
+
&.el-button--danger,
|
|
36
|
+
&.el-button--info,
|
|
37
|
+
&.el-button--primary,
|
|
38
|
+
&.el-button--success,
|
|
39
|
+
&.el-button--warning {
|
|
40
|
+
border-left-color: rgba(255, 255, 255, 0.5);
|
|
41
|
+
border-right-color: rgba(255, 255, 255, 0.5);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
&:last-child {
|
|
46
|
+
& > .el-button {
|
|
47
|
+
border-top-left-radius: 0;
|
|
48
|
+
border-bottom-left-radius: 0;
|
|
49
|
+
&.el-button--danger,
|
|
50
|
+
&.el-button--info,
|
|
51
|
+
&.el-button--primary,
|
|
52
|
+
&.el-button--success,
|
|
53
|
+
&.el-button--warning {
|
|
54
|
+
border-left-color: rgba(255, 255, 255, 0.5);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
&:not(:last-child) {
|
|
59
|
+
& > .el-button {
|
|
60
|
+
margin-right: -1px;
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
& > .es-upload {
|
|
65
|
+
float: left;
|
|
66
|
+
&:first-child {
|
|
67
|
+
& > .el-upload--handle > .el-upload {
|
|
68
|
+
& > .el-button {
|
|
69
|
+
border-top-right-radius: 0;
|
|
70
|
+
border-bottom-right-radius: 0;
|
|
71
|
+
&.el-button--danger,
|
|
72
|
+
&.el-button--info,
|
|
73
|
+
&.el-button--primary,
|
|
74
|
+
&.el-button--success,
|
|
75
|
+
&.el-button--warning {
|
|
76
|
+
border-right-color: rgba(255, 255, 255, 0.5);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
&:not(:first-child):not(:last-child) {
|
|
82
|
+
& > .el-upload--handle > .el-upload {
|
|
83
|
+
& > .el-button {
|
|
84
|
+
border-radius: 0;
|
|
85
|
+
&.el-button--danger,
|
|
86
|
+
&.el-button--info,
|
|
87
|
+
&.el-button--primary,
|
|
88
|
+
&.el-button--success,
|
|
89
|
+
&.el-button--warning {
|
|
90
|
+
border-left-color: rgba(255, 255, 255, 0.5);
|
|
91
|
+
border-right-color: rgba(255, 255, 255, 0.5);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
&:last-child {
|
|
97
|
+
& > .el-upload--handle > .el-upload {
|
|
98
|
+
& > .el-button {
|
|
99
|
+
border-top-left-radius: 0;
|
|
100
|
+
border-bottom-left-radius: 0;
|
|
101
|
+
&.el-button--danger,
|
|
102
|
+
&.el-button--info,
|
|
103
|
+
&.el-button--primary,
|
|
104
|
+
&.el-button--success,
|
|
105
|
+
&.el-button--warning {
|
|
106
|
+
border-left-color: rgba(255, 255, 255, 0.5);
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
&:not(:last-child) {
|
|
112
|
+
& > .el-upload--handle > .el-upload {
|
|
113
|
+
& > .el-button {
|
|
114
|
+
margin-right: -1px;
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
@@ -787,7 +787,9 @@ export default {
|
|
|
787
787
|
}
|
|
788
788
|
});
|
|
789
789
|
this.filesTotalSize = filesTotalSize;
|
|
790
|
-
|
|
790
|
+
if (this.lists.length) {
|
|
791
|
+
this.$emit('input', this.lists);
|
|
792
|
+
}
|
|
791
793
|
}
|
|
792
794
|
} else {
|
|
793
795
|
let msg = res.msg || '系统错误,请联系管理员!';
|
package/src/index.js
CHANGED
package/src/utils/util.js
CHANGED
|
@@ -2163,6 +2163,7 @@ const isLogined = function ({
|
|
|
2163
2163
|
token ||
|
|
2164
2164
|
to.path === '/' ||
|
|
2165
2165
|
to.path === '/404' ||
|
|
2166
|
+
to.path === '/error' ||
|
|
2166
2167
|
(typeof exclude === 'boolean' && exclude) ||
|
|
2167
2168
|
exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 ||
|
|
2168
2169
|
to.path === '/login' ||
|
|
@@ -2844,7 +2845,9 @@ const toFunction = function (str) {
|
|
|
2844
2845
|
* @param {string} [$color] - 颜色值
|
|
2845
2846
|
**/
|
|
2846
2847
|
const updateTheme = function (color, send) {
|
|
2847
|
-
|
|
2848
|
+
if (!color) {
|
|
2849
|
+
return false;
|
|
2850
|
+
}
|
|
2848
2851
|
|
|
2849
2852
|
if (send === undefined) {
|
|
2850
2853
|
send = true;
|