Merge branch 'dev' of https://gitee.com/continew/continew-admin-ui into dev

src/views/system/config/components/BasicSetting.vue

@@ -142,10 +142,10 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form } = useForm({
-  SITE_FAVICON: '',
+  SITE_FAVICON: undefined,
-  SITE_LOGO: '',
+  SITE_LOGO: undefined,
-  SITE_TITLE: '',
+  SITE_TITLE: undefined,
-  SITE_COPYRIGHT: ''
+  SITE_COPYRIGHT: undefined
 })
 
 const siteFavicon = ref<OptionResp>()

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>({
+const { form, resetForm } = useForm({
-  name: '',
-  parentId: undefined,
   sort: 999,
   status: 1
 })

src/views/system/dict/DictItemAddModal.vue

@@ -79,9 +79,7 @@ const columns: Columns = [
 ]
 
 const { form, resetForm } = useForm({
-  label: '',
+  color: 'blue',
-  value: '',
-  color: '',
   sort: 999,
   status: 1
 })

src/views/system/dict/tree/DictAddModal.vue

@@ -47,10 +47,7 @@ const columns: Columns = [
   }
 ]
 
-const { form, resetForm } = useForm({
+const { form, resetForm } = useForm({})
-  name: '',
-  code: ''
-})
 
 // 重置
 const reset = () => {

src/views/system/dict/tree/index.vue

@@ -12,7 +12,10 @@
           <template #title="node">
             <a-trigger v-model:popup-visible="node.popupVisible" trigger="contextMenu" align-point
               animation-name="slide-dynamic-origin" auto-fit-transform-origin position="bl" scroll-to-close>
-              <div @contextmenu="onContextmenu(node)">{{ node.name }}（{{ node.code }}）</div>
+              <a-tooltip v-if="node.description" :content="node.description" background-color="rgb(var(--primary-6))" position="right">
+                <div @contextmenu="onContextmenu(node)">{{ node.name }}（{{ node.code }}）</div>
+              </a-tooltip>
+              <div v-else @contextmenu="onContextmenu(node)">{{ node.name }}（{{ node.code }}）</div>
               <template #content>
                 <RightMenu v-if="has.hasPermOr(['system:dict:update', 'system:dict:delete'])" :data="node"
                   @on-menu-item-click="onMenuItemClick" />

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))

src/views/system/notice/NoticeAddModal.vue

@@ -122,13 +122,7 @@ const rules: FormInstance['rules'] = {
   content: [{ required: true, message: '请输入内容' }]
 }
 
-const { form, resetForm } = useForm({
+const { form, resetForm } = useForm({})
-  title: '',
-  content: '',
-  type: '',
-  effectiveTime: undefined,
-  terminateTime: undefined
-})
 
 // 重置
 const reset = () => {

src/views/system/role/RoleAddModal.vue

@@ -112,13 +112,8 @@ const rules: FormInstance['rules'] = {
 }
 
 const { form, resetForm } = useForm({
-  name: '',
-  code: '',
   sort: 999,
-  description: undefined,
+  dataScope: 4
-  menuIds: undefined,
-  dataScope: 4,
-  deptIds: undefined
 })
 
 const menuTreeRef = ref()

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>({
+const { form, resetForm } = useForm({
-  name: '',
-  code: '',
   type: 2,
-  accessKey: undefined,
-  secretKey: undefined,
-  endpoint: undefined,
-  bucketName: undefined,
-  domain: undefined,
-  description: undefined,
   isDefault: false,
   sort: 999,
   status: 1

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: '',
+  status: 1 as Status
-  email: '',
-  deptId: '',
-  roleIds: [] as string[],
-  description: '',
-  status: 1 as Status,
-  type: 2 as 1 | 2,
-  disabled: false
 })
 
 // 重置

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({
+const { form, resetForm } = useForm({})
-  newPassword: ''
-})
 
 // 重置
 const reset = () => {

src/views/system/user/index.vue

@@ -109,7 +109,7 @@ const {
   pagination,
   search,
   handleDelete
-} = useTable((page) => listUser({ ...queryForm, ...page }), { immediate: true })
+} = useTable((page) => listUser({ ...queryForm, ...page }), { immediate: false })
 
 const columns: TableInstanceColumns[] = [
   {
@@ -135,7 +135,7 @@ const columns: TableInstanceColumns[] = [
   { title: '手机号', dataIndex: 'phone', width: 170, ellipsis: true, tooltip: true },
   { title: '邮箱', dataIndex: 'email', width: 170, ellipsis: true, tooltip: true },
   { title: '系统内置', slotName: 'isSystem', width: 100, align: 'center', show: false },
-  { title: '描述', dataIndex: 'description', ellipsis: true, tooltip: true },
+  { title: '描述', dataIndex: 'description', width: 130, ellipsis: true, tooltip: true },
   { title: '创建人', dataIndex: 'createUserString', ellipsis: true, tooltip: true, width: 140, show: false },
   { title: '创建时间', dataIndex: 'createTime', width: 180 },
   { title: '修改人', dataIndex: 'updateUserString', ellipsis: true, tooltip: true, width: 140, show: false },

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
 })