From fd55ad422888f74ea2deda679172db0cff923c9f Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sun, 19 May 2024 13:55:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=80=BC=E4=BD=BF=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/config/components/BasicSetting.vue |  8 ++++----
 src/views/system/dept/DeptAddModal.vue              |  5 +----
 src/views/system/dict/DictItemAddModal.vue          |  4 +---
 src/views/system/dict/tree/DictAddModal.vue         |  5 +----
 src/views/system/menu/MenuAddModal.vue              | 11 +----------
 src/views/system/notice/NoticeAddModal.vue          |  8 +-------
 src/views/system/role/RoleAddModal.vue              |  7 +------
 src/views/system/storage/StorageAddModal.vue        | 11 +----------
 src/views/system/user/UserAddModal.vue              | 12 +-----------
 src/views/system/user/UserResetPwdModal.vue         |  4 +---
 src/views/system/user/index.vue                     |  2 +-
 src/views/tool/generator/GenConfigDrawer.vue        |  5 -----
 12 files changed, 14 insertions(+), 68 deletions(-)

diff --git a/src/views/system/config/components/BasicSetting.vue b/src/views/system/config/components/BasicSetting.vue
index fd3e17f..8066304 100644
--- a/src/views/system/config/components/BasicSetting.vue
+++ b/src/views/system/config/components/BasicSetting.vue
@@ -142,10 +142,10 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form } = useForm({
-  SITE_FAVICON: '',
-  SITE_LOGO: '',
-  SITE_TITLE: '',
-  SITE_COPYRIGHT: ''
+  SITE_FAVICON: undefined,
+  SITE_LOGO: undefined,
+  SITE_TITLE: undefined,
+  SITE_COPYRIGHT: undefined
 })
 
 const siteFavicon = ref<OptionResp>()
diff --git a/src/views/system/dept/DeptAddModal.vue b/src/views/system/dept/DeptAddModal.vue
index cfcbfa1..9126aa1 100644
--- a/src/views/system/dept/DeptAddModal.vue
+++ b/src/views/system/dept/DeptAddModal.vue
@@ -15,7 +15,6 @@
 
 <script setup lang="ts">
 import { Message } from '@arco-design/web-vue'
-import type { DeptReq } from './type'
 import { addDept, getDept, updateDept } from '@/apis'
 import { type Columns, GiForm } from '@/components/GiForm'
 import { useForm } from '@/hooks'
@@ -93,9 +92,7 @@ const columns: Columns = [
   }
 ]
 
-const { form, resetForm } = useForm<DeptReq>({
-  name: '',
-  parentId: undefined,
+const { form, resetForm } = useForm({
   sort: 999,
   status: 1
 })
diff --git a/src/views/system/dict/DictItemAddModal.vue b/src/views/system/dict/DictItemAddModal.vue
index 88f3646..0ac7677 100644
--- a/src/views/system/dict/DictItemAddModal.vue
+++ b/src/views/system/dict/DictItemAddModal.vue
@@ -79,9 +79,7 @@ const columns: Columns = [
 ]
 
 const { form, resetForm } = useForm({
-  label: '',
-  value: '',
-  color: '',
+  color: 'blue',
   sort: 999,
   status: 1
 })
diff --git a/src/views/system/dict/tree/DictAddModal.vue b/src/views/system/dict/tree/DictAddModal.vue
index 43c2715..8e5d4a2 100644
--- a/src/views/system/dict/tree/DictAddModal.vue
+++ b/src/views/system/dict/tree/DictAddModal.vue
@@ -47,10 +47,7 @@ const columns: Columns = [
   }
 ]
 
-const { form, resetForm } = useForm({
-  name: '',
-  code: ''
-})
+const { form, resetForm } = useForm({})
 
 // 重置
 const reset = () => {
diff --git a/src/views/system/menu/MenuAddModal.vue b/src/views/system/menu/MenuAddModal.vue
index 3797ebe..ed6c31a 100644
--- a/src/views/system/menu/MenuAddModal.vue
+++ b/src/views/system/menu/MenuAddModal.vue
@@ -122,7 +122,6 @@
 <script setup lang="ts">
 import { type FormInstance, Message } from '@arco-design/web-vue'
 import { mapTree } from 'xe-utils'
-import type { MenuForm } from './type'
 import { type MenuResp, addMenu, getMenu, updateMenu } from '@/apis'
 import { useForm } from '@/hooks'
 import { filterTree, transformPathToName } from '@/utils'
@@ -163,20 +162,12 @@ const rules: FormInstance['rules'] = {
   permission: [{ required: true, message: '请输入权限标识' }]
 }
 
-const { form, resetForm } = useForm<MenuForm>({
+const { form, resetForm } = useForm({
   type: 1,
-  icon: '',
-  title: '',
   sort: 999,
-  permission: '',
-  path: '',
-  name: '',
-  component: '',
-  redirect: '',
   isExternal: false,
   isCache: false,
   isHidden: false,
-  parentId: '',
   status: 1
 })
 const componentName = computed(() => transformPathToName(form.path))
diff --git a/src/views/system/notice/NoticeAddModal.vue b/src/views/system/notice/NoticeAddModal.vue
index 8e889f0..7f6a07f 100644
--- a/src/views/system/notice/NoticeAddModal.vue
+++ b/src/views/system/notice/NoticeAddModal.vue
@@ -122,13 +122,7 @@ const rules: FormInstance['rules'] = {
   content: [{ required: true, message: '请输入内容' }]
 }
 
-const { form, resetForm } = useForm({
-  title: '',
-  content: '',
-  type: '',
-  effectiveTime: undefined,
-  terminateTime: undefined
-})
+const { form, resetForm } = useForm({})
 
 // 重置
 const reset = () => {
diff --git a/src/views/system/role/RoleAddModal.vue b/src/views/system/role/RoleAddModal.vue
index 827a892..80385bd 100644
--- a/src/views/system/role/RoleAddModal.vue
+++ b/src/views/system/role/RoleAddModal.vue
@@ -112,13 +112,8 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form, resetForm } = useForm({
-  name: '',
-  code: '',
   sort: 999,
-  description: undefined,
-  menuIds: undefined,
-  dataScope: 4,
-  deptIds: undefined
+  dataScope: 4
 })
 
 const menuTreeRef = ref()
diff --git a/src/views/system/storage/StorageAddModal.vue b/src/views/system/storage/StorageAddModal.vue
index f928a11..70ee03b 100644
--- a/src/views/system/storage/StorageAddModal.vue
+++ b/src/views/system/storage/StorageAddModal.vue
@@ -90,7 +90,6 @@
 <script setup lang="ts">
 import { type FormInstance, Message } from '@arco-design/web-vue'
 import { useWindowSize } from '@vueuse/core'
-import type { StorageReq } from './type'
 import { addStorage, getStorage, updateStorage } from '@/apis'
 import { useForm } from '@/hooks'
 import { useDict } from '@/hooks/app'
@@ -117,16 +116,8 @@ const rules: FormInstance['rules'] = {
   bucketName: [{ required: true, message: '请输入桶名称' }]
 }
 
-const { form, resetForm } = useForm<StorageReq>({
-  name: '',
-  code: '',
+const { form, resetForm } = useForm({
   type: 2,
-  accessKey: undefined,
-  secretKey: undefined,
-  endpoint: undefined,
-  bucketName: undefined,
-  domain: undefined,
-  description: undefined,
   isDefault: false,
   sort: 999,
   status: 1
diff --git a/src/views/system/user/UserAddModal.vue b/src/views/system/user/UserAddModal.vue
index 2963c26..41f46eb 100644
--- a/src/views/system/user/UserAddModal.vue
+++ b/src/views/system/user/UserAddModal.vue
@@ -112,18 +112,8 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form, resetForm } = useForm({
-  id: '',
-  username: '',
-  nickname: '',
   gender: 1 as Gender,
-  phone: '',
-  email: '',
-  deptId: '',
-  roleIds: [] as string[],
-  description: '',
-  status: 1 as Status,
-  type: 2 as 1 | 2,
-  disabled: false
+  status: 1 as Status
 })
 
 // 重置
diff --git a/src/views/system/user/UserResetPwdModal.vue b/src/views/system/user/UserResetPwdModal.vue
index 99130d6..36f76c4 100644
--- a/src/views/system/user/UserResetPwdModal.vue
+++ b/src/views/system/user/UserResetPwdModal.vue
@@ -36,9 +36,7 @@ const columns: Columns = [
   { label: '密码', field: 'newPassword', type: 'input-password', rules: [{ required: true, message: '请输入密码' }] }
 ]
 
-const { form, resetForm } = useForm({
-  newPassword: ''
-})
+const { form, resetForm } = useForm({})
 
 // 重置
 const reset = () => {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index d7525f5..a08fa58 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -139,7 +139,7 @@ const {
   pagination,
   search,
   handleDelete
-} = useTable((page) => listUser({ ...queryForm, ...page }), { immediate: true })
+} = useTable((page) => listUser({ ...queryForm, ...page }), { immediate: false })
 
 const columns: TableInstanceColumns[] = [
   {
diff --git a/src/views/tool/generator/GenConfigDrawer.vue b/src/views/tool/generator/GenConfigDrawer.vue
index 333df08..08ac96c 100644
--- a/src/views/tool/generator/GenConfigDrawer.vue
+++ b/src/views/tool/generator/GenConfigDrawer.vue
@@ -160,11 +160,6 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form, resetForm } = useForm({
-  author: '',
-  businessName: '',
-  moduleName: '',
-  packageName: '',
-  tablePrefix: '',
   isOverride: false
 })