agilebuilder-ui 1.0.46 → 1.0.48
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/package.json +1 -1
- package/src/styles/display-layout.scss +2 -2
- package/src/styles/mixin.scss +4 -4
- package/src/styles/theme/ocean-blue/button.scss +9 -4
- package/src/styles/theme/ocean-blue/checkbox.scss +1 -1
- package/src/styles/theme/ocean-blue/element-variables.scss +1 -1
- package/src/styles/theme/ocean-blue/index.scss +4 -4
- package/src/styles/theme/ocean-blue/{dark-blue-var.scss → ocean-blue.scss} +9 -2
- package/src/styles/theme/ocean-blue/pagination.scss +1 -2
- package/src/styles/theme/ocean-blue/sidebar.scss +21 -3
- package/src/styles/theme/ocean-blue/tab.scss +2 -2
- package/src/styles/theme/ocean-blue/table.scss +1 -1
- package/src/styles/theme/ocean-blue/tree.scss +4 -1
- package/src/utils/auth.js +6 -2
- package/src/views/layout/components/Menubar/index.vue +11 -2
- package/src/views/layout/tab-content-index.vue +2 -2
package/package.json
CHANGED
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
height: calc(100vh - 20px);
|
|
19
19
|
|
|
20
20
|
.el-aside {
|
|
21
|
-
margin-right:
|
|
21
|
+
margin-right: 20px;
|
|
22
22
|
padding-top: 5px;
|
|
23
23
|
background-color: #FFFFFF;
|
|
24
24
|
box-shadow: 0px 1px 8px 0px #00000019;
|
|
@@ -31,4 +31,4 @@
|
|
|
31
31
|
background: #FFFFFF;
|
|
32
32
|
box-shadow: 0px 1px 8px 0px #00000019;
|
|
33
33
|
}
|
|
34
|
-
}
|
|
34
|
+
}
|
package/src/styles/mixin.scss
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
@mixin clearfix {
|
|
2
|
-
|
|
2
|
+
:after {
|
|
3
3
|
content: "";
|
|
4
4
|
display: table;
|
|
5
5
|
clear: both;
|
|
@@ -7,13 +7,13 @@
|
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
@mixin scrollBar {
|
|
10
|
-
|
|
10
|
+
::-webkit-scrollbar-track-piece {
|
|
11
11
|
background: #d3dce6;
|
|
12
12
|
}
|
|
13
|
-
|
|
13
|
+
::-webkit-scrollbar {
|
|
14
14
|
width: 6px;
|
|
15
15
|
}
|
|
16
|
-
|
|
16
|
+
::-webkit-scrollbar-thumb {
|
|
17
17
|
background: #99a9bf;
|
|
18
18
|
border-radius: 20px;
|
|
19
19
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
@import "./
|
|
1
|
+
@import "./ocean-blue.scss";
|
|
2
2
|
|
|
3
3
|
.ocean-blue {
|
|
4
4
|
.is-text {
|
|
@@ -14,15 +14,20 @@
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
.el-button--primary {
|
|
17
|
-
|
|
17
|
+
border-radius: 4px;
|
|
18
18
|
background: $--button-primary-btn-color;
|
|
19
19
|
border-color: $--button-primary-btn-color;
|
|
20
20
|
}
|
|
21
21
|
|
|
22
22
|
.operation-area .el-button--primary {
|
|
23
23
|
border-radius: 4px;
|
|
24
|
-
background: $--button-
|
|
25
|
-
border-color: $--button-
|
|
24
|
+
background: $--button-primary-btn-color;
|
|
25
|
+
border-color: $--button-primary-btn-color;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
.operation-area .el-button--primary:hover{
|
|
29
|
+
color: $--button-primary-btn-color;
|
|
30
|
+
background: $--button-primary-btn-color;
|
|
26
31
|
}
|
|
27
32
|
|
|
28
33
|
.button--default {
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
@import './scrollbar-style.scss';
|
|
15
15
|
@import './message.scss';
|
|
16
16
|
@import './radio.scss';
|
|
17
|
-
|
|
17
|
+
@import "./ocean-blue.scss";
|
|
18
18
|
|
|
19
19
|
.ocean-blue {
|
|
20
20
|
font-family: Source Han Sans CN;
|
|
@@ -185,12 +185,12 @@
|
|
|
185
185
|
|
|
186
186
|
//顶部标签字体样式
|
|
187
187
|
.menu-tab-container .el-tabs__item.is-active {
|
|
188
|
-
color:
|
|
188
|
+
color: $--menu-dont-color;
|
|
189
189
|
}
|
|
190
190
|
|
|
191
|
-
|
|
191
|
+
//顶部标签下划线样式
|
|
192
192
|
.menu-tab-container .el-tabs__active-bar {
|
|
193
|
-
background-color:
|
|
193
|
+
background-color: $--menu-dont-color;
|
|
194
194
|
}
|
|
195
195
|
|
|
196
196
|
.el-pagination {
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
/* 改变主题色变量 */
|
|
2
|
-
$--color-primary: #
|
|
2
|
+
$--color-primary: #0089BA;
|
|
3
|
+
$--color-hover: #ebf6f9;
|
|
3
4
|
$--button-default-border-color: $--color-primary;
|
|
4
5
|
$--button-default-font-color: $--color-primary;
|
|
5
6
|
$--button-font-weight: regular;
|
|
6
7
|
$--button-default-font-color: $--color-primary;
|
|
7
|
-
$--button-primary-btn-color:
|
|
8
|
+
$--button-primary-btn-color: #05a0da;
|
|
9
|
+
//菜单字体颜色
|
|
10
|
+
$--menu-dont-color: $--color-primary;
|
|
11
|
+
//选中的字体颜色
|
|
12
|
+
$--select-font-color: $--color-primary;
|
|
13
|
+
|
|
14
|
+
$--menu-hove-background-color: $--color-hover;
|
|
8
15
|
$--button-opt-background-color: #0780ED;
|
|
9
16
|
$th-cell-background: #F0F8FE;
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
@import "./ocean-blue.scss";
|
|
1
2
|
.ocean-blue {
|
|
2
3
|
#app {
|
|
3
4
|
|
|
@@ -104,11 +105,15 @@
|
|
|
104
105
|
color: #525A6C;
|
|
105
106
|
line-height: 46px;
|
|
106
107
|
font-weight: medium;
|
|
107
|
-
|
|
108
108
|
}
|
|
109
|
-
|
|
109
|
+
.el-menu-item {
|
|
110
|
+
height: 46px;
|
|
111
|
+
color: #525A6C;
|
|
112
|
+
line-height: 46px;
|
|
113
|
+
font-weight: medium;
|
|
114
|
+
}
|
|
110
115
|
.el-menu-item.is-active {
|
|
111
|
-
color:
|
|
116
|
+
color: $--menu-dont-color;
|
|
112
117
|
font-weight: medium;
|
|
113
118
|
font-size: 14px;
|
|
114
119
|
letter-spacing: 0px;
|
|
@@ -186,6 +191,13 @@
|
|
|
186
191
|
border-right: 2px solid #3D4CF2
|
|
187
192
|
}
|
|
188
193
|
|
|
194
|
+
.el-menu--collapse .el-sub-menu.is-active .el-sub-menu__title{
|
|
195
|
+
color: $--menu-dont-color;
|
|
196
|
+
}
|
|
197
|
+
.el-sub-menu__title:hover{
|
|
198
|
+
background-color: $--menu-hove-background-color;
|
|
199
|
+
}
|
|
200
|
+
|
|
189
201
|
.sidebar-container .el-menu--collapse .el-submenu__title:not(.is-disabled):hover,
|
|
190
202
|
.sidebar-container .el-menu-item:not(.is-disabled):hover {
|
|
191
203
|
background: #F7F7F8;
|
|
@@ -265,4 +277,10 @@
|
|
|
265
277
|
}
|
|
266
278
|
}
|
|
267
279
|
}
|
|
280
|
+
.router-link-active >.is-active{
|
|
281
|
+
color: $--menu-dont-color;
|
|
282
|
+
}
|
|
283
|
+
.el-menu-item:hover{
|
|
284
|
+
background-color: $--menu-hove-background-color;
|
|
285
|
+
}
|
|
268
286
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
@import "./ocean-blue.scss";
|
|
1
2
|
.ocean-blue {
|
|
2
3
|
|
|
3
4
|
.superForm,
|
|
@@ -40,10 +41,9 @@
|
|
|
40
41
|
display: none;
|
|
41
42
|
}
|
|
42
43
|
|
|
43
|
-
|
|
44
44
|
.el-tabs__item.is-active {
|
|
45
45
|
background-color: #FFFFFF;
|
|
46
|
-
color:
|
|
46
|
+
color: $--menu-dont-color;
|
|
47
47
|
font-weight: 500;
|
|
48
48
|
}
|
|
49
49
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
@import "./
|
|
1
|
+
@import "./ocean-blue.scss";
|
|
2
2
|
|
|
3
3
|
.ocean-blue {
|
|
4
4
|
|
|
@@ -11,6 +11,9 @@
|
|
|
11
11
|
margin-right: 8px;
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
+
.is-current{
|
|
15
|
+
color: $--select-font-color;
|
|
16
|
+
}
|
|
14
17
|
|
|
15
18
|
// .el-tree-node .is-checked {
|
|
16
19
|
// background-color: $th-cell-background !important;
|
package/src/utils/auth.js
CHANGED
|
@@ -89,8 +89,12 @@ export function getTheme() {
|
|
|
89
89
|
return authApi.getTheme()
|
|
90
90
|
}
|
|
91
91
|
|
|
92
|
-
export function setTheme(
|
|
93
|
-
|
|
92
|
+
export function setTheme(theme) {
|
|
93
|
+
if(theme) {
|
|
94
|
+
authApi.setTheme(theme)
|
|
95
|
+
} else {
|
|
96
|
+
removeTheme()
|
|
97
|
+
}
|
|
94
98
|
}
|
|
95
99
|
|
|
96
100
|
export function removeTheme() {
|
|
@@ -104,6 +104,7 @@ export default {
|
|
|
104
104
|
this.firstLeafMenu.code + '~~' + this.firstLeafMenu.i18nValue
|
|
105
105
|
window.$vueApp.config.globalProperties._selectMenu = this.defaultActive
|
|
106
106
|
}
|
|
107
|
+
console.log('getFirstMenu=====firstLeafMenu333=', this.firstLeafMenu)
|
|
107
108
|
if (this.firstLeafMenu && this.firstLeafMenu.fullPath) {
|
|
108
109
|
// 跳转到第一个页面
|
|
109
110
|
if (
|
|
@@ -125,7 +126,11 @@ export default {
|
|
|
125
126
|
'/iframe-page/page'
|
|
126
127
|
)
|
|
127
128
|
// this.$router.push({ path: '/iframe-page/page', query: query })
|
|
128
|
-
|
|
129
|
+
let routePath = '/tab-content-iframe-index'
|
|
130
|
+
if(this.isDevp){
|
|
131
|
+
routePath = '/devp-project/setting'
|
|
132
|
+
}
|
|
133
|
+
this.$router.push({path: routePath, query: query})
|
|
129
134
|
} else {
|
|
130
135
|
const query = {
|
|
131
136
|
customSystem: this.systemCode,
|
|
@@ -161,8 +166,11 @@ export default {
|
|
|
161
166
|
// 表示需要选中指定的菜单
|
|
162
167
|
this.isSelectFirst = true
|
|
163
168
|
} else {
|
|
164
|
-
|
|
169
|
+
if(!this.isDevp){
|
|
170
|
+
shouldSelectMenu = this.getFirstMenuWithCookie(menus)
|
|
171
|
+
}
|
|
165
172
|
}
|
|
173
|
+
console.log('getFirstMenu=====shouldSelectMenu111=', shouldSelectMenu)
|
|
166
174
|
if (this.isSelectFirst && !shouldSelectMenu && menus && menus.length > 0) {
|
|
167
175
|
for (let i = 0; i < menus.length; i++) {
|
|
168
176
|
const menu = menus[i]
|
|
@@ -173,6 +181,7 @@ export default {
|
|
|
173
181
|
}
|
|
174
182
|
}
|
|
175
183
|
}
|
|
184
|
+
console.log('getFirstMenu=====shouldSelectMenu222=', shouldSelectMenu)
|
|
176
185
|
return shouldSelectMenu
|
|
177
186
|
},
|
|
178
187
|
getShouldSelectMenu(menu, currentMenuCode) {
|
|
@@ -70,12 +70,12 @@ export default {
|
|
|
70
70
|
|
|
71
71
|
<style lang="scss" rel="stylesheet/scss" scoped>
|
|
72
72
|
@import 'agilebuilder-ui/src/styles/mixin.scss';
|
|
73
|
+
@include clearfix;
|
|
73
74
|
.app-wrapper {
|
|
74
|
-
@include clearfix;
|
|
75
75
|
position: relative;
|
|
76
76
|
height: 100%;
|
|
77
77
|
width: 100%;
|
|
78
|
-
|
|
78
|
+
.mobile.openSidebar {
|
|
79
79
|
position: fixed;
|
|
80
80
|
top: 0;
|
|
81
81
|
}
|