agilebuilder-ui 1.1.37-sit2 → 1.1.38-sit1

package/lib/{tab-content-iframe-index-8113610a.js → tab-content-iframe-index-2a5e10d0.js}

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

package/lib/{tab-content-index-3b7f4fa8.js → tab-content-index-b4e908df.js}

@@ -1,5 +1,5 @@
-import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-f92e8ddb.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";
+import { _ as f, c as _, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-398aaf91.js";
+import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as C, renderList as T, 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() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);
 } }, watch: { $route() {
@@ -8,7 +8,7 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   this.getBreadcrumb();
 }, methods: { getBreadcrumb() {
   const { params: e } = this.$route;
-  this.$route.matched;
+  console.log("this.$route.matched==", this.$route.matched);
   let t = this.$route.matched.filter((a) => {
     if (a.name) {
       var r = _(a.path);
@@ -17,12 +17,12 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   });
   if (t) {
     let a;
-    const r = x(), n = window.$vueApp.config.globalProperties.systemNameObj;
-    n && (a = n[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);
+    const r = x(), o = window.$vueApp.config.globalProperties.systemNameObj;
+    o && (a = o[r]), t = [{ path: "/", redirect: "noredirect", meta: { title: a } }].concat(t);
+    const s = P.get("selectMenu"), d = window.$vueApp.config.globalProperties._selectMenu;
+    let n;
+    if (d ? n = d : 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 d = u("el-breadcrumb-item"), n = u("el-breadcrumb");
+  return l(), b(n, { class: "app-breadcrumb", separator: ">" }, { default: g(() => [v(L, { name: "breadcrumb", tag: "span" }, { default: g(() => [(l(!0), p(C, null, T(s.levelListWithTitle, (i, c) => (l(), b(d, { key: i.path + "-" + c }, { default: g(() => [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)
@@ -87,16 +87,16 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
   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, "*");
+    console.log("tab-content-接收到登录超时的信息---event.data=", e.data), window.parent.postMessage(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: O, 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)])]));
+} } }, 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: O, Breadcrumb: A, TabContent: f(N, [["render", function(e, t, a, r, o, s) {
+  const d = u("el-tab-pane"), n = u("el-tabs");
+  return e.openTab && e.openTab.length > 0 ? (l(), 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: g(() => [(l(!0), p(C, null, T(e.openTab, (i) => (l(), b(d, { 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"])) : (l(), p("div", Q, [m("div", R, [m("div", q, w(o.defaultPageTipCn), 1), m("div", z, w(o.defaultPageTipEn), 1)])]));
 }], ["__scopeId", "data-v-a5252a92"]]) }, mixins: [E], data: () => ({ showMenuRoute: I(), systemCode: null }), computed: { sidebar() {
   return this.$store.state.app.sidebar;
 }, device() {
@@ -104,12 +104,12 @@ const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ l
 }, classObj() {
   return { hideSidebar: !this.sidebar.opened, openSidebar: this.sidebar.opened, withoutAnimation: this.sidebar.withoutAnimation, mobile: this.device === "mobile" };
 } }, created() {
-  this.systemCode = window.$vueApp.config.globalProperties.customSystem, this.systemCode;
+  this.systemCode = window.$vueApp.config.globalProperties.customSystem, console.log("新菜单组件-----systemCode====", 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 d = u("menubar"), n = u("breadcrumb"), i = u("tab-content");
+  return l(), p("div", { class: S([s.classObj, "app-wrapper"]) }, [s.device === "mobile" && s.sidebar.opened ? (l(), p("div", { key: 0, class: "drawer-bg", onClick: t[0] || (t[0] = (...c) => s.handleClickOutside && s.handleClickOutside(...c)) })) : y("", !0), v(d, { "system-code": o.systemCode, collapse: !0, class: "sidebar-container" }, null, 8, ["system-code"]), m("div", j, [o.showMenuRoute ? (l(), b(n, { key: 0 })) : y("", !0), v(i)])], 2);
 }], ["__scopeId", "data-v-5c0a6bf6"]]);
 export {
   W as default

package/lib/{tache-subprocess-history-75f40d2a.js → tache-subprocess-history-b4622487.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-f92e8ddb.js";
+import { _ as I } from "./index-398aaf91.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.37-sit2",
+  "version": "1.1.38-sit1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -27,6 +27,8 @@
   <template v-if="fileList && fileList.length > 0">
     <fs-preview-new
       :disabled="disabled"
+      :absolute-preview="absolutePreview"
+      :absolute-downloadable="absoluteDownloadable"
       :file-list="fileList"
       :system-code="systemCode"
       :before-remove="beforeRemove"
@@ -117,6 +119,16 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 是否禁用时也可预览
+  absolutePreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  absoluteDownloadable: {
+    type: Boolean,
+    default: false
   }
 })
 const baseURL = window.$vueApp.config.globalProperties.baseURL

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

@@ -24,6 +24,8 @@
   <template v-if="fileList && fileList.length > 0">
     <fs-preview-new
       :disabled="disabled"
+      :absolute-preview="absolutePreview"
+      :absolute-downloadable="absoluteDownloadable"
       :file-list="fileList"
       :system-code="systemCode"
       :before-remove="beforeRemove"
@@ -114,6 +116,16 @@ const props = defineProps({
   beforeUpload: {
     type: Function,
     default: () => {}
+  },
+  // 是否禁用时也可预览
+  absolutePreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  absoluteDownloadable: {
+    type: Boolean,
+    default: false
   }
 })
 const baseURL = window.$vueApp.config.globalProperties.baseURL

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

@@ -7,12 +7,19 @@
             <div style="display: flex; align-items: center">
               <!-- 'amb-color-icon-XLS' -->
               <super-icon :iconValue="getFileIconByName(file.showName)" />
-              <el-tooltip content="预览" placement="top">
-                <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
+              <template v-if="disabled && !absolutePreview">
+                <span style="cursor: no-drop">
                   <span style="margin-left: 6.5px">{{ file.showName }}</span>
                 </span>
-              </el-tooltip>
-              <el-tooltip v-if="!disabled" content="下载" placement="top">
+              </template>
+              <template v-if="!disabled || absolutePreview">
+                <el-tooltip content="预览" placement="top">
+                  <span style="cursor: pointer" @click="preview(file.showName, file.serverPath)">
+                    <span style="margin-left: 6.5px">{{ file.showName }}</span>
+                  </span>
+                </el-tooltip>
+              </template>
+              <el-tooltip v-if="!disabled || absoluteDownloadable" content="下载" placement="top">
                 <el-icon style="margin-left: 10px" @click="handleDownload(file)">
                   <Download />
                 </el-icon>
@@ -104,6 +111,16 @@ const props = defineProps({
   baseURL: {
     type: String,
     default: null
+  },
+  // 是否禁用时也可预览
+  absolutePreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  absoluteDownloadable: {
+    type: Boolean,
+    default: false
   }
 })
 const baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
@@ -178,8 +195,11 @@ const isPromise = (p: any) => {
   return p && Object.prototype.toString.call(p) === '[object Promise]'
 }
 const preview = (showName: string, serverPath: string) => {
+  debugger
   console.log('preview----props.fileList=', props.fileList)
-
+  if (props.disabled && !props.absolutePreview) {
+    return
+  }
   let isImg = false
   if (showName && isImage(showName)) {
     isImg = true

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

@@ -8,6 +8,8 @@
     :openFsUpload="openFsUpload"
     :fileSetObj="{
       accept: accept,
+      absolutePreview: absolutePreview,
+      absoluteDownloadable: absoluteDownloadable,
       multiple: multiple,
       limitFileSize: limitFileSize,
       limit: limitNum,
@@ -23,6 +25,8 @@
     :systemCode="systemCode"
     :accept="accept"
     :multiple="multiple"
+    :absolute-preview="absolutePreview"
+    :absolute-downloadable="absoluteDownloadable"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
     :placeholder="placeholder"
@@ -47,6 +51,8 @@
     :multiple="multiple"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
+    :absolute-preview="absolutePreview"
+    :absolute-downloadable="absoluteDownloadable"
     :placeholder="placeholder"
     :action="action"
     :headers="headers"
@@ -70,6 +76,8 @@
     :multiple="multiple"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
+    :absolute-preview="absolutePreview"
+    :absolute-downloadable="absoluteDownloadable"
     :placeholder="placeholder"
     :action="action"
     :headers="headers"
@@ -97,6 +105,8 @@
     :multiple="multiple"
     :limit="limitNum"
     :limitFileSize="limitFileSize"
+    :absolute-preview="absolutePreview"
+    :absolute-downloadable="absoluteDownloadable"
     :placeholder="placeholder"
     :action="action"
     :headers="headers"
@@ -252,6 +262,16 @@ const props = defineProps({
   openCameraOrChoosePhoto: {
     type: String,
     default: 'openCameraAndChoosePhoto'
+  },
+  // 是否禁用时也可预览
+  absolutePreview: {
+    type: Boolean,
+    default: false
+  },
+  // 是否禁用时也可下载
+  absoluteDownloadable: {
+    type: Boolean,
+    default: false
   }
 })
 const isMobile = ref(isMobileBrowser())

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

@@ -13,6 +13,7 @@
       :additional-settings="controlConfig"
       :parent="parentFormData"
       :prop="column.prop"
+      :custom-params="controlConfig ? controlConfig.customParams : null"
       :row="row"
       :row-index="position ? position.row : null"
       :select-options="options"
@@ -545,7 +546,8 @@ import {
   getEntityFieldValue,
   setEntityFieldValue,
   getPropValueNew,
-  watchPageContextDynamicVariable
+  watchPageContextDynamicVariable,
+  formatCustomParams
 } from '../../../src/utils/util'
 import { getToken } from '../../../src/utils/auth'
 import apis from './apis'
@@ -662,16 +664,17 @@ export default {
     const gridData = gridParams.gridData
     const subTableData = gridParams.subTableData
     const isSubTableShowPage = gridParams.isSubTableShowPage
-    let controlConfig = {}
-    if (this.column.controlConfig) {
-      controlConfig = JSON.parse(this.column.controlConfig)
-    }
+
     const additionalParamMap = getAdditionalParamMap(gridParams)
     const pageContext = gridParams.options.pageContext
     const isMobile = isMobileBrowser()
 
     const componentId = this.listCode + '_' + this.column.prop
     let scanEnable = false
+    let controlConfig = {}
+    if (this.column.controlConfig) {
+      controlConfig = JSON.parse(this.column.controlConfig)
+    }
     if (controlConfig.scanEnable) {
       scanEnable = true
     }
@@ -899,16 +902,11 @@ export default {
     //   deep: true
     // })
     const that = this
+    if (this.controlConfig?.customParams) {
+      formatCustomParams(this.controlConfig.customParams, this.pageContext, this.row)
+    }
     // 选择文件结束
     eventBus.$on(this.componentId + '-pickFileDone', (data) => {
-      console.log(
-        'superPage666611---pickFileDone--data.componentId=',
-        data.componentId,
-        'data.listCode=',
-        data.listCode,
-        'data=',
-        data
-      )
       if (that.$refs.fileUploadRef) {
         that.$refs.fileUploadRef.pickFileDone(data)
       }
@@ -921,14 +919,6 @@ export default {
     })
     // 扫描结束
     eventBus.$on(this.componentId + '-scanDone', (data) => {
-      console.log(
-        'superPage666611---scanDone--data.componentId=',
-        data.componentId,
-        'data.listCode=',
-        data.listCode,
-        'data=',
-        data
-      )
       that.innerValue = data.result
       that.blurEvent()
       this.callCustomEvent('afterScanDone')

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

@@ -96,6 +96,7 @@
             :grid-data="gridData"
             :page-grid-data="pageGridData"
             :current-page="currentPage"
+            :custom-params="controlConfig ? controlConfig.customParams : null"
             @refresh-list="refreshList"
           />
           <row-operation
@@ -134,6 +135,7 @@
           :additional-param-map="additionalParamMap"
           :additional-settings="additionalSettings"
           :page-context="options?.pageContext"
+          :custom-params="controlConfig ? controlConfig.customParams : null"
         />
       </span>
       <!-- 自定义格式的时候 -->
@@ -171,6 +173,7 @@
           :component-id="componentId"
           :additional-settings="additionalSettings"
           :page-context="options?.pageContext"
+          :custom-params="controlConfig ? controlConfig.customParams : null"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>
@@ -388,7 +391,7 @@ import customFormatter from './custom-formatter'
 import RowOperation from './row-operation.vue'
 import apis from './apis'
 import { mapGetters } from 'vuex'
-import { getEntityFieldValue, getParentObjectUtil } from '../../../src/utils/util'
+import { getEntityFieldValue, getParentObjectUtil, formatCustomParams } from '../../../src/utils/util'
 import ViewImageDialog from './view-image-dialog.vue'
 import eventBus from './eventBus'
 import FsPreview from '../../fs-preview'
@@ -701,6 +704,10 @@ export default {
     this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
+    if (this.controlConfig) {
+      const gridParams = store.get(this.listCode)
+      formatCustomParams(this.controlConfig.customParams, gridParams.pageContext, this.row)
+    }
     // 监听取消自定义编辑事件
     eventBus.$on('clearTableAllStartEditing', () => {
       this.clearAllEditing()

package/packages/super-grid/src/search-form-item.vue

@@ -148,26 +148,30 @@
     >
       <el-option v-for="item in column.valueSet" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
-    <dynamic-source-select
+    <template
       v-else-if="
         column.componentType &&
         (column.componentType === 'multiselect' || column.componentType === 'select') &&
         isDynamicDataSourceSource(column)
       "
-      :allow-create="true"
-      :base-props="{
-        multiple: column.componentType === 'multiselect' ? true : false
-      }"
-      :entity="searchForm"
-      :filterable="true"
-      :is-join-table="isJoinTable"
-      :list-code="code"
-      :list-toolbar-form-data="listToolbarFormData"
-      :options="getDynamicDataSourceOptions(column)"
-      :table-name="tableName"
-      :value="getFormItemValue(column.prop)"
-      @input="setValueToModelProp(column.prop, $event)"
-    />
+    >
+      <dynamic-source-select
+        v-model:value="searchForm[column.prop]"
+        :allow-create="true"
+        :base-props="{
+          multiple: column.componentType === 'multiselect' ? true : false
+        }"
+        :entity="searchForm"
+        :filterable="true"
+        :is-join-table="isJoinTable"
+        :list-code="code"
+        :list-toolbar-form-data="listToolbarFormData"
+        :options="getDynamicDataSourceOptions(column)"
+        :table-name="tableName"
+        @change="multiselectChange"
+        @input="setValueToModelProp(column.prop, $event)"
+      />
+    </template>
     <!--
 									<el-input-number
 										v-else-if="column.componentType && column.componentType==='inputNumber'"
@@ -471,6 +475,18 @@ export default {
       } else {
         return ['00:00:00']
       }
+    },
+    multiselectChange(arr, selectedItem) {
+      if (arr.indexOf('saveAll') !== -1) {
+        if (this.searchForm[this.column.prop]) {
+          const options = this.getDynamicDataSourceOptions(this.column)
+          this.searchForm[this.column.prop] = this.searchForm[this.column.prop].split(',')
+        } else {
+          this.searchForm[this.column.prop] = []
+        }
+      } else {
+        this.searchForm[this.column.prop] = arr
+      }
     }
   },
   emits: ['submit-form']

package/src/api/sso-service.js

@@ -61,7 +61,7 @@ function logout() {
 }
 
 function getCurrentUserPermissionsBySystem(loginName, systemCode) {
-  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, isMobileBrowser())
+  console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, 'isMobile=',isMobileBrowser(),'systemCode=',systemCode)
   if(isMobileBrowser()){
     return getCurrentUserMobilePermissions(loginName)
   } else {
@@ -72,6 +72,7 @@ function getCurrentUserPermissionsBySystem(loginName, systemCode) {
         systemCode = window.$vueApp.config.globalProperties.systemCode
       }
     }
+    console.log('getCurrentUserPermissionsBySystem----loginName=', loginName, 'systemCode222=',systemCode)
     return request.get(
       window.$vueApp.config.globalProperties.baseAPI +
         '/sso/current-users/permissions/with-system?loginName=' +

package/src/permission.js

@@ -157,10 +157,11 @@ router.beforeEach((to, from, next) => {
                     // 开发平台本身的功能或直接平台功能时
                     // console.log('开发平台本身的功能或直接平台功能时')
                     let systemCode = to.query ? to.query.customSystem: null
+                    console.log('getCurrentUserPermissions---systemCode111=', systemCode)
                     if (!systemCode) {
                       systemCode = window.$vueApp.config.globalProperties.currentSystem
                     }
-                    console.log('3333systemCode=', systemCode)
+                    console.log('getCurrentUserPermissions---systemCode222=', systemCode)
                     return store.dispatch('getCurrentUserPermissions', {loginName:user.loginName, systemCode})
                   }
                 })

package/src/store/modules/user.js

@@ -238,7 +238,7 @@ const user = {
         const loginName = param.loginName
         const systemCode = param.systemCode
         let storePermissions = getPermissions(systemCode)
-        console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions=', storePermissions)
+        console.log('getCurrentUserPermissions-----systemCode=', systemCode)
         // 这个判断会导致资源不会重新加载？？
         if (
           typeof storePermissions === 'undefined' ||
@@ -248,6 +248,7 @@ const user = {
           ssoService
             .getCurrentUserPermissionsBySystem(loginName, systemCode)
             .then((permissions) => {
+              console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'permissions[0]=', permissions && permissions.length>0?permissions[0]: null )
               let currentPermissions = ['index']
               currentPermissions = currentPermissions.concat(permissions)
               storePermissions = setPermissions(currentPermissions, systemCode)
@@ -257,6 +258,8 @@ const user = {
               reject(error)
             })
         } else {
+          let keys = Object.keys(storePermissions)
+          console.log('getCurrentUserPermissions-----systemCode=', systemCode, 'storePermissions[1]=', keys && keys.length>1?keys[1]: null )
           resolve(storePermissions)
         }
       })

package/src/utils/common-util.js

@@ -589,7 +589,7 @@ export function loadCSS() {
     console.error('皮肤主题为空!')
     return
   }
-  const baseAPI = window.$vueApp.config.globalProperties.baseAPI?window.$vueApp.config.globalProperties.baseAPI:localStorage.getItem('_baseAPI_')
+  const baseAPI = localStorage.getItem('_baseAPI_')
   if (baseAPI) {
     const href = replacePrefix(baseAPI) + '/component/theme/load-theme?theme=' + theme + '&_t_=' + new Date().getTime()
     let isHasLink = true

package/src/utils/permissionAuth.js

@@ -26,7 +26,7 @@ export function getSystemCode() {
 
 export function getPermissions(systemCode) {
   let totalPermissions = null
-  if(!systemCode){
+  if(!systemCode || systemCode+''==='null'){
     systemCode = getSystemCode()
   }
   let permissions = localStorage.getItem(permissionKey + systemCode)
@@ -91,17 +91,19 @@ export function getTotalPermissions() {
 }
 
 export function setPermissions(permissions, systemCode) {
+  console.log('setPermissions==========systemCode=', systemCode,'isHasPlatPermission----permissions[0]=',permissions && permissions.length > 0 ?permissions[0]: null)
   const isMobile = isMobileBrowser()
   let key
   const permissionObjs = getPermissionObjs(permissions)
   if(isMobile){
     key = mobilePermissionKey
   } else {
-    if (!systemCode) {
+    if (!systemCode || systemCode+''==='null') {
       systemCode = getSystemCode()
     }
     key = permissionKey + systemCode
   }
+  console.log('setPermissions==========systemCode=', systemCode,'key=',key)
   localStorage.setItem(key, JSON.stringify(permissionObjs))
   setPermissionAllSystemKey(key)
   return permissionObjs
@@ -121,7 +123,7 @@ function getPermissionObjs(permissions){
 
 
 export function getMenus(systemCode) {
-  if (!systemCode) {
+  if (!systemCode || systemCode+''==='null') {
     systemCode = getSystemCode()
   } 
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
@@ -136,7 +138,7 @@ export function getMenus(systemCode) {
 
 export function setMenus(menus, systemCode) {
   if (menus) {
-    if (!systemCode) {
+    if (!systemCode || systemCode+''==='null') {
       systemCode = getSystemCode()
     }
     const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)
@@ -148,7 +150,7 @@ export function setMenus(menus, systemCode) {
 }
 
 export function removeMenus(systemCode) {
-  if (!systemCode) {
+  if (!systemCode || systemCode+''==='null') {
     systemCode = getSystemCode()
   }
   const myPermissionMenuKey = getRunInfoKey(permissionMenuKey)

package/src/utils/util.js

@@ -620,6 +620,22 @@ function getAdditionalParamMap(pageContext) {
   }
 }
 
+export function formatCustomParams(customParams, pageContext, row) {
+  if (customParams && customParams.length > 0) {
+    customParams.forEach((param) => {
+      if (param.paramValue && param.paramValue.indexOf('${') === 0) {
+        // 表示是动态变量
+        const dynamicValue = getPropValueNew(param.paramValue, pageContext, row)
+        if (dynamicValue !== undefined && dynamicValue !== null) {
+          param.paramValue = dynamicValue
+        } else {
+          param.paramValue = null
+        }
+      }
+    })
+  }
+  return customParams
+}
 export function getPropValueNew(propValue, pageContext, row) {
   let value = null
   if (propValue && propValue !== null && propValue !== '') {