From b579b4542d8c4d35b466f80bb3c41ecd2f4255b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E6=B0=B8=E6=98=A5?= Date: Thu, 4 Dec 2025 19:54:14 +0800 Subject: [PATCH] =?UTF-8?q?feat-wip(components):=20=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/hooks/common/table.ts | 12 +++++------- src/locales/langs/zh-cn.ts | 2 +- src/service/api/auth.ts | 6 +++--- src/service/api/sys/core/dictionary.ts | 6 +++--- src/typings/api/common.d.ts | 4 ++-- src/views/sys/core/dictionary/index.vue | 4 ++-- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/hooks/common/table.ts b/src/hooks/common/table.ts index a0fb6984..46c9906f 100644 --- a/src/hooks/common/table.ts +++ b/src/hooks/common/table.ts @@ -1,8 +1,8 @@ -import { computed, effectScope, onScopeDispose, reactive, shallowRef, watch } from 'vue'; import type { Ref } from 'vue'; +import { computed, effectScope, onScopeDispose, reactive, shallowRef, watch } from 'vue'; import type { PaginationProps } from 'naive-ui'; -import { useBoolean, useTable } from '@sa/hooks'; import type { PaginationData, TableColumnCheck, UseTableOptions } from '@sa/hooks'; +import { useBoolean, useTable } from '@sa/hooks'; import type { FlatResponseData } from '@sa/axios'; import { jsonClone } from '@sa/utils'; import { useAppStore } from '@/store/modules/app'; @@ -235,11 +235,11 @@ export function defaultTransform( const { data, error } = response; if (!error) { - const { records, pageNumber, pageSize, total } = data; + const { records, pageIndex, pageSize, total } = data; return { data: records, - pageNum: pageNumber, + pageNum: pageIndex, pageSize, total }; @@ -300,9 +300,7 @@ function getColumns>(cols: Column[], che } }); - const filteredColumns = checks.filter(item => item.checked).map(check => columnMap.get(check.key) as Column); - - return filteredColumns; + return checks.filter(item => item.checked).map(check => columnMap.get(check.key) as Column); } export function isTableColumnHasKey(column: NaiveUI.TableColumn): column is NaiveUI.TableColumnWithKey { diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index d6518d46..e51ce123 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -321,7 +321,7 @@ const local: App.I18n.Schema = { options: { type: { enum: '枚举', - tree: '数型' + tree: '树型' } }, item: { diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts index 20b725fe..c1e37f34 100644 --- a/src/service/api/auth.ts +++ b/src/service/api/auth.ts @@ -8,7 +8,7 @@ import { request } from '../request'; */ export function fetchLogin(username: string, password: string) { return request({ - url: '/auth/login', + url: '/authorize/login', method: 'post', data: { username, @@ -19,7 +19,7 @@ export function fetchLogin(username: string, password: string) { /** Get user info */ export function fetchGetUserInfo() { - return request({ url: '/auth/getUserInfo' }); + return request({ url: '/authorize/getUserInfo' }); } /** @@ -29,7 +29,7 @@ export function fetchGetUserInfo() { */ export function fetchRefreshToken(refreshToken: string) { return request({ - url: '/auth/refreshToken', + url: '/authorize/refreshToken', method: 'post', data: { refreshToken diff --git a/src/service/api/sys/core/dictionary.ts b/src/service/api/sys/core/dictionary.ts index 241e60f1..7b75ef84 100644 --- a/src/service/api/sys/core/dictionary.ts +++ b/src/service/api/sys/core/dictionary.ts @@ -2,7 +2,7 @@ import { request } from '../../../request'; export function fetchPageDictionary(pageRequest: Api.Sys.Core.DictionaryQueryPageRequest) { return request>({ - url: '/dictionary/page', + url: '/dictionary/paginate', method: 'post', data: pageRequest }); @@ -10,7 +10,7 @@ export function fetchPageDictionary(pageRequest: Api.Sys.Core.DictionaryQueryPag export function fetchDictionaryAdd(dictionaryOp: Api.Sys.Core.DictionaryOp) { return request({ - url: '/dictionary/add', + url: '/dictionary/insert', method: 'post', data: dictionaryOp }); @@ -18,7 +18,7 @@ export function fetchDictionaryAdd(dictionaryOp: Api.Sys.Core.DictionaryOp) { export function fetchDictionaryEdit(dictionaryOp: Api.Sys.Core.DictionaryOp) { return request({ - url: '/dictionary/edit', + url: '/dictionary/update', method: 'post', data: dictionaryOp }); diff --git a/src/typings/api/common.d.ts b/src/typings/api/common.d.ts index fd338efd..005c1bba 100644 --- a/src/typings/api/common.d.ts +++ b/src/typings/api/common.d.ts @@ -7,7 +7,7 @@ declare namespace Api { namespace Common { /** 分页请求 */ interface PageRequest { - pageNumber: number; + pageIndex: number; pageSize: number; } @@ -19,7 +19,7 @@ declare namespace Api { /** 分页响应 */ interface PageResponse { total: number; - pageNumber: number; + pageIndex: number; pageSize: number; records: T[]; } diff --git a/src/views/sys/core/dictionary/index.vue b/src/views/sys/core/dictionary/index.vue index 59c2ec4e..455d9874 100644 --- a/src/views/sys/core/dictionary/index.vue +++ b/src/views/sys/core/dictionary/index.vue @@ -12,7 +12,7 @@ import DictionaryOperateDrawer from '@/views/sys/core/dictionary/modules/diction const appStore = useAppStore(); const pageRequest: Api.Sys.Core.DictionaryQueryPageRequest = reactive({ - pageNumber: 1, + pageIndex: 1, pageSize: 10, query: { name: null, @@ -25,7 +25,7 @@ const { columns, columnChecks, data, loading, getData, getDataByPage, mobilePagi api: () => fetchPageDictionary(pageRequest), transform: response => defaultTransform(response), onPaginationParamsChange: params => { - pageRequest.pageNumber = params.page || 1; + pageRequest.pageIndex = params.page || 1; pageRequest.pageSize = params.pageSize || 10; }, columns: () => [