From 959bb1867ccbafb97a7e2417e488201cc02ec52c Mon Sep 17 00:00:00 2001 From: mizhexiaoxiao <1157861072@qq.com> Date: Fri, 2 Feb 2024 10:42:38 +0800 Subject: [PATCH 1/3] fix keepalive --- web/src/views/system/api/index.vue | 12 ++++++------ web/src/views/system/user/index.vue | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/web/src/views/system/api/index.vue b/web/src/views/system/api/index.vue index 00520fc..23c9cc5 100644 --- a/web/src/views/system/api/index.vue +++ b/web/src/views/system/api/index.vue @@ -13,7 +13,7 @@ import { useCRUD } from '@/composables' // import { loginTypeMap, loginTypeOptions } from '@/constant/data' import api from '@/api' -defineOptions({ name: 'Api列表' }) +defineOptions({ name: 'API管理' }) const $table = ref(null) const queryItems = ref({}) @@ -141,9 +141,9 @@ const columns = [ { default: () => '编辑', icon: renderIcon('material-symbols:edit', { size: 16 }), - }, + } ), - [[vPermission, 'post/api/v1/api/update']], + [[vPermission, 'post/api/v1/api/update']] ), h( NPopconfirm, @@ -163,12 +163,12 @@ const columns = [ { default: () => '删除', icon: renderIcon('material-symbols:delete-outline', { size: 16 }), - }, + } ), - [[vPermission, 'delete/api/v1/api/delete']], + [[vPermission, 'delete/api/v1/api/delete']] ), default: () => h('div', {}, '确定删除该API吗?'), - }, + } ), ] }, diff --git a/web/src/views/system/user/index.vue b/web/src/views/system/user/index.vue index f4d2b1d..e2f5427 100644 --- a/web/src/views/system/user/index.vue +++ b/web/src/views/system/user/index.vue @@ -26,7 +26,7 @@ import api from '@/api' import TheIcon from '@/components/icon/TheIcon.vue' import { useUserStore } from '@/store' -defineOptions({ name: '用户列表' }) +defineOptions({ name: '用户管理' }) const $table = ref(null) const queryItems = ref({}) @@ -99,7 +99,7 @@ const columns = [ const group = [] for (let i = 0; i < roles.length; i++) group.push( - h(NTag, { type: 'info', style: { margin: '2px 3px' } }, { default: () => roles[i].name }), + h(NTag, { type: 'info', style: { margin: '2px 3px' } }, { default: () => roles[i].name }) ) return h('span', group) }, @@ -113,7 +113,7 @@ const columns = [ return h( NTag, { type: 'info', style: { margin: '2px 3px' } }, - { default: () => (row.is_superuser ? '是' : '否') }, + { default: () => (row.is_superuser ? '是' : '否') } ) }, }, @@ -130,7 +130,7 @@ const columns = [ { default: () => (row.last_login !== null ? formatDate(row.last_login) : null), icon: renderIcon('mdi:update', { size: 16 }), - }, + } ) }, }, @@ -175,9 +175,9 @@ const columns = [ { default: () => '编辑', icon: renderIcon('material-symbols:edit', { size: 16 }), - }, + } ), - [[vPermission, 'post/api/v1/user/update']], + [[vPermission, 'post/api/v1/user/update']] ), h( NPopconfirm, @@ -197,12 +197,12 @@ const columns = [ { default: () => '删除', icon: renderIcon('material-symbols:delete-outline', { size: 16 }), - }, + } ), - [[vPermission, 'delete/api/v1/user/delete']], + [[vPermission, 'delete/api/v1/user/delete']] ), default: () => h('div', {}, '确定删除该用户吗?'), - }, + } ), ] }, From 5d751fe9dd6b29ec9e588ee5a14246432a03c207 Mon Sep 17 00:00:00 2001 From: mizhexiaoxiao <1157861072@qq.com> Date: Fri, 2 Feb 2024 11:06:07 +0800 Subject: [PATCH 2/3] Update i18n --- web/i18n/index.js | 8 ++++---- web/src/layout/components/header/components/Languages.vue | 3 +++ web/src/store/modules/app/index.js | 6 +++--- web/src/store/modules/tags/helpers.js | 6 +++--- web/src/store/modules/tags/index.js | 6 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/web/i18n/index.js b/web/i18n/index.js index 791eaa2..b593e7c 100644 --- a/web/i18n/index.js +++ b/web/i18n/index.js @@ -1,15 +1,15 @@ import { createI18n } from 'vue-i18n' -import { sStorage } from '@/utils' +import { lStorage } from '@/utils' import messages from './messages' -const currentLocale = sStorage.get('locale') +const currentLocale = lStorage.get('locale') const i18n = createI18n({ legacy: false, globalInjection: true, - locale: currentLocale || 'en', - fallbackLocale: 'en', + locale: currentLocale || 'cn', + fallbackLocale: 'cn', messages: messages, }) diff --git a/web/src/layout/components/header/components/Languages.vue b/web/src/layout/components/header/components/Languages.vue index 02c4282..9b8362f 100644 --- a/web/src/layout/components/header/components/Languages.vue +++ b/web/src/layout/components/header/components/Languages.vue @@ -9,6 +9,7 @@ diff --git a/web/src/store/modules/app/index.js b/web/src/store/modules/app/index.js index 9b47bf0..02dfecd 100644 --- a/web/src/store/modules/app/index.js +++ b/web/src/store/modules/app/index.js @@ -1,9 +1,9 @@ import { defineStore } from 'pinia' import { useDark } from '@vueuse/core' -import { sStorage } from '@/utils' +import { lStorage } from '@/utils' import i18n from '~/i18n' -const currentLocale = sStorage.get('locale') +const currentLocale = lStorage.get('locale') const { locale } = i18n.global const isDark = useDark() @@ -54,7 +54,7 @@ export const useAppStore = defineStore('app', { setLocale(newLocale) { this.locale = newLocale locale.value = newLocale - sStorage.set('locale', newLocale) + lStorage.set('locale', newLocale) }, }, }) diff --git a/web/src/store/modules/tags/helpers.js b/web/src/store/modules/tags/helpers.js index d7c94c9..4178a2e 100644 --- a/web/src/store/modules/tags/helpers.js +++ b/web/src/store/modules/tags/helpers.js @@ -1,6 +1,6 @@ -import { sStorage } from '@/utils' +import { lStorage } from '@/utils' -export const activeTag = sStorage.get('activeTag') -export const tags = sStorage.get('tags') +export const activeTag = lStorage.get('activeTag') +export const tags = lStorage.get('tags') export const WITHOUT_TAG_PATHS = ['/404', '/login'] diff --git a/web/src/store/modules/tags/index.js b/web/src/store/modules/tags/index.js index 60c2264..cc78899 100644 --- a/web/src/store/modules/tags/index.js +++ b/web/src/store/modules/tags/index.js @@ -1,7 +1,7 @@ import { defineStore } from 'pinia' import { activeTag, tags, WITHOUT_TAG_PATHS } from './helpers' import { router } from '@/router' -import { sStorage } from '@/utils' +import { lStorage } from '@/utils' export const useTagsStore = defineStore('tag', { state() { @@ -18,11 +18,11 @@ export const useTagsStore = defineStore('tag', { actions: { setActiveTag(path) { this.activeTag = path - sStorage.set('activeTag', path) + lStorage.set('activeTag', path) }, setTags(tags) { this.tags = tags - sStorage.set('tags', tags) + lStorage.set('tags', tags) }, addTag(tag = {}) { this.setActiveTag(tag.path) From 8497d1ae9be8fd5aac567c974f9a73f9e21365c9 Mon Sep 17 00:00:00 2001 From: mizhexiaoxiao <1157861072@qq.com> Date: Fri, 2 Feb 2024 11:10:53 +0800 Subject: [PATCH 3/3] Update --- app/api/v1/users/users.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/api/v1/users/users.py b/app/api/v1/users/users.py index 241c1f0..fcce163 100644 --- a/app/api/v1/users/users.py +++ b/app/api/v1/users/users.py @@ -14,7 +14,7 @@ logger = logging.getLogger(__name__) router = APIRouter() -@router.get("/list", summary="查看用户列表", dependencies=[DependPermisson]) +@router.get("/list", summary="查看用户列表") async def list_user( page: int = Query(1, description="页码"), page_size: int = Query(10, description="每页数量"), @@ -32,7 +32,7 @@ async def list_user( return SuccessExtra(data=data, total=total, page=page, page_size=page_size) -@router.get("/get", summary="查看用户", dependencies=[DependPermisson]) +@router.get("/get", summary="查看用户") async def get_user( user_id: int = Query(..., description="用户ID"), ): @@ -42,7 +42,7 @@ async def get_user( return Success(data=user_dict) -@router.post("/create", summary="创建用户", dependencies=[DependPermisson]) +@router.post("/create", summary="创建用户") async def create_user( user_in: UserCreate, ): @@ -58,7 +58,7 @@ async def create_user( return Success(msg="Created Successfully") -@router.post("/update", summary="更新用户", dependencies=[DependPermisson]) +@router.post("/update", summary="更新用户") async def update_user( user_in: UserUpdate, ): @@ -68,7 +68,7 @@ async def update_user( return Success(msg="Updated Successfully") -@router.delete("/delete", summary="删除用户", dependencies=[DependPermisson]) +@router.delete("/delete", summary="删除用户") async def delete_user( user_id: int = Query(..., description="用户ID"), ):