From bf4a8543ca9f4e9ef6d13f78385f5c0f30255dc0 Mon Sep 17 00:00:00 2001
From: LiuHao <liuhaoai545@gmail.com>
Date: 星期六, 06 五月 2023 09:25:05 +0800
Subject: [PATCH] Merge branch 'ts' into dev
---
src/views/tool/gen/editTable.vue | 108 ++++++++++++++++++++++++-----------------------------
1 files changed, 49 insertions(+), 59 deletions(-)
diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue
index a61556c..15e6edd 100644
--- a/src/views/tool/gen/editTable.vue
+++ b/src/views/tool/gen/editTable.vue
@@ -6,24 +6,14 @@
</el-tab-pane>
<el-tab-pane label="瀛楁淇℃伅" name="columnInfo">
<el-table ref="dragTable" :data="columns" row-key="columnId" :max-height="tableHeight">
- <el-table-column label="搴忓彿" type="index" min-width="5%"/>
- <el-table-column
- label="瀛楁鍒楀悕"
- prop="columnName"
- min-width="10%"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="搴忓彿" type="index" min-width="5%" />
+ <el-table-column label="瀛楁鍒楀悕" prop="columnName" min-width="10%" :show-overflow-tooltip="true" />
<el-table-column label="瀛楁鎻忚堪" min-width="10%">
<template #default="scope">
<el-input v-model="scope.row.columnComment"></el-input>
</template>
</el-table-column>
- <el-table-column
- label="鐗╃悊绫诲瀷"
- prop="columnType"
- min-width="10%"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鐗╃悊绫诲瀷" prop="columnType" min-width="10%" :show-overflow-tooltip="true" />
<el-table-column label="Java绫诲瀷" min-width="11%">
<template #default="scope">
<el-select v-model="scope.row.javaType">
@@ -100,14 +90,10 @@
<el-table-column label="瀛楀吀绫诲瀷" min-width="12%">
<template #default="scope">
<el-select v-model="scope.row.dictType" clearable filterable placeholder="璇烽�夋嫨">
- <el-option
- v-for="dict in dictOptions"
- :key="dict.dictType"
- :label="dict.dictName"
- :value="dict.dictType">
+ <el-option v-for="dict in dictOptions" :key="dict.dictType" :label="dict.dictName" :value="dict.dictType">
<span style="float: left">{{ dict.dictName }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ dict.dictType }}</span>
- </el-option>
+ </el-option>
</el-select>
</template>
</el-table-column>
@@ -126,73 +112,77 @@
</el-card>
</template>
-<script setup name="GenEdit">
-import { getGenTable, updateGenTable } from "@/api/tool/gen";
-import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
-import basicInfoForm from "./basicInfoForm";
-import genInfoForm from "./genInfoForm";
+<script setup name="GenEdit" lang="ts">
+import { getGenTable, updateGenTable } from '@/api/tool/gen';
+import { DbColumnVO, DbTableVO } from '@/api/tool/gen/types';
+import { optionselect as getDictOptionselect } from '@/api/system/dict/type';
+import { DictTypeVO } from '@/api/system/dict/type/types';
+import basicInfoForm from './basicInfoForm.vue';
+import genInfoForm from "./genInfoForm.vue";
+import { ComponentInternalInstance } from "vue";
const route = useRoute();
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const activeName = ref("columnInfo");
-const tableHeight = ref(document.documentElement.scrollHeight - 245 + "px");
-const tables = ref([]);
-const columns = ref([]);
-const dictOptions = ref([]);
-const info = ref({});
+const activeName = ref('columnInfo');
+const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px');
+const tables = ref<DbTableVO[]>([]);
+const columns = ref<DbColumnVO[]>([]);
+const dictOptions = ref<DictTypeVO[]>([]);
+const info = ref<Partial<DbTableVO>>({});
+
+const basicInfo = ref(basicInfoForm);
+const genInfo = ref(genInfoForm);
/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- const basicForm = proxy.$refs.basicInfo.$refs.basicInfoForm;
- const genForm = proxy.$refs.genInfo.$refs.genInfoForm;
- Promise.all([basicForm, genForm].map(getFormPromise)).then(res => {
+const submitForm = () => {
+ const basicForm = basicInfo.value.$refs.basicInfoForm;
+ const genForm = genInfo.value.$refs.genInfoForm;
+
+ Promise.all([basicForm, genForm].map(getFormPromise)).then(async res => {
const validateResult = res.every(item => !!item);
if (validateResult) {
- const genTable = Object.assign({}, info.value);
+ const genTable: any = Object.assign({}, info.value);
genTable.columns = columns.value;
genTable.params = {
- treeCode: info.value.treeCode,
+ treeCode: info.value?.treeCode,
treeName: info.value.treeName,
treeParentCode: info.value.treeParentCode,
parentMenuId: info.value.parentMenuId
};
- updateGenTable(genTable).then(res => {
- proxy.$modal.msgSuccess(res.msg);
- if (res.code === 200) {
- close();
- }
- });
+ const response = await updateGenTable(genTable);
+ proxy?.$modal.msgSuccess(response.msg);
+ if (response.code === 200) {
+ close();
+ }
} else {
- proxy.$modal.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
+ proxy?.$modal.msgError("琛ㄥ崟鏍￠獙鏈�氳繃锛岃閲嶆柊妫�鏌ユ彁浜ゅ唴瀹�");
}
});
}
-function getFormPromise(form) {
+const getFormPromise = (form: any) => {
return new Promise(resolve => {
- form.validate(res => {
+ form.validate((res: any) => {
resolve(res);
});
});
}
-function close() {
- const obj = { path: "/tool/gen", query: { t: Date.now(), pageNum: route.query.pageNum } };
- proxy.$tab.closeOpenPage(obj);
+const close = () => {
+ const obj = {path: "/tool/gen", query: {t: Date.now(), pageNum: route.query.pageNum}};
+ proxy?.$tab.closeOpenPage(obj);
}
-(() => {
- const tableId = route.params && route.params.tableId;
+(async () => {
+ const tableId = route.params && route.params.tableId as string;
if (tableId) {
// 鑾峰彇琛ㄨ缁嗕俊鎭�
- getGenTable(tableId).then(res => {
- columns.value = res.data.rows;
- info.value = res.data.info;
- tables.value = res.data.tables;
- });
+ const res = await getGenTable(tableId);
+ columns.value = res.data.rows;
+ info.value = res.data.info;
+ tables.value = res.data.tables;
/** 鏌ヨ瀛楀吀涓嬫媺鍒楄〃 */
- getDictOptionselect().then(response => {
- dictOptions.value = response.data;
- });
+ const response = await getDictOptionselect();
+ dictOptions.value = response.data;
}
})();
</script>
--
Gitblit v1.9.3