自动填充租户id
This commit is contained in:
@@ -2,9 +2,6 @@
|
|||||||
<div class="app-container">
|
<div class="app-container">
|
||||||
<el-card class="filter-container" shadow="never">
|
<el-card class="filter-container" shadow="never">
|
||||||
<el-form ref="queryForm" :model="queryParams" :inline="true" label-width="100px">
|
<el-form ref="queryForm" :model="queryParams" :inline="true" label-width="100px">
|
||||||
<el-form-item label="租户ID">
|
|
||||||
<el-input v-model="queryParams.tenantId" placeholder="租户ID" clearable style="width: 220px" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="名称">
|
<el-form-item label="名称">
|
||||||
<el-input v-model="queryParams.name" placeholder="名称" clearable style="width: 180px" />
|
<el-input v-model="queryParams.name" placeholder="名称" clearable style="width: 180px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -38,7 +35,6 @@
|
|||||||
<el-table-column label="适用范围" prop="valueRange" min-width="140" show-overflow-tooltip />
|
<el-table-column label="适用范围" prop="valueRange" min-width="140" show-overflow-tooltip />
|
||||||
<el-table-column label="微服务" prop="microService" min-width="140" show-overflow-tooltip />
|
<el-table-column label="微服务" prop="microService" min-width="140" show-overflow-tooltip />
|
||||||
<el-table-column label="描述" prop="description" min-width="160" show-overflow-tooltip />
|
<el-table-column label="描述" prop="description" min-width="160" show-overflow-tooltip />
|
||||||
<el-table-column label="租户ID" prop="tenantId" min-width="220" show-overflow-tooltip />
|
|
||||||
<el-table-column label="创建时间" prop="createdTime" min-width="160">
|
<el-table-column label="创建时间" prop="createdTime" min-width="160">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
{{ formatDateTime(scope.row.createdTime) }}
|
{{ formatDateTime(scope.row.createdTime) }}
|
||||||
@@ -80,9 +76,6 @@
|
|||||||
:rules="formRules"
|
:rules="formRules"
|
||||||
label-width="110px"
|
label-width="110px"
|
||||||
>
|
>
|
||||||
<el-form-item label="租户ID" prop="tenantId">
|
|
||||||
<el-input v-model="form.tenantId" placeholder="租户ID(可选)" />
|
|
||||||
</el-form-item>
|
|
||||||
<el-form-item label="名称" prop="name">
|
<el-form-item label="名称" prop="name">
|
||||||
<el-input v-model="form.name" placeholder="名称" />
|
<el-input v-model="form.name" placeholder="名称" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@@ -111,6 +104,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
import { getBusinessHeaders } from '@/utils/business-headers'
|
||||||
import {
|
import {
|
||||||
getDictItemList,
|
getDictItemList,
|
||||||
getQiWeiConfigDictItem,
|
getQiWeiConfigDictItem,
|
||||||
@@ -132,7 +126,6 @@ export default {
|
|||||||
queryParams: {
|
queryParams: {
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 10,
|
size: 10,
|
||||||
tenantId: '',
|
|
||||||
name: '',
|
name: '',
|
||||||
type: '',
|
type: '',
|
||||||
microService: '',
|
microService: '',
|
||||||
@@ -140,7 +133,6 @@ export default {
|
|||||||
},
|
},
|
||||||
form: {
|
form: {
|
||||||
id: '',
|
id: '',
|
||||||
tenantId: '',
|
|
||||||
name: '',
|
name: '',
|
||||||
value: '',
|
value: '',
|
||||||
type: '',
|
type: '',
|
||||||
@@ -162,6 +154,11 @@ export default {
|
|||||||
isPlainObject(val) {
|
isPlainObject(val) {
|
||||||
return val !== null && typeof val === 'object' && !Array.isArray(val)
|
return val !== null && typeof val === 'object' && !Array.isArray(val)
|
||||||
},
|
},
|
||||||
|
getTenantIdFromBusinessHeaders() {
|
||||||
|
const headers = getBusinessHeaders()
|
||||||
|
const value = headers && headers['X-Tenant-Id']
|
||||||
|
return value ? String(value).trim() : ''
|
||||||
|
},
|
||||||
safeJsonStringify(val) {
|
safeJsonStringify(val) {
|
||||||
try {
|
try {
|
||||||
return JSON.stringify(val, null, 2)
|
return JSON.stringify(val, null, 2)
|
||||||
@@ -173,7 +170,6 @@ export default {
|
|||||||
const params = {
|
const params = {
|
||||||
current: this.queryParams.current,
|
current: this.queryParams.current,
|
||||||
size: this.queryParams.size,
|
size: this.queryParams.size,
|
||||||
tenantId: this.queryParams.tenantId || undefined,
|
|
||||||
name: this.queryParams.name || undefined,
|
name: this.queryParams.name || undefined,
|
||||||
type: this.queryParams.type || undefined,
|
type: this.queryParams.type || undefined,
|
||||||
microService: this.queryParams.microService || undefined,
|
microService: this.queryParams.microService || undefined,
|
||||||
@@ -226,7 +222,6 @@ export default {
|
|||||||
this.queryParams = {
|
this.queryParams = {
|
||||||
current: 1,
|
current: 1,
|
||||||
size: 10,
|
size: 10,
|
||||||
tenantId: '',
|
|
||||||
name: '',
|
name: '',
|
||||||
type: '',
|
type: '',
|
||||||
microService: '',
|
microService: '',
|
||||||
@@ -264,7 +259,6 @@ export default {
|
|||||||
this.isEdit = Boolean(data.id)
|
this.isEdit = Boolean(data.id)
|
||||||
this.form = {
|
this.form = {
|
||||||
id: data.id || '',
|
id: data.id || '',
|
||||||
tenantId: data.tenantId || '',
|
|
||||||
name: data.name || 'qiwei_config',
|
name: data.name || 'qiwei_config',
|
||||||
value: data.value || '',
|
value: data.value || '',
|
||||||
type: data.type || 'qiwei_config',
|
type: data.type || 'qiwei_config',
|
||||||
@@ -276,7 +270,6 @@ export default {
|
|||||||
this.isEdit = false
|
this.isEdit = false
|
||||||
this.form = {
|
this.form = {
|
||||||
id: '',
|
id: '',
|
||||||
tenantId: '',
|
|
||||||
name: 'qiwei_config',
|
name: 'qiwei_config',
|
||||||
value: this.safeJsonStringify(data || {}),
|
value: this.safeJsonStringify(data || {}),
|
||||||
type: 'qiwei_config',
|
type: 'qiwei_config',
|
||||||
@@ -299,7 +292,6 @@ export default {
|
|||||||
this.isEdit = true
|
this.isEdit = true
|
||||||
this.form = {
|
this.form = {
|
||||||
id: row.id,
|
id: row.id,
|
||||||
tenantId: row.tenantId || '',
|
|
||||||
name: row.name || '',
|
name: row.name || '',
|
||||||
value: row.value || '',
|
value: row.value || '',
|
||||||
type: row.type || '',
|
type: row.type || '',
|
||||||
@@ -329,8 +321,9 @@ export default {
|
|||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
this.$refs.dataForm.validate((valid) => {
|
this.$refs.dataForm.validate((valid) => {
|
||||||
if (!valid) return
|
if (!valid) return
|
||||||
|
const tenantId = this.getTenantIdFromBusinessHeaders()
|
||||||
const payload = {
|
const payload = {
|
||||||
tenantId: this.form.tenantId || undefined,
|
tenantId,
|
||||||
name: this.form.name,
|
name: this.form.name,
|
||||||
value: this.form.value,
|
value: this.form.value,
|
||||||
type: this.form.type,
|
type: this.form.type,
|
||||||
@@ -357,7 +350,6 @@ export default {
|
|||||||
resetFormData() {
|
resetFormData() {
|
||||||
this.form = {
|
this.form = {
|
||||||
id: '',
|
id: '',
|
||||||
tenantId: '',
|
|
||||||
name: '',
|
name: '',
|
||||||
value: '',
|
value: '',
|
||||||
type: '',
|
type: '',
|
||||||
|
|||||||
Reference in New Issue
Block a user