@indfnd/common 1.1.17 → 1.1.18

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.1.18](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.17...v1.1.18) (2025-11-06)
+
+
+### Bug Fixes
+
+* 表格组件修改 ([3b0f8e1](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/3b0f8e1179aa7eedfa9e57de3a3b83ef26819d5b))
+* 路由升级 ([4c452b8](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/4c452b82991d4df843bf593e67b90a04006201df))
+* 路由升级 ([f248b56](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/f248b56d827b22fe1dd7683f81c0b5c84b37aeef))
+
 ### [1.1.17](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.16...v1.1.17) (2025-11-03)
 
 

package/dist/ind-common.es.js

@@ -1,5 +1,5 @@
 import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Drawer$1, Dropdown as Dropdown$1, Modal as Modal$1, Form, FormItem, Select as Select$1, Option, Row, Col, Menu, MenuItem, Submenu, Badge, DropdownMenu, DropdownItem, Tag, Header, Layout, Content, Spin, Poptip as Poptip$1, CheckboxGroup, Checkbox, RadioGroup, Radio, Card, Message, LoadingBar } from "view-design";
-import { isNil, getSessionStorage, putOssFileApi, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate as isDate$1, isArray as isArray$1, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios as axios$3, getPreviewUrlApi, getToken, isFunction as isFunction$1, isString as isString$1, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getPermissionCache, getLocalStorage, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
+import { isNil, getSessionStorage, putOssFileApi, formatDate as formatDate$1, useConfig, getQuarterNum, formatQuarter, str2Date, isDate as isDate$1, isArray as isArray$1, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios as axios$3, getPreviewUrlApi, getToken, isFunction as isFunction$1, isString as isString$1, uuid, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, isEqual, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, getLocalStorage, getPermissionCache, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, putOssFileUrl, getOssFileUrl, responseInterceptors, listComTreeApi, listUserTreeApi, UC_ENUM, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, setSessionStorage, getAppListApi, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getAugmentedNamespace(n) {
@@ -5460,7 +5460,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.1.16";
+const version = "1.1.17";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -53503,7 +53503,8 @@ const __vue2_script$14 = {
         return data2.treeLevelFlag;
       },
       autoGroupColumnDef: null,
-      groupDisplayType: ""
+      groupDisplayType: "",
+      inited: false
     };
   },
   computed: {
@@ -53744,7 +53745,13 @@ const __vue2_script$14 = {
       this.renderSumRow();
     }
   },
-  async created() {
+  created() {
+    if (this.autoRefresh) {
+      this.tableRefresh();
+      this.inited = true;
+    }
+  },
+  async mounted() {
     var _a;
     this.tableRef = this;
     this.unitType = this.defaultTableUnitType;
@@ -53773,7 +53780,10 @@ const __vue2_script$14 = {
   activated() {
     console.log(this._uid + "activated");
     if (this.autoRefresh) {
-      this.tableRefresh();
+      if (!this.inited) {
+        this.tableRefresh();
+      }
+      this.inited = false;
     }
   },
   destroyed() {
@@ -57595,8 +57605,11 @@ const __vue2_script$_ = {
     watchUrlParamsProp() {
       this.$watch(
         "urlParams",
-        () => {
-          this.init();
+        (newVal, oldVal) => {
+          let flag = isEqual(newVal, oldVal);
+          if (!flag) {
+            this.init();
+          }
         },
         { immediate: true }
       );
@@ -60622,17 +60635,30 @@ var render$G = function() {
 var staticRenderFns$G = [];
 const __vue2_script$H = {
   name: "IndEmptyLayout",
+  data() {
+    return {
+      tagNavList: []
+    };
+  },
   computed: {
-    tagNavList() {
-      return this.$store.state.app.tagNavList;
-    },
     notCacheName() {
       return [this.$route.meta && this.$route.meta.notCache ? this.$route.name : ""];
     },
     cacheList() {
-      const list = (this.tagNavList || []).filter((item2) => !(item2.meta && item2.meta.notCache)).map((item2) => item2.name);
+      const list = (this.tagNavList || []).filter((item2) => !(item2.meta && item2.meta.notCache)).map((item2) => {
+        var _a, _b;
+        return (_b = (_a = item2.meta) == null ? void 0 : _a.data) == null ? void 0 : _b.permissionValue;
+      });
       return ["IndEmptyLayout", ...list];
     }
+  },
+  watch: {
+    $route: {
+      handler() {
+        this.tagNavList = getLocalStorage("ibp-sc-tagNavList");
+      },
+      immediate: true
+    }
   }
 };
 const __cssModules$H = {};
@@ -60681,7 +60707,7 @@ function __vue2_injectStyles$G(context) {
     this[o] = __cssModules$G[o];
   }
 }
-var pageLayout = /* @__PURE__ */ function() {
+var PageLayout = /* @__PURE__ */ function() {
   return __component__$G.exports;
 }();
 var render$E = function() {
@@ -71571,7 +71597,7 @@ var components = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProp
   User,
   BasicLayout,
   EmptyLayout,
-  PageLayout: pageLayout,
+  PageLayout,
   DetailView: detailView,
   PageView: pageView,
   Login,
@@ -71733,8 +71759,44 @@ 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;
+  if (!microType)
+    return permissionList;
+  return permissionList.filter((item2) => {
+    const itemName = item2 && item2.permissionValue || "";
+    return itemName.startsWith(microType) || itemName.startsWith(`${config$1.routerBase}-${microType}`);
+  });
+}
+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)
@@ -71836,29 +71898,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) {
@@ -71880,31 +71919,96 @@ function generator(menuData = []) {
   }
   return menuData;
 }
-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);
+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) {
+    await store2.dispatch("getUserInfo");
+    await store2.dispatch("getAppListData");
+    await store2.dispatch("getPermissionData", {
+      constantRouterComponents,
+      permissionStoreKeyParams: "ibp-sc-permission"
+    });
+    router.options = _.cloneDeep(routerOptionsBak);
+  }
+  const permissionData = getPermissionCache();
   const microPermissionData = filterMicroPermissionList(microType, permissionData);
-  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) {
+    router.addRoute(rootRoute2.name, pageRoute);
+    rootRoute2.children.push(pageRoute);
   }
-  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 (!isAdded(router, to)) {
+    let tempPer = microPermissionData.find((item2) => {
+      return item2.permissionValue == to.name || item2.name == to.name;
+    });
+    if (!tempPer && to.path != "/") {
+      tempPer = microPermissionData.find((item2) => {
+        var _a, _b, _c;
+        return ((_a = item2 == null ? void 0 : item2.uri) == null ? void 0 : _a.includes("?")) ? (_b = item2 == null ? void 0 : item2.uri) == null ? void 0 : _b.includes(to.path) : (_c = item2 == null ? void 0 : item2.uri) == null ? void 0 : _c.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);
+    }
+  }
+  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 }) {
@@ -71919,13 +72023,7 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
     if (url.endsWith("/login"))
       return;
     if (window.confirm("\u4F1A\u8BDD\u5DF2\u5931\u6548\uFF0C\u662F\u5426\u91CD\u65B0\u767B\u5F55\uFF1F")) {
-      if (top == self) {
-        router.push({ name: LOGIN_PAGE_NAME }, () => {
-          window.location.reload();
-        });
-      } else {
-        top.location = "/ibp-sc/login";
-      }
+      top.location = "/ibp-sc/login";
     }
   };
   window.apiErrorHandler = function(msg) {
@@ -71954,9 +72052,11 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
     return false;
   };
   router.beforeEach(async (to, from, next) => {
+    var _a;
     LoadingBar.start();
     let token = getToken();
     let search = location.search;
+    let tempToken = false;
     if (search) {
       let rlt = getQueryVariable("token");
       if (rlt) {
@@ -71965,17 +72065,18 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
           store2.dispatch("loginSuccess", token);
         }
       }
-      let ssoToken = getQueryVariable("sso_token");
+      let ssoToken = getQueryVariable("sso_token") || sessionStorage.getItem("sso_token");
       if (ssoToken) {
-        token = true;
+        tempToken = true;
         sessionStorage.setItem("sso_token", ssoToken);
       }
     }
-    if (!token && to.name !== LOGIN_PAGE_NAME) {
+    let isInitilaze = !store2.state.user.userName;
+    if (!tempToken && !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 || location.href.includes("imarket-analysis")) {
       Spin.show();
       try {
         await renderRoutes({
@@ -71983,10 +72084,23 @@ function addRouterGuards({ router, store: store2, microType, allowPermissionList
           store: store2,
           microType,
           allowPermissionList,
-          routerOptionsBak
+          routerOptionsBak,
+          to
         });
-        next({ ...to, replace: true });
+        if (isInitilaze || !((_a = to.matched) == null ? void 0 : _a.length)) {
+          console.log("\u8DEF\u7531\u6CA1\u6709\u5339\u914D\u5230", to);
+          if (to.name && to.path == "/") {
+            next({ name: to.name, query: to.query });
+          } else {
+            console.log("\u8DEF\u7531\u5339\u914D\u5230\uFF0C\u8DF3", to);
+            next({ ...to });
+          }
+        } else {
+          console.log("\u8DEF\u7531\u5339\u914D\u5230\uFF0C\u8DF32", to);
+          next();
+        }
       } catch (error) {
+        console.log("router.beforeeach err", error);
         next({ name: LOGIN_PAGE_NAME });
       }
       Spin.hide();
@@ -73562,4 +73676,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 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, editor as WangEditor, zeroRadio as ZeroRadio, addRouterGuards, clickOutside, createMacroBasicRoutes, createMicroBasicRoutes, API as default, install, 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, 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, editor as WangEditor, zeroRadio as ZeroRadio, addRouterGuards, clickOutside, createMacroBasicRoutes, createMicroBasicRoutes, API as default, install, permission, print, routerOptions, store, transferDom };