diff --git a/package.json b/package.json index 800ce36..79251a3 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "codemirror": "^6.0.1", "driver.js": "^1.3.1", "fingerprintjs2": "^2.1.4", + "jsbarcode": "^3.11.6", "nprogress": "^0.2.0", "pinia": "^2.1.7", "pinia-plugin-persistedstate": "^3.2.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f018f2c..513de83 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -47,6 +47,9 @@ importers: fingerprintjs2: specifier: ^2.1.4 version: 2.1.4 + jsbarcode: + specifier: ^3.11.6 + version: 3.11.6 nprogress: specifier: ^0.2.0 version: 0.2.0 @@ -2690,6 +2693,9 @@ packages: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true + jsbarcode@3.11.6: + resolution: {integrity: sha512-G5TKGyKY1zJo0ZQKFM1IIMfy0nF2rs92BLlCz+cU4/TazIc4ZH+X1GYeDRt7TKjrYqmPfTjwTBkU/QnQlsYiuA==} + jsesc@2.5.2: resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} engines: {node: '>=4'} @@ -6988,6 +6994,8 @@ snapshots: dependencies: argparse: 2.0.1 + jsbarcode@3.11.6: {} + jsesc@2.5.2: {} json-buffer@3.0.1: {} diff --git a/src/lang/modules/enUS.ts b/src/lang/modules/enUS.ts index 4120285..7503977 100644 --- a/src/lang/modules/enUS.ts +++ b/src/lang/modules/enUS.ts @@ -57,6 +57,7 @@ export default { ["icon-selector"]: "icon-selector", ["user-center"]: "user-center", ["fingerprintjs2"]: "fingerprintjs2", + ["barcode"]: "barcode", ["markdown"]: "Markdown", ["directive"]: "directive", ["anti-shake"]: "anti-shake", diff --git a/src/lang/modules/zhCN.ts b/src/lang/modules/zhCN.ts index 79cb6a2..ecd9334 100644 --- a/src/lang/modules/zhCN.ts +++ b/src/lang/modules/zhCN.ts @@ -57,6 +57,7 @@ export default { ["icon-selector"]: "图标选择器", ["user-center"]: "用户中心", ["fingerprintjs2"]: "浏览器指纹", + ["barcode"]: "条形码", ["markdown"]: "Markdown", ["directive"]: "自定义指令", ["anti-shake"]: "防抖", diff --git a/src/layout/components/Aside/index copy.vue b/src/layout/components/Aside/index copy.vue new file mode 100644 index 0000000..bb68831 --- /dev/null +++ b/src/layout/components/Aside/index copy.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/layout/components/Tabs/index.vue b/src/layout/components/Tabs/index.vue index a8bef06..edc6d00 100644 --- a/src/layout/components/Tabs/index.vue +++ b/src/layout/components/Tabs/index.vue @@ -72,6 +72,7 @@ const onDelete = (key: string) => { routerStore.removeTabsList(key); routerStore.removeRouteName(key); if (tabsList.value.length == 0) return; + if (currentRoute.value.name != key) return; router.push(tabsList.value.at(-1).path); }; diff --git a/src/layout/layout-defaults/index.vue b/src/layout/layout-defaults/index.vue index ef12d91..2be29f2 100644 --- a/src/layout/layout-defaults/index.vue +++ b/src/layout/layout-defaults/index.vue @@ -1,5 +1,5 @@