Skip to content

Commit 5933a55

Browse files
ssongliussongliu
committed
fix: 菜单样式调整
1 parent fb1c34d commit 5933a55

File tree

10 files changed

+23
-41
lines changed

10 files changed

+23
-41
lines changed

‎web/dashboard/src/business/app-layout/header-components/Help.vue‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@
77
</span>
88
<el-dropdown-menu slot="dropdown">
99
<el-dropdown-item command="docs">{{ $t('commons.help.ko_docs') }}</el-dropdown-item>
10-
<el-dropdown-item command="support">{{ $t('commons.help.business_support') }}</el-dropdown-item>
1110
<el-dropdown-item class="iconfont iconguanyu" command="about">{{$t("commons.help.about")}}</el-dropdown-item>
1211
</el-dropdown-menu>
1312
<el-dialog class="ko-dialog" :show-close="false" :visible.sync="aboutDialogVisible" width="50%">
1413
<div class="aboutBackground" style="padding: 20px 25px;">
1514
<img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
1615
<p>{{ $t("commons.personal.introduction") }}</p>
1716
<p>{{ $t("commons.personal.introduction2") }}</p>
18-
<strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
17+
<strong>{{ $t("commons.personal.version") }}: v1.7.0</strong>
1918
</div>
2019
<div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
2120
<el-row style="color: #ffffff;text-align: center">
@@ -50,28 +49,25 @@ export default {
5049
methods: {
5150
handleCommand(command) {
5251
switch (command) {
53-
case "support":
54-
window.open("https://kubeoperator.io/", "_blank")
55-
break
5652
case "docs":
57-
window.open("https://kubeoperator.io/docs/kubepi/", "_blank")
53+
window.open("https://github.com/1Panel-dev/KubePi/wiki", "_blank")
5854
break
5955
default:
6056
this.aboutDialogVisible = true
6157
break
6258
}
6359
},
6460
toGithub() {
65-
window.open("https://github.com/KubeOperator/KubePi", "_blank")
61+
window.open("https://github.com/1Panel-dev/KubePi", "_blank")
6662
},
6763
toIssue() {
68-
window.open("https://github.com/KubeOperator/KubePi/issues", "_blank")
64+
window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank")
6965
},
7066
toTalk() {
71-
window.open("https://kubeoperator.io/#contact", "_blank")
67+
window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank")
7268
},
7369
toGithubStar() {
74-
window.open("https://github.com/KubeOperator/KubePi", "_blank")
70+
window.open("https://github.com/1Panel-dev/KubePi", "_blank")
7571
},
7672
},
7773
}

‎web/dashboard/src/components/detail/detail-key-value.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
</el-link>
66
<div v-if="showItem">
77
<div v-for="(value,key,index) in valueObj" v-bind:key="index" class="myTag">
8-
<el-tag type="info" size="small" v-if="value.length < 50">
8+
<el-tag type="info" size="small" v-if="value.length + key.length < 50">
99
{{ key }} = {{ value }}
1010
</el-tag>
11-
<el-tooltip v-if="value.length > 50" :content="value" placement="top">
12-
<el-tag type="info" size="small" v-if="value.length >= 50">
13-
{{ key }} = {{ value.substring(0, 50) + "..." }}
11+
<el-tooltip v-if="value.length + key.length >= 50" :content="value" placement="top">
12+
<el-tag type="info" size="small">
13+
{{ (key + '=' + value).substring(0, 50) + "..." }}
1414
</el-tag>
1515
</el-tooltip>
1616
</div>

‎web/dashboard/src/components/ko-charts/index.vue‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ export default {
1717
},
1818
1919
methods: {
20+
loadColor(index) {
21+
const colors = ['#fee82c','#abcd2c','#db2d45','#cd4d89','#1491d1','#f17f43','#108774','#7c4899','#282a88','#008B8B','#90EE90','#8B0000']
22+
return colors[index]
23+
},
2024
initCharts(index) {
2125
const echarts = require('echarts');
2226
let myChart = echarts.init(document.getElementById(this.chartData.name));
@@ -46,12 +50,7 @@ export default {
4650
},
4751
data: this.chartData.data,
4852
itemStyle: {
49-
normal: {
50-
color: function () {
51-
const colors = ['#fee82c','#abcd2c','#db2d45','#cd4d89','#1491d1','#f17f43','#108774','#7c4899','#282a88','#008B8B','#90EE90','#8B0000']
52-
return [colors[index]]
53-
}
54-
}
53+
color: this.loadColor(index)
5554
},
5655
5756
}

‎web/dashboard/src/components/layout/sidebar/index.vue‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:default-active="activeMenu"
77
:collapse="isCollapse"
88
:collapse-transition="false"
9-
:unique-opened="false"
9+
:unique-opened="true"
1010
mode="vertical"
1111
active-text-color="#FFFFFF"
1212
>
@@ -222,11 +222,6 @@
222222
text-align: center;
223223
line-height: $menu-height;
224224
}
225-
226-
.el-submenu__title {
227-
//padding-left: 20px !important;
228-
}
229-
230225
.submenu-title-no-dropdown, .el-submenu__title {
231226
max-width: 60px;
232227
text-align: center;

‎web/dashboard/src/i18n/lang/en-US.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ const message = {
2222
help: {
2323
help: "Help",
2424
about: "About",
25-
business_support: "Business Support",
2625
ko_docs: "Official Document",
2726
},
2827
button: {

‎web/dashboard/src/i18n/lang/zh-CN.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const message = {
2323
help: {
2424
help: "帮助",
2525
about: "关于",
26-
business_support: "商业支持",
2726
ko_docs: "官方文档",
2827
},
2928
button: {

‎web/kubepi/src/business/app-layout/header-components/Help.vue‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
</span>
88
<el-dropdown-menu slot="dropdown">
99
<el-dropdown-item command="docs">{{ $t('commons.help.ko_docs') }}</el-dropdown-item>
10-
<el-dropdown-item command="support">{{ $t('commons.help.business_support') }}</el-dropdown-item>
1110
<!-- <el-dropdown-item command="api">API</el-dropdown-item>-->
1211
<el-dropdown-item class="iconfont iconguanyu" command="about">{{$t("commons.help.about")}}</el-dropdown-item>
1312
</el-dropdown-menu>
@@ -16,7 +15,7 @@
1615
<img style="margin-left: 0;" :src="require('@/assets/KubePi-red.png')" class="sidebar-logo" alt="Sidebar Logo">
1716
<p>{{ $t("commons.personal.introduction") }}</p>
1817
<p>{{ $t("commons.personal.introduction2") }}</p>
19-
<strong>{{ $t("commons.personal.version") }}: v1.1.2</strong>
18+
<strong>{{ $t("commons.personal.version") }}: v1.7.0</strong>
2019
</div>
2120
<div style="padding:15px 20px;box-shadow:rgb(69 70 70) 0 -14px 24px -12px;">
2221
<el-row style="color: #ffffff;text-align: center">
@@ -51,11 +50,8 @@ export default {
5150
methods: {
5251
handleCommand(command) {
5352
switch (command) {
54-
case "support":
55-
window.open("https://kubeoperator.io/", "_blank")
56-
break
5753
case "docs":
58-
window.open("https://kubeoperator.io/docs/kubepi/", "_blank")
54+
window.open("https://github.com/1Panel-dev/KubePi/wiki", "_blank")
5955
break
6056
case "api":
6157
window.open("/kubepi/swagger/index.html", "_blank");
@@ -66,16 +62,16 @@ export default {
6662
}
6763
},
6864
toGithub() {
69-
window.open("https://github.com/KubeOperator/KubePi", "_blank")
65+
window.open("https://github.com/1Panel-dev/KubePi", "_blank")
7066
},
7167
toIssue() {
72-
window.open("https://github.com/KubeOperator/KubePi/issues", "_blank")
68+
window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank")
7369
},
7470
toTalk() {
75-
window.open("https://kubeoperator.io/#contact", "_blank")
71+
window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank")
7672
},
7773
toGithubStar() {
78-
window.open("https://github.com/KubeOperator/KubePi")
74+
window.open("https://github.com/1Panel-dev/KubePi", "_blank")
7975
},
8076
},
8177
}

‎web/kubepi/src/components/layout/sidebar/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
:default-active="activeMenu"
77
:collapse="isCollapse"
88
:collapse-transition="false"
9-
:unique-opened="false"
9+
:unique-opened="true"
1010
mode="vertical"
1111
active-text-color="#FFFFFF"
1212
>

‎web/kubepi/src/i18n/lang/en-US.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const message = {
2323
help: {
2424
help: "Help",
2525
about: "About",
26-
business_support: "Business Support",
2726
ko_docs: "Official Document",
2827
},
2928
button: {

‎web/kubepi/src/i18n/lang/zh-CN.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ const message = {
2323
help: {
2424
help: "帮助",
2525
about: "关于",
26-
business_support: "商业支持",
2726
ko_docs: "官方文档",
2827
},
2928
button: {

0 commit comments

Comments
 (0)