test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(环境管理): 域名长度限制调整到 253 

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2024-11-04 14:52:08 +08:00 committed by Craftsman
parent 576aba0a06
commit 475498e636
1 changed files with 138 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
framework/sdk-parent/frontend/src/components/environment/commons/ApiHostTable.vue
View File

@ -4,49 +4,63 @@
<el-table-column prop="ip" label="IP">
<template slot-scope="scope">
<el-input size="small" v-if="scope.row.status" v-model="scope.row.ip"></el-input>
<span v-else>{{scope.row.ip}}</span>
<span v-else>{{ scope.row.ip }}</span>
</template>
</el-table-column>
<el-table-column prop="domain" :label="$t('load_test.domain')">
<template slot-scope="scope">
<el-input size="small" v-if="scope.row.status" v-model="scope.row.domain"></el-input>
<span v-else>{{scope.row.domain}}</span>
<span v-else>{{ scope.row.domain }}</span>
</template>
</el-table-column>
<el-table-column prop="annotation" :label="$t('commons.annotation')">
<template slot-scope="scope">
<el-input size="small" v-if="scope.row.status" v-model="scope.row.annotation"></el-input>
<span v-else>{{scope.row.annotation}}</span>
<span v-else>{{ scope.row.annotation }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('commons.operating')" width="100">
<template v-slot:default="scope">
<span>
<el-button size="mini" p="$t('commons.remove')" icon="el-icon-close" circle @click="remove(scope.row)"
class="ht-btn-remove"/>
<el-button size="mini" p="$t('commons.save')" icon="el-icon-check" type="primary" circle @click="confirm(scope.row)"
class="ht-btn-confirm"/>
<el-button
size="mini"
p="$t('commons.remove')"
icon="el-icon-close"
circle
@click="remove(scope.row)"
class="ht-btn-remove" />
<el-button
size="mini"
p="$t('commons.save')"
icon="el-icon-check"
type="primary"
circle
@click="confirm(scope.row)"
class="ht-btn-confirm" />
</span>
</template>
</el-table-column>
</el-table>
<el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-circle-plus-outline" @click="add">{{$t("commons.add")}}</el-button>
<el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-files" @click="copy">{{$t("commons.copy")}}</el-button>
<el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-circle-plus-outline" @click="add">{{
$t('commons.add')
}}</el-button>
<el-button class="ht-btn-add" size="mini" p="$t('commons.add')" icon="el-icon-files" @click="copy">{{
$t('commons.copy')
}}</el-button>
</div>
</template>
<script>
import MsApiVariableInput from "./ApiVariableInput";
import MsTableOperatorButton from "../../MsTableOperatorButton";
import MsApiVariableInput from './ApiVariableInput';
import MsTableOperatorButton from '../../MsTableOperatorButton';
export default {
name: "MsApiHostTable",
components: {MsApiVariableInput, MsTableOperatorButton},
export default {
name: 'MsApiHostTable',
components: { MsApiVariableInput, MsTableOperatorButton },
props: {
hostTable: Array,
},
@ -55,7 +69,7 @@
currentPage: 1,
pageSize: 5,
total: 0,
}
};
},
created() {
this.init();
@ -74,7 +88,7 @@
status: 'edit',
annotation: '',
uuid: this.uuid(),
}
};
this.hostTable.push(row);
},
copy: function (r) {
@ -84,7 +98,7 @@
status: 'edit',
annotation: '',
uuid: this.uuid(),
}
};
// 获取上一行的数据
for (let i = this.hostTable.length - 1; i >= 0; i--) {
if (this.hostTable[i].status === '') {
@ -98,9 +112,9 @@
this.hostTable.push(row);
},
confirm: function (row) {
this.validateIp(row.ip) && this.validateDomain(row.domain) ? row.status = '' : row.status;
this.validateIp(row.ip) && this.validateDomain(row.domain) ? (row.status = '') : row.status;
this.$emit('change', this.hostTable);
if (row.status === "") {
if (row.status === '') {
return true;
}
return false;
@ -112,23 +126,24 @@
domain: '',
status: 'edit',
annotation: '',
uuid: this.uuid()
}
uuid: this.uuid(),
};
this.hostTable.push(row);
}
},
validateIp(ip) {
let regexp = /^((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}$/;
if (regexp.test(ip) == false) {
if (regexp.test(ip) === false) {
this.$warning(this.$t('load_test.input_ip'));
return false;
}
return true;
},
validateDomain(domain) {
let strRegex = "^(?=^.{3,255}$)(http(s)?:\\/\\/)?(www\\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\\d+)*(\\/\\w+\\.\\w+)*$";
let strRegex =
'^(?=^.{3,255}$)(http(s)?:\\/\\/)?(www\\.)?[a-zA-Z0-9][-a-zA-Z0-9]{0,62}(\\.[a-zA-Z0-9][-a-zA-Z0-9]{0,62})+(:\\d+)*(\\/\\w+\\.\\w+)*$';
const re = new RegExp(strRegex);
if (re.test(domain) && domain.length < 67) {
if (re.test(domain) && domain.length < 253) {
return true;
}
this.$warning(this.$t('load_test.input_domain'));
@ -140,31 +155,30 @@
uuid: function () {
return (((1 + Math.random()) * 0x100000) | 0).toString(16).substring(1);
},
}
}
},
};
</script>
<style scoped>
.ht-btn-remove {
.ht-btn-remove {
color: white;
background-color: #DCDFE6;
}
background-color: #dcdfe6;
}
.ht-btn-confirm {
.ht-btn-confirm {
color: white;
/*background-color: #1483F6;*/
}
}
.ht-btn-add {
.ht-btn-add {
border: 0px;
margin-top: 10px;
color: #783887;
background-color: white;
}
}
.ht-tb {
.ht-tb {
background-color: white;
border: 0px;
}
}
</style>