agilebuilder-ui 1.1.59-sit3 → 1.1.59-sit5

package/lib/{tab-content-iframe-index-876a8209.js → tab-content-iframe-index-421402be.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { a8 as s } from "./index-6f698bf4.js";
+import { a8 as s } from "./index-fe09842f.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-f0c57f0b.js → tab-content-index-22f2cbec.js}

@@ -1,4 +1,4 @@
-import { a8 as v, aa as I, ab as N, ac as $, ad as S, ae as E, af as F, ag as C, ah as O, ai as W, aj as R, ak as B, al as w, am as V } from "./index-6f698bf4.js";
+import { a8 as v, aa as I, ab as N, ac as $, ad as S, ae as E, af as F, ag as C, ah as O, ai as W, aj as R, ak as B, al as w, am as V } from "./index-fe09842f.js";
 import { createVNode as g, resolveComponent as d, openBlock as u, createBlock as p, withCtx as h, renderSlot as L, createElementBlock as f, normalizeClass as A, createCommentVNode as x, Fragment as k, renderList as P, defineComponent as D, h as b, createTextVNode as U, toDisplayString as T, TransitionGroup as j, createElementVNode as _ } from "vue";
 $(["sidebar", "protectedRouters"]);
 const J = v(D({ name: "MenuItem", functional: !0, props: { icon: { type: String, default: "" }, title: { type: String, default: "" }, hasChildren: { type: Boolean, default: !1 }, isRoot: { type: Boolean, default: !1 }, code: { type: Boolean, default: !1 }, backlogTotal: { type: Number, default: 0 }, menuLayer: { type: Number, default: null } }, render(e) {

package/lib/{tache-subprocess-history-64e43c0f.js → tache-subprocess-history-ac48a106.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-6f698bf4.js";
+import { a8 as I } from "./index-fe09842f.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-90f1e460.js → timeline-definition-MYPXXCX6-gLqnWxDu-bdff1586.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-61629279.js";
-import { d as K } from "./arc-Js_tyW10-685cc1fd.js";
-import "./index-6f698bf4.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-2926ed23.js";
+import { d as K } from "./arc-Js_tyW10-fab9b899.js";
+import "./index-fe09842f.js";
 import "vue";
 var q = function() {
   var n = a(function(s, d, l, h) {

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

@@ -0,0 +1,11 @@
+import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-82fc1fb1.js";
+import "./index-fe09842f.js";
+import "vue";
+import "./mermaid.core-CAqkCmS1-2926ed23.js";
+import "./_baseUniq-BXtq6_NW-196cb88a.js";
+import "./min-BngCxx8g-ecd802af.js";
+import "./clone-CEJtuQzg-781a17c9.js";
+export {
+  s as TreemapModule,
+  T as createTreemapServices
+};

package/lib/{xychartDiagram-H2YORKM3-Whqa4ezL-12bbee61.js → xychartDiagram-H2YORKM3-Whqa4ezL-f8bbee72.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-61629279.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-2926ed23.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-0cae0aa6.js";
-import "./index-6f698bf4.js";
+import { l as _t } from "./linear-DqgVh5FN-5f0098ae.js";
+import "./index-fe09842f.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.59-sit3",
+  "version": "1.1.59-sit5",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/components/select-input.vue

@@ -428,10 +428,10 @@ function remoteMethod(searchText, isInit) {
       Object.assign(dataSourceObj, valueSetOptionsObj)
       // 更新uuid为字段名
       dataSourceObj.uuid = props.prop
-      dataSourceObj.props.tableName = valueSetOptionsObj.props?.tableName
       if (!dataSourceObj.props) {
         dataSourceObj.props = {}
       }
+      dataSourceObj.props.tableName = valueSetOptionsObj.props?.tableName
       dataSourceObj.props.prop = props.prop
 
       const param:any = {

package/packages/utils/value-set.js

@@ -214,10 +214,10 @@ function getConfigWithValueSet(valueSetInfo, prop, column) {
         Object.assign(infoObj, valueSetOptionsObj)
         // 更新uuid为字段名
         infoObj.uuid = prop
-        infoObj.props.tableName = valueSetOptionsObj.props.tableName
         if (!infoObj.props) {
           infoObj.props = {}
         }
+        infoObj.props.tableName = valueSetOptionsObj.props?.tableName
         infoObj.props.prop = prop
       }
       if (valueSetOptionsObj.dynamicDataSourceCode) {
@@ -258,10 +258,10 @@ function getConfigWithTitleValueSet(valueSetOptions, prop) {
         Object.assign(infoObj, valueSetOptionsObj)
         // 更新uuid为字段名
         infoObj.uuid = prop
-        infoObj.props.tableName = valueSetOptionsObj.props?.tableName
         if (!infoObj.props) {
           infoObj.props = {}
         }
+        infoObj.props.tableName = valueSetOptionsObj.props?.tableName
         infoObj.props.prop = prop
       }
       if (valueSetOptionsObj.dynamicDataSourceCode) {

package/src/store/modules/user.js

@@ -3,6 +3,8 @@ import {
   getUsername,
   setUsername,
   removeUsername,
+  setTenantUsername,
+  removeTenantUsername,
   removeCurrentUser,
   clearPermission,
   removeAllThemes,
@@ -137,6 +139,7 @@ const user = {
             if (user) {
               loginName = user.loginName
               setUsername(user.loginName)
+              setTenantUsername(user.tenantLoginName)
               setCurrentUser(user)
               commit('setName', user.name)
             }
@@ -179,6 +182,7 @@ const user = {
               if (user) {
                 loginName = user.loginName
                 setUsername(user.loginName)
+                setTenantUsername(user.tenantLoginName)
                 setCurrentUser(user)
                 commit('setName', user.name)
               }
@@ -216,10 +220,12 @@ const user = {
             .then((user) => {
               if (user) {
                 setUsername(user.loginName)
+                setTenantUsername(user.tenantLoginName)
                 setCurrentUser(user)
                 commit('setName', user.name)
               } else {
                 removeUsername()
+                removeTenantUsername()
                 removeCurrentUser()
                 commit('setName', '')
               }

package/src/utils/auth-api.js

@@ -3,6 +3,7 @@ import Cookies from 'js-cookie'
 const jwtKey = 'JWT'
 const devpJwtKey = '_devp_JWT'
 const currentUserNameKey = 'USERNAME'
+const currentTenantUserNameKey = 'TENANT_USERNAME'
 const currentUserInfoKey = 'CURRENT_USER'
 const currentSystemUrlKey = 'CURRENT_SYSTEM_URL_'
 const langKey = 'CURRENT_LANGUAGE'
@@ -84,6 +85,26 @@ function removeUsername() {
     removeCookieCache(currentUserNameKey)
 }
 
+function getTenantUsername() {
+    // username格式为tenantCode::loginName
+    let username = getCookieCache(currentTenantUserNameKey)
+    if (!username) {
+        username = getSessionCache(currentTenantUserNameKey)
+    }
+    return username
+}
+
+function setTenantUsername(username) {
+    // username格式为tenantCode::loginName
+    setSessionCache(currentTenantUserNameKey, username)
+    setCookieCache(currentTenantUserNameKey, username)
+}
+
+function removeTenantUsername() {
+    removeSessionCache(currentTenantUserNameKey)
+    removeCookieCache(currentTenantUserNameKey)
+}
+
 function getCurrentUser() {
     const myCurrentUserInfoKey = getRunInfoKey(currentUserInfoKey)
     return getCurrentUserByKey(myCurrentUserInfoKey)
@@ -294,6 +315,9 @@ export default {
     getUsername,
     setUsername,
     removeUsername,
+    getTenantUsername,
+    setTenantUsername,
+    removeTenantUsername,
     getCurrentUser,
     setCurrentUser,
     removeCurrentUser,

package/src/utils/auth.js

@@ -28,6 +28,18 @@ export function removeUsername() {
   authApi.removeUsername()
 }
 
+export function getTenantUsername() {
+  return authApi.getTenantUsername()
+}
+
+export function setTenantUsername(username) {
+  authApi.setTenantUsername(username)
+}
+
+export function removeTenantUsername() {
+  authApi.removeTenantUsername()
+}
+
 export function getCurrentUser() {
   return authApi.getCurrentUser()
 }
@@ -162,6 +174,7 @@ export function clearPermission() {
   removeAllLanguages()
 
   removeUsername()
+  removeTenantUsername()
   removeCurrentUser()
 
   removeAllSystemPermissions()

package/src/utils/request.js

@@ -1,6 +1,6 @@
 import axios from 'axios'
 import { ElMessage as Message } from 'element-plus'
-import { getToken, getRunCurrentRole, setSessionCache } from './auth'
+import { getToken, getRunCurrentRole, setSessionCache, getTenantUsername } from './auth'
 import store from '../store'
 import { getI18n } from './util'
 import { getLoginTimeoutUrlInfo, getRelativeBaseUrl, getTimeZone, setCustomSystemBackendUrl } from './common-util'
@@ -63,9 +63,11 @@ service.interceptors.response.use(
     if (error.response) {
       if (error.response.status === 401) {
         // LoginException(401)
+        const tenantLoginName = getTenantUsername()
         // 清除window.sessionStorage中的jwt，否则无法转到login页面
         store.dispatch('clearToken').then(()=>{
           let msgObj = getLoginTimeoutUrlInfo()
+          msgObj.tenantLoginName = tenantLoginName
           const isInIframe = window.$vueApp.config.globalProperties.$isInIframe()
           // console.log('isInIframe==========', isInIframe, 'getToken()=', getToken())
           if (isInIframe === true) {

package/lib/architecture-O4VJ6CD3-ZoZ2IAk2-21def564.js

@@ -1,11 +0,0 @@
-import { A as a, e as s } from "./mermaid-parser.core-CH9ryA1K-9518369e.js";
-import "./index-6f698bf4.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-61629279.js";
-import "./_baseUniq-BXtq6_NW-a0c1582f.js";
-import "./min-BngCxx8g-34ca95fa.js";
-import "./clone-CEJtuQzg-ff2eaa63.js";
-export {
-  a as ArchitectureModule,
-  s as createArchitectureServices
-};

package/lib/gitGraph-ZV4HHKMB-BSmtVGRu-78c1f891.js

@@ -1,11 +0,0 @@
-import { G, f as s } from "./mermaid-parser.core-CH9ryA1K-9518369e.js";
-import "./index-6f698bf4.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-61629279.js";
-import "./_baseUniq-BXtq6_NW-a0c1582f.js";
-import "./min-BngCxx8g-34ca95fa.js";
-import "./clone-CEJtuQzg-ff2eaa63.js";
-export {
-  G as GitGraphModule,
-  s as createGitGraphServices
-};

package/lib/info-63CPKGFF-C8sYWczU-f735fbff.js

@@ -1,11 +0,0 @@
-import { I as c, c as f } from "./mermaid-parser.core-CH9ryA1K-9518369e.js";
-import "./index-6f698bf4.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-61629279.js";
-import "./_baseUniq-BXtq6_NW-a0c1582f.js";
-import "./min-BngCxx8g-34ca95fa.js";
-import "./clone-CEJtuQzg-ff2eaa63.js";
-export {
-  c as InfoModule,
-  f as createInfoServices
-};

package/lib/packet-HUATNLJX-bfFWFja0-347d8398.js

@@ -1,11 +0,0 @@
-import { P as c, a as s } from "./mermaid-parser.core-CH9ryA1K-9518369e.js";
-import "./index-6f698bf4.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-61629279.js";
-import "./_baseUniq-BXtq6_NW-a0c1582f.js";
-import "./min-BngCxx8g-34ca95fa.js";
-import "./clone-CEJtuQzg-ff2eaa63.js";
-export {
-  c as PacketModule,
-  s as createPacketServices
-};

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

@@ -1,11 +0,0 @@
-import { b as s, d as c } from "./mermaid-parser.core-CH9ryA1K-9518369e.js";
-import "./index-6f698bf4.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-61629279.js";
-import "./_baseUniq-BXtq6_NW-a0c1582f.js";
-import "./min-BngCxx8g-34ca95fa.js";
-import "./clone-CEJtuQzg-ff2eaa63.js";
-export {
-  s as PieModule,
-  c as createPieServices
-};

package/lib/radar-NJJJXTRR-BnUCJhQL-2fd4f4a9.js

@@ -1,11 +0,0 @@
-import { R as d, g as s } from "./mermaid-parser.core-CH9ryA1K-9518369e.js";
-import "./index-6f698bf4.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-61629279.js";
-import "./_baseUniq-BXtq6_NW-a0c1582f.js";
-import "./min-BngCxx8g-34ca95fa.js";
-import "./clone-CEJtuQzg-ff2eaa63.js";
-export {
-  d as RadarModule,
-  s as createRadarServices
-};

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

@@ -1,11 +0,0 @@
-import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-9518369e.js";
-import "./index-6f698bf4.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-61629279.js";
-import "./_baseUniq-BXtq6_NW-a0c1582f.js";
-import "./min-BngCxx8g-34ca95fa.js";
-import "./clone-CEJtuQzg-ff2eaa63.js";
-export {
-  s as TreemapModule,
-  T as createTreemapServices
-};