agilebuilder-ui 1.1.38-sit2 → 1.1.38-sit4

package/lib/{tab-content-iframe-index-9bf6e5fc.js → tab-content-iframe-index-68a2bf6a.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-f5b5c746.js";
+import { _ as s } from "./index-718d62ef.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-28133c86.js → tab-content-index-dffda0e2.js}

@@ -1,4 +1,4 @@
-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-f5b5c746.js";
+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-718d62ef.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);

package/lib/{tache-subprocess-history-7a5bfc89.js → tache-subprocess-history-835f415f.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-f5b5c746.js";
+import { _ as I } from "./index-718d62ef.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.38-sit2",
+  "version": "1.1.38-sit4",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -13,7 +13,7 @@
       :additional-settings="controlConfig"
       :parent="parentFormData"
       :prop="column.prop"
-      :custom-params="controlConfig ? controlConfig.customParams : null"
+      :custom-params="myCustomParams"
       :row="row"
       :row-index="position ? position.row : null"
       :select-options="options"
@@ -763,7 +763,8 @@ export default {
       isShowScanIcon,
       baseURL,
       colConfigure, // v10字段配置原信息
-      designProperty // 字段配置
+      designProperty, // 字段配置
+      myCustomParams: {}
     }
   },
   computed: {},
@@ -811,6 +812,12 @@ export default {
   },
   created() {
     const gridParams = store.get(this.listCode)
+    if (this.controlConfig?.customParams) {
+      if (!this.pageContext) {
+        this.pageContext = gridParams.options.pageContext
+      }
+      this.myCustomParams = formatCustomParams(this.controlConfig.customParams, this.pageContext, this.row)
+    }
     this.gridParams = gridParams
     this.isCreateRow = gridParams.isCreateRow
     this.setTreeType()
@@ -902,9 +909,6 @@ 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) => {
       if (that.$refs.fileUploadRef) {

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

@@ -223,7 +223,6 @@ import searchMethods from './search-methods'
 import searchFormNumber from './search-form-number.vue'
 import store from './store'
 import { getDynamicDataSourceOptions, isDynamicDataSourceSource, getControlConfig } from './utils'
-import { type } from 'os'
 
 export default {
   name: 'SearchFormItem',

package/src/utils/util.js

@@ -621,20 +621,23 @@ function getAdditionalParamMap(pageContext) {
 }
 
 export function formatCustomParams(customParams, pageContext, row) {
+  const formatCustomParams = {}
   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
+          formatCustomParams[param.paramName] = dynamicValue
         } else {
-          param.paramValue = null
+          formatCustomParams[param.paramName] = null
         }
+      } else {
+        formatCustomParams[param.paramName] = param.paramValue
       }
     })
   }
-  return customParams
+  return formatCustomParams
 }
 export function getPropValueNew(propValue, pageContext, row) {
   let value = null