@indfnd/common 1.0.93 → 1.0.95

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 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.95](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.94...v1.0.95) (2025-02-08)
+
+### [1.0.94](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.93...v1.0.94) (2025-02-08)
+
+
+### Features
+
+* 路由跳转优化 ([93a4352](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/93a4352165b2d266f91c77d40eaa97defee93bc3))
+* 路由优化升级 ([78512ca](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/78512ca46d8755edd8f9d9646ba0fe3736e70008))
+
+
+### Bug Fixes
+
+* 路由表调试 ([0b3760d](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/0b3760d588d8533965e3162cf7b56980e70e181d))
+* ag 单元格tab抓取 ([dd5bf14](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/dd5bf14211b8bb203b8f627f061ece91f3c5003e))
+* router组织路由修改 ([d0f30e5](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/d0f30e5ce31aa8eb0d11d26b42f605f7d381930f))
+
 ### [1.0.93](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.92...v1.0.93) (2025-02-06)
 
 ### [1.0.92](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.91...v1.0.92) (2025-02-06)

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.92";
+const version = "1.0.94";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -51472,14 +51472,22 @@ const __vue2_script$1d = {
         },
         on: {
           "on-enter": () => {
+            console.log("gridapi i s", window.gridApi);
             let nextRowIndex = node.rowIndex + 1;
             window.gridApi.ensureIndexVisible(nextRowIndex);
             window.gridApi.ensureColumnVisible(column);
             setTimeout(() => {
-              window.gridApi.gridBodyCtrl.rowRenderer.rowCtrlsByRowIndex[nextRowIndex].centerGui.element.getElementsByTagName("input")[1].focus();
+              window.gridApi.gridBodyCtrl.rowRenderer.rowCtrlsByRowIndex[nextRowIndex].centerGui.element.getElementsByTagName("input")[0].focus();
             }, 0);
           },
-          "on-keypress": () => {
+          "on-keydown": (event) => {
+            console.log("event keydown", event, node);
+            if (event.key == "Tab") {
+              event.preventDefault();
+            }
+          },
+          "on-keypress": (event) => {
+            console.log("event keypress", event);
           },
           "on-blur": (event) => {
             let v = event.target.value;
@@ -59812,7 +59820,7 @@ var render$E = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("KeepAlive", { attrs: { "include": _vm.cacheList, "exclude": _vm.notCacheName } }, [_c("RouterView", { ref: "child" })], 1);
+  return _c("KeepAlive", { attrs: { "exclude": _vm.notCacheName } }, [_c("RouterView", { ref: "child" })], 1);
 };
 var staticRenderFns$E = [];
 const __vue2_script$F = {
@@ -67479,7 +67487,7 @@ const rootRoute = {
   name: config.rootRouteName,
   path: "/",
   redirect: "/home",
-  component: BasicLayout,
+  component: top == self ? BasicLayout : EmptyLayout,
   meta: {
     hideInMenu: true,
     notCache: true
@@ -67575,6 +67583,7 @@ function filterMicroPermissionList(microType, permissionList = []) {
   return permissionList;
 }
 function permission2Router(list, microType) {
+  console.log("permission2Router params", list, microType);
   if (!list) {
     return [];
   }
@@ -67582,6 +67591,7 @@ function permission2Router(list, microType) {
   for (const item2 of list) {
     tempList.push({
       path: dealRoutePath(item2.uri, microType),
+      uri: item2.uri,
       name: item2.permissionValue,
       meta: {
         appId: item2.appId,
@@ -67597,6 +67607,7 @@ function permission2Router(list, microType) {
       component: item2.permissionValue
     });
   }
+  console.log("permission2Router result", tempList);
   return tempList;
 }
 function listToMenuTree({ list, menuTree, pageNode, parentId, crumbs, root, microType }) {
@@ -67699,6 +67710,29 @@ 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) {
@@ -67720,6 +67754,27 @@ function generator(menuData = []) {
   }
   return menuData;
 }
+function generatorRouteByPermission(item2) {
+  if (window.loadComponentHandler) {
+    item2.component = window.loadComponentHandler(item2.path, item2.name) || NotFound;
+  } else {
+    console.error(`\u627E\u4E0D\u5230\u7EC4\u4EF6\u5B9A\u4E49:${item2.component},\u8BF7\u6392\u67E5\u8D44\u6E90\u8DEF\u5F84\u914D\u7F6E\u662F\u5426\u6B63\u786E`);
+    item2.component = NotFound;
+  }
+  return item2;
+}
+const isAdded = (router, route) => {
+  var _a, _b;
+  let rlt = router.resolve(route);
+  return !!((_b = (_a = rlt == null ? void 0 : rlt.resolved) == null ? void 0 : _a.matched) == null ? void 0 : _b.length);
+};
+const pageRoute = {
+  path: "/page",
+  name: "page",
+  meta: { hideInMenu: true, notCache: true },
+  component: EmptyLayout,
+  children: []
+};
 async function renderRoutes({
   router,
   store: store2,
@@ -67728,54 +67783,68 @@ async function renderRoutes({
   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 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);
+  console.log("wtf is to", to);
+  let isInitilaze = !store2.state.user.userName;
+  if (isAdded(router, to) && !isInitilaze) {
+    return;
   }
-  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
-    );
+  if (isInitilaze) {
+    store2.dispatch("getIndexInfo");
+    await store2.dispatch("getUserInfo");
+    await store2.dispatch("getAppListData");
+    await store2.dispatch("getPermissionData");
+    router.options = _.cloneDeep(routerOptionsBak);
   }
-  console.log("dynamicROuters111", dynamicRouters);
-  const rootRoute2 = router.options.routes.find((item2) => item2.path === "/");
-  const dynamicRouters1 = generator(dynamicRouters);
-  for (const item2 of dynamicRouters1) {
-    router.addRoute(rootRoute2.name, item2);
-    rootRoute2.children.push(item2);
+  const permissionData = getPermissionCache();
+  const microPermissionData = filterMicroPermissionList(microType, permissionData);
+  if (top == self) {
+    let dynamicRouters = generatorDynamicRouter(microPermissionData, microType);
+    const rootRoute2 = router.options.routes.find((item2) => item2.path === "/");
+    for (const item2 of dynamicRouters) {
+      router.addRoute(rootRoute2.name, item2);
+      rootRoute2.children.push(item2);
+    }
+  } else {
+    const rootRoute2 = router.options.routes.find((item2) => item2.path === "/");
+    if (isInitilaze) {
+      router.addRoute(rootRoute2.name, pageRoute);
+      rootRoute2.children.push(pageRoute);
+    }
+    if (!isAdded(router, to)) {
+      let tempPer = microPermissionData.find((item2) => {
+        return item2.permissionValue == to.name;
+      });
+      if (!tempPer) {
+        tempPer = microPermissionData.find((item2) => {
+          return item2.uri.endsWith(to.path);
+        });
+      }
+      const perType = getPermissionType(tempPer.type || "");
+      let tmpRoute = generatorRouteByPermission(permission2Router([tempPer], microType)[0]);
+      if (perType == "PAGE") {
+        router.addRoute(pageRoute.name, tmpRoute);
+        pageRoute.children.push(tmpRoute);
+      }
+      if (perType == "MENU") {
+        router.addRoute(rootRoute2.name, tmpRoute);
+        rootRoute2.children.push(tmpRoute);
+      }
+    }
   }
   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;
-  });
-  needAddRoutes.forEach((item2) => {
-    item2.component = item2.name;
-    item2.meta = { hideInMenu: true, title: item2.label, activeName: item2.name };
-  });
-  const dynamicDetailRouters = generator(needAddRoutes);
-  for (const item2 of dynamicDetailRouters) {
-    router.addRoute(config.rootRouteName, item2);
+  if (isInitilaze) {
+    const microAllowPermissionList = filterMicroPermissionList(microType, allowPermissionList);
+    const needAddRoutes = microAllowPermissionList.filter((permission2) => {
+      return router.options.routes.findIndex((route) => permission2.name === route.name) === -1;
+    });
+    needAddRoutes.forEach((item2) => {
+      item2.component = item2.name;
+      item2.meta = { hideInMenu: true, title: item2.label, activeName: item2.name };
+    });
+    const dynamicDetailRouters = generator(needAddRoutes);
+    for (const item2 of dynamicDetailRouters) {
+      router.addRoute(config.rootRouteName, item2);
+    }
   }
 }
 function addRouterGuards({ router, store: store2, microType, allowPermissionList }) {
@@ -67825,6 +67894,7 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
     return false;
   };
   router.beforeEach(async (to, from, next) => {
+    console.log("guard to is", to);
     LoadingBar.start();
     let token = getToken();
     let search = location.search;
@@ -67842,11 +67912,12 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
         sessionStorage.setItem("sso_token", ssoToken);
       }
     }
+    let isInitilaze = !store2.state.user.userName;
     if (!token && to.name !== LOGIN_PAGE_NAME) {
       next({ name: LOGIN_PAGE_NAME });
     } else if (to.name === LOGIN_PAGE_NAME) {
       next();
-    } else if (!store2.state.user.userName) {
+    } else if (isInitilaze || top !== self) {
       Spin.show();
       try {
         await renderRoutes({
@@ -67857,7 +67928,17 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
           routerOptionsBak,
           to
         });
-        next({ ...to, replace: true });
+        if (isInitilaze || !to.path || to.path == "/") {
+          if (to.name && to.path == "/") {
+            console.log("guard next to is", { name: to.name, replace: true });
+            next({ name: to.name });
+          } else {
+            console.log("guard next to is", to);
+            next({ ...to });
+          }
+        } else {
+          next();
+        }
       } catch (error) {
         next({ name: LOGIN_PAGE_NAME });
       }