From 182c447ef83adf6ec182e2d8af221f3f536dd361 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 28 Mar 2023 22:43:10 +0800
Subject: [PATCH 1/6] fix: dept leaderUserId #I6R4NH

---
 src/views/system/dept/dept.data.ts | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/views/system/dept/dept.data.ts b/src/views/system/dept/dept.data.ts
index 177433a4..3f38722f 100644
--- a/src/views/system/dept/dept.data.ts
+++ b/src/views/system/dept/dept.data.ts
@@ -3,6 +3,15 @@ import { getListSimpleUsers } from '@/api/system/user'
 import { BasicColumn, FormSchema, useRender } from '@/components/Table'
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 
+let userOptions: any[] = []
+
+async function getUserList() {
+  const res = await getListSimpleUsers()
+  userOptions = res
+}
+
+await getUserList()
+
 export const columns: BasicColumn[] = [
   {
     title: '部门名称',
@@ -12,8 +21,19 @@ export const columns: BasicColumn[] = [
   },
   {
     title: '负责人',
-    dataIndex: 'leader',
-    width: 120
+    dataIndex: 'leaderUserId',
+    width: 120,
+    customRender: ({ text }) => {
+      if (!text) {
+        return '未设置'
+      }
+      for (const user of userOptions) {
+        if (text === user.id) {
+          return user.nickname
+        }
+      }
+      return '未知【' + text + '】'
+    }
   },
   {
     title: '排序',
@@ -94,7 +114,7 @@ export const formSchema: FormSchema[] = [
     field: 'leaderUserId',
     component: 'ApiSelect',
     componentProps: {
-      api: () => getListSimpleUsers(),
+      options: () => getListSimpleUsers(),
       labelField: 'nickname',
       valueField: 'id'
     }

From 9d7298598a9808794bea87efbd1ce4c89da54a9f Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 28 Mar 2023 22:49:14 +0800
Subject: [PATCH 2/6] fix: tenant  #I6R4NN

---
 src/views/system/tenant/tenant.data.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/tenant/tenant.data.ts b/src/views/system/tenant/tenant.data.ts
index c5a37456..8b9d091b 100644
--- a/src/views/system/tenant/tenant.data.ts
+++ b/src/views/system/tenant/tenant.data.ts
@@ -147,13 +147,13 @@ export const formSchema: FormSchema[] = [
     label: '用户名称',
     field: 'username',
     component: 'Input',
-    ifShow: ({ values }) => values.id !== undefined
+    ifShow: ({ values }) => !!!values.id
   },
   {
     label: '用户密码',
     field: 'password',
     component: 'InputPassword',
-    ifShow: ({ values }) => values.id === undefined
+    ifShow: ({ values }) => !!!values.id
   },
   {
     label: '账号额度',

From 0c5e6e9e2ce36754ca964e77a36c3133e55b5183 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 28 Mar 2023 22:52:07 +0800
Subject: [PATCH 3/6] fix: codegen pre #I6R4O4

---
 src/views/infra/codegen/components/PreviewModal.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/infra/codegen/components/PreviewModal.vue b/src/views/infra/codegen/components/PreviewModal.vue
index 1bdf1ddb..05f2e90d 100644
--- a/src/views/infra/codegen/components/PreviewModal.vue
+++ b/src/views/infra/codegen/components/PreviewModal.vue
@@ -1,7 +1,7 @@
 <template>
-  <BasicModal v-bind="$attrs" :width="1000" @register="registerModal" title="预览代码">
+  <BasicModal v-bind="$attrs" :defaultFullscreen="true" @register="registerModal" title="预览代码">
     <div class="flex">
-      <Card class="w-1/3 w-full">
+      <Card class="w-1/4">
         <BasicTree
           title="文件夹列表"
           toolbar
@@ -12,7 +12,7 @@
           @select="handleSelect"
         />
       </Card>
-      <Card class="w-2/3 w-full">
+      <Card class="w-3/4">
         <Tabs v-model:activeKey="activeKey">
           <TabPane v-for="item in previewCodes" :key="item.filePath" :tab="item.filePath.substring(item.filePath.lastIndexOf('/') + 1)">
             <a-button type="link" style="float: right" @click="copy(item.code)">复制</a-button>

From 8ccc8bb22a3a3a993d4ea2d63ed31f8b7791c7bf Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 28 Mar 2023 23:22:15 +0800
Subject: [PATCH 4/6] fix: codegen #I6R4OB

---
 src/views/infra/codegen/EditTable.vue         | 11 +++++--
 .../codegen/components/BasicInfoForm.vue      | 12 +++-----
 .../codegen/components/CloumInfoForm.vue      | 30 +++++++------------
 .../infra/codegen/components/FinishForm.vue   |  2 +-
 4 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/src/views/infra/codegen/EditTable.vue b/src/views/infra/codegen/EditTable.vue
index 15749dca..137d2568 100644
--- a/src/views/infra/codegen/EditTable.vue
+++ b/src/views/infra/codegen/EditTable.vue
@@ -1,6 +1,6 @@
 <template>
   <PageWrapper>
-    <div class="m-0-auto w-200">
+    <div class="step-form-form">
       <Steps :current="current">
         <Step title="生成信息" />
         <Step title="字段信息" />
@@ -54,7 +54,6 @@ function handleStep1Next(step1Values: any) {
   current.value++
   basicInfoValue.value = step1Values
   state.initSetp2 = true
-  console.info(step1Values)
 }
 
 function handleStepPrev() {
@@ -66,7 +65,6 @@ async function handleStep2Next(step2Values: any) {
   columnsInfoValue.value = step2Values
   await handleSubmit()
   state.initSetp3 = true
-  console.log(step2Values)
 }
 
 async function handleSubmit() {
@@ -95,3 +93,10 @@ onMounted(async () => {
   await getList()
 })
 </script>
+<style lang="less" scoped>
+.step-form-form {
+  width: 750px;
+  margin: 0 auto;
+  margin-top: 10px;
+}
+</style>
diff --git a/src/views/infra/codegen/components/BasicInfoForm.vue b/src/views/infra/codegen/components/BasicInfoForm.vue
index 1bba0c62..1fbeccca 100644
--- a/src/views/infra/codegen/components/BasicInfoForm.vue
+++ b/src/views/infra/codegen/components/BasicInfoForm.vue
@@ -5,15 +5,11 @@
     </div>
     <Divider />
     <h3>说明</h3>
-    <h4>转账到支付宝账户</h4>
-    <p>
-      如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。
-    </p>
+    <h4>基本信息</h4>
+    <p> 配置生成的基本信息 </p>
 
-    <h4>转账到银行卡</h4>
-    <p>
-      如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。
-    </p>
+    <h4>生成信息</h4>
+    <p> 配置生成生成的详细信息。 </p>
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/infra/codegen/components/CloumInfoForm.vue b/src/views/infra/codegen/components/CloumInfoForm.vue
index 8cd8e6a4..a8008d23 100644
--- a/src/views/infra/codegen/components/CloumInfoForm.vue
+++ b/src/views/infra/codegen/components/CloumInfoForm.vue
@@ -4,18 +4,13 @@
       <BasicTable :dataSource="columnsInfo" @register="registerTable" @row-click="handleEdit" />
     </div>
     <Divider />
-    <a-button @click="customResetFunc">上一步</a-button>
-    <a-button @click="customSubmitFunc">下一步</a-button>
+    <div class="step2-button">
+      <a-button @click="customResetFunc">上一步</a-button>
+      <a-button type="primary" @click="customSubmitFunc">下一步</a-button>
+    </div>
     <h3>说明</h3>
-    <h4>转账到支付宝账户</h4>
-    <p>
-      如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。
-    </p>
-
-    <h4>转账到银行卡</h4>
-    <p>
-      如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。如果需要，这里可以放一些关于产品的常见问题说明。
-    </p>
+    <h4>配置字段</h4>
+    <p> 配置表的字段类型，增删改查，字典等 </p>
   </div>
 </template>
 <script lang="ts" setup>
@@ -62,6 +57,11 @@ function handleEdit(record: EditRecordRow) {
     margin: 0 auto;
   }
 
+  &-button {
+    display: flex;
+    justify-content: center;
+  }
+
   h3 {
     margin: 0 0 12px;
     font-size: 16px;
@@ -80,12 +80,4 @@ function handleEdit(record: EditRecordRow) {
     color: @text-color;
   }
 }
-
-.pay-select {
-  width: 20%;
-}
-
-.pay-input {
-  width: 70%;
-}
 </style>
diff --git a/src/views/infra/codegen/components/FinishForm.vue b/src/views/infra/codegen/components/FinishForm.vue
index 2777a120..7af842a5 100644
--- a/src/views/infra/codegen/components/FinishForm.vue
+++ b/src/views/infra/codegen/components/FinishForm.vue
@@ -1 +1 @@
-<template><span>保存成功</span></template>
+<template><span>保存成功,其他功能待完善</span></template>

From 4a7339236b055a7f662b12a15e5ba8b9f1b19171 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 28 Mar 2023 23:25:51 +0800
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=86=8D=E8=BF=9B=E8=A1=8C=E9=80=80=E5=87=BA=EF=BC=8C=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BAGET=20=E4=B8=8D=E6=94=AF=E6=8C=81=20#I6R4NQ?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/user.ts | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/src/api/base/user.ts b/src/api/base/user.ts
index 55a7f42e..bec1a3c8 100644
--- a/src/api/base/user.ts
+++ b/src/api/base/user.ts
@@ -6,9 +6,7 @@ import { ErrorMessageMode } from '@/types/axios'
 enum Api {
   Login = '/system/auth/login',
   Logout = '/system/auth/logout',
-  GetUserInfo = '/system/auth/get-permission-info',
-  GetPermCode = '/getPermCode',
-  TestRetry = '/testRetry'
+  GetUserInfo = '/system/auth/get-permission-info'
 }
 
 /**
@@ -33,23 +31,6 @@ export function getUserInfo() {
   return defHttp.get<GetUserInfoModel>({ url: Api.GetUserInfo }, { errorMessageMode: 'none' })
 }
 
-export function getPermCode() {
-  return defHttp.get<string[]>({ url: Api.GetPermCode })
-}
-
 export function doLogout() {
-  return defHttp.get({ url: Api.Logout })
-}
-
-export function testRetry() {
-  return defHttp.get(
-    { url: Api.TestRetry },
-    {
-      retryRequest: {
-        isOpenRetry: true,
-        count: 5,
-        waitTime: 1000
-      }
-    }
-  )
+  return defHttp.post({ url: Api.Logout })
 }

From f919305e36f22b8d804c8b4abaaa0e05a74265e0 Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Tue, 28 Mar 2023 23:38:49 +0800
Subject: [PATCH 6/6] fix: account #I6R59O

---
 src/views/system/mail/account/account.data.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/system/mail/account/account.data.ts b/src/views/system/mail/account/account.data.ts
index fb86d034..c7642089 100644
--- a/src/views/system/mail/account/account.data.ts
+++ b/src/views/system/mail/account/account.data.ts
@@ -1,5 +1,5 @@
 import { BasicColumn, FormSchema, useRender } from '@/components/Table'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
 
 export const columns: BasicColumn[] = [
   {
@@ -100,10 +100,9 @@ export const formSchema: FormSchema[] = [
   {
     label: '是否开启 SSL',
     field: 'sslEnable',
-    component: 'Select',
-    defaultValue: 0,
+    component: 'Switch',
     componentProps: {
-      options: getIntDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)
+      options: getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)
     }
   }
 ]