Merge branch 'main' of github.com:pure-admin/vue-pure-admin into gitee

package.json

@@ -36,7 +36,7 @@
     "@pureadmin/table": "^2.2.0",
     "@pureadmin/utils": "^1.9.2",
     "@vueuse/core": "^10.1.2",
-    "@vueuse/motion": "2.0.0-beta.12",
+    "@vueuse/motion": "^2.0.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "animate.css": "^4.1.1",
@@ -73,7 +73,7 @@
     "vue-types": "^5.0.3",
     "vue-virtual-scroller": "2.0.0-beta.7",
     "vue-waterfall-plugin-next": "^2.2.1",
-    "vue3-danmaku": "1.4.0-beta.1",
+    "vue3-danmaku": "^1.4.0",
     "vuedraggable": "^4.1.0",
     "xgplayer": "^3.0.2",
     "xlsx": "^0.18.5"

src/layout/components/notice/index.vue

@@ -46,8 +46,9 @@ notices.value.map(v => (noticesNum.value += v.list.length));
   display: flex;
   align-items: center;
   justify-content: center;
-  width: 60px;
+  width: 40px;
   height: 48px;
+  margin-right: 10px;
   cursor: pointer;
 
   .header-notice-icon {

src/views/tabs/hooks.ts

@@ -1,54 +1,69 @@
+import { isString, isEmpty } from "@pureadmin/utils";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
-import { useRouter, useRoute } from "vue-router";
+import {
-import { onBeforeMount } from "vue";
+  useRouter,
+  useRoute,
+  type LocationQueryRaw,
+  type RouteParamsRaw
+} from "vue-router";
 
 export function useDetail() {
   const route = useRoute();
   const router = useRouter();
-  const id = route.query?.id ? route.query?.id : route.params?.id;
+  const getParameter = isEmpty(route.params) ? route.query : route.params;
 
   function toDetail(
-    index: number | string | string[] | number[],
+    parameter: LocationQueryRaw | RouteParamsRaw,
-    model: string
+    model: "query" | "params"
   ) {
+    // ⚠️ 这里要特别注意下，因为vue-router在解析路由参数的时候会自动转化成字符串类型，比如在使用useRoute().route.query或useRoute().route.params时，得到的参数都是字符串类型
+    // 所以在传参的时候，如果参数是数字类型，就需要在此处 toString() 一下，保证传参跟路由参数类型一致都是字符串，这是必不可少的环节！！！
+    Object.keys(parameter).forEach(param => {
+      if (!isString(parameter[param])) {
+        parameter[param] = parameter[param].toString();
+      }
+    });
     if (model === "query") {
       // 保存信息到标签页
       useMultiTagsStoreHook().handleTags("push", {
         path: `/tabs/query-detail`,
         name: "TabQueryDetail",
-        query: { id: String(index) },
+        query: parameter,
         meta: {
           title: {
-            zh: `No.${index} - 详情信息`,
+            zh: `No.${parameter.id} - 详情信息`,
-            en: `No.${index} - DetailInfo`
+            en: `No.${parameter.id} - DetailInfo`
           },
+          // 如果使用的是非国际化精简版title可以像下面这么写
+          // title: `No.${index} - 详情信息`,
           // 最大打开标签数
           dynamicLevel: 3
         }
       });
       // 路由跳转
-      router.push({ name: "TabQueryDetail", query: { id: String(index) } });
+      router.push({ name: "TabQueryDetail", query: parameter });
-    } else {
+    } else if (model === "params") {
       useMultiTagsStoreHook().handleTags("push", {
         path: `/tabs/params-detail/:id`,
         name: "TabParamsDetail",
-        params: { id: String(index) },
+        params: parameter,
         meta: {
           title: {
-            zh: `No.${index} - 详情信息`,
+            zh: `No.${parameter.id} - 详情信息`,
-            en: `No.${index} - DetailInfo`
+            en: `No.${parameter.id} - DetailInfo`
           }
+          // 如果使用的是非国际化精简版title可以像下面这么写
+          // title: `No.${index} - 详情信息`,
         }
       });
-      router.push({ name: "TabParamsDetail", params: { id: String(index) } });
+      router.push({ name: "TabParamsDetail", params: parameter });
     }
   }
 
-  function initToDetail(model) {
+  // 用于页面刷新，重新获取浏览器地址栏参数并保存到标签页
-    onBeforeMount(() => {
+  const initToDetail = (model: "query" | "params") => {
-      if (id) toDetail(id, model);
+    if (getParameter) toDetail(getParameter, model);
-    });
+  };
-  }
 
-  return { toDetail, initToDetail, id, router };
+  return { toDetail, initToDetail, getParameter, router };
 }

src/views/tabs/index.vue

@@ -56,10 +56,17 @@ function onCloseTags() {
         class="m-2"
         v-for="index in 6"
         :key="index"
-        @click="toDetail(index, 'query')"
+        @click="toDetail({ id: index }, 'query')"
       >
         打开{{ index }}详情页
       </el-button>
+      <el-button
+        @click="
+          toDetail({ id: 666, name: '小明', age: 18, job: '工程师' }, 'query')
+        "
+      >
+        多个参数
+      </el-button>
     </div>
 
     <el-divider />
@@ -70,7 +77,7 @@ function onCloseTags() {
         class="m-2"
         v-for="index in 6"
         :key="index"
-        @click="toDetail(index, 'params')"
+        @click="toDetail({ id: index }, 'params')"
       >
         打开{{ index }}详情页
       </el-button>

src/views/tabs/params-detail.vue

@@ -5,10 +5,13 @@ defineOptions({
   name: "TabParamsDetail"
 });
 
-const { initToDetail, id } = useDetail();
+const { initToDetail, getParameter } = useDetail();
 initToDetail("params");
 </script>
 
 <template>
-  <div>{{ id }} - 详情页内容在此（params传参）</div>
+  <div>
+    {{ getParameter.id }} - 详情页内容在此（params传参）
+    <p>当前页面参数为：{{ getParameter }}</p>
+  </div>
 </template>

src/views/tabs/query-detail.vue

@@ -5,10 +5,13 @@ defineOptions({
   name: "TabQueryDetail"
 });
 
-const { initToDetail, id } = useDetail();
+const { initToDetail, getParameter } = useDetail();
 initToDetail("query");
 </script>
 
 <template>
-  <div>{{ id }} - 详情页内容在此（query传参）</div>
+  <div>
+    {{ getParameter.id }} - 详情页内容在此（query传参）
+    <p>当前页面参数为：{{ getParameter }}</p>
+  </div>
 </template>