diff --git a/internal/web/actions/default/dns/domains/domainutils/utils.go b/internal/web/actions/default/dns/domains/domainutils/utils.go index 1b523453..130f0d35 100644 --- a/internal/web/actions/default/dns/domains/domainutils/utils.go +++ b/internal/web/actions/default/dns/domains/domainutils/utils.go @@ -17,7 +17,6 @@ func ValidateDomainFormat(domain string) bool { if piece == "-" || strings.HasPrefix(piece, "-") || strings.HasSuffix(piece, "-") || - //strings.Contains(piece, "--") || len(piece) > 63 || !regexp.MustCompile(`^[a-z0-9-]+$`).MatchString(piece) { return false diff --git a/web/public/js/components.js b/web/public/js/components.js index d76ef7de..d611292a 100644 --- a/web/public/js/components.js +++ b/web/public/js/components.js @@ -817,8 +817,8 @@ Vue.component("traffic-map-box",{props:["v-stats","v-is-attack"],mounted:functio -`}),Vue.component("ns-cluster-combo-box",{props:["v-cluster-id"],data:function(){let t=this;return Tea.action("/ns/clusters/options").post().success(function(e){t.clusters=e.data.clusters}),{clusters:[]}},methods:{change:function(e){null==e?this.$emit("change",0):this.$emit("change",e.value)}},template:`
- +
`}),Vue.component("ns-cluster-combo-box",{props:["v-cluster-id","name"],data:function(){let t=this,e=(Tea.action("/ns/clusters/options").post().success(function(e){t.clusters=e.data.clusters}),"clusterId");return{clusters:[],inputName:e=null!=this.name&&0 + `}),Vue.component("plan-user-selector",{props:["v-user-id"],data:function(){return{}},methods:{change:function(e){this.$emit("change",e)}},template:`
`}),Vue.component("plan-price-view",{props:["v-plan"],data:function(){return{plan:this.vPlan}},template:`
diff --git a/web/public/js/components.src.js b/web/public/js/components.src.js index a8e185ae..661591d0 100755 --- a/web/public/js/components.src.js +++ b/web/public/js/components.src.js @@ -2451,7 +2451,7 @@ Vue.component("ns-cluster-selector", { }) Vue.component("ns-cluster-combo-box", { - props: ["v-cluster-id"], + props: ["v-cluster-id", "name"], data: function () { let that = this Tea.action("/ns/clusters/options") @@ -2459,8 +2459,16 @@ Vue.component("ns-cluster-combo-box", { .success(function (resp) { that.clusters = resp.data.clusters }) + + + let inputName = "clusterId" + if (this.name != null && this.name.length > 0) { + inputName = this.name + } + return { - clusters: [] + clusters: [], + inputName: inputName } }, methods: { @@ -2473,7 +2481,7 @@ Vue.component("ns-cluster-combo-box", { } }, template: `
- +
` }) diff --git a/web/public/js/components/ns/ns-cluster-combo-box.js b/web/public/js/components/ns/ns-cluster-combo-box.js index 1cd879de..03361a29 100644 --- a/web/public/js/components/ns/ns-cluster-combo-box.js +++ b/web/public/js/components/ns/ns-cluster-combo-box.js @@ -1,5 +1,5 @@ Vue.component("ns-cluster-combo-box", { - props: ["v-cluster-id"], + props: ["v-cluster-id", "name"], data: function () { let that = this Tea.action("/ns/clusters/options") @@ -7,8 +7,16 @@ Vue.component("ns-cluster-combo-box", { .success(function (resp) { that.clusters = resp.data.clusters }) + + + let inputName = "clusterId" + if (this.name != null && this.name.length > 0) { + inputName = this.name + } + return { - clusters: [] + clusters: [], + inputName: inputName } }, methods: { @@ -21,6 +29,6 @@ Vue.component("ns-cluster-combo-box", { } }, template: `
- +
` }) \ No newline at end of file