agilebuilder-ui 1.1.58 → 1.1.59

package/lib/{tab-content-iframe-index-75264b8f.js → tab-content-iframe-index-1c1b399a.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { a8 as s } from "./index-39f4c2e9.js";
+import { a8 as s } from "./index-d765e1c9.js";
 const a = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-b5d019d0.js → tab-content-index-b388ff23.js}

@@ -1,4 +1,4 @@
-import { a8 as g, aa as x, ab as _, ac as P, ad as h, ae as O, af as I, ag as S } from "./index-39f4c2e9.js";
+import { a8 as g, aa as x, ab as _, ac as P, ad as h, ae as O, af as I, ag as S } from "./index-d765e1c9.js";
 import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as f, createVNode as v, TransitionGroup as M, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as L, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = g({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-c28957b5.js → tache-subprocess-history-d6599acf.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as l, createElementBlock as s, createElementVNode as y, createVNode as a, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { a8 as I } from "./index-39f4c2e9.js";
+import { a8 as I } from "./index-d765e1c9.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/lib/{timeline-definition-MYPXXCX6-gLqnWxDu-eb59893c.js → timeline-definition-MYPXXCX6-gLqnWxDu-42270e69.js}

@@ -1,6 +1,6 @@
-import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import { d as K } from "./arc-Js_tyW10-719f78f7.js";
-import "./index-39f4c2e9.js";
+import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-11ef209e.js";
+import { d as K } from "./arc-Js_tyW10-5acd6e93.js";
+import "./index-d765e1c9.js";
 import "vue";
 var q = function() {
   var n = a(function(s, d, l, h) {

package/lib/treemap-75Q7IDZK-B2atdfMH-ed052435.js

@@ -0,0 +1,11 @@
+import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-17e7d40c.js";
+import "./index-d765e1c9.js";
+import "vue";
+import "./mermaid.core-CAqkCmS1-11ef209e.js";
+import "./_baseUniq-BXtq6_NW-e2aee7b2.js";
+import "./min-BngCxx8g-b2e9be97.js";
+import "./clone-CEJtuQzg-d13243fe.js";
+export {
+  s as TreemapModule,
+  T as createTreemapServices
+};

package/lib/{xychartDiagram-H2YORKM3-Whqa4ezL-a369bfb2.js → xychartDiagram-H2YORKM3-Whqa4ezL-a5714162.js}

@@ -1,8 +1,8 @@
-import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
+import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-11ef209e.js";
 import { i as yi } from "./init-ZxktEp_H-731b6c9b.js";
 import { o as bi } from "./ordinal-DSZU4PqD-57a34423.js";
-import { l as _t } from "./linear-DqgVh5FN-99802dce.js";
-import "./index-39f4c2e9.js";
+import { l as _t } from "./linear-DqgVh5FN-af7529a4.js";
+import "./index-d765e1c9.js";
 import "vue";
 import "./defaultLocale-DVr69WTU-dbb4acef.js";
 var Tt, Rt, Dt, Lt, Pt, vt, Et, Mt, It, $t;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.58",
+  "version": "1.1.59",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/src/store/modules/user.js

@@ -22,11 +22,10 @@ import {
   getMenus,
   getPermissions,
   setMenus,
-  setPermissions,
-  removeAllSystemPermissions
+  setPermissions
 } from '../../utils/permissionAuth'
 
-import { isPlateSys } from '../../utils/common-util'
+import { isPlateSys, cachePermissionsWhenLoginWithToken } from '../../utils/common-util'
 import { ElMessage } from 'element-plus'
 
 const user = {
@@ -131,7 +130,8 @@ const user = {
     loginWithCookieTokenNew({ commit }, userInfo) {
 	    clearVoiceCache()
 	    return new Promise((resolve, reject) => {
-        let loginName = userInfo.loginName
+        let loginName = userInfo?userInfo.loginName: null
+        let systemCode = userInfo?userInfo.systemCode: null
         if (!loginName) {
           ssoService.getCurrentUser().then(user => {
             if (user) {
@@ -140,17 +140,9 @@ const user = {
               setCurrentUser(user)
               commit('setName', user.name)
             }
-            // 登录时清除缓存的资源
-            removeAllSystemPermissions()
-            // setToken(tokenInfo.jwt)
-            // commit('setToken', tokenInfo.jwt)
-            const systemCode = userInfo.systemCode
-            ssoService
-              .getCurrentUserPermissionsBySystem(loginName, systemCode)
-              .then((permissions) => {
-                let currentPermissions = ['index']
-                currentPermissions = currentPermissions.concat(permissions)
-                setPermissions(currentPermissions, systemCode)
+            // 缓存资源
+            cachePermissionsWhenLoginWithToken(loginName, systemCode)
+              .then(() => {
                 resolve(user)
               })
               .catch((error) => {
@@ -159,6 +151,15 @@ const user = {
           }).catch(error => {
             reject(error)
           })
+        } else {
+          // 缓存资源
+          cachePermissionsWhenLoginWithToken(loginName, systemCode)
+            .then(() => {
+              resolve()
+            })
+            .catch((error) => {
+              reject(error)
+            })
         }
       })
     },
@@ -171,7 +172,7 @@ const user = {
      * @returns 
      */
     loginWithCookieToken({ commit }, loginName) {
-	  clearVoiceCache()
+	    clearVoiceCache()
       return new Promise((resolve, reject) => {
         if (!loginName) {
             ssoService.getCurrentUser().then(user => {
@@ -181,16 +182,9 @@ const user = {
                 setCurrentUser(user)
                 commit('setName', user.name)
               }
-              // 登录时清除缓存的资源
-              removeAllSystemPermissions()
-              // setToken(tokenInfo.jwt)
-              // commit('setToken', tokenInfo.jwt)
-              ssoService
-                .getCurrentUserPermissionsBySystem(loginName)
-                .then((permissions) => {
-                  let currentPermissions = ['index']
-                  currentPermissions = currentPermissions.concat(permissions)
-                  setPermissions(currentPermissions)
+              // 缓存资源
+              cachePermissionsWhenLoginWithToken(loginName)
+                .then(() => {
                   resolve(user)
                 })
                 .catch((error) => {
@@ -199,6 +193,15 @@ const user = {
             }).catch(error => {
               reject(error)
             })
+        } else {
+          // 缓存资源
+          cachePermissionsWhenLoginWithToken(loginName)
+            .then(() => {
+              resolve()
+            })
+            .catch((error) => {
+              reject(error)
+            })
         }
       })
     },

package/src/utils/common-util.js

@@ -6,6 +6,8 @@ import i18nUtil from './i18n-util'
 import { Base64 } from 'js-base64'
 import { getWatermarkSetting } from './watermark'
 import { cacheAllGlobalPropCache, GLOBAL_PROP } from './global-prop'
+import { removeAllSystemPermissions, setPermissions } from './permissionAuth'
+import ssoService from '../api/sso-service'
 
 /**
  * 获得相对地址
@@ -940,4 +942,26 @@ export function getLoginTimeoutUrlInfo(){
     msgObj.customSystem = customSystem
   }
   return msgObj
+}
+/**
+ * 根据token登录时，缓存资源
+ * @param {} loginName 
+ * @returns 
+ */
+export function cachePermissionsWhenLoginWithToken(loginName, systemCode){
+  return new Promise((resolve, reject) => {
+  // 登录时清除缓存的资源
+    removeAllSystemPermissions()
+    ssoService
+      .getCurrentUserPermissionsBySystem(loginName, systemCode)
+      .then((permissions) => {
+        let currentPermissions = ['index']
+        currentPermissions = currentPermissions.concat(permissions)
+        setPermissions(currentPermissions)
+        resolve()
+      })
+      .catch((error) => {
+        reject(error)
+      })
+    })
 }

package/lib/architecture-O4VJ6CD3-ZoZ2IAk2-0ff42498.js

@@ -1,11 +0,0 @@
-import { A as a, e as s } from "./mermaid-parser.core-CH9ryA1K-4b70808b.js";
-import "./index-39f4c2e9.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import "./_baseUniq-BXtq6_NW-60e4328b.js";
-import "./min-BngCxx8g-ab94b031.js";
-import "./clone-CEJtuQzg-73867b2f.js";
-export {
-  a as ArchitectureModule,
-  s as createArchitectureServices
-};

package/lib/gitGraph-ZV4HHKMB-BSmtVGRu-de5bfda8.js

@@ -1,11 +0,0 @@
-import { G, f as s } from "./mermaid-parser.core-CH9ryA1K-4b70808b.js";
-import "./index-39f4c2e9.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import "./_baseUniq-BXtq6_NW-60e4328b.js";
-import "./min-BngCxx8g-ab94b031.js";
-import "./clone-CEJtuQzg-73867b2f.js";
-export {
-  G as GitGraphModule,
-  s as createGitGraphServices
-};

package/lib/info-63CPKGFF-C8sYWczU-4bccdf17.js

@@ -1,11 +0,0 @@
-import { I as c, c as f } from "./mermaid-parser.core-CH9ryA1K-4b70808b.js";
-import "./index-39f4c2e9.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import "./_baseUniq-BXtq6_NW-60e4328b.js";
-import "./min-BngCxx8g-ab94b031.js";
-import "./clone-CEJtuQzg-73867b2f.js";
-export {
-  c as InfoModule,
-  f as createInfoServices
-};

package/lib/packet-HUATNLJX-bfFWFja0-4c2ceb7e.js

@@ -1,11 +0,0 @@
-import { P as c, a as s } from "./mermaid-parser.core-CH9ryA1K-4b70808b.js";
-import "./index-39f4c2e9.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import "./_baseUniq-BXtq6_NW-60e4328b.js";
-import "./min-BngCxx8g-ab94b031.js";
-import "./clone-CEJtuQzg-73867b2f.js";
-export {
-  c as PacketModule,
-  s as createPacketServices
-};

package/lib/pie-WTHONI2E-QPrWs3SR-b9606dad.js

@@ -1,11 +0,0 @@
-import { b as s, d as c } from "./mermaid-parser.core-CH9ryA1K-4b70808b.js";
-import "./index-39f4c2e9.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import "./_baseUniq-BXtq6_NW-60e4328b.js";
-import "./min-BngCxx8g-ab94b031.js";
-import "./clone-CEJtuQzg-73867b2f.js";
-export {
-  s as PieModule,
-  c as createPieServices
-};

package/lib/radar-NJJJXTRR-BnUCJhQL-c61ef38d.js

@@ -1,11 +0,0 @@
-import { R as d, g as s } from "./mermaid-parser.core-CH9ryA1K-4b70808b.js";
-import "./index-39f4c2e9.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import "./_baseUniq-BXtq6_NW-60e4328b.js";
-import "./min-BngCxx8g-ab94b031.js";
-import "./clone-CEJtuQzg-73867b2f.js";
-export {
-  d as RadarModule,
-  s as createRadarServices
-};

package/lib/treemap-75Q7IDZK-B2atdfMH-fcb58e74.js

@@ -1,11 +0,0 @@
-import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-4b70808b.js";
-import "./index-39f4c2e9.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-e7f9f7e9.js";
-import "./_baseUniq-BXtq6_NW-60e4328b.js";
-import "./min-BngCxx8g-ab94b031.js";
-import "./clone-CEJtuQzg-73867b2f.js";
-export {
-  s as TreemapModule,
-  T as createTreemapServices
-};