diff --git a/src/apis/common/common.ts b/src/apis/common/common.ts index ab51437..ef2aaed 100644 --- a/src/apis/common/common.ts +++ b/src/apis/common/common.ts @@ -24,16 +24,6 @@ export function listRoleDict(query?: { name: string, status: number }) { return http.get(`${BASE_URL}/dict/role`, query) } -/** @desc 查询租户套餐列表 */ -export function listTenantPackageDict(query?: { description: string, status: number }) { - return http.get(`${BASE_URL}/dict/package`, query) -} - -/** @desc 查询租户数据源列表 */ -export function listTenantDatasourceDict(query?: { description: string }) { - return http.get(`${BASE_URL}/dict/datasource`, query) -} - /** @desc 查询字典列表 */ export function listCommonDict(code: string) { return http.get(`${BASE_URL}/dict/${code}`) diff --git a/src/apis/tenant/common.ts b/src/apis/tenant/common.ts new file mode 100644 index 0000000..61571ac --- /dev/null +++ b/src/apis/tenant/common.ts @@ -0,0 +1,9 @@ +import http from '@/utils/http' +import type { LabelValueState } from '@/types/global' + +const BASE_URL = '/tenant/common' + +/** @desc 查询租户套餐列表 */ +export function listTenantPackageDict(query?: { description: string, status: number }) { + return http.get(`${BASE_URL}/dict/package`, query) +} diff --git a/src/apis/tenant/datasource.ts b/src/apis/tenant/datasource.ts deleted file mode 100644 index 71439e4..0000000 --- a/src/apis/tenant/datasource.ts +++ /dev/null @@ -1,36 +0,0 @@ -import type * as T from './type' -import http from '@/utils/http' - -export type * from './type' - -const BASE_URL = '/tenant/datasource' - -/** @desc 查询租户数据源列表 */ -export function listTenantDatasource(query: T.TenantDatasourcePageQuery) { - return http.get>(`${BASE_URL}`, query) -} - -/** @desc 查询租户数据源详情 */ -export function getTenantDatasource(id: string) { - return http.get(`${BASE_URL}/${id}`) -} - -/** @desc 新增租户数据源 */ -export function addTenantDatasource(data: any) { - return http.post(`${BASE_URL}`, data) -} - -/** @desc 修改租户数据源 */ -export function updateTenantDatasource(data: any, id: string) { - return http.put(`${BASE_URL}/${id}`, data) -} - -/** @desc 删除租户数据源 */ -export function deleteTenantDatasource(id: string) { - return http.del(`${BASE_URL}/${id}`) -} - -/** @desc 测试租户数据源连接 */ -export function testTenantDatasourceConnection(id: string) { - return http.post(`${BASE_URL}/${id}/test/connection`) -} diff --git a/src/apis/tenant/index.ts b/src/apis/tenant/index.ts index 81a557b..2b9c52d 100644 --- a/src/apis/tenant/index.ts +++ b/src/apis/tenant/index.ts @@ -1,2 +1,3 @@ +export * from './common' +export * from './management' export * from './package' -export * from './datasource' diff --git a/src/apis/tenant/type.ts b/src/apis/tenant/type.ts index 00c574c..d8695b5 100644 --- a/src/apis/tenant/type.ts +++ b/src/apis/tenant/type.ts @@ -5,11 +5,9 @@ export interface TenantResp { code: string domain: string expireTime: string - isolationLevel: number description: number status: string packageId: string - datasourceId: string createUser: string createTime: string updateUser: string @@ -17,7 +15,6 @@ export interface TenantResp { createUserString: string updateUserString: string packageName: string - datasourceName: string } export interface TenantQuery { description?: string @@ -49,25 +46,3 @@ export interface TenantPackageQuery { sort: Array } export interface TenantPackagePageQuery extends TenantPackageQuery, PageQuery {} - -/** 租户数据源 */ -export interface TenantDatasourceResp { - id: string - name: string - databaseType: string - host: string - port: string - username: string - description: string - createUser: string - createTime: string - updateUser: string - updateTime: string - createUserString: string - updateUserString: string -} -export interface TenantDatasourceQuery { - description?: string - sort: Array -} -export interface TenantDatasourcePageQuery extends TenantDatasourceQuery, PageQuery {} diff --git a/src/views/tenant/datasource/AddModal.vue b/src/views/tenant/datasource/AddModal.vue deleted file mode 100644 index 591f69e..0000000 --- a/src/views/tenant/datasource/AddModal.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - - diff --git a/src/views/tenant/datasource/DetailDrawer.vue b/src/views/tenant/datasource/DetailDrawer.vue deleted file mode 100644 index 532c2ec..0000000 --- a/src/views/tenant/datasource/DetailDrawer.vue +++ /dev/null @@ -1,47 +0,0 @@ - - - - - diff --git a/src/views/tenant/datasource/index.vue b/src/views/tenant/datasource/index.vue deleted file mode 100644 index 8bf8f1c..0000000 --- a/src/views/tenant/datasource/index.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - - - diff --git a/src/views/tenant/management/AddModal.vue b/src/views/tenant/management/AddModal.vue index 5e2d1f1..968edaf 100644 --- a/src/views/tenant/management/AddModal.vue +++ b/src/views/tenant/management/AddModal.vue @@ -20,8 +20,7 @@ import { addTenant, getTenant, updateTenant } from '@/apis/tenant/management' import { type ColumnItem, GiForm } from '@/components/GiForm' import { useResetReactive } from '@/hooks' import { encryptByRsa } from '@/utils/encrypt' -import { listTenantDatasourceDict, listTenantPackageDict } from '@/apis' -import { useDict } from '@/hooks/app' +import { listTenantPackageDict } from '@/apis/tenant' import type { LabelValueState } from '@/types/global' const emit = defineEmits<{ @@ -35,20 +34,13 @@ const visible = ref(false) const isUpdate = computed(() => !!dataId.value) const title = computed(() => (isUpdate.value ? '修改租户' : '新增租户')) const formRef = ref>() -const { tenant_isolation_level_enum } = useDict('tenant_isolation_level_enum') const packageList = ref([]) -const datasourceList = ref([]) // 查询租户套餐 const getPackageList = async () => { const { data } = await listTenantPackageDict() packageList.value = data } -// 查询租户数据源 -const getDatasourceList = async () => { - const { data } = await listTenantDatasourceDict() - datasourceList.value = data -} const [form, resetForm] = useResetReactive({ isolationLevel: 1, @@ -120,33 +112,6 @@ const columns: ColumnItem[] = reactive([ return isUpdate.value }, }, - { - label: '隔离级别', - field: 'isolationLevel', - type: 'radio-group', - span: 24, - required: true, - props: { - type: 'button', - options: tenant_isolation_level_enum, - }, - hide: () => { - return isUpdate.value - }, - }, - { - label: '数据源', - field: 'dbConnectId', - type: 'select', - span: 24, - required: true, - hide: () => { - return isUpdate.value || form.isolationLevel !== 2 - }, - props: { - options: datasourceList, - }, - }, { label: '描述', field: 'description', @@ -173,7 +138,6 @@ const reset = () => { formRef.value?.formRef?.resetFields() resetForm() getPackageList() - getDatasourceList() } // 保存 diff --git a/src/views/tenant/management/DetailDrawer.vue b/src/views/tenant/management/DetailDrawer.vue index 85fc85f..070dbdf 100644 --- a/src/views/tenant/management/DetailDrawer.vue +++ b/src/views/tenant/management/DetailDrawer.vue @@ -15,7 +15,6 @@ - 永不过期 {{ dataDetail?.expireTime }} @@ -24,8 +23,6 @@ {{ dataDetail?.domain }} 未设置 - - {{ dataDetail?.datasourceName }} {{ dataDetail?.createUserString }} {{ dataDetail?.createTime }} {{ dataDetail?.updateUserString }} @@ -38,7 +35,7 @@