Skip to content

Commit 12fe24a

Browse files
committed
feat:【system 系统管理】租户管理时,支持填写多个域名 websites
1 parent 7637811 commit 12fe24a

File tree

1 file changed

+25
-7
lines changed

1 file changed

+25
-7
lines changed

src/views/system/tenant/index.vue

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,14 @@
7777
<span>{{ parseTime(scope.row.expireTime) }}</span>
7878
</template>
7979
</el-table-column>
80-
<el-table-column label="绑定域名" align="center" prop="domain" width="180" />
80+
<el-table-column label="绑定域名" align="center" prop="websites" width="180">
81+
<template v-slot="scope">
82+
<el-tag v-for="website in scope.row.websites || []" :key="website" style="margin-right: 2px; margin-bottom: 2px;">
83+
{{ website }}
84+
</el-tag>
85+
<span v-if="!scope.row.websites || scope.row.websites.length === 0">-</span>
86+
</template>
87+
</el-table-column>
8188
<el-table-column label="租户状态" align="center" prop="status">
8289
<template v-slot="scope">
8390
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
@@ -131,8 +138,8 @@
131138
<el-date-picker clearable size="small" v-model="form.expireTime" type="date"
132139
value-format="timestamp" placeholder="请选择过期时间" />
133140
</el-form-item>
134-
<el-form-item label="绑定域名" prop="domain">
135-
<el-input v-model="form.domain" placeholder="请输入绑定域名" />
141+
<el-form-item label="绑定域名" prop="websites">
142+
<el-input v-model="form.websites" type="textarea" rows="2" placeholder="请输入网站,多个网站请换行分隔" />
136143
</el-form-item>
137144
<el-form-item label="租户状态" prop="status">
138145
<el-radio-group v-model="form.status">
@@ -198,7 +205,6 @@ export default {
198205
status: [{ required: true, message: "租户状态不能为空", trigger: "blur" }],
199206
accountCount: [{ required: true, message: "账号额度不能为空", trigger: "blur" }],
200207
expireTime: [{ required: true, message: "过期时间不能为空", trigger: "blur" }],
201-
domain: [{ required: true, message: "绑定域名不能为空", trigger: "blur" }],
202208
username: [{ required: true, message: "用户名称不能为空", trigger: "blur" }],
203209
password: [{ required: true, message: "用户密码不能为空", trigger: "blur" }],
204210
}
@@ -237,7 +243,7 @@ export default {
237243
contactMobile: undefined,
238244
accountCount: undefined,
239245
expireTime: undefined,
240-
domain: undefined,
246+
websites: undefined,
241247
status: CommonStatusEnum.ENABLE,
242248
};
243249
this.resetForm("form");
@@ -264,6 +270,10 @@ export default {
264270
const id = row.id;
265271
getTenant(id).then(response => {
266272
this.form = response.data;
273+
// websites 数组转为换行分隔字符串,便于文本域展示
274+
if (Array.isArray(this.form.websites)) {
275+
this.form.websites = this.form.websites.join('\n');
276+
}
267277
this.open = true;
268278
this.title = "修改租户";
269279
});
@@ -274,17 +284,25 @@ export default {
274284
if (!valid) {
275285
return;
276286
}
287+
// 处理 websites,将换行分隔的字符串转换为数组
288+
const submitData = { ...this.form };
289+
if (submitData.websites) {
290+
submitData.websites = submitData.websites
291+
.split('\n')
292+
.filter(item => item.trim() !== '')
293+
.map(item => item.trim());
294+
}
277295
// 修改的提交
278296
if (this.form.id != null) {
279-
updateTenant(this.form).then(response => {
297+
updateTenant(submitData).then(response => {
280298
this.$modal.msgSuccess("修改成功");
281299
this.open = false;
282300
this.getList();
283301
});
284302
return;
285303
}
286304
// 添加的提交
287-
createTenant(this.form).then(response => {
305+
createTenant(submitData).then(response => {
288306
this.$modal.msgSuccess("新增成功");
289307
this.open = false;
290308
this.getList();

0 commit comments

Comments
 (0)