Merge branch 'master' of github.com:KubeOperator/KubePi

Author: ssongliu

web/dashboard/src/components/detail/detail-containers.vue

@@ -121,7 +121,7 @@ export default {
           label: this.$t("commons.button.terminal"),
           icon: "iconfont iconline-terminalzhongduan",
           click: (row) => {
-            this.openTerminalLogs(row)
+            this.openTerminal(row)
           },
           disabled: () => {
             return !checkPermissions({ scope: "namespace", apiGroup: "", resource: "pods/exec", verb: "*" })

web/kubepi/src/business/cluster-management/create/index.vue

@@ -110,7 +110,7 @@ export default {
         configContent: ""
       },
       rules: {
-        name: [Rule.RequiredRule, Rule.LengthRule],
+        name: [Rule.RequiredRule, Rule.LengthRule,Rule.CommonNameRule],
         apiServer: [Rule.RequiredRule],
         token: [Rule.RequiredRule],
         certDataStr: [Rule.RequiredRule],
@@ -225,4 +225,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

web/kubepi/src/utils/rules.js

@@ -35,7 +35,7 @@ const LengthRule = {
     message: i18n.t("commons.validate.limit", [1, 30]),
     trigger: "blur"
 }
-const NamePattern = /^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$/
+const NamePattern = /^[a-z0-9]([-_a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-_a-z0-9]*[a-z0-9])?)*$/
 
 const CommonNameRule = {
     required: true,