From 073af595bf64c3ed289fdd22d82330511a0de09d Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 13 Apr 2023 17:43:28 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E5=AD=97=E6=AE=B5=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FoundationFor.vue               | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue
index 93ac6ec1f..b379862c5 100644
--- a/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue
+++ b/template/admin/src/pages/system/codeGeneration/components/FoundationFor.vue
@@ -38,9 +38,8 @@
           数据库表可以生成系统存在的，也可以选择【否】后手动生成，不过此生成方式不交单一；如果不满足使用需求可以先在数据库中创建表，然后选择【是】再进行操作
         </div>
       </FormItem>
-      <FormItem label="表SQL">
-        <Button type="primary" @click="addRow">{{ foundation.isTable ? '生成表sql' : '添加一行' }}</Button>
-
+      <FormItem label="字段配置">
+        <Button type="primary" @click="addRow">{{ foundation.isTable ? '生成字段' : '添加一行' }}</Button>
         <div>
           <Table
             ref="selection"
@@ -148,7 +147,7 @@ export default {
         {
           title: '字段名称',
           slot: 'field',
-          minWidth: 200,
+          minWidth: 100,
         },
         {
           title: '字段类型',
@@ -185,13 +184,13 @@ export default {
         {
           title: '列表名',
           slot: 'table_name',
-          width: 100,
+          minWidth: 120,
           align: 'center',
         },
         {
           title: '表单类型',
           slot: 'from_type',
-          minWidth: 150,
+          minWidth: 100,
         },
       ],
       fromTypeList: [
@@ -284,10 +283,13 @@ export default {
         console.log(this.tableField);
         for (let i = 0; i < this.tableField.length; i++) {
           const el = this.tableField[i];
-          if (!el.field || !el.file_type || !el.default || !el.comment) {
+          if (
+            (!el.field || !el.file_type || !el.default || !el.comment) &&
+            !['addTimestamps', 'addSoftDelete'].includes(el.file_type)
+          ) {
             return this.$Message.warning('请先完善上一条数据');
           }
-          if (el.is_table && !el.table_name) {
+          if (el.is_table && !el.table_name && !['addTimestamps', 'addSoftDelete'].includes(el.file_type)) {
             return this.$Message.warning('请输入列表名');
           }
         }