From 27d44236653ecdb3bcaa4d03976ea8d163002f65 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 07 八月 2025 15:06:19 +0800
Subject: [PATCH] fix: 修改字典bug
---
src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue | 1 +
src/views/DictionaryManage/DataDictionary.vue | 9 ++++++++-
package.json | 2 +-
auto-imports.d.ts | 2 +-
src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue | 1 +
pnpm-lock.yaml | 8 ++++----
src/utils/request/index.ts | 8 ++++----
7 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index 562aaf2..2a77459 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -413,4 +413,4 @@
readonly watchPostEffect: UnwrapRef<typeof import('vue')['watchPostEffect']>
readonly watchSyncEffect: UnwrapRef<typeof import('vue')['watchSyncEffect']>
}
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index bbc987e..d4b32ec 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"dependencies": {
"@bole-12333/chat-kit": "latest",
"@bole-12333/customer-chat": "latest",
- "@bole-core/components": "latest",
+ "@bole-core/components": "^1.3.14",
"@bole-core/core": "latest",
"@bole-core/pretty-layout": "latest",
"@bole-core/sass-utils": "latest",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6e552b2..acc4e24 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,8 +20,8 @@
specifier: latest
version: 1.0.3(@bole-12333/chat-kit@1.0.1)(@tiptap/core@2.1.13)(@tiptap/extension-document@2.1.13)(@tiptap/extension-image@2.1.13)(@tiptap/extension-mention@2.1.13)(@tiptap/extension-paragraph@2.1.13)(@tiptap/extension-placeholder@2.1.13)(@tiptap/extension-text@2.1.13)(@tiptap/pm@2.1.13)(@tiptap/suggestion@2.1.13)(dayjs@1.11.6)(vue@3.5.11)
'@bole-core/components':
- specifier: latest
- version: 1.3.13(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.8.4)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11)
+ specifier: ^1.3.14
+ version: 1.3.14(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.8.4)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11)
'@bole-core/core':
specifier: latest
version: 1.0.7(@ywwlmm/openapi@0.0.3)(ali-oss@6.21.0)(axios@1.7.7)(dayjs@1.11.6)(element-plus@2.8.4)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.1)(vue-router@4.4.5)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
@@ -1895,8 +1895,8 @@
vue: 3.5.11(typescript@4.8.4)
dev: false
- /@bole-core/components@1.3.13(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.8.4)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11):
- resolution: {integrity: sha512-14vVgnE0syul+Zdn1IRdRQYjfbP0WdyTW4QQPN8+5eoWZ/b9AL/0lWt15otFFdfUcOf7/uTtkPm8bsw4dOgphg==}
+ /@bole-core/components@1.3.14(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.6)(element-plus@2.8.4)(lodash@4.17.21)(mitt@3.0.0)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.20.3)(vue-component-type-helpers@2.1.6)(vue@3.5.11):
+ resolution: {integrity: sha512-UVJZZBXKkA637624Z6rMIURTipDx8nop1xEdP9iwN1yZBp/sAqlQvwSkYm7nIwJPYSX8tVbSO+CP9IuxcyqHDw==}
peerDependencies:
'@bole-core/core': '*'
'@bole-core/sass-utils': '*'
diff --git a/src/utils/request/index.ts b/src/utils/request/index.ts
index eaabecb..d12fccc 100644
--- a/src/utils/request/index.ts
+++ b/src/utils/request/index.ts
@@ -264,18 +264,18 @@
[505]: 'HTTP鐗堟湰涓嶅彈鏀寔',
};
-function handleAxiosResponseError(error: AxiosError<ErrorResponse, IRequestOptions>) {
+function handleAxiosResponseError(error: AxiosError<ResponseStructure, IRequestOptions>) {
if (error.response.config.url.toLowerCase().includes(RefreshTokenUrl.toLowerCase())) {
handleLogout();
return;
}
if (error && error.response) {
let message = ErrorMessageMap[error.response?.status] ?? '璇锋眰閿欒';
- if (error.response.data?.error?.message) {
- message = error.response.data?.error?.message;
+ if (error.response.data?.msg) {
+ message = error.response.data?.msg;
}
- if (error.response?.status === 401) {
+ if (error.response?.status === 401 || error.response.data.code === 401) {
handleLogout();
}
Message.errorMessage(message);
diff --git a/src/views/DictionaryManage/DataDictionary.vue b/src/views/DictionaryManage/DataDictionary.vue
index d585ccc..86acd05 100644
--- a/src/views/DictionaryManage/DataDictionary.vue
+++ b/src/views/DictionaryManage/DataDictionary.vue
@@ -1,7 +1,7 @@
<template>
<LoadingLayout :loading="state.loading">
<AppContainer>
- <ProTableQueryFilterBar @on-reset="reset">
+ <ProTableQueryFilterBar @on-reset="handleReset">
<template #query>
<QueryFilterItem>
<FieldSelect
@@ -220,4 +220,11 @@
return !!res;
} catch (error) {}
}
+
+async function handleReset() {
+ try {
+ const dictionaryCategoryList = await ensureQueryData();
+ reset({ categoryId: dictionaryCategoryList[0].value });
+ } catch (error) {}
+}
</script>
diff --git a/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue b/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue
index 80d7afb..72c70ca 100644
--- a/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue
+++ b/src/views/DictionaryManage/components/AddOrEditDictionaryCategory.vue
@@ -26,6 +26,7 @@
:controls="false"
:min="0"
:max="999999"
+ :value-on-clear="0"
></ProFormInputNumber>
</ProFormItemV2>
</ProForm>
diff --git a/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue b/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
index 0004505..2ea2250 100644
--- a/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
+++ b/src/views/DictionaryManage/components/AddOrEditDictionaryDialog.vue
@@ -33,6 +33,7 @@
:controls="false"
:min="0"
:max="999999"
+ :value-on-clear="0"
></ProFormInputNumber>
</ProFormItemV2>
<ProFormItemV2 label="缂栧彿:" prop="code" :check-rules="[{ message: '璇疯緭鍏ョ紪鍙�' }]">
--
Gitblit v1.9.1