agilebuilder-ui 1.1.57-sit3 → 1.1.58-sit1

package/lib/{tab-content-iframe-index-f6d751c8.js → tab-content-iframe-index-f8a0b7d8.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { a8 as s } from "./index-0ed2fd1d.js";
+import { a8 as s } from "./index-b5bd5d08.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-21a895d8.js → tab-content-index-b327c8a6.js}

@@ -1,6 +1,6 @@
-import { a8 as f, aa as x, ab as _, ac as P, ad as h, ae as O, af as I, ag as M } from "./index-0ed2fd1d.js";
-import { resolveComponent as u, openBlock as d, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
-const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
+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-b5bd5d08.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);
 } }, watch: { $route() {
   this.getBreadcrumb();
@@ -17,12 +17,12 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   });
   if (t) {
     let a;
-    const r = _(), n = window.$vueApp.config.globalProperties.systemNameObj;
-    n && (a = n[r]), t = [{ path: "/", redirect: "noredirect", meta: { title: a } }].concat(t);
+    const r = _(), o = window.$vueApp.config.globalProperties.systemNameObj;
+    o && (a = o[r]), t = [{ path: "/", redirect: "noredirect", meta: { title: a } }].concat(t);
     const s = P.get("selectMenu"), l = window.$vueApp.config.globalProperties._selectMenu;
-    let o;
-    if (l ? o = l : s && (o = s), o) {
-      const i = o.substring(0, o.indexOf("~~")), c = o.substring(o.indexOf("~~") + 2);
+    let n;
+    if (l ? n = l : s && (n = s), n) {
+      const i = n.substring(0, n.indexOf("~~")), c = n.substring(n.indexOf("~~") + 2);
       if (t && t.length > 0) {
         const $ = t[t.length - 1];
         this.isShouldConcatLastMenu(c, i, $) && t.push({ path: i, meta: { title: c } });
@@ -35,9 +35,9 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   return !(!this.isTitleNotEqual(e, a) || !this.isPathNotEqual(t, a));
 }, isTitleNotEqual(e, t) {
   return !(!e || !t.meta || e === t.meta.title || e === this.$t(t.meta.title));
-}, isPathNotEqual: (e, t) => !(!e || !t.path || e === t.path) } }, [["render", function(e, t, a, r, n, s) {
-  const l = u("el-breadcrumb-item"), o = u("el-breadcrumb");
-  return d(), b(o, { class: "app-breadcrumb", separator: ">" }, { default: g(() => [v(L, { name: "breadcrumb", tag: "span" }, { default: g(() => [(d(!0), p(T, null, C(s.levelListWithTitle, (i, c) => (d(), b(l, { key: i.path + "-" + c }, { default: g(() => [m("span", k, w(e.$t(i.meta.title)), 1)]), _: 2 }, 1024))), 128))]), _: 1 })]), _: 1 });
+}, isPathNotEqual: (e, t) => !(!e || !t.path || e === t.path) } }, [["render", function(e, t, a, r, o, s) {
+  const l = u("el-breadcrumb-item"), n = u("el-breadcrumb");
+  return d(), b(n, { class: "app-breadcrumb", separator: ">" }, { default: f(() => [v(M, { name: "breadcrumb", tag: "span" }, { default: f(() => [(d(!0), p(T, null, C(s.levelListWithTitle, (i, c) => (d(), b(l, { key: i.path + "-" + c }, { default: f(() => [m("span", k, w(e.$t(i.meta.title)), 1)]), _: 2 }, 1024))), 128))]), _: 1 })]), _: 1 });
 }], ["__scopeId", "data-v-768a430c"]]), { body: B } = document, E = { watch: { $route(e) {
   this.device === "mobile" && this.sidebar.opened && h.dispatch("closeSidebar", { withoutAnimation: !1 });
 } }, beforeMount() {
@@ -76,8 +76,8 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   if (e.routePath === "/iframe-page/page") {
     let a, r = "";
     if (e.routeQuery)
-      for (const n in e.routeQuery)
-        n === "src" ? a = e.routeQuery[n] : r += n + "=" + e.routeQuery[n] + "&";
+      for (const o in e.routeQuery)
+        o === "src" ? a = e.routeQuery[o] : r += o + "=" + e.routeQuery[o] + "&";
     a && (t = a), r && (t += "?" + r);
   } else if (e.routePath.indexOf("http:") < 0 && e.routePath.indexOf("https:") < 0 && (t = "#"), t = e.routePath.indexOf("?") >= 0 ? t + e.routePath + "&" : t + e.routePath + "?", e.routeQuery)
     for (const a in e.routeQuery)
@@ -86,18 +86,24 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
 }, recieveMessage(e) {
   if (e && typeof e.data == "string" && e.data === "refreshTabContent")
     window.location.reload();
-  else if (e && typeof e.data == "string" && e.data.indexOf("loginTimeout") >= 0)
-    e.data, window.parent.postMessage(e.data, "*");
-  else if (e && typeof e.data == "string" && e.data === "return-to-system-list") {
+  else if (e && typeof e.data == "string" && e.data.indexOf("loginTimeout") >= 0) {
+    e.data;
+    try {
+      const t = JSON.parse(e.data);
+      t.isInTab = "true", window.parent.postMessage(JSON.stringify(t), "*");
+    } catch {
+      console.error("平台 tab-content.vue中登录超时，json转换失败,event.data=", e.data);
+    }
+  } else if (e && typeof e.data == "string" && e.data === "return-to-system-list") {
     this.$store.commit("clear_tabs");
     let t = "_IS_APP_LIST";
     const a = window.sessionStorage.getItem(t);
     a !== void 0 && a === "true" ? this.$router.push({ path: "/mms/apps/list" }) : this.$router.push({ path: "/mms/systems/list" });
   }
-} } }, V = ["src"], Q = { key: 1, class: "default-page-tip" }, R = { class: "default-page-tip-msg" }, q = { class: "default-page-tip-item" }, z = { class: "default-page-tip-item" }, j = { class: "main-container" }, W = f({ name: "Layout", components: { Menubar: I, Breadcrumb: A, TabContent: f(N, [["render", function(e, t, a, r, n, s) {
-  const l = u("el-tab-pane"), o = u("el-tabs");
-  return e.openTab && e.openTab.length > 0 ? (d(), b(o, { key: 0, modelValue: s.activeIndex, "onUpdate:modelValue": t[0] || (t[0] = (i) => s.activeIndex = i), class: "nav-tab menu-tab-container", closable: "", onTabRemove: s.closeSelectedTag }, { default: g(() => [(d(!0), p(T, null, C(e.openTab, (i) => (d(), b(l, { key: i.code, label: i.name, name: i.code }, { default: g(() => [m("iframe", { ref_for: !0, ref: "tabMainContent", src: s.getFullPath(i), class: "tab-main-content", name: "tab-main-content", frameborder: "0" }, null, 8, V)]), _: 2 }, 1032, ["label", "name"]))), 128))]), _: 1 }, 8, ["modelValue", "onTabRemove"])) : (d(), p("div", Q, [m("div", R, [m("div", q, w(n.defaultPageTipCn), 1), m("div", z, w(n.defaultPageTipEn), 1)])]));
-}], ["__scopeId", "data-v-a5252a92"]]) }, mixins: [E], data: () => ({ showMenuRoute: M(), systemCode: null }), computed: { sidebar() {
+} } }, V = ["src"], Q = { key: 1, class: "default-page-tip" }, R = { class: "default-page-tip-msg" }, j = { class: "default-page-tip-item" }, q = { class: "default-page-tip-item" }, z = { class: "main-container" }, W = g({ name: "Layout", components: { Menubar: I, Breadcrumb: A, TabContent: g(N, [["render", function(e, t, a, r, o, s) {
+  const l = u("el-tab-pane"), n = u("el-tabs");
+  return e.openTab && e.openTab.length > 0 ? (d(), b(n, { key: 0, modelValue: s.activeIndex, "onUpdate:modelValue": t[0] || (t[0] = (i) => s.activeIndex = i), class: "nav-tab menu-tab-container", closable: "", onTabRemove: s.closeSelectedTag }, { default: f(() => [(d(!0), p(T, null, C(e.openTab, (i) => (d(), b(l, { key: i.code, label: i.name, name: i.code }, { default: f(() => [m("iframe", { ref_for: !0, ref: "tabMainContent", src: s.getFullPath(i), class: "tab-main-content", name: "tab-main-content", frameborder: "0" }, null, 8, V)]), _: 2 }, 1032, ["label", "name"]))), 128))]), _: 1 }, 8, ["modelValue", "onTabRemove"])) : (d(), p("div", Q, [m("div", R, [m("div", j, w(o.defaultPageTipCn), 1), m("div", q, w(o.defaultPageTipEn), 1)])]));
+}], ["__scopeId", "data-v-80f8eb5e"]]) }, mixins: [E], data: () => ({ showMenuRoute: S(), systemCode: null }), computed: { sidebar() {
   return this.$store.state.app.sidebar;
 }, device() {
   return this.$store.state.app.device;
@@ -107,9 +113,9 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   this.systemCode = window.$vueApp.config.globalProperties.customSystem, this.systemCode;
 }, methods: { handleClickOutside() {
   this.$store.dispatch("closeSidebar", { withoutAnimation: !1 });
-} } }, [["render", function(e, t, a, r, n, s) {
-  const l = u("menubar"), o = u("breadcrumb"), i = u("tab-content");
-  return d(), p("div", { class: S([s.classObj, "app-wrapper"]) }, [s.device === "mobile" && s.sidebar.opened ? (d(), p("div", { key: 0, class: "drawer-bg", onClick: t[0] || (t[0] = (...c) => s.handleClickOutside && s.handleClickOutside(...c)) })) : y("", !0), v(l, { "system-code": n.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), m("div", j, [n.showMenuRoute ? (d(), b(o, { key: 0 })) : y("", !0), v(i)])], 2);
+} } }, [["render", function(e, t, a, r, o, s) {
+  const l = u("menubar"), n = u("breadcrumb"), i = u("tab-content");
+  return d(), p("div", { class: L([s.classObj, "app-wrapper"]) }, [s.device === "mobile" && s.sidebar.opened ? (d(), p("div", { key: 0, class: "drawer-bg", onClick: t[0] || (t[0] = (...c) => s.handleClickOutside && s.handleClickOutside(...c)) })) : y("", !0), v(l, { "system-code": o.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), m("div", z, [o.showMenuRoute ? (d(), b(n, { key: 0 })) : y("", !0), v(i)])], 2);
 }], ["__scopeId", "data-v-5c0a6bf6"]]);
 export {
   W as default

package/lib/{tache-subprocess-history-b7f9b31d.js → tache-subprocess-history-aa9f1b26.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-0ed2fd1d.js";
+import { a8 as I } from "./index-b5bd5d08.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-ef084beb.js → timeline-definition-MYPXXCX6-gLqnWxDu-e750201c.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-6c0f2e5c.js";
-import { d as K } from "./arc-Js_tyW10-6f3f1db2.js";
-import "./index-0ed2fd1d.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-82993e20.js";
+import { d as K } from "./arc-Js_tyW10-df45eaa0.js";
+import "./index-b5bd5d08.js";
 import "vue";
 var q = function() {
   var n = a(function(s, d, l, h) {

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

@@ -0,0 +1,11 @@
+import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-cd66f36d.js";
+import "./index-b5bd5d08.js";
+import "vue";
+import "./mermaid.core-CAqkCmS1-82993e20.js";
+import "./_baseUniq-BXtq6_NW-617aa2f9.js";
+import "./min-BngCxx8g-c59244ce.js";
+import "./clone-CEJtuQzg-43a7bd59.js";
+export {
+  s as TreemapModule,
+  T as createTreemapServices
+};

package/lib/{xychartDiagram-H2YORKM3-Whqa4ezL-53c0c31c.js → xychartDiagram-H2YORKM3-Whqa4ezL-07612af3.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-6c0f2e5c.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-82993e20.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-5c70024b.js";
-import "./index-0ed2fd1d.js";
+import { l as _t } from "./linear-DqgVh5FN-6ccdedc2.js";
+import "./index-b5bd5d08.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.57-sit3",
+  "version": "1.1.58-sit1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/fs-preview/src/fs-preview.vue

@@ -13,19 +13,19 @@
       <div v-if="firstFileName" ref="toolRef" class="fs-preview-tool">
         <slot name="tool-prefix" :item="getFirstFile()"></slot>
         <el-tooltip v-if="enableDelete && !disabled" :content="$t('fsUpload.delete')">
-          <super-icon @click="deleteFirst()" iconValue="amb-color-icon-shanchu" />
+          <super-icon @click="deleteFirst()" iconValue="amb-icon-shanchu" />
         </el-tooltip>
         <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('fsUpload.preview')">
-          <super-icon @click="previewFirst()" iconValue="amb-color-icon-yulan" />
+          <super-icon @click="previewFirst()" iconValue="amb-icon-yulan" />
         </el-tooltip>
         <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('fsUpload.download')">
-          <super-icon @click="downloadFirst()" iconValue="amb-color-icon-xiazai" />
+          <super-icon @click="downloadFirst()" iconValue="amb-icon-xiazai" />
         </el-tooltip>
         <slot name="tool-suffix" :item="getFirstFile()"></slot>
         <el-divider v-if="showMultipleFile" direction="vertical" />
         <el-popover :width="450" trigger="click">
           <template #reference>
-            <el-button v-if="showMultipleFile" type="primary" round size="small" @click="showMultiView">
+            <el-button v-if="showMultipleFile" plain type="primary" round size="small" @click="showMultiView">
               {{ $t('fsUpload.more') }}
               <el-icon><ArrowDownBold /></el-icon>
             </el-button>
@@ -60,10 +60,10 @@
                   <super-icon @click="deleteFile(item)" iconValue="amb-color-icon-shanchu" />
                 </el-tooltip>
                 <el-tooltip v-if="!disabled || !fileSetObj.disabledNoPreview" :content="$t('fsUpload.preview')">
-                  <super-icon @click="previewSingle(item)" iconValue="amb-color-icon-yulan" />
+                  <super-icon @click="previewSingle(item)" iconValue="amb-icon-yulan" />
                 </el-tooltip>
                 <el-tooltip v-if="!disabled || !fileSetObj.disabledNoDownload" :content="$t('fsUpload.download')">
-                  <super-icon @click="donwloadFile(index)" iconValue="amb-color-icon-xiazai" />
+                  <super-icon @click="donwloadFile(index)" iconValue="amb-icon-xiazai" />
                 </el-tooltip>
               </div>
             </div>
@@ -331,8 +331,8 @@ export default {
       const token = getToken()
       const watermark = await getWatermarkSetting()
       let isShowWatermark = false
-      if(watermark && watermark.useRange && watermark.useRange.indexOf('annex')>=0){
-        isShowWatermark = this.watermark.isShowWatermark===undefined?true:this.watermark.isShowWatermark
+      if (watermark && watermark.useRange && watermark.useRange.indexOf('annex') >= 0) {
+        isShowWatermark = this.watermark.isShowWatermark === undefined ? true : this.watermark.isShowWatermark
       }
       let watermarkContent = this.watermark?.content
       if (!watermarkContent && watermark) {
@@ -509,4 +509,14 @@ export default {
 .super-icon + .super-icon {
   margin-left: 5px;
 }
+.amb-iconfont + .amb-iconfont {
+  margin-left: 5px;
+}
+.amb-color-iconfont + .amb-iconfont {
+  margin-left: 5px;
+}
+
+.amb-iconfont {
+  color: var(--el-color-primary);
+}
 </style>

package/packages/fs-upload-new/src/file-upload-mobile/file-upload-component.vue

@@ -1,28 +1,46 @@
 <template>
   <el-upload action="#" list-type="picture-card" :file-list="fileListResult" :auto-upload="false" :disabled="true">
-  <template  v-if="!disabled" #tip>
-    <el-text size="small" style="padding: 10px;font-weight: 600"> {{ accept }} {{limitFileSize?$t('imatrixUIMessage.uploadFileTip',{fileSize: limitFileSize}): ''}}</el-text>
-  </template>
-  <template v-if="!disabled" #trigger>
-    <el-icon @click="chooseFile"><Plus /></el-icon>
- </template>
+    <template v-if="!disabled" #tip>
+      <el-text size="small" style="padding: 10px; font-weight: 600">
+        {{ accept }}
+        {{ limitFileSize ? $t('imatrixUIMessage.uploadFileTip', { fileSize: limitFileSize }) : '' }}</el-text
+      >
+    </template>
+    <template v-if="!disabled" #trigger>
+      <el-icon @click="chooseFile"><Plus /></el-icon>
+    </template>
 
     <template #file="{ file }">
-      <div  style="width: 100%;" >
-        <div v-if="!isImg(file)" class="el-upload-list__item-thumbnail" >
-        <div  class="file-name-container" >
-            {{file.name}}
-        </div></div>
-        <img v-else class="el-upload-list__item-thumbnail" :src="getPreviewSrc(file.showName?file.showName: file.name, file.serverPath)" alt="" />
-        <fs-preview-new :disabled="disabled" :file-list="fileListResult" :file="file" :system-code="systemCode" :watermark="watermark" :before-remove="beforeRemove" :on-remove="onRemove" :before-download="beforeDownload" @remove="removeFile"/>
-
+      <div style="width: 100%">
+        <div v-if="!isImg(file)" class="el-upload-list__item-thumbnail">
+          <div class="file-name-container">
+            {{ file.name }}
+          </div>
+        </div>
+        <img
+          v-else
+          class="el-upload-list__item-thumbnail"
+          :src="getPreviewSrc(file.showName ? file.showName : file.name, file.serverPath)"
+          alt=""
+        />
+        <fs-preview-new
+          :disabled="disabled"
+          :file-list="fileListResult"
+          :file="file"
+          :system-code="systemCode"
+          :watermark="watermark"
+          :before-remove="beforeRemove"
+          :on-remove="onRemove"
+          :before-download="beforeDownload"
+          @remove="removeFile"
+        />
       </div>
     </template>
   </el-upload>
 </template>
 
 <script lang="ts" setup>
-import { ref,defineEmits } from 'vue'
+import { ref, defineEmits } from 'vue'
 import { Plus } from '@element-plus/icons-vue'
 import fsPreviewNew from '../fs-preview-new.vue'
 
@@ -68,14 +86,14 @@ const props = defineProps({
     default: ''
   },
   // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-  watermark:{
+  watermark: {
     type: Object,
     default: () => ({})
   }
 })
 
- //拖动定义的方法
-const emits = defineEmits(['chooseFile', 'remove']);
+//拖动定义的方法
+const emits = defineEmits(['chooseFile', 'remove'])
 
 const dialogImageUrl = ref('')
 const dialogVisible = ref(false)
@@ -86,16 +104,19 @@ let baseURL = props.baseURL
 const baseAPI = window.$vueApp.config.globalProperties.baseAPI
 
 const fileListResult = ref(props.fileList)
-console.log('file-upload-component---fileListResult=', fileListResult.value?JSON.stringify(fileListResult.value):fileListResult.value)
+console.log(
+  'file-upload-component---fileListResult=',
+  fileListResult.value ? JSON.stringify(fileListResult.value) : fileListResult.value
+)
 function changeFileList(fileList: any) {
   fileListResult.value = fileList
 }
-const chooseFile = ()=>{
+const chooseFile = () => {
   console.log('点击选择文件按钮---')
   emits('chooseFile')
 }
-const isImg = (file: Object) =>{
-    return isImage(file.showName?file.showName:file.name)
+const isImg = (file: Object) => {
+  return isImage(file.showName ? file.showName : file.name)
 }
 
 function getPreviewSrc(showName: string, serverPath: string) {
@@ -115,12 +136,11 @@ const formatName = (showName: string) => {
   return showName
 }
 
-function removeFile(param){
+function removeFile(param) {
   emits('remove', param)
 }
 
-defineExpose({changeFileList})
-
+defineExpose({ changeFileList })
 </script>
 <style scoped>
 .file-name-container {

package/packages/fs-upload-new/src/fs-button-upload.vue

@@ -18,7 +18,7 @@
     >
       <el-button size="small" type="primary">{{ placeholder }}</el-button>
       <template #tip>
-        <el-text size="small">
+        <el-text>
           {{ accept }}
           {{ $t('imatrixUIMessage.uploadFileTip', { fileSize: limitFileSize }) }}</el-text
         >
@@ -142,7 +142,7 @@ const props = defineProps({
     default: 0
   },
   // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-  watermark:{
+  watermark: {
     type: Object,
     default: () => ({})
   }

package/packages/fs-upload-new/src/fs-drag-upload.vue

@@ -17,7 +17,7 @@
     <el-icon class="el-icon--upload"><upload-filled /></el-icon>
     <div class="el-upload__text">{{ placeholder }}</div>
     <template #tip>
-      <el-text size="small">
+      <el-text>
         {{ accept }}
         {{ $t('imatrixUIMessage.uploadFileTip', { fileSize: limitFileSize }) }}
       </el-text>
@@ -140,7 +140,7 @@ const props = defineProps({
     default: 0
   },
   // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-  watermark:{
+  watermark: {
     type: Object,
     default: () => ({})
   }

package/packages/super-grid/src/normal-column-content.vue

@@ -364,8 +364,6 @@ import {
   isHasEditOption,
   isRequiredEdit,
   getAdditionalParamMap,
-  getContentAlign,
-  getHeaderAlign,
   isEditOptionFunction
 } from './utils'
 import DynamicInput from './dynamic-input.vue'
@@ -504,8 +502,6 @@ export default {
     return {
       selectRow: null,
       that: this,
-      align: 'left', // 文本内容对齐
-      headerAlign: 'left', // 表头对齐方式
       columnFormatter: this.column.formatter,
       hyperLinks: {},
       fileDownType: '',
@@ -656,14 +652,6 @@ export default {
         this.isShowOverflowTooltip = true
       }
     }
-    const align = getContentAlign(this.column, gridParams)
-    if (align) {
-      this.align = gridParams.options.align
-    }
-    const headerAlign = getHeaderAlign(this.column, gridParams)
-    if (headerAlign) {
-      this.headerAlign = headerAlign
-    }
     if (gridParams.isHasDynamic === undefined && this.column.dynamic !== undefined && this.column.dynamic === true) {
       // 当前列表中有动态列
       gridParams.isHasDynamic = true

package/packages/super-grid/src/normal-column.vue

@@ -408,7 +408,7 @@ export default {
 
 .normal-column-header-icon {
   font-size: 20px;
-  color: #409eff;
+  color: var(--el-color-primary);
   cursor: pointer;
 }
 </style>

package/packages/super-grid/src/row-operation.vue

@@ -8,6 +8,7 @@
           <component
             v-bind="operationSettingData"
             :is="isElementType"
+            class="row-operation-icon"
             v-permission="operationSettingData.permission"
             :disabled="preventReclick"
             @mousedown="onClickFun(operationSettingData)"
@@ -31,6 +32,7 @@
           <component
             v-bind="operationSettingData"
             :is="isElementType"
+            class="row-operation-icon"
             :disabled="preventReclick"
             @mousedown="onClickFun(operationSettingData)"
           >

package/packages/super-grid/src/super-grid-service.js

@@ -758,7 +758,7 @@ const superGridService = {
     })
   },
   filterHasAuthColumns(columns, gridParams, systemCode) {
-    if(!this.pageContext || !this.configureObj) {
+    if (!this.pageContext || !this.configureObj) {
       return columns
     }
     const prop = this.configureObj.code ? this.configureObj.code : this.code

package/packages/super-grid/src/super-grid.vue

@@ -53,6 +53,7 @@
         @row-click="rowClickEvent"
         @row-dblclick="rowDblclickEvent"
       />
+
       <el-table
         v-else-if="refreshGrid && hasLoadedColumns && !isShowCard"
         ref="superGrid"

package/packages/super-icon/src/index.vue

@@ -45,7 +45,8 @@ const defaultShowSvgAction = ref(
 </script>
 <style lang="scss" scoped>
 .super-icon {
- width: 14px;
- height: 14px;
+  width: 1em; // 继承父类的 font-size
+  height: 1em; // 继承父类的 font-size
+  font-size: 14px; // 默认 font-size 为 14px
 }
 </style>

package/src/permission.js

@@ -34,7 +34,11 @@ function cacheAllLanguages() {
 
 // 首次加载业务系统时，缓存所有语言
 function cacheAllEnableGlobalProp() {
-  return cacheAllEnableGlobalPropUtil(window.$http)
+  try {
+    return cacheAllEnableGlobalPropUtil(window.$http)
+  } catch (e) {
+    console.error('cacheAllEnableGlobalProp-error=', e)
+  }
 }
 
 const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单

package/src/store/modules/user.js

@@ -126,40 +126,75 @@ const user = {
           })
       })
     },
-    // 登录。根据token登录系统
+    loginWithCookieTokenNew({ commit }, userInfo) {
+		clearVoiceCache()
+	    return new Promise((resolve, reject) => {
+        const loginName = userInfo.loginName
+        if (!loginName) {
+          ssoService.getCurrentUser().then(user => {
+            if (user) {
+              loginName = user.loginName
+              setUsername(user.loginName)
+              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)
+                resolve(user)
+              })
+              .catch((error) => {
+                reject(error)
+              })
+          }).catch(error => {
+            reject(error)
+          })
+        }
+      })
+    },
+    /**
+     * 登录。根据token登录系统
+     * @deprecated 该方法已过期，请使用loginWithCookieTokenNew。该方法会导致，登录超时再登录后，按钮不显示问题。
+     * 原因是getCurrentUserPermissionsBySystem方法需要系统编码systemCode参数。
+     * @param {*} param0 
+     * @param {*} loginName 
+     * @returns 
+     */
     loginWithCookieToken({ commit }, loginName) {
-      clearVoiceCache()
+	  clearVoiceCache()
       return new Promise((resolve, reject) => {
         if (!loginName) {
-          ssoService
-            .getCurrentUser()
-            .then((user) => {
+            ssoService.getCurrentUser().then(user => {
               if (user) {
                 loginName = user.loginName
                 setUsername(user.loginName)
                 setCurrentUser(user)
                 commit('setName', user.name)
               }
-              resolve(user)
-            })
-            .catch((error) => {
-              reject(error)
-            })
-        }
-        if (loginName) {
-          // 登录时清除缓存的资源
-          removeAllSystemPermissions()
-          // setToken(tokenInfo.jwt)
-          // commit('setToken', tokenInfo.jwt)
-          ssoService
-            .getCurrentUserPermissionsBySystem(loginName)
-            .then((permissions) => {
-              let currentPermissions = ['index']
-              currentPermissions = currentPermissions.concat(permissions)
-              setPermissions(currentPermissions)
-              resolve()
-            })
-            .catch((error) => {
+              // 登录时清除缓存的资源
+              removeAllSystemPermissions()
+              // setToken(tokenInfo.jwt)
+              // commit('setToken', tokenInfo.jwt)
+              ssoService
+                .getCurrentUserPermissionsBySystem(loginName)
+                .then((permissions) => {
+                  let currentPermissions = ['index']
+                  currentPermissions = currentPermissions.concat(permissions)
+                  setPermissions(currentPermissions)
+                  resolve(user)
+                })
+                .catch((error) => {
+                  reject(error)
+                })
+            }).catch(error => {
               reject(error)
             })
         }

package/src/styles/_layout-custom-properties.scss

@@ -6,7 +6,7 @@
   --app-main-padding: 15px; // 页面外框内间距
   --app-main-padding-vertical: 5px; // 页面上下内间距（top/bottom）
   --app-main-padding-horizontal: 15px; // 页面左右内间距（left/right）
-  --dec-page-main-padding: 10px; // 页面外框内间距
+  --dec-page-main-padding: 15px; // 页面外框内间距
   --app-container-padding: 20px; // 页面外框内间距
   --runtime-page-container-padding: 20px; // 页面卡片容器内间距
   --runtime-page-container-view-gap: 15px; // 渲染容器内间距
@@ -15,6 +15,12 @@
   --amb-widget-container-tool-gap: 10px; // 操控台 间隔
   --super-grid-main-view-gap: 15px; // 表格布局间隙
   --super-grid-main-btn-view-gap: 10px; // 按钮间隙
+  --menu-font-size: 16px;
+  --tab-header-font-size: 16px;
+  --el-font-size-base: 16px;
+  --input-font-size: var(--el-font-size-base);
+  --el-input-height: 36px;
+  --el-input-inner-height: 36px;
 }
 
 @media (max-width: 768px) {