From d41e280db3fc48e771f03627ee948f22c3f9db74 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Wed, 26 Apr 2023 18:23:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(view):=20=E4=BB=A3=E7=A0=81=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E5=99=A8=20=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F=20sel?=
=?UTF-8?q?ect?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
closed #I6Z3Y0
---
src/views/infra/codegen/components/CloumInfoForm.vue | 2 +-
src/views/infra/codegen/components/FinishForm.vue | 9 ++++++++-
src/views/infra/codegen/components/data.ts | 4 ++--
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/views/infra/codegen/components/CloumInfoForm.vue b/src/views/infra/codegen/components/CloumInfoForm.vue
index a8008d2..0f7ac5b 100644
--- a/src/views/infra/codegen/components/CloumInfoForm.vue
+++ b/src/views/infra/codegen/components/CloumInfoForm.vue
@@ -6,7 +6,7 @@
<Divider />
<div class="step2-button">
<a-button @click="customResetFunc">上一步</a-button>
- <a-button type="primary" @click="customSubmitFunc">下一步</a-button>
+ <a-button type="primary" @click="customSubmitFunc">提交</a-button>
</div>
<h3>说明</h3>
<h4>配置字段</h4>
diff --git a/src/views/infra/codegen/components/FinishForm.vue b/src/views/infra/codegen/components/FinishForm.vue
index 01d7179..a17e9d8 100644
--- a/src/views/infra/codegen/components/FinishForm.vue
+++ b/src/views/infra/codegen/components/FinishForm.vue
@@ -2,7 +2,7 @@
<div class="m-5 result-success">
<Result status="success" title="代码生成成功" sub-title="可点击下方按钮预览、下载，或返回列表页。">
<template #extra>
- <a-button key="console" type="primary" @click="closeCurrent"> 返回列表 </a-button>
+ <a-button key="console" type="primary" @click="handleGoList"> 返回列表 </a-button>
<a-button key="preview" @click="handlePreview"> 预览 </a-button>
<a-button key="download" @click="handleGenTable"> 生成 </a-button>
</template>
@@ -14,12 +14,14 @@
import { Result } from 'ant-design-vue'
import { useRoute } from 'vue-router'
import { useModal } from '@/components/Modal'
+import { useGo } from '@/hooks/web/usePage'
import { useI18n } from '@/hooks/web/useI18n'
import { useTabs } from '@/hooks/web/useTabs'
import { useMessage } from '@/hooks/web/useMessage'
import PreviewModal from './PreviewModal.vue'
import { downloadCodegen, getCodegenTable } from '@/api/infra/codegen'
+const go = useGo()
const { closeCurrent } = useTabs()
const { query } = useRoute()
const { t } = useI18n()
@@ -38,6 +40,11 @@ async function handleGenTable() {
await downloadCodegen(res.table)
createMessage.success(t('common.successText'))
}
+
+function handleGoList() {
+ closeCurrent()
+ go('/infra/codegen')
+}
</script>
<style lang="less" scoped>
.result-success {
diff --git a/src/views/infra/codegen/components/data.ts b/src/views/infra/codegen/components/data.ts
index 4062af5..b5e1d58 100644
--- a/src/views/infra/codegen/components/data.ts
+++ b/src/views/infra/codegen/components/data.ts
@@ -258,7 +258,7 @@ export const columns: BasicColumn[] = [
title: '查询方式',
dataIndex: 'listOperationCondition',
editRow: true,
- editComponent: 'Checkbox',
+ editComponent: 'Select',
editComponentProps: {
options: [
{ label: '=', value: '=' },
@@ -271,7 +271,7 @@ export const columns: BasicColumn[] = [
{ label: 'BETWEEN', value: 'BETWEEN' }
]
},
- width: 60
+ width: 80
},
{
title: '允许空',