Compare commits

...

3 Commits

Author SHA1 Message Date
xiaoxian521
ebe1826492 fix: 修复标签页操作示例在切换国际化时报错 2026-02-06 10:46:21 +08:00
xiaoxian521
7b2dcdddca chore: 升级依赖,相关兼容处理 2026-02-05 10:31:12 +08:00
Yorlg
986e6e5104 perf(layout): 优化消息通知小红点显示逻辑 (#1265) 2026-02-03 19:00:23 +08:00
9 changed files with 748 additions and 711 deletions

View File

@@ -57,7 +57,7 @@
"@pureadmin/utils": "^2.6.4", "@pureadmin/utils": "^2.6.4",
"@vue-flow/background": "^1.3.2", "@vue-flow/background": "^1.3.2",
"@vue-flow/core": "^1.48.2", "@vue-flow/core": "^1.48.2",
"@vueuse/core": "^14.1.0", "@vueuse/core": "^14.2.0",
"@vueuse/motion": "^3.0.3", "@vueuse/motion": "^3.0.3",
"@wangeditor/editor": "^5.1.23", "@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12", "@wangeditor/editor-for-vue": "^5.1.12",
@@ -69,10 +69,10 @@
"codemirror-editor-vue3": "^2.8.0", "codemirror-editor-vue3": "^2.8.0",
"cropperjs": "^1.6.2", "cropperjs": "^1.6.2",
"dayjs": "^1.11.19", "dayjs": "^1.11.19",
"deep-chat": "^2.4.1", "deep-chat": "^2.4.2",
"echarts": "^6.0.0", "echarts": "^6.0.0",
"el-table-infinite-scroll": "^3.0.8", "el-table-infinite-scroll": "^3.0.8",
"element-plus": "^2.13.1", "element-plus": "^2.13.2",
"highlight.js": "^11.11.1", "highlight.js": "^11.11.1",
"intro.js": "^7.2.0", "intro.js": "^7.2.0",
"js-cookie": "^3.0.5", "js-cookie": "^3.0.5",
@@ -100,7 +100,7 @@
"vue-i18n": "^11.2.8", "vue-i18n": "^11.2.8",
"vue-json-pretty": "^2.6.0", "vue-json-pretty": "^2.6.0",
"vue-pdf-embed": "^2.1.3", "vue-pdf-embed": "^2.1.3",
"vue-router": "^4.6.4", "vue-router": "^5.0.2",
"vue-tippy": "^6.7.1", "vue-tippy": "^6.7.1",
"vue-types": "^6.0.0", "vue-types": "^6.0.0",
"vue-virtual-scroller": "2.0.0-beta.8", "vue-virtual-scroller": "2.0.0-beta.8",
@@ -114,12 +114,12 @@
"xlsx": "^0.18.5" "xlsx": "^0.18.5"
}, },
"devDependencies": { "devDependencies": {
"@commitlint/cli": "^20.3.1", "@commitlint/cli": "^20.4.1",
"@commitlint/config-conventional": "^20.3.1", "@commitlint/config-conventional": "^20.4.1",
"@commitlint/types": "^20.3.1", "@commitlint/types": "^20.4.0",
"@eslint/js": "^9.39.2", "@eslint/js": "^9.39.2",
"@faker-js/faker": "^10.2.0", "@faker-js/faker": "^10.2.0",
"@iconify/json": "^2.2.432", "@iconify/json": "^2.2.435",
"@iconify/vue": "4.2.0", "@iconify/vue": "4.2.0",
"@intlify/unplugin-vue-i18n": "^11.0.3", "@intlify/unplugin-vue-i18n": "^11.0.3",
"@tailwindcss/vite": "^4.1.18", "@tailwindcss/vite": "^4.1.18",
@@ -127,14 +127,14 @@
"@types/dagre": "^0.7.53", "@types/dagre": "^0.7.53",
"@types/intro.js": "^5.1.5", "@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6", "@types/js-cookie": "^3.0.6",
"@types/node": "^20.19.30", "@types/node": "^20.19.31",
"@types/nprogress": "^0.2.3", "@types/nprogress": "^0.2.3",
"@types/path-browserify": "^1.0.3", "@types/path-browserify": "^1.0.3",
"@types/qrcode": "^1.5.6", "@types/qrcode": "^1.5.6",
"@types/qs": "^6.14.0", "@types/qs": "^6.14.0",
"@types/sortablejs": "^1.15.9", "@types/sortablejs": "^1.15.9",
"@vitejs/plugin-vue": "^6.0.3", "@vitejs/plugin-vue": "^6.0.4",
"@vitejs/plugin-vue-jsx": "^5.1.3", "@vitejs/plugin-vue-jsx": "^5.1.4",
"boxen": "^8.0.1", "boxen": "^8.0.1",
"code-inspector-plugin": "^1.4.1", "code-inspector-plugin": "^1.4.1",
"cssnano": "^7.1.2", "cssnano": "^7.1.2",
@@ -154,7 +154,7 @@
"rimraf": "^6.1.2", "rimraf": "^6.1.2",
"rollup-plugin-visualizer": "^6.0.5", "rollup-plugin-visualizer": "^6.0.5",
"sass": "^1.97.3", "sass": "^1.97.3",
"stylelint": "^17.0.0", "stylelint": "^17.1.1",
"stylelint-config-recess-order": "^7.6.0", "stylelint-config-recess-order": "^7.6.0",
"stylelint-config-recommended-vue": "^1.6.1", "stylelint-config-recommended-vue": "^1.6.1",
"stylelint-config-standard-scss": "^17.0.0", "stylelint-config-standard-scss": "^17.0.0",

1396
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -24,6 +24,12 @@ const currentNoticeHasData = computed(() => {
return currentNotice && currentNotice.list.length > 0; return currentNotice && currentNotice.list.length > 0;
}); });
const hasAnyNoticeData = computed(() => {
return notices.value.some(
item => Array.isArray(item.list) && item.list.length > 0
);
});
const onWatchMore = () => { const onWatchMore = () => {
dropdownRef.value.handleClose(); dropdownRef.value.handleClose();
}; };
@@ -43,7 +49,7 @@ const onMarkAsRead = () => {
<span <span
:class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-[7px]']" :class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-[7px]']"
> >
<el-badge is-dot> <el-badge is-dot :hidden="!hasAnyNoticeData">
<span class="header-notice-icon"> <span class="header-notice-icon">
<IconifyIconOffline :icon="BellIcon" /> <IconifyIconOffline :icon="BellIcon" />
</span> </span>

View File

@@ -56,13 +56,13 @@ onMounted(() => {
:avatars="{ :avatars="{
default: { default: {
styles: { styles: {
position: 'left', position: 'start',
container: { marginLeft: '12px', marginRight: '5px' } container: { marginLeft: '12px', marginRight: '5px' }
} }
}, },
ai: { ai: {
src: 'https://xiaoxian521.github.io/hyperlink/img/vue-pure-admin/chatai/gemini.png', src: 'https://xiaoxian521.github.io/hyperlink/img/vue-pure-admin/chatai/gemini.png',
styles: { position: 'left', avatar: { paddingTop: '6px' } } styles: { position: 'start', avatar: { paddingTop: '6px' } }
} }
}" }"
:speechToText="{ :speechToText="{
@@ -80,11 +80,11 @@ onMounted(() => {
}, },
svg: { styles: { default: { bottom: '0.35em', left: '0.35em' } } } svg: { styles: { default: { bottom: '0.35em', left: '0.35em' } } }
}, },
position: 'inside-right' position: 'inside-end'
} }
}" }"
:submitButtonStyles="{ :submitButtonStyles="{
position: 'outside-right', position: 'outside-end',
submit: { submit: {
container: { container: {
default: { default: {

View File

@@ -89,7 +89,7 @@ onMounted(() => {
} }
}" }"
:submitButtonStyles="{ :submitButtonStyles="{
position: 'outside-right', position: 'outside-end',
submit: { submit: {
container: { container: {
default: { default: {

View File

@@ -46,7 +46,7 @@ onMounted(() => {
} }
}" }"
:avatars="{ :avatars="{
default: { styles: { position: 'left' } }, default: { styles: { position: 'start' } },
ai: { src: 'https://xiaoxian521.github.io/hyperlink/svg/openai.svg' } ai: { src: 'https://xiaoxian521.github.io/hyperlink/svg/openai.svg' }
}" }"
:submitButtonStyles="{ :submitButtonStyles="{

View File

@@ -22,7 +22,7 @@ onMounted(() => {
style="border-radius: 8px" style="border-radius: 8px"
:speechToText="{ :speechToText="{
webSpeech: { language: 'zh-CN' }, webSpeech: { language: 'zh-CN' },
button: { position: 'outside-left' } button: { position: 'outside-start' }
}" }"
:textInput="{ :textInput="{
placeholder: { text: '发送消息' } placeholder: { text: '发送消息' }

View File

@@ -68,7 +68,7 @@ const shortcuts1 = [
const value3 = ref(""); const value3 = ref("");
const datePickerRef = ref(); const datePickerRef = ref();
const placement = ref("auto"); const placement = ref("auto") as any;
const checkTag = ref([ const checkTag = ref([
{ {
title: "auto", // https://popper.js.org/docs/v2/constructors/#options title: "auto", // https://popper.js.org/docs/v2/constructors/#options

View File

@@ -4,6 +4,7 @@ import {
getNodeByUniqueId, getNodeByUniqueId,
appendFieldByUniqueId appendFieldByUniqueId
} from "@/utils/tree"; } from "@/utils/tree";
import { useI18n } from "vue-i18n";
import { useDetail } from "./hooks"; import { useDetail } from "./hooks";
import { ref, computed } from "vue"; import { ref, computed } from "vue";
import { clone } from "@pureadmin/utils"; import { clone } from "@pureadmin/utils";
@@ -15,6 +16,7 @@ defineOptions({
name: "Tabs" name: "Tabs"
}); });
const { locale } = useI18n();
const { toDetail, router } = useDetail(); const { toDetail, router } = useDetail();
const menusTree = clone(usePermissionStoreHook().wholeMenus, true); const menusTree = clone(usePermissionStoreHook().wholeMenus, true);
@@ -30,6 +32,12 @@ const multiTags = computed(() => {
return useMultiTagsStoreHook()?.multiTags; return useMultiTagsStoreHook()?.multiTags;
}); });
const treeSelectProps = {
label: (data: any) => transformI18n(data.meta.title),
children: "children",
disabled: "disabled"
};
function onCloseTags() { function onCloseTags() {
if (currentValues.value.length === 0) return; if (currentValues.value.length === 0) return;
currentValues.value.forEach(uniqueId => { currentValues.value.forEach(uniqueId => {
@@ -92,6 +100,7 @@ function onCloseTags() {
<el-divider /> <el-divider />
<el-tree-select <el-tree-select
:key="locale"
v-model="currentValues" v-model="currentValues"
class="w-[300px]!" class="w-[300px]!"
node-key="uniqueId" node-key="uniqueId"
@@ -100,11 +109,7 @@ function onCloseTags() {
multiple multiple
filterable filterable
default-expand-all default-expand-all
:props="{ :props="treeSelectProps"
label: data => transformI18n(data.meta.title),
children: 'children',
disabled: 'disabled'
}"
:data="treeData" :data="treeData"
> >
<template #default="{ data }"> <template #default="{ data }">