From 19a0f1233681b51e942817d5b8638db2099f6677 Mon Sep 17 00:00:00 2001
From: "WANGFAN\\wangf" <15871339963@163.com>
Date: Thu, 9 Jan 2025 18:12:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BA=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=8A=A5=E9=94=99=E6=97=B6layout=E5=B8=83=E5=B1=80col?=
 =?UTF-8?q?umn=E6=8E=92=E5=88=97=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=9D=9E=E5=BD=93=E5=89=8Dtab=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E9=87=8D=E5=AE=9A=E5=90=91=E5=88=B0=E6=9C=AB?=
 =?UTF-8?q?=E5=B0=BEtab=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  1 +
 pnpm-lock.yaml                                |  8 ++
 src/lang/modules/enUS.ts                      |  1 +
 src/lang/modules/zhCN.ts                      |  1 +
 src/layout/components/Aside/index copy.vue    | 75 +++++++++++++++++++
 src/layout/components/Tabs/index.vue          |  1 +
 src/layout/layout-defaults/index.vue          |  3 +-
 src/layout/layout-mixing/index.vue            |  2 +-
 src/mock/_data/system_menu.ts                 | 17 +++++
 src/views/component/barcode/barcode.vue       | 36 +++++++++
 .../fingerprintjs2/fingerprintjs2.vue         | 18 +++--
 src/vite-env.d.ts                             |  1 +
 12 files changed, 155 insertions(+), 9 deletions(-)
 create mode 100644 src/layout/components/Aside/index copy.vue
 create mode 100644 src/views/component/barcode/barcode.vue

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 @@
+<template>
+  <div :class="asideDark ? 'aside dark' : 'aside'">
+    <Logo />
+    <a-layout-sider :collapsed="collapsed" breakpoint="xl" class="layout_side" :width="220">
+      <a-scrollbar style="height: 100%; overflow: auto" outer-class="scrollbar"><Menu :route-tree="routeTree" /></a-scrollbar>
+    </a-layout-sider>
+  </div>
+</template>
+
+<script setup lang="ts">
+import Logo from "@/layout/components/Logo/index.vue";
+import Menu from "@/layout/components/Menu/index.vue";
+import { storeToRefs } from "pinia";
+import { useThemeConfig } from "@/store/modules/theme-config";
+import { useRoutesConfigStore } from "@/store/modules/route-config";
+const themeStore = useThemeConfig();
+const { collapsed, asideDark } = storeToRefs(themeStore);
+const routerStore = useRoutesConfigStore();
+const { routeTree } = storeToRefs(routerStore);
+</script>
+
+<style lang="scss" scoped>
+.aside {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+}
+.dark {
+  background: #232324;
+}
+.layout_side {
+  flex: 1;
+  overflow: hidden;
+  .scrollbar {
+    height: 100%;
+  }
+}
+
+// 修改左侧滚动条宽度
+:deep(.arco-scrollbar-thumb-direction-vertical .arco-scrollbar-thumb-bar) {
+  width: 4px;
+  margin-left: 8px;
+}
+
+// 去掉右侧阴影并替换为边线
+:deep(.arco-layout-sider-light) {
+  border-right: $border-1 solid $color-border-2;
+  box-shadow: unset;
+}
+
+// 解决折叠菜单的icon不居中问题
+:deep(.arco-menu-vertical.arco-menu-collapsed) {
+  // 消除icon的自带padding值，并且让元素居中
+  .arco-menu-has-icon {
+    justify-content: center;
+    padding: 0;
+  }
+
+  // 消除icon的自带margin-right值，并且设置icon的padding值以保留icon空隙
+  .arco-menu-icon {
+    padding: 10px 0;
+    margin-right: 0;
+  }
+
+  // 消除title占位
+  .arco-menu-title {
+    display: none;
+  }
+}
+
+// 去掉sider背景
+.arco-layout-sider {
+  background: unset;
+}
+</style>
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 @@
 <template>
-  <a-layout class="layout">
+  <a-layout class="layout" :has-sider="true">
     <Aside />
     <a-layout class="layout-right">
       <Header />
@@ -26,6 +26,7 @@ let { isFooter } = storeToRefs(themeStore);
 <style lang="scss" scoped>
 .layout {
   height: 100vh;
+  border: 1px solid red;
 }
 .layout-right {
   display: grid;
diff --git a/src/layout/layout-mixing/index.vue b/src/layout/layout-mixing/index.vue
index 3946425..3b3d9b7 100644
--- a/src/layout/layout-mixing/index.vue
+++ b/src/layout/layout-mixing/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-layout class="layout">
+  <a-layout class="layout" :has-sider="true">
     <div :class="asideDark ? 'aside dark' : 'aside'">
       <Logo />
       <a-layout-sider :collapsed="collapsed" breakpoint="xl" class="layout_side" :width="220">
diff --git a/src/mock/_data/system_menu.ts b/src/mock/_data/system_menu.ts
index 135a820..2076111 100644
--- a/src/mock/_data/system_menu.ts
+++ b/src/mock/_data/system_menu.ts
@@ -554,6 +554,23 @@ export default [
               icon: "icon-menu",
               sort: 8
             }
+          },
+          {
+            path: "/component/barcode",
+            name: "barcode",
+            component: "component/barcode/barcode",
+            meta: {
+              title: "barcode",
+              hide: false,
+              disable: false,
+              keepAlive: true,
+              affix: false,
+              link: "",
+              iframe: false,
+              roles: ["admin"],
+              icon: "icon-menu",
+              sort: 9
+            }
           }
         ]
       },
diff --git a/src/views/component/barcode/barcode.vue b/src/views/component/barcode/barcode.vue
new file mode 100644
index 0000000..bd4d9f9
--- /dev/null
+++ b/src/views/component/barcode/barcode.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="snow-page">
+    <div class="snow-inner">
+      <svg id="imgcode"></svg>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import JsBarcode from "jsbarcode";
+
+const createCode = () => {
+  JsBarcode("#imgcode", "123", {
+    format: "CODE39", //选择要使用的条形码类型
+    width: 3, //设置条之间的宽度
+    height: 100, //高度
+    displayValue: true, //是否在条形码下方显示文字
+    text: "456", //覆盖显示的文本
+    fontOptions: "bold italic", //使文字加粗体或变斜体
+    font: "fantasy", //设置文本的字体
+    textAlign: "left", //设置文本的水平对齐方式
+    textPosition: "top", //设置文本的垂直位置
+    textMargin: 5, //设置条形码和文本之间的间距
+    fontSize: 15, //设置文本的大小
+    background: "#eee", //设置条形码的背景
+    lineColor: "#2196f3", //设置条和文本的颜色。
+    margin: 15 //设置条形码周围的空白边距
+  });
+};
+
+onMounted(() => {
+  createCode();
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/views/component/fingerprintjs2/fingerprintjs2.vue b/src/views/component/fingerprintjs2/fingerprintjs2.vue
index 5a8e76d..ff1dd13 100644
--- a/src/views/component/fingerprintjs2/fingerprintjs2.vue
+++ b/src/views/component/fingerprintjs2/fingerprintjs2.vue
@@ -15,15 +15,19 @@
 <script setup lang="ts">
 import Fingerprint2 from "fingerprintjs2";
 
-const browserInfo = ref<Array[Object]>([]);
+interface IComponents {
+  key: string;
+  value: any;
+}
+const browserInfo = ref<any>([]);
 const getBrowserInfo = () => {
   // 浏览器指纹
-  Fingerprint2.get(components => {
+  Fingerprint2.get((components: any) => {
     // 参数只有回调函数时，默认浏览器指纹依据所有配置信息进行生成
-    const values = components.map(component => component.value); // 配置的值的数组
+    const values = components.map((component: any) => component.value); // 配置的值的数组
     const murmur = Fingerprint2.x64hash128(values.join(""), 31).toUpperCase(); // 生成浏览器指纹
     let arr = [];
-    components.forEach(el => {
+    components.forEach((el: IComponents) => {
       switch (el.key) {
         case "userAgent":
           arr.push({ label: "用户代理(User-Agent)", value: el.value });
@@ -76,16 +80,16 @@ const getBrowserInfo = () => {
   });
 };
 
-const mobileFinger = ref<Array[Object]>([]);
+const mobileFinger = ref<any>([]);
 const getMobileFinger = () => {
-  Fingerprint2.get(components => {
+  Fingerprint2.get((components: any) => {
     // 由于Fingerprint2是通过浏览器设备信息生成的浏览器指纹，
     // 大多数用户不会修改手机配置，同型号产品可能会出现指纹相同，这里需要加上唯一标识
     components.push({
       key: "ip",
       value: "192.168.1.1" //通过接口获取的到ip
     });
-    const values = components.map(component => component.value); // 配置的值的数组
+    const values = components.map((component: any) => component.value); // 配置的值的数组
     const murmur = Fingerprint2.x64hash128(values.join(""), 31).toUpperCase(); // 生成浏览器指纹
     mobileFinger.value.push({ label: "移动设备指纹(需要唯一标识)", value: murmur });
   });
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index ce20f09..9e1f313 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -19,3 +19,4 @@ declare module "@/directives/modules/custom";
 declare module "mockjs";
 declare module "@/store/modules/route-config";
 declare module "@arco-design/*";
+declare module "fingerprintjs2";