@indfnd/common 1.0.89 → 1.0.90

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.0.90](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.89...v1.0.90) (2025-02-06)
+
+
+### Features
+
+* 给IndTree增加api ([1ef72f3](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/1ef72f39d4ecda9c79ad6f3b07c4a3b8025a749c))
+
+
+### Bug Fixes
+
+* router组织路由修改 ([c982f4e](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/c982f4e28370c7aabcdad9a0062ba12c35e04b6a))
+
 ### [1.0.89](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.88...v1.0.89) (2025-01-23)
 
 

package/dist/ind-common.es.js

@@ -5460,7 +5460,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.0.88";
+const version = "1.0.89";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -67442,7 +67442,7 @@ var routerPlugin = {
   install(Vue2, { router, store: store2 }) {
     Vue2.prototype.$backToMenu = function() {
       console.log("trigger $backToMenu");
-      if (this.$config.showMenus) {
+      if (top == self) {
         const breadCrumbList = store2.state.app.breadCrumbList;
         store2.commit("closeTag", {
           $router: router,
@@ -67558,9 +67558,37 @@ const PERMISSION_TYPE = {
 function isMenuPermissionType(type) {
   return [PERMISSION_TYPE.DIRECTORY, PERMISSION_TYPE.MENU].includes(type);
 }
+function getPermissionType(type) {
+  return Object.keys(PERMISSION_TYPE).find((key) => PERMISSION_TYPE[key] === type);
+}
 function filterMicroPermissionList(microType, permissionList = []) {
   return permissionList;
 }
+function permission2Router(list, microType) {
+  if (!list) {
+    return [];
+  }
+  let tempList = [];
+  for (const item2 of list) {
+    tempList.push({
+      path: dealRoutePath(item2.uri, microType),
+      name: item2.permissionValue,
+      meta: {
+        appId: item2.appId,
+        permissionId: item2.permissionId,
+        title: item2.label,
+        icon: item2.icon,
+        crumbs: [
+          { icon: item2.icon, name: item2.permissionValue, title: item2.label, type: item2.type }
+        ],
+        activeName: item2.permissionValue,
+        data: item2
+      },
+      component: item2.permissionValue
+    });
+  }
+  return tempList;
+}
 function listToMenuTree({ list, menuTree, pageNode, parentId, crumbs, root, microType }) {
   if (!list)
     return;
@@ -67661,29 +67689,6 @@ function generatorMenuTree(permissionList = []) {
   });
   return menuTree;
 }
-function generatorDynamicRouter(permissionList = [], microType) {
-  const menuTree = [];
-  const pageNode = {
-    path: "/page",
-    name: "page",
-    meta: { hideInMenu: true, notCache: true },
-    component: "EmptyLayoutNotCache",
-    children: []
-  };
-  listToMenuTree({
-    list: permissionList,
-    menuTree,
-    pageNode,
-    parentId: "0",
-    crumbs: [],
-    root: true,
-    microType
-  });
-  if (pageNode.children.length) {
-    menuTree.push(pageNode);
-  }
-  return generator(menuTree);
-}
 function generator(menuData = []) {
   for (let item2 of menuData) {
     if (item2.component) {
@@ -67705,20 +67710,51 @@ function generator(menuData = []) {
   }
   return menuData;
 }
-async function renderRoutes({ router, store: store2, microType, allowPermissionList, routerOptionsBak }) {
+async function renderRoutes({
+  router,
+  store: store2,
+  microType,
+  allowPermissionList,
+  routerOptionsBak,
+  to
+}) {
+  var _a;
   store2.dispatch("getIndexInfo");
   await store2.dispatch("getUserInfo");
   await store2.dispatch("getAppListData");
   const permissionData = await store2.dispatch("getPermissionData");
   router.options = _.cloneDeep(routerOptionsBak);
   const microPermissionData = filterMicroPermissionList(microType, permissionData);
-  const dynamicRouters = generatorDynamicRouter(microPermissionData, microType);
-  console.log("dynamicROuters", dynamicRouters);
+  const tempPerList = microPermissionData.filter((item2) => item2.uri.includes(to.path));
+  const perType = getPermissionType(tempPerList[0].type || "");
+  let dynamicRouters = [];
+  dynamicRouters.push({
+    path: "/page",
+    name: "page",
+    meta: { hideInMenu: true, notCache: true },
+    component: "EmptyLayoutNotCache",
+    children: []
+  });
+  if (perType == "PAGE") {
+    dynamicRouters[dynamicRouters.length - 1].children = dynamicRouters[dynamicRouters.length - 1].children.concat(tempPerList);
+  }
+  if (perType == "MENU") {
+    const tempPerId = ((_a = tempPerList[0]) == null ? void 0 : _a.permissionId) || "";
+    const tempChildren = microPermissionData.filter((item2) => item2.pid == tempPerId);
+    dynamicRouters.unshift(...permission2Router(tempPerList, microType));
+    dynamicRouters[dynamicRouters.length - 1].children = permission2Router(
+      dynamicRouters[dynamicRouters.length - 1].children.concat(tempChildren),
+      microType
+    );
+  }
+  console.log("dynamicROuters111", dynamicRouters);
   const rootRoute2 = router.options.routes.find((item2) => item2.path === "/");
-  for (const item2 of dynamicRouters) {
+  const dynamicRouters1 = generator(dynamicRouters);
+  for (const item2 of dynamicRouters1) {
     router.addRoute(rootRoute2.name, item2);
     rootRoute2.children.push(item2);
   }
+  console.log("router after render", router);
   const microAllowPermissionList = filterMicroPermissionList(microType, allowPermissionList);
   const needAddRoutes = microAllowPermissionList.filter((permission2) => {
     return router.options.routes.findIndex((route) => permission2.name === route.name) === -1;
@@ -67808,7 +67844,8 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
           store: store2,
           microType,
           allowPermissionList,
-          routerOptionsBak
+          routerOptionsBak,
+          to
         });
         next({ ...to, replace: true });
       } catch (error) {