From 901213d13364b6a7febe407b5a20aba72a340a13 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 18 Nov 2024 20:37:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/code/generator/GenConfigDrawer.vue  | 12 ++---
 src/views/login/components/account/index.vue  |  2 +-
 src/views/open/app/AppAddModal.vue            | 10 ++--
 src/views/schedule/job/JobAddModal.vue        |  5 +-
 .../setting/profile/BasicInfoUpdateModal.vue  | 33 ++++++------
 src/views/system/dept/DeptAddModal.vue        | 10 ++--
 src/views/system/dict/DictItemAddModal.vue    | 15 +++---
 src/views/system/dict/tree/DictAddModal.vue   |  4 +-
 .../system/file/main/FileAsideStatistics.vue  |  4 +-
 src/views/system/notice/add/index.vue         | 53 +++++++++++--------
 src/views/system/notice/detail/index.vue      | 23 ++++----
 src/views/system/notice/index.vue             |  2 +-
 src/views/system/user/UserAddDrawer.vue       | 10 ++--
 src/views/system/user/UserResetPwdModal.vue   |  4 +-
 src/views/system/user/UserUpdateRoleModal.vue |  4 +-
 src/views/system/user/index.vue               | 16 +++---
 16 files changed, 110 insertions(+), 97 deletions(-)

diff --git a/src/views/code/generator/GenConfigDrawer.vue b/src/views/code/generator/GenConfigDrawer.vue
index ef0541d..b4888e1 100644
--- a/src/views/code/generator/GenConfigDrawer.vue
+++ b/src/views/code/generator/GenConfigDrawer.vue
@@ -146,6 +146,9 @@ const options: Options = {
   grid: { cols: 2 },
   btns: { hide: true },
 }
+const { form, resetForm } = useForm({
+  isOverride: false,
+})
 const formColumns: Columns = reactive([
   {
     label: '作者名称',
@@ -198,8 +201,8 @@ const formColumns: Columns = reactive([
     type: 'switch',
     props: {
       type: 'round',
-      checkedValue: 1,
-      uncheckedValue: 2,
+      checkedValue: true,
+      uncheckedValue: false,
       checkedText: '是',
       uncheckedText: '否',
     },
@@ -233,10 +236,6 @@ const columns: TableInstanceColumns[] = [
   { title: '关联字典', slotName: 'dictCode' },
 ]
 
-const { form, resetForm } = useForm({
-  isOverride: false,
-})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
@@ -281,6 +280,7 @@ const onOpen = async (tableName: string, comment: string) => {
   // 查询生成配置
   const { data } = await getGenConfig(tableName)
   Object.assign(form, data)
+  form.isOverride = form.isOverride || false
   visible.value = true
   // 查询字段配置
   await getDataList(tableName, false)
diff --git a/src/views/login/components/account/index.vue b/src/views/login/components/account/index.vue
index 63d8817..96e6c1a 100644
--- a/src/views/login/components/account/index.vue
+++ b/src/views/login/components/account/index.vue
@@ -113,7 +113,7 @@ const handleLogin = async () => {
     })
     tabsStore.reset()
     const { redirect, ...othersQuery } = router.currentRoute.value.query
-    router.push({
+    await router.push({
       path: (redirect as string) || '/',
       query: {
         ...othersQuery,
diff --git a/src/views/open/app/AppAddModal.vue b/src/views/open/app/AppAddModal.vue
index d837770..94a673f 100644
--- a/src/views/open/app/AppAddModal.vue
+++ b/src/views/open/app/AppAddModal.vue
@@ -37,6 +37,10 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({
+  status: 1,
+})
+
 const columns: Columns = reactive([
   {
     label: '名称',
@@ -46,7 +50,7 @@ const columns: Columns = reactive([
   },
   {
     label: '失效时间',
-    field: 'expirationTime',
+    field: 'expireTime',
     type: 'date-picker',
     props: {
       placeholder: '请选择失效时间',
@@ -76,10 +80,6 @@ const columns: Columns = reactive([
   },
 ])
 
-const { form, resetForm } = useForm({
-  status: 1,
-})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/src/views/schedule/job/JobAddModal.vue b/src/views/schedule/job/JobAddModal.vue
index cc2bf6d..a16863d 100644
--- a/src/views/schedule/job/JobAddModal.vue
+++ b/src/views/schedule/job/JobAddModal.vue
@@ -4,7 +4,7 @@
     :title="title"
     :mask-closable="false"
     :esc-to-close="false"
-    :width="width >= 600 ? 600 : '100%'"
+    :width="width >= 700 ? 700 : '100%'"
     @before-ok="save"
     @close="reset"
   >
@@ -182,6 +182,7 @@ import { addJob, listGroup, updateJob } from '@/apis/schedule/job'
 import { useForm } from '@/hooks'
 import { useDict } from '@/hooks/app'
 import CronGeneratorModal from '@/components/GenCron/CronModel/index.vue'
+import type { LabelValueState } from '@/types/global'
 
 const emit = defineEmits<{
   (e: 'save-success'): void
@@ -196,7 +197,7 @@ const visible = ref(false)
 const isUpdate = computed(() => !!dataId.value)
 const title = computed(() => (isUpdate.value ? '修改任务' : '新增任务'))
 const formRef = ref<FormInstance>()
-const groupList = ref()
+const groupList = ref<LabelValueState[]>([])
 const genModal = ref()
 const { job_trigger_type_enum, job_task_type_enum, job_route_strategy_enum, job_block_strategy_enum } = useDict(
   'job_trigger_type_enum',
diff --git a/src/views/setting/profile/BasicInfoUpdateModal.vue b/src/views/setting/profile/BasicInfoUpdateModal.vue
index 9d965a5..0f4d271 100644
--- a/src/views/setting/profile/BasicInfoUpdateModal.vue
+++ b/src/views/setting/profile/BasicInfoUpdateModal.vue
@@ -17,17 +17,27 @@
 import { useWindowSize } from '@vueuse/core'
 import { Message } from '@arco-design/web-vue'
 import { updateUserBaseInfo } from '@/apis/system'
-import { type Columns, GiForm } from '@/components/GiForm'
+import { type Columns, GiForm, type Options } from '@/components/GiForm'
 import { useForm } from '@/hooks'
 import { useUserStore } from '@/stores'
 
 const { width } = useWindowSize()
+const userStore = useUserStore()
+
+const userInfo = computed(() => userStore.userInfo)
+const visible = ref(false)
+const formRef = ref<InstanceType<typeof GiForm>>()
 
 const options: Options = {
   form: { size: 'large' },
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({
+  nickname: userInfo.value.nickname,
+  gender: userInfo.value.gender,
+})
+
 const columns: Columns = reactive([
   {
     label: '昵称',
@@ -48,27 +58,12 @@ const columns: Columns = reactive([
   },
 ])
 
-const userStore = useUserStore()
-const userInfo = computed(() => userStore.userInfo)
-const { form, resetForm } = useForm({
-  nickname: userInfo.value.nickname,
-  gender: userInfo.value.gender,
-})
-
-const formRef = ref<InstanceType<typeof GiForm>>()
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
   resetForm()
 }
 
-const visible = ref(false)
-// 修改
-const onUpdate = async () => {
-  reset()
-  visible.value = true
-}
-
 // 保存
 const save = async () => {
   const isInvalid = await formRef.value?.formRef?.validate()
@@ -84,5 +79,11 @@ const save = async () => {
   }
 }
 
+// 修改
+const onUpdate = async () => {
+  reset()
+  visible.value = true
+}
+
 defineExpose({ onUpdate })
 </script>
diff --git a/src/views/system/dept/DeptAddModal.vue b/src/views/system/dept/DeptAddModal.vue
index e974700..e1df159 100644
--- a/src/views/system/dept/DeptAddModal.vue
+++ b/src/views/system/dept/DeptAddModal.vue
@@ -55,6 +55,11 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({
+  sort: 999,
+  status: 1,
+})
+
 const columns: Columns = reactive([
   {
     label: '上级部门',
@@ -118,11 +123,6 @@ const columns: Columns = reactive([
   },
 ])
 
-const { form, resetForm } = useForm({
-  sort: 999,
-  status: 1,
-})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/src/views/system/dict/DictItemAddModal.vue b/src/views/system/dict/DictItemAddModal.vue
index 162ae85..8042751 100644
--- a/src/views/system/dict/DictItemAddModal.vue
+++ b/src/views/system/dict/DictItemAddModal.vue
@@ -23,6 +23,7 @@
 
 <script setup lang="ts">
 import { Message } from '@arco-design/web-vue'
+import { useWindowSize } from '@vueuse/core'
 import { addDictItem, getDictItem, updateDictItem } from '@/apis/system/dict'
 import { type Columns, GiForm, type Options } from '@/components/GiForm'
 import { useForm } from '@/hooks'
@@ -31,6 +32,8 @@ const emit = defineEmits<{
   (e: 'save-success'): void
 }>()
 
+const { width } = useWindowSize()
+
 const dataId = ref('')
 const dictId = ref('')
 const visible = ref(false)
@@ -43,6 +46,12 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({
+  color: 'blue',
+  sort: 999,
+  status: 1,
+})
+
 const columns: Columns = reactive([
   { label: '标签', field: 'label', type: 'input', rules: [{ required: true, message: '请输入标签' }] },
   { label: '值', field: 'value', type: 'input', rules: [{ required: true, message: '请输入值' }] },
@@ -79,12 +88,6 @@ const columns: Columns = reactive([
   },
 ])
 
-const { form, resetForm } = useForm({
-  color: 'blue',
-  sort: 999,
-  status: 1,
-})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/src/views/system/dict/tree/DictAddModal.vue b/src/views/system/dict/tree/DictAddModal.vue
index 2ec5ecb..eea3ff0 100644
--- a/src/views/system/dict/tree/DictAddModal.vue
+++ b/src/views/system/dict/tree/DictAddModal.vue
@@ -37,6 +37,8 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({})
+
 const columns: Columns = reactive([
   { label: '名称', field: 'name', type: 'input', rules: [{ required: true, message: '请输入名称' }] },
   { label: '编码', field: 'code', type: 'input', disabled: () => isUpdate.value, rules: [{ required: true, message: '请输入编码' }] },
@@ -51,8 +53,6 @@ const columns: Columns = reactive([
   },
 ])
 
-const { form, resetForm } = useForm({})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/src/views/system/file/main/FileAsideStatistics.vue b/src/views/system/file/main/FileAsideStatistics.vue
index 6ece5d1..c7eea97 100644
--- a/src/views/system/file/main/FileAsideStatistics.vue
+++ b/src/views/system/file/main/FileAsideStatistics.vue
@@ -11,7 +11,7 @@
     </a-space>
     <div v-if="chartData.length > 0">
       <a-divider />
-      <VCharts :option="option" autoresize :style="{ height: '120px', width: '150px' }" />
+      <VCharts :option="chartOption" autoresize :style="{ height: '120px', width: '150px' }" />
     </div>
   </section>
 </template>
@@ -38,7 +38,7 @@ const totalData = ref<FileStatisticsResp>({
 })
 const chartData = ref<Array<{ name: string, value: number, size: string }>>([])
 const statisticValueStyle = { 'color': '#5856D6', 'font-size': '18px' }
-const { option } = useChart(() => {
+const { chartOption } = useChart(() => {
   return {
     grid: {
       left: 0,
diff --git a/src/views/system/notice/add/index.vue b/src/views/system/notice/add/index.vue
index 4440d72..29040bc 100644
--- a/src/views/system/notice/add/index.vue
+++ b/src/views/system/notice/add/index.vue
@@ -2,15 +2,15 @@
   <div ref="containerRef" class="detail">
     <div class="detail_header">
       <a-affix :target="(containerRef as HTMLElement)">
-        <a-page-header title="通知公告" :subtitle="type === 'edit' ? '修改' : '新增'" @back="onBack">
+        <a-page-header title="通知公告" :subtitle="title" @back="onBack">
           <template #extra>
-            <a-button type="primary" @click="onReleased">
+            <a-button type="primary" @click="save">
               <template #icon>
-                <icon-save v-if="type === 'edit'" />
+                <icon-save v-if="isUpdate" />
                 <icon-send v-else />
               </template>
               <template #default>
-                {{ type === 'edit' ? '保存' : '发布' }}
+                {{ isUpdate ? '保存' : '发布' }}
               </template>
             </a-button>
           </template>
@@ -59,21 +59,32 @@
 import { Message } from '@arco-design/web-vue'
 import { useWindowSize } from '@vueuse/core'
 import AiEditor from './components/index.vue'
-import { useTabsStore } from '@/stores'
+import { addNotice, getNotice, updateNotice } from '@/apis/system/notice'
+import { listUserDict } from '@/apis'
 import { type Columns, GiForm, type Options } from '@/components/GiForm'
-import { addNotice, getNotice, updateNotice } from '@/apis/system'
+import type { LabelValueState } from '@/types/global'
+import { useTabsStore } from '@/stores'
 import { useForm } from '@/hooks'
 import { useDict } from '@/hooks/app'
-import { listUserDict } from '@/apis'
-import type { LabelValueState } from '@/types/global'
 
 const { width } = useWindowSize()
-const { notice_type } = useDict('notice_type')
-const containerRef = ref<HTMLElement | null>()
-const tabsStore = useTabsStore()
 const route = useRoute()
-const formRef = ref<InstanceType<typeof GiForm>>()
+const router = useRouter()
+const tabsStore = useTabsStore()
+
 const { id, type } = route.query
+const isUpdate = computed(() => type === 'update')
+const title = computed(() => (isUpdate.value ? '修改' : '新增'))
+const containerRef = ref<HTMLElement | null>()
+const formRef = ref<InstanceType<typeof GiForm>>()
+const { notice_type } = useDict('notice_type')
+
+const options: Options = {
+  form: { size: 'large' },
+  grid: { cols: 2 },
+  btns: { hide: true },
+}
+
 const { form, resetForm } = useForm({
   title: '',
   type: '',
@@ -82,11 +93,6 @@ const { form, resetForm } = useForm({
   content: '',
   noticeScope: 1,
 })
-const options: Options = {
-  form: { size: 'large' },
-  grid: { cols: 2 },
-  btns: { hide: true },
-}
 
 const columns: Columns = reactive([
   {
@@ -149,17 +155,18 @@ const onUpdate = async (id: string) => {
 
 // 返回
 const onBack = () => {
+  router.back()
   tabsStore.closeCurrent(route.path)
 }
 
-// 发布
-const onReleased = async () => {
+// 保存
+const save = async () => {
   const isInvalid = await formRef.value?.formRef?.validate()
   if (isInvalid) return false
   try {
     // 通知范围 所有人 去除指定用户
     form.noticeUsers = form.noticeScope === 1 ? null : form.noticeUsers
-    if (type === 'edit') {
+    if (isUpdate.value) {
       await updateNotice(form, id as string)
       Message.success('修改成功')
     } else {
@@ -194,9 +201,9 @@ const onSelectUser = (value: string[]) => {
 
 const userList = ref<LabelValueState[]>([])
 onMounted(async () => {
-  // 当id存在与type为edit时，执行修改操作
-  if (id && type === 'edit') {
-    onUpdate(id as string)
+  // 当id存在与type为update时，执行修改操作
+  if (id && isUpdate.value) {
+    await onUpdate(id as string)
   }
   // 获取所有用户
   const { data } = await listUserDict()
diff --git a/src/views/system/notice/detail/index.vue b/src/views/system/notice/detail/index.vue
index 5c0d936..22a8e93 100644
--- a/src/views/system/notice/detail/index.vue
+++ b/src/views/system/notice/detail/index.vue
@@ -39,15 +39,16 @@
 
 <script setup lang="ts">
 import AiEditor from './components/index.vue'
-import { useTabsStore } from '@/stores'
 import { getNotice } from '@/apis/system/notice'
+import { useTabsStore } from '@/stores'
 import { useForm } from '@/hooks'
 
-const containerRef = ref<HTMLElement | null>()
-const tabsStore = useTabsStore()
 const route = useRoute()
 const router = useRouter()
+const tabsStore = useTabsStore()
+
 const { id } = route.query
+const containerRef = ref<HTMLElement | null>()
 const { form, resetForm } = useForm({
   title: '',
   createUserString: '',
@@ -56,19 +57,21 @@ const { form, resetForm } = useForm({
   content: '',
 })
 
-// 修改
-const onDetail = async (id: string) => {
-  resetForm()
-  const res = await getNotice(id)
-  Object.assign(form, res.data)
-}
+// 回退
 const onBack = () => {
   router.back()
   tabsStore.closeCurrent(route.path)
 }
 
+// 打开
+const onOpen = async (id: string) => {
+  resetForm()
+  const { data } = await getNotice(id)
+  Object.assign(form, data)
+}
+
 onMounted(() => {
-  onDetail(id as string)
+  onOpen(id as string)
 })
 </script>
 
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index d2a61ce..195fce2 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -123,7 +123,7 @@ const onAdd = () => {
 
 // 修改
 const onUpdate = (record: NoticeResp) => {
-  router.push({ path: '/system/notice/add', query: { id: record.id, type: 'edit' } })
+  router.push({ path: '/system/notice/add', query: { id: record.id, type: 'update' } })
 }
 
 // 详情
diff --git a/src/views/system/user/UserAddDrawer.vue b/src/views/system/user/UserAddDrawer.vue
index cc20454..2900009 100644
--- a/src/views/system/user/UserAddDrawer.vue
+++ b/src/views/system/user/UserAddDrawer.vue
@@ -42,6 +42,11 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({
+  gender: 1 as Gender,
+  status: 1 as Status,
+})
+
 const columns: Columns = reactive([
   {
     label: '用户名',
@@ -160,11 +165,6 @@ const columns: Columns = reactive([
   },
 ])
 
-const { form, resetForm } = useForm({
-  gender: 1 as Gender,
-  status: 1 as Status,
-})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/src/views/system/user/UserResetPwdModal.vue b/src/views/system/user/UserResetPwdModal.vue
index 68a236a..39e67fb 100644
--- a/src/views/system/user/UserResetPwdModal.vue
+++ b/src/views/system/user/UserResetPwdModal.vue
@@ -34,12 +34,12 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({})
+
 const columns: Columns = reactive([
   { label: '密码', field: 'newPassword', type: 'input-password', rules: [{ required: true, message: '请输入密码' }] },
 ])
 
-const { form, resetForm } = useForm({})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/src/views/system/user/UserUpdateRoleModal.vue b/src/views/system/user/UserUpdateRoleModal.vue
index 63e9424..bb28556 100644
--- a/src/views/system/user/UserUpdateRoleModal.vue
+++ b/src/views/system/user/UserUpdateRoleModal.vue
@@ -36,6 +36,8 @@ const options: Options = {
   btns: { hide: true },
 }
 
+const { form, resetForm } = useForm({})
+
 const columns: Columns = reactive([
   {
     label: '角色',
@@ -52,8 +54,6 @@ const columns: Columns = reactive([
   },
 ])
 
-const { form, resetForm } = useForm({})
-
 // 重置
 const reset = () => {
   formRef.value?.formRef?.resetFields()
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e473311..53cc72e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -101,13 +101,13 @@ import UserImportDrawer from './UserImportDrawer.vue'
 import UserDetailDrawer from './UserDetailDrawer.vue'
 import UserResetPwdModal from './UserResetPwdModal.vue'
 import UserUpdateRoleModal from './UserUpdateRoleModal.vue'
-import { type UserQuery, type UserResp, deleteUser, exportUser, listUser } from '@/apis/system/user'
+import { type UserResp, deleteUser, exportUser, listUser } from '@/apis/system/user'
 import type { Columns, Options } from '@/components/GiForm'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
-import { useDownload, useTable } from '@/hooks'
+import { DisEnableStatusList } from '@/constant/common'
+import { useDownload, useForm, useTable } from '@/hooks'
 import { isMobile } from '@/utils'
 import has from '@/utils/has'
-import { DisEnableStatusList } from '@/constant/common'
 
 defineOptions({ name: 'SystemUser' })
 
@@ -116,6 +116,9 @@ const options: Options = reactive({
   grid: { cols: { xs: 1, sm: 1, md: 2, lg: 3, xl: 3, xxl: 3 } },
   fold: { enable: true, index: 1, defaultCollapsed: true },
 })
+const { form: queryForm, resetForm } = useForm({
+  sort: ['t1.id,desc'],
+})
 const queryFormColumns: Columns = reactive([
   {
     type: 'input',
@@ -147,9 +150,6 @@ const queryFormColumns: Columns = reactive([
     },
   },
 ])
-const queryForm = reactive<UserQuery>({
-  sort: ['t1.id,desc'],
-})
 
 const {
   tableData: dataList,
@@ -207,9 +207,7 @@ const columns: TableInstanceColumns[] = [
 
 // 重置
 const reset = () => {
-  queryForm.description = undefined
-  queryForm.status = undefined
-  queryForm.createTime = []
+  resetForm()
   search()
 }