From 98afdfc04074b48599399d26e9addd05820a822c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Wed, 29 Mar 2023 22:38:19 +0800
Subject: [PATCH] =?UTF-8?q?REVIEW=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict/dict.type.ts              |  2 +-
 .../codegen/components/BasicInfoForm.vue      | 16 +++-------
 .../codegen/components/ColumInfoForm.vue      | 26 +++++++---------
 .../codegen/components/GenerateInfoForm.vue   | 30 ++++++++-----------
 src/views/system/dict/data.vue                |  2 +-
 5 files changed, 29 insertions(+), 47 deletions(-)

diff --git a/src/api/system/dict/dict.type.ts b/src/api/system/dict/dict.type.ts
index 0d9faeb2..ed2969f1 100644
--- a/src/api/system/dict/dict.type.ts
+++ b/src/api/system/dict/dict.type.ts
@@ -10,7 +10,7 @@ export type DictTypeVO = {
 }
 
 // 查询字典（精简)列表
-export const listSimpleDictType = () => {
+export const getSimpleDictTypeList = () => {
   return request.get({ url: '/system/dict-type/list-all-simple' })
 }
 
diff --git a/src/views/infra/codegen/components/BasicInfoForm.vue b/src/views/infra/codegen/components/BasicInfoForm.vue
index 21b280ee..73174cbc 100644
--- a/src/views/infra/codegen/components/BasicInfoForm.vue
+++ b/src/views/infra/codegen/components/BasicInfoForm.vue
@@ -11,7 +11,6 @@
           <el-input placeholder="请输入" v-model="formData.tableComment" />
         </el-form-item>
       </el-col>
-
       <el-col :span="12">
         <el-form-item prop="className">
           <template #label>
@@ -25,7 +24,6 @@
               </el-tooltip>
             </span>
           </template>
-
           <el-input placeholder="请输入" v-model="formData.className" />
         </el-form-item>
       </el-col>
@@ -43,13 +41,12 @@
   </el-form>
 </template>
 <script setup lang="ts">
-import { CodegenTableVO } from '@/api/infra/codegen/types'
+import * as CodegenApi from '@/api/infra/codegen'
 import { PropType } from 'vue'
 
-const emits = defineEmits(['update:basicInfo'])
 const props = defineProps({
   table: {
-    type: Object as PropType<Nullable<CodegenTableVO>>,
+    type: Object as PropType<Nullable<CodegenApi.CodegenTableVO>>,
     default: () => null
   }
 })
@@ -62,7 +59,6 @@ const formData = ref({
   author: '',
   remark: ''
 })
-
 const rules = reactive({
   tableName: [required],
   tableComment: [required],
@@ -70,6 +66,7 @@ const rules = reactive({
   author: [required]
 })
 
+/** 监听 table 属性，复制给 formData 属性 */
 watch(
   () => props.table,
   (table) => {
@@ -81,12 +78,7 @@ watch(
     immediate: true
   }
 )
-watch(
-  () => formData.value,
-  (val) => {
-    emits('update:basicInfo', val)
-  }
-)
+
 defineExpose({
   validate: async () => unref(formRef)?.validate()
 })
diff --git a/src/views/infra/codegen/components/ColumInfoForm.vue b/src/views/infra/codegen/components/ColumInfoForm.vue
index 33d29978..5d2a036d 100644
--- a/src/views/infra/codegen/components/ColumInfoForm.vue
+++ b/src/views/infra/codegen/components/ColumInfoForm.vue
@@ -114,28 +114,24 @@
 </template>
 <script setup lang="ts">
 import { PropType } from 'vue'
-import { CodegenColumnVO } from '@/api/infra/codegen/types'
-import { DictTypeVO, listSimpleDictType } from '@/api/system/dict/dict.type'
+import * as CodegenApi from '@/api/infra/codegen'
+import * as DictDataApi from '@/api/system/dict/dict.type'
 
-const emits = defineEmits(['update:columns'])
 const props = defineProps({
   columns: {
-    type: Array as unknown as PropType<CodegenColumnVO[]>,
+    type: Array as unknown as PropType<CodegenApi.CodegenColumnVO[]>,
     default: () => null
   }
 })
 
-const formData = ref<CodegenColumnVO[]>([])
+const formData = ref<CodegenApi.CodegenColumnVO[]>([])
 const tableHeight = document.documentElement.scrollHeight - 350 + 'px'
 
 /** 查询字典下拉列表 */
-const dictOptions = ref<DictTypeVO[]>()
+const dictOptions = ref<DictDataApi.DictTypeVO[]>()
 const getDictOptions = async () => {
-  dictOptions.value = await listSimpleDictType()
+  dictOptions.value = await DictDataApi.getSimpleDictTypeList()
 }
-onMounted(async () => {
-  await getDictOptions()
-})
 
 watch(
   () => props.columns,
@@ -148,10 +144,8 @@ watch(
     immediate: true
   }
 )
-watch(
-  () => formData.value,
-  (val) => {
-    emits('update:columns', val)
-  }
-)
+
+onMounted(async () => {
+  await getDictOptions()
+})
 </script>
diff --git a/src/views/infra/codegen/components/GenerateInfoForm.vue b/src/views/infra/codegen/components/GenerateInfoForm.vue
index 92bac8dd..356ee6df 100644
--- a/src/views/infra/codegen/components/GenerateInfoForm.vue
+++ b/src/views/infra/codegen/components/GenerateInfoForm.vue
@@ -5,10 +5,10 @@
         <el-form-item prop="templateType" label="生成模板">
           <el-select v-model="formData.templateType" @change="tplSelectChange">
             <el-option
-              v-for="dict in getDictOptions(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)"
-              :key="parseInt(dict.value)"
+              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_TEMPLATE_TYPE)"
+              :key="dict.value"
               :label="dict.label"
-              :value="parseInt(dict.value)"
+              :value="dict.value"
             />
           </el-select>
         </el-form-item>
@@ -17,10 +17,10 @@
         <el-form-item prop="scene" label="生成场景">
           <el-select v-model="formData.scene">
             <el-option
-              v-for="dict in getDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)"
-              :key="parseInt(dict.value)"
+              v-for="dict in getIntDictOptions(DICT_TYPE.INFRA_CODEGEN_SCENE)"
+              :key="dict.value"
               :label="dict.label"
-              :value="parseInt(dict.value)"
+              :value="dict.value"
             />
           </el-select>
         </el-form-item>
@@ -280,17 +280,16 @@
   </el-form>
 </template>
 <script setup lang="ts">
-import { CodegenTableVO } from '@/api/infra/codegen/types'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { handleTree } from '@/utils/tree'
+import * as CodegenApi from '@/api/infra/codegen'
 import * as MenuApi from '@/api/system/menu'
 import { PropType } from 'vue'
-import { getDictOptions, DICT_TYPE } from '@/utils/dict'
-import { handleTree } from '@/utils/tree'
 
 const message = useMessage() // 消息弹窗
-const emits = defineEmits(['update:basicInfo'])
 const props = defineProps({
   table: {
-    type: Object as PropType<Nullable<CodegenTableVO>>,
+    type: Object as PropType<Nullable<CodegenApi.CodegenTableVO>>,
     default: () => null
   }
 })
@@ -335,6 +334,7 @@ const menuTreeProps = {
 const subSelectChange = () => {
   formData.value.subTableFkName = ''
 }
+
 /** 选择生成模板触发 */
 const tplSelectChange = (value) => {
   if (value !== 1) {
@@ -361,18 +361,14 @@ watch(
     immediate: true
   }
 )
-watch(
-  () => formData.value,
-  (val) => {
-    emits('update:basicInfo', val)
-  }
-)
+
 onMounted(async () => {
   try {
     const resp = await MenuApi.getSimpleMenusList()
     menus.value = handleTree(resp)
   } catch {}
 })
+
 defineExpose({
   validate: async () => unref(formRef)?.validate()
 })
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 8492262a..41bcbaa8 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -190,7 +190,7 @@ const handleExport = async () => {
 
 /** 查询字典（精简)列表 */
 const getDictList = async () => {
-  dicts.value = await DictTypeApi.listSimpleDictType()
+  dicts.value = await DictTypeApi.getSimpleDictTypeList()
 }
 
 /** 初始化 **/