lxd/FlowBL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

多租户：调整 tenant 表的 domain 字段为 website，避免 dm 数据库的关键字冲突

Browse Source
This commit is contained in:
YunaiV 2023-11-06 19:09:20 +08:00 committed by owen
parent 82aed175ab
commit a08e9bea7c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/views/system/tenant/TenantForm.vue
View File

@ -54,8 +54,8 @@
value-format="x" value-format="x"
/> />
</el-form-item> </el-form-item>
<el-form-item label="绑定域名" prop="domain"> <el-form-item label="绑定域名" prop="website">
<el-input v-model="formData.domain" placeholder="请输入绑定域名" /> <el-input v-model="formData.website" placeholder="请输入绑定域名" />
</el-form-item> </el-form-item>
<el-form-item label="租户状态" prop="status"> <el-form-item label="租户状态" prop="status">
<el-radio-group v-model="formData.status"> <el-radio-group v-model="formData.status">
@ -97,7 +97,7 @@ const formData = ref({
contactMobile: undefined, contactMobile: undefined,
accountCount: undefined, accountCount: undefined,
expireTime: undefined, expireTime: undefined,
domain: undefined, website: undefined,
status: CommonStatusEnum.ENABLE status: CommonStatusEnum.ENABLE
}) })
const formRules = reactive({ const formRules = reactive({
@ -107,7 +107,7 @@ const formRules = reactive({
status: [{ required: true, message: '租户状态不能为空', trigger: 'blur' }], status: [{ required: true, message: '租户状态不能为空', trigger: 'blur' }],
accountCount: [{ required: true, message: '账号额度不能为空', trigger: 'blur' }], accountCount: [{ required: true, message: '账号额度不能为空', trigger: 'blur' }],
expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }], expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }],
domain: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }], website: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }],
username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }], username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }] password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }]
}) })
@ -170,7 +170,7 @@ const resetForm = () => {
contactMobile: undefined, contactMobile: undefined,
accountCount: undefined, accountCount: undefined,
expireTime: undefined, expireTime: undefined,
domain: undefined, website: undefined,
status: CommonStatusEnum.ENABLE status: CommonStatusEnum.ENABLE
} }
formRef.value?.resetFields() formRef.value?.resetFields()

2
src/views/system/tenant/index.vue
View File

@ -125,7 +125,7 @@
width="180" width="180"
:formatter="dateFormatter" :formatter="dateFormatter"
/> />
<el-table-column label="绑定域名" align="center" prop="domain" width="180" /> <el-table-column label="绑定域名" align="center" prop="website" width="180" />
<el-table-column label="租户状态" align="center" prop="status"> <el-table-column label="租户状态" align="center" prop="status">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />