@indfnd/common 1.0.97 → 1.0.99

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.99](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.98...v1.0.99) (2025-02-21)
+
+
+### Features
+
+* 回退版本 ([23b018a](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/23b018a0b597133694fdfdb9b474a8f49ae8047c))
+
+### [1.0.98](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.97...v1.0.98) (2025-02-21)
+
+
+### Bug Fixes
+
+* 修改路由第一次跳转页面url参数丢失问题 ([3a8afce](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/3a8afcea48de55e73ae43c9b78a4dcbb84c76d0e))
+
 ### [1.0.97](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.96...v1.0.97) (2025-02-18)
 
 ### [1.0.96](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.0.95...v1.0.96) (2025-02-08)

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.96";
+const version = "1.0.98";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -59820,7 +59820,7 @@ var render$F = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("KeepAlive", { attrs: { "exclude": _vm.notCacheName } }, [_c("RouterView", { ref: "child" })], 1);
+  return _c("KeepAlive", { attrs: { "include": _vm.cacheList, "exclude": _vm.notCacheName } }, [_c("RouterView", { ref: "child" })], 1);
 };
 var staticRenderFns$F = [];
 const __vue2_script$G = {
@@ -59884,7 +59884,7 @@ function __vue2_injectStyles$F(context) {
     this[o] = __cssModules$F[o];
   }
 }
-var PageLayout = /* @__PURE__ */ function() {
+var pageLayout = /* @__PURE__ */ function() {
   return __component__$F.exports;
 }();
 var render$D = function() {
@@ -67446,7 +67446,7 @@ var components = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProp
   User,
   BasicLayout,
   EmptyLayout,
-  PageLayout,
+  PageLayout: pageLayout,
   DetailView: detailView,
   PageView: pageView,
   Login,
@@ -67607,40 +67607,9 @@ 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) {
-  console.log("permission2Router params", list, microType);
-  if (!list) {
-    return [];
-  }
-  let tempList = [];
-  for (const item2 of list) {
-    tempList.push({
-      path: dealRoutePath(item2.uri, microType),
-      uri: item2.uri,
-      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
-    });
-  }
-  console.log("permission2Router result", tempList);
-  return tempList;
-}
 function listToMenuTree({ list, menuTree, pageNode, parentId, crumbs, root, microType }) {
   if (!list)
     return;
@@ -67785,94 +67754,31 @@ 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: PageLayout,
-  children: []
-};
-async function renderRoutes({
-  router,
-  store: store2,
-  microType,
-  allowPermissionList,
-  routerOptionsBak,
-  to
-}) {
-  let isInitilaze = !store2.state.user.userName;
-  if (isAdded(router, to) && !isInitilaze) {
-    return;
-  }
-  if (isInitilaze) {
-    store2.dispatch("getIndexInfo");
-    await store2.dispatch("getUserInfo");
-    await store2.dispatch("getAppListData");
-    await store2.dispatch("getPermissionData");
-    router.options = _.cloneDeep(routerOptionsBak);
-  }
-  const permissionData = getPermissionCache();
+async function renderRoutes({ router, store: store2, microType, allowPermissionList, routerOptionsBak }) {
+  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);
-  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(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, meta: { ...tmpRoute.meta, notCache: true } });
-        pageRoute.children.push(tmpRoute);
-      }
-      if (perType == "MENU") {
-        router.addRoute(rootRoute2.name, tmpRoute);
-        rootRoute2.children.push(tmpRoute);
-      }
-    }
+  const dynamicRouters = generatorDynamicRouter(microPermissionData, microType);
+  console.log("dynamicROuters", dynamicRouters);
+  const rootRoute2 = router.options.routes.find((item2) => item2.path === "/");
+  for (const item2 of dynamicRouters) {
+    router.addRoute(rootRoute2.name, item2);
+    rootRoute2.children.push(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);
-    }
+  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 }) {
@@ -67939,12 +67845,11 @@ 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 (isInitilaze || top !== self) {
+    } else if (!store2.state.user.userName) {
       Spin.show();
       try {
         await renderRoutes({
@@ -67952,18 +67857,9 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
           store: store2,
           microType,
           allowPermissionList,
-          routerOptionsBak,
-          to
+          routerOptionsBak
         });
-        if (isInitilaze || !to.path || to.path == "/") {
-          if (to.name && to.path == "/") {
-            next({ name: to.name, query: to.query });
-          } else {
-            next({ ...to });
-          }
-        } else {
-          next();
-        }
+        next({ ...to, replace: true });
       } catch (error) {
         next({ name: LOGIN_PAGE_NAME });
       }
@@ -68420,4 +68316,4 @@ const API = {
   getDefaultTheme,
   doChangeTheme
 };
-export { AppMenu, auditLogModal as AuditLogModal, auditModal as AuditModal, BackTop, backTopPanel as BackTopPanel, BasicLayout, brandInputModal as BrandInputModal, Button, ButtonGroup, Collect, comInputModal as ComInputModal, ConditionPanel, datePicker as DatePicker, detailView as DetailView, Drawer, Dropdown, dropdownItem as DropdownItem, dropdownMenu as DropdownMenu, EmptyLayout, ErrorContent, errorStore as ErrorStore, index$4 as ExcelFlowModal, FormWrap, Fullscreen as FullScreen, helpTableModal as HelpTableModal, helpTreeModal as HelpTreeModal, Icons, imagePreview as ImagePreview, configPlugin as IndConfigPlugin, routerPlugin as IndRouterPlugin, index$2 as ItemCompInputModal, itemInputModal as ItemInputModal, itemTypeCombineSelect as ItemTypeCombineSelect, language as Language, LoadingPanel, Login, materialItemModal as MaterialItemModal, mobileindex as MobileTable, Modal, NotFound, IndOption as Option, optionGroup as OptionGroup, OtherMenu, PageLayout, pageView as PageView, Poptip, reportIndexModal as ReportIndexModal, reportOptionModal as ReportOptionModal, roleAuth as RoleAuth, index$1 as RowSumSettingInputModal, Select, SideMenu, SideMenuItem, SiderTrigger, Sign, signModal as SignModal, index as StepTrack, Table, TagsNav, Tooltip, Tree, index$3 as TreeModal, ImpTreeSelect as TreeSelect, unitRadio as UnitRadio, uploadFile as UploadFile, uploadImg as UploadImg, User, userAuth as UserAuth, zeroRadio as ZeroRadio, addRouterGuards, clickOutside, createMacroBasicRoutes, createMicroBasicRoutes, API as default, permission, print, routerOptions, store, transferDom };
+export { AppMenu, auditLogModal as AuditLogModal, auditModal as AuditModal, BackTop, backTopPanel as BackTopPanel, BasicLayout, brandInputModal as BrandInputModal, Button, ButtonGroup, Collect, comInputModal as ComInputModal, ConditionPanel, datePicker as DatePicker, detailView as DetailView, Drawer, Dropdown, dropdownItem as DropdownItem, dropdownMenu as DropdownMenu, EmptyLayout, ErrorContent, errorStore as ErrorStore, index$4 as ExcelFlowModal, FormWrap, Fullscreen as FullScreen, helpTableModal as HelpTableModal, helpTreeModal as HelpTreeModal, Icons, imagePreview as ImagePreview, configPlugin as IndConfigPlugin, routerPlugin as IndRouterPlugin, index$2 as ItemCompInputModal, itemInputModal as ItemInputModal, itemTypeCombineSelect as ItemTypeCombineSelect, language as Language, LoadingPanel, Login, materialItemModal as MaterialItemModal, mobileindex as MobileTable, Modal, NotFound, IndOption as Option, optionGroup as OptionGroup, OtherMenu, pageLayout as PageLayout, pageView as PageView, Poptip, reportIndexModal as ReportIndexModal, reportOptionModal as ReportOptionModal, roleAuth as RoleAuth, index$1 as RowSumSettingInputModal, Select, SideMenu, SideMenuItem, SiderTrigger, Sign, signModal as SignModal, index as StepTrack, Table, TagsNav, Tooltip, Tree, index$3 as TreeModal, ImpTreeSelect as TreeSelect, unitRadio as UnitRadio, uploadFile as UploadFile, uploadImg as UploadImg, User, userAuth as UserAuth, zeroRadio as ZeroRadio, addRouterGuards, clickOutside, createMacroBasicRoutes, createMicroBasicRoutes, API as default, permission, print, routerOptions, store, transferDom };