diff --git a/web/dashboard/src/business/app-layout/header-components/Help.vue b/web/dashboard/src/business/app-layout/header-components/Help.vue index 9e232054f..87038b035 100644 --- a/web/dashboard/src/business/app-layout/header-components/Help.vue +++ b/web/dashboard/src/business/app-layout/header-components/Help.vue @@ -7,7 +7,6 @@ {{ $t('commons.help.ko_docs') }} - {{ $t('commons.help.business_support') }} {{$t("commons.help.about")}} @@ -15,7 +14,7 @@

{{ $t("commons.personal.introduction") }}

{{ $t("commons.personal.introduction2") }}

- {{ $t("commons.personal.version") }}: v1.1.2 + {{ $t("commons.personal.version") }}: v1.7.0
@@ -50,11 +49,8 @@ export default { methods: { handleCommand(command) { switch (command) { - case "support": - window.open("https://kubeoperator.io/", "_blank") - break case "docs": - window.open("https://kubeoperator.io/docs/kubepi/", "_blank") + window.open("https://github.com/1Panel-dev/KubePi/wiki", "_blank") break default: this.aboutDialogVisible = true @@ -62,16 +58,16 @@ export default { } }, toGithub() { - window.open("https://github.com/KubeOperator/KubePi", "_blank") + window.open("https://github.com/1Panel-dev/KubePi", "_blank") }, toIssue() { - window.open("https://github.com/KubeOperator/KubePi/issues", "_blank") + window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank") }, toTalk() { - window.open("https://kubeoperator.io/#contact", "_blank") + window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank") }, toGithubStar() { - window.open("https://github.com/KubeOperator/KubePi", "_blank") + window.open("https://github.com/1Panel-dev/KubePi", "_blank") }, }, } diff --git a/web/dashboard/src/components/detail/detail-key-value.vue b/web/dashboard/src/components/detail/detail-key-value.vue index 9b9f4d1f2..fd45ead50 100644 --- a/web/dashboard/src/components/detail/detail-key-value.vue +++ b/web/dashboard/src/components/detail/detail-key-value.vue @@ -5,12 +5,12 @@
- + {{ key }} = {{ value }} - - - {{ key }} = {{ value.substring(0, 50) + "..." }} + + + {{ (key + '=' + value).substring(0, 50) + "..." }}
diff --git a/web/dashboard/src/components/ko-charts/index.vue b/web/dashboard/src/components/ko-charts/index.vue index 703d190ca..e3a82fa6e 100644 --- a/web/dashboard/src/components/ko-charts/index.vue +++ b/web/dashboard/src/components/ko-charts/index.vue @@ -17,6 +17,10 @@ export default { }, methods: { + loadColor(index) { + const colors = ['#fee82c','#abcd2c','#db2d45','#cd4d89','#1491d1','#f17f43','#108774','#7c4899','#282a88','#008B8B','#90EE90','#8B0000'] + return colors[index] + }, initCharts(index) { const echarts = require('echarts'); let myChart = echarts.init(document.getElementById(this.chartData.name)); @@ -46,12 +50,7 @@ export default { }, data: this.chartData.data, itemStyle: { - normal: { - color: function () { - const colors = ['#fee82c','#abcd2c','#db2d45','#cd4d89','#1491d1','#f17f43','#108774','#7c4899','#282a88','#008B8B','#90EE90','#8B0000'] - return [colors[index]] - } - } + color: this.loadColor(index) }, } diff --git a/web/dashboard/src/components/layout/sidebar/index.vue b/web/dashboard/src/components/layout/sidebar/index.vue index e44dda156..2d73917f2 100644 --- a/web/dashboard/src/components/layout/sidebar/index.vue +++ b/web/dashboard/src/components/layout/sidebar/index.vue @@ -6,7 +6,7 @@ :default-active="activeMenu" :collapse="isCollapse" :collapse-transition="false" - :unique-opened="false" + :unique-opened="true" mode="vertical" active-text-color="#FFFFFF" > @@ -222,11 +222,6 @@ text-align: center; line-height: $menu-height; } - - .el-submenu__title { - //padding-left: 20px !important; - } - .submenu-title-no-dropdown, .el-submenu__title { max-width: 60px; text-align: center; diff --git a/web/dashboard/src/i18n/lang/en-US.js b/web/dashboard/src/i18n/lang/en-US.js index 19133919e..d8d6f580c 100644 --- a/web/dashboard/src/i18n/lang/en-US.js +++ b/web/dashboard/src/i18n/lang/en-US.js @@ -22,7 +22,6 @@ const message = { help: { help: "Help", about: "About", - business_support: "Business Support", ko_docs: "Official Document", }, button: { diff --git a/web/dashboard/src/i18n/lang/zh-CN.js b/web/dashboard/src/i18n/lang/zh-CN.js index 116c564ed..d0d4c43ff 100644 --- a/web/dashboard/src/i18n/lang/zh-CN.js +++ b/web/dashboard/src/i18n/lang/zh-CN.js @@ -23,7 +23,6 @@ const message = { help: { help: "帮助", about: "关于", - business_support: "商业支持", ko_docs: "官方文档", }, button: { diff --git a/web/kubepi/src/business/app-layout/header-components/Help.vue b/web/kubepi/src/business/app-layout/header-components/Help.vue index 55a254448..230cad0ca 100644 --- a/web/kubepi/src/business/app-layout/header-components/Help.vue +++ b/web/kubepi/src/business/app-layout/header-components/Help.vue @@ -7,7 +7,6 @@ {{ $t('commons.help.ko_docs') }} - {{ $t('commons.help.business_support') }} {{$t("commons.help.about")}} @@ -16,7 +15,7 @@

{{ $t("commons.personal.introduction") }}

{{ $t("commons.personal.introduction2") }}

- {{ $t("commons.personal.version") }}: v1.1.2 + {{ $t("commons.personal.version") }}: v1.7.0
@@ -51,11 +50,8 @@ export default { methods: { handleCommand(command) { switch (command) { - case "support": - window.open("https://kubeoperator.io/", "_blank") - break case "docs": - window.open("https://kubeoperator.io/docs/kubepi/", "_blank") + window.open("https://github.com/1Panel-dev/KubePi/wiki", "_blank") break case "api": window.open("/kubepi/swagger/index.html", "_blank"); @@ -66,16 +62,16 @@ export default { } }, toGithub() { - window.open("https://github.com/KubeOperator/KubePi", "_blank") + window.open("https://github.com/1Panel-dev/KubePi", "_blank") }, toIssue() { - window.open("https://github.com/KubeOperator/KubePi/issues", "_blank") + window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank") }, toTalk() { - window.open("https://kubeoperator.io/#contact", "_blank") + window.open("https://github.com/1Panel-dev/KubePi/issues", "_blank") }, toGithubStar() { - window.open("https://github.com/KubeOperator/KubePi") + window.open("https://github.com/1Panel-dev/KubePi", "_blank") }, }, } diff --git a/web/kubepi/src/components/layout/sidebar/index.vue b/web/kubepi/src/components/layout/sidebar/index.vue index 82f28a955..de8364bd2 100644 --- a/web/kubepi/src/components/layout/sidebar/index.vue +++ b/web/kubepi/src/components/layout/sidebar/index.vue @@ -6,7 +6,7 @@ :default-active="activeMenu" :collapse="isCollapse" :collapse-transition="false" - :unique-opened="false" + :unique-opened="true" mode="vertical" active-text-color="#FFFFFF" > diff --git a/web/kubepi/src/i18n/lang/en-US.js b/web/kubepi/src/i18n/lang/en-US.js index c1d53b781..0419c7206 100644 --- a/web/kubepi/src/i18n/lang/en-US.js +++ b/web/kubepi/src/i18n/lang/en-US.js @@ -23,7 +23,6 @@ const message = { help: { help: "Help", about: "About", - business_support: "Business Support", ko_docs: "Official Document", }, button: { diff --git a/web/kubepi/src/i18n/lang/zh-CN.js b/web/kubepi/src/i18n/lang/zh-CN.js index 576e924e6..89d68b2e2 100644 --- a/web/kubepi/src/i18n/lang/zh-CN.js +++ b/web/kubepi/src/i18n/lang/zh-CN.js @@ -23,7 +23,6 @@ const message = { help: { help: "帮助", about: "关于", - business_support: "商业支持", ko_docs: "官方文档", }, button: {