From 90945440fe172657b6d9c5731f5a24e1e45f6666 Mon Sep 17 00:00:00 2001 From: rubyliu Date: Sun, 13 Aug 2023 21:34:28 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E7=94=A8=E6=88=B7=E7=BB=84=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/api/modules/setting/usergroup.ts | 6 +++--- .../components/pure/ms-pagination/page-item-ellipsis.vue | 6 +++--- frontend/src/components/pure/ms-table/columnSelector.vue | 4 ++-- frontend/src/models/setting/usergroup.ts | 4 ++-- .../views/setting/system/usergroup/components/authTable.vue | 6 +++--- frontend/src/views/setting/system/usergroup/index.vue | 2 +- frontend/src/views/setting/system/usergroup/locale/en-US.ts | 2 +- frontend/src/views/setting/system/usergroup/locale/zh-CN.ts | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/frontend/src/api/modules/setting/usergroup.ts b/frontend/src/api/modules/setting/usergroup.ts index 6c2c9026a9..ea6352e2c0 100644 --- a/frontend/src/api/modules/setting/usergroup.ts +++ b/frontend/src/api/modules/setting/usergroup.ts @@ -12,7 +12,7 @@ import { addUserToUserGroupUrl, } from '@/api/requrls/setting/usergroup'; import { TableQueryParams, CommonList } from '@/models/common'; -import { UserGroupItem, UserGroupAuthSeting, SaveGlobalUSettingData, UserTableItem } from '@/models/setting/usergroup'; +import { UserGroupItem, UserGroupAuthSetting, SaveGlobalUSettingData, UserTableItem } from '@/models/setting/usergroup'; export function updateOrAddUserGroup(data: Partial) { return MSR.post({ @@ -41,11 +41,11 @@ export function getUsergroupInfo(id: string) { } export function getGlobalUSetting(id: string) { - return MSR.get({ url: `${getGlobalUSettingUrl}${id}` }); + return MSR.get({ url: `${getGlobalUSettingUrl}${id}` }); } export function saveGlobalUSetting(data: SaveGlobalUSettingData) { - return MSR.post({ url: editGlobalUSettingUrl, data }); + return MSR.post({ url: editGlobalUSettingUrl, data }); } export function postUserByUserGroup(data: TableQueryParams) { diff --git a/frontend/src/components/pure/ms-pagination/page-item-ellipsis.vue b/frontend/src/components/pure/ms-pagination/page-item-ellipsis.vue index 6d96fa503a..9958b857fb 100644 --- a/frontend/src/components/pure/ms-pagination/page-item-ellipsis.vue +++ b/frontend/src/components/pure/ms-pagination/page-item-ellipsis.vue @@ -12,16 +12,16 @@ import MsIcon from '../ms-icon-font/index.vue'; defineOptions({ - name: 'PageItemElipsis', + name: 'PageItemEllipsis', }); - export interface PageItemElipsisProps { + export interface PageItemEllipsisProps { current: number; step: number; pages: number; } - const props = withDefaults(defineProps(), { + const props = withDefaults(defineProps(), { step: 5, }); const emit = defineEmits<{ diff --git a/frontend/src/components/pure/ms-table/columnSelector.vue b/frontend/src/components/pure/ms-table/columnSelector.vue index babceed41b..84f9b161e8 100644 --- a/frontend/src/components/pure/ms-table/columnSelector.vue +++ b/frontend/src/components/pure/ms-table/columnSelector.vue @@ -35,7 +35,7 @@
{{ t(item.title as string) }}
- +
{{ t('msTable.columnSetting.nonSort') }} @@ -109,7 +109,7 @@ loadColumn(props.tableKey); }; - const handleFisrtColumnChange = (idx: number) => { + const handleFirstColumnChange = (idx: number) => { const item = nonSortColumn.value[idx]; item.showInTable = !item.showInTable; hasChange.value = true; diff --git a/frontend/src/models/setting/usergroup.ts b/frontend/src/models/setting/usergroup.ts index 7c25a6ef88..a73176674a 100644 --- a/frontend/src/models/setting/usergroup.ts +++ b/frontend/src/models/setting/usergroup.ts @@ -50,7 +50,7 @@ export interface UserGroupPermissionItem { export type AuthScopeType = 'SYSTEM' | 'PROJECT' | 'ORGANIZATION'; // 用户组对应的权限配置 -export interface UserGroupAuthSeting { +export interface UserGroupAuthSetting { // 菜单项ID id: AuthScopeType; // 菜单所属类型 @@ -64,7 +64,7 @@ export interface UserGroupAuthSeting { // 菜单下的权限列表 permissions?: UserGroupPermissionItem[]; // 子菜单 - children?: UserGroupAuthSeting[]; + children?: UserGroupAuthSetting[]; } // 权限表格DataItem diff --git a/frontend/src/views/setting/system/usergroup/components/authTable.vue b/frontend/src/views/setting/system/usergroup/components/authTable.vue index cd6dd1e7b4..f90150d476 100644 --- a/frontend/src/views/setting/system/usergroup/components/authTable.vue +++ b/frontend/src/views/setting/system/usergroup/components/authTable.vue @@ -55,7 +55,7 @@ import { type TableColumnData, type TableData } from '@arco-design/web-vue'; import useUserGroupStore from '@/store/modules/setting/usergroup'; import { getGlobalUSetting, saveGlobalUSetting } from '@/api/modules/setting/usergroup'; - import { UserGroupAuthSeting, AuthTableItem, type AuthScopeType, SavePermissions } from '@/models/setting/usergroup'; + import { UserGroupAuthSetting, AuthTableItem, type AuthScopeType, SavePermissions } from '@/models/setting/usergroup'; import MsButton from '@/components/pure/ms-button/index.vue'; export declare type OperationName = 'selection-checkbox' | 'selection-radio' | 'expand' | 'drag-handle'; @@ -116,7 +116,7 @@ * @param type * @param idx */ - const makeData = (item: UserGroupAuthSeting, type: AuthScopeType) => { + const makeData = (item: UserGroupAuthSetting, type: AuthScopeType) => { const result: AuthTableItem[] = []; item.children?.forEach((child, index) => { const perChecked = @@ -143,7 +143,7 @@ return result; }; - const transformData = (data: UserGroupAuthSeting[]) => { + const transformData = (data: UserGroupAuthSetting[]) => { const result: AuthTableItem[] = []; data.forEach((item) => { if (item.type === 'SYSTEM') { diff --git a/frontend/src/views/setting/system/usergroup/index.vue b/frontend/src/views/setting/system/usergroup/index.vue index b03ab744fe..12dcc771ef 100644 --- a/frontend/src/views/setting/system/usergroup/index.vue +++ b/frontend/src/views/setting/system/usergroup/index.vue @@ -12,7 +12,7 @@
{{ store.userGroupInfo.currentName }}
- + diff --git a/frontend/src/views/setting/system/usergroup/locale/en-US.ts b/frontend/src/views/setting/system/usergroup/locale/en-US.ts index c6c7f4bbfb..4373d38851 100644 --- a/frontend/src/views/setting/system/usergroup/locale/en-US.ts +++ b/frontend/src/views/setting/system/usergroup/locale/en-US.ts @@ -33,7 +33,7 @@ export default { userIsNotNone: 'User is not none', confirm: 'Confirm', global: 'Global', - searchPlacehoder: 'Search by ID/Name', + searchPlaceholder: 'Search by ID/Name', SYSTEM: '系统', PROJECT: '项目', ORGANIZATION: '组织', diff --git a/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts b/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts index 5a76164df0..e5d841e2a2 100644 --- a/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts +++ b/frontend/src/views/setting/system/usergroup/locale/zh-CN.ts @@ -33,7 +33,7 @@ export default { pleaseInputUserGroupName: '请输入用户组名称，且不与其他用户组名称重复', userGroupNameIsExist: `用户组{name}已存在`, pleaseSelectAuthScope: '请选择用户组所属的权限范围', - searchPlacehoder: '通过ID/名称搜索', + searchPlaceholder: '通过ID/名称搜索', SYSTEM: '系统', PROJECT: '项目', ORGANIZATION: '组织',