super-page-runtime 2.0.76 → 2.0.81

package/dist/es/components/runtime/utils/page-init-util.js

@@ -1,15 +1,18 @@
 import http from "agilebuilder-ui/src/utils/request";
-import { useRoute } from "vue-router";
+import "vue-router";
 import { getAdditionalParamMap } from "./events/standard-event.js";
 import { PageDimensions } from "./interfaces/page-design-types.js";
 import { setVariableValue, formatVariableValue, getFormPropName } from "./page-helper-util.js";
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
+import { functions } from "./api/page-expose-util.js";
+import { deepCopy } from "./common-util.js";
 function queryPageDesignByCode(pageCode) {
   return http.get(
     window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
   );
 }
 function convertToPageContext(pageDesign, pageRequest) {
+  var _a;
   if (pageDesign == null) {
     return null;
   }
@@ -29,24 +32,23 @@ function convertToPageContext(pageDesign, pageRequest) {
     // 表格uuid集合
     listCodes: pageDesign.listCodes,
     // 当前页面中表格对应的数据表名集合，后台保存子表记录时需要
-    formNoRuleCode: pageDesign.formNoRuleCode,
+    formNoRuleCode: pageDesign.props ? pageDesign.props.formNoRuleCode : null,
     // 表单编号规则
-    judgeHeavyList: pageDesign.judgeHeavyList,
+    judgeHeavyList: pageDesign.props && pageDesign.props.judgeHeavyList.length > 0 ? pageDesign.props.judgeHeavyList : null,
     // 判重组合字段集合配置
-    conversionCodes: pageDesign.conversionCodes,
-    // 数据转换规则
+    // conversionCodes: pageDesign.conversionCodes, // 数据转换规则。按钮上配置的，此处不需要
     pageType: pageDesign.pageType,
     // 页面类型：form、list、chart
-    beanName: pageDesign.beanName,
+    beanName: pageDesign.props ? pageDesign.props.beanName : null,
     // 业务处理类，继承CommonBaseService接口的类
-    importBeanName: pageDesign.importBeanName,
+    importBeanName: pageDesign.props ? pageDesign.props.importBeanName : null,
     // 导入处理类，继承ImportDefinitionService接口的类
-    notIdInitializationList: pageDesign.notIdInitializationList,
-    // 无ID或taskId时初始条件配置
     subTablePageInfo: pageDesign.subTablePageInfo,
     // 列表分页信息，格式是：{列表编码: 每页显示多少条记录}，表单页面中校验有分页的子表时提示使用，提示信息格式：第 {pageNum} 页第 {row} 行记录
     workflowCode: pageDesign.workflowCode,
     workflowVersion: pageDesign.workflowVersion,
+    refercePropMap: (_a = pageDesign.runtime) == null ? void 0 : _a.refercePropMap,
+    //当前表单页面中引用字段信息集合,get请求时需要使用，格式为{tableName:[字段名,.. ... ], tableName:[字段名,.. ... ]}
     entity: {
       data: {},
       task: {},
@@ -57,6 +59,15 @@ function convertToPageContext(pageDesign, pageRequest) {
       system: {}
     }
   };
+  if (pageDesign.props && pageDesign.props.notIdInitializationList) {
+    let notIdInitializationList = pageDesign.props.notIdInitializationList;
+    if (typeof notIdInitializationList === "string") {
+      notIdInitializationList = JSON.parse(notIdInitializationList);
+    }
+    if (notIdInitializationList.length > 0) {
+      pageContext["notIdInitializationList"] = notIdInitializationList;
+    }
+  }
   if (pageDesign.variables) {
     const pageObj = pageContext.entity.page;
     for (const variable of pageDesign.variables) {
@@ -90,10 +101,12 @@ function getPageDimensions() {
 function getRequestObject(pageRequest) {
   const requestObj = {};
   if (pageRequest) {
+    console.log("getRequestObject11----pageRequest=", pageRequest);
     const paramStoreId = pageRequest.paramStoreId;
     packageAdditionalMap(paramStoreId, requestObj);
     delete pageRequest.paramStoreId;
     Object.assign(requestObj, pageRequest);
+    console.log("getRequestObject22----requestObj=", requestObj);
   }
   let url = decodeURI(window.location.href);
   if (url && url.includes("?")) {
@@ -104,20 +117,23 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  const route = useRoute();
+  if (requestObj["_t_"]) ;
+  return requestObj;
+}
+function packageAdditionalMapWithRoute(route, requestObj) {
+  console.log("packageAdditionalMapWithRoute----route=", route);
   if (route) {
     if (route.params) {
       Object.assign(requestObj, route.params);
     }
+    console.log("packageAdditionalMapWithRoute----route.query=", route.query);
     if (route.query) {
       Object.assign(requestObj, route.query);
       const paramStoreId = route.query.paramStoreId;
       packageAdditionalMap(paramStoreId, requestObj);
     }
+    console.log("packageAdditionalMapWithRoute----requestObj=", requestObj);
   }
-  if (requestObj["_t_"])
-    ;
-  return requestObj;
 }
 function packageAdditionalMap(paramStoreId, requestObj) {
   if (paramStoreId) {
@@ -129,11 +145,10 @@ function packageAdditionalMap(paramStoreId, requestObj) {
     }
   }
 }
-function getModelFields(pageContext, formItemConfigure, prop) {
+function getModelFields(formItemConfigure, prop) {
   if (!formItemConfigure) {
     return ["temp"];
   }
-  pageContext.entity;
   let propsBase;
   let propName = prop;
   if (!prop) {
@@ -160,7 +175,7 @@ function getModelFields(pageContext, formItemConfigure, prop) {
   return fields;
 }
 function getFormModelFields(pageContext, formItemConfigure, prop) {
-  const fields = getModelFields(pageContext, formItemConfigure, prop);
+  const fields = getModelFields(formItemConfigure, prop);
   const entity = pageContext.entity;
   if (entity.data.ID == void 0 && entity.data.id == void 0) {
     let propsBase;
@@ -294,12 +309,52 @@ function packageFormRules(pageContext, configure) {
     }
   }
 }
+function controlObjectRenderState(pageContext, propName) {
+  if (pageContext.initInfo) {
+    const types = ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"];
+    types.forEach((type) => {
+      const infos = pageContext.initInfo[type];
+      if (infos) {
+        if (type === "dynamicControlFormEdit") {
+          let settings = infos.filter((item) => item.name === "_all_fields" || item.name === propName);
+          if (settings && settings.length > 0) {
+            settings = settings.filter((item) => item.name === "_all_fields");
+            if (settings && settings.length > 0) {
+              const copySetting = deepCopy(settings[0]);
+              copySetting.name = propName;
+              settings = [copySetting];
+            }
+          }
+          functions.dynamicControlFormEdit(pageContext, settings, false);
+        } else if (type === "disableElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.disableElement(pageContext, [propName], false);
+          }
+        } else if (type === "enableElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.enableElement(pageContext, [propName], false);
+          }
+        } else if (type === "hideElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.hideElement(pageContext, [propName], false);
+          }
+        } else if (type === "showElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.showElement(pageContext, [propName], false);
+          }
+        }
+      }
+    });
+  }
+}
 export {
+  controlObjectRenderState,
   convertToPageContext,
   getDefaultValue,
   getFormModelFields,
   getModelFields,
   getPermissionCodes,
+  packageAdditionalMapWithRoute,
   packageFormRules,
   queryPageDesignByCode,
   queryPageSuperGrids

package/dist/es/components/runtime/views/assemblys/button/button/button-runtime.vue2.js

@@ -13,10 +13,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
+    function isDisable() {
+      return designProperty.value.state === "disabled" || isButtongLoading();
+    }
+    function isButtongLoading() {
+      return props.pageContext.canClick !== void 0 && props.pageContext.clickUuid !== void 0 ? !props.pageContext.canClick && props.pageContext.clickUuid === props.configure.uuid : false;
+    }
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");
       return openBlock(), createBlock(_component_el_button, {
-        disabled: designProperty.value.state === "disabled",
+        disabled: isDisable(),
         class: normalizeClass(unref(runtimeClass)),
         style: normalizeStyle(unref(runtimeStyle)),
         type: designProperty.value.type,
@@ -24,6 +30,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         text: designProperty.value.text,
         round: designProperty.value.round,
         plain: designProperty.value.plain,
+        loading: isButtongLoading(),
         onClick: _cache[0] || (_cache[0] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
       }, {
         default: withCtx(() => [
@@ -46,7 +53,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ], 64)) : createCommentVNode("", true)
         ]),
         _: 1
-      }, 8, ["disabled", "class", "style", "type", "size", "text", "round", "plain"]);
+      }, 8, ["disabled", "class", "style", "type", "size", "text", "round", "plain", "loading"]);
     };
   }
 });

package/dist/es/components/runtime/views/assemblys/data/table/sub-table-runtime.vue.js

@@ -29,10 +29,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
-    let dynamicFields = getModelFields(props.pageContext, props.configure, prop);
+    let dynamicFields = getModelFields(props.configure, prop);
     const listViewShowFlag = ref(false);
     const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
+      isSql: true,
       subTableData: null,
       extraParam: {},
       operations: {},

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -127,6 +127,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "start-placeholder": designProperty.value.placeholder,
             "end-placeholder": designProperty.value.endPlaceholder,
             format: designProperty.value.format,
+            "value-format": designProperty.value.valueFormat ? "x" : designProperty.value.valueFormat,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
@@ -136,7 +137,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             onFocus: _cache[3] || (_cache[3] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
             onVisibleChange: _cache[4] || (_cache[4] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
             onPanelChange: _cache[5] || (_cache[5] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
-          }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type"])) : (openBlock(), createBlock(_component_el_date_picker, {
+          }, null, 8, ["is-range", "clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "value-format", "modelValue", "shortcuts", "type"])) : (openBlock(), createBlock(_component_el_date_picker, {
             key: 1,
             clearable: designProperty.value.clearable,
             disabled: designProperty.value.state === "disabled",
@@ -150,12 +151,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:modelValue": _cache[6] || (_cache[6] = ($event) => dynamicModelMethod.value = $event),
             shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
+            "value-format": designProperty.value.valueFormat ? "x" : designProperty.value.valueFormat,
             onChange: _cache[7] || (_cache[7] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
             onBlur: _cache[8] || (_cache[8] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
             onFocus: _cache[9] || (_cache[9] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "focus")),
             onVisibleChange: _cache[10] || (_cache[10] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "visible-change")),
             onPanelChange: _cache[11] || (_cache[11] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "panel-change"))
-          }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type"]))
+          }, null, 8, ["clearable", "disabled", "readonly", "size", "placeholder", "start-placeholder", "end-placeholder", "format", "modelValue", "shortcuts", "type", "value-format"]))
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"]);

package/dist/es/components/runtime/views/assemblys/form/file-upload/fileupload-runtime.vue2.js

@@ -2,7 +2,7 @@ import { defineComponent, ref, resolveComponent, openBlock, createBlock, normali
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { fileUploadBeforeUpload } from "../../../../utils/events/event-util.js";
 import http from "agilebuilder-ui/src/utils/request";
-import FsUploadNew from "agilebuilder-ui";
+import { FsUploadNew } from "agilebuilder-ui";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "fileupload-runtime",
   props: {
@@ -23,16 +23,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const initPaths = getVariableValue(entity, pathFields);
     const fileList = ref([]);
     const fileInfo = ref({});
-    const baseURL = window.$vueApp.config.globalProperties.baseURL;
-    const baseAPI = window.$vueApp.config.globalProperties.baseAPI;
-    let url = baseURL;
-    if (!isPlateSys(props.pageContext.systemCode)) {
-      url = baseAPI;
-    }
     if (initPaths) {
       const uuids = initPaths.split(",");
       if (uuids.length > 0) {
-        http.post(url + "/common/fs-upload/search-file-names").then((result) => {
+        const backendUrl = props.pageContext.backendUrl;
+        http.post(backendUrl + "/common/fs-upload/search-file-names", uuids).then((result) => {
           const names = [];
           for (let index = 0; index < uuids.length; index++) {
             const uuid = uuids[index];
@@ -74,13 +69,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       setVariableValue(props.pageContext.entity, pathFields, uuids.join(","));
       setVariableValue(props.pageContext.entity, nameFields, names.join(","));
     };
-    function isPlateSys(systemCode) {
-      if (systemCode && (systemCode === "agilebuilder" || systemCode === "portal" || systemCode === "mms" || systemCode === "task" || systemCode === "wf" || systemCode === "dc" || systemCode === "mc" || systemCode === "mobile" || systemCode === "acs" || systemCode === "bs" || systemCode === "pcm")) {
-        return true;
-      } else {
-        return false;
-      }
-    }
     return (_ctx, _cache) => {
       const _component_el_form_item = resolveComponent("el-form-item");
       return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
@@ -98,7 +86,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ]),
         default: withCtx(() => [
           createVNode(unref(FsUploadNew), {
-            disabled: designProperty.value.state == "disabled",
+            disabled: designProperty.value.state === "disabled",
             displayType: designProperty.value.displayType,
             accept: designProperty.value.accept,
             multiple: designProperty.value.multiple,
@@ -115,7 +103,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         _: 1
       }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createBlock(unref(FsUploadNew), {
         key: 1,
-        disabled: designProperty.value.state == "disabled",
+        disabled: designProperty.value.state === "disabled",
         displayType: designProperty.value.displayType,
         accept: designProperty.value.accept,
         multiple: designProperty.value.multiple,

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue.js

@@ -1,4 +1,7 @@
 import _sfc_main from "./placeholder-runtime.vue2.js";
+/* empty css                         */
+import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
+const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a0860ff0"]]);
 export {
-  _sfc_main as default
+  placeholderRuntime as default
 };

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue2.js

@@ -1,5 +1,6 @@
-import { defineComponent, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementVNode } from "vue";
-const _hoisted_1 = /* @__PURE__ */ createElementVNode("div", { style: { "width": "100%", "height": "100%" } }, " ", -1);
+import { defineComponent, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, pushScopeId, popScopeId, createElementVNode } from "vue";
+const _withScopeId = (n) => (pushScopeId("data-v-a0860ff0"), n = n(), popScopeId(), n);
+const _hoisted_1 = /* @__PURE__ */ _withScopeId(() => /* @__PURE__ */ createElementVNode("div", { style: { "width": "100%", "height": "100%" } }, " ", -1));
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "placeholder-runtime",
   props: {

package/dist/es/components/runtime/views/assemblys/object-render.vue.js

@@ -3,8 +3,9 @@ import _sfc_main$1 from "./error-render.vue.js";
 import { getRuntimeComponentByName } from "../../utils/assemblys-config.js";
 import { PageDimensions } from "../../utils/interfaces/page-design-types.js";
 import { addComponentRef, addComponentRefByCode } from "../../utils/global-refs.js";
-import { getPermissionCodes, packageFormRules } from "../../utils/page-init-util.js";
-import { caculateShowCondition } from "../../utils/page-helper-util.js";
+import { getPermissionCodes, packageFormRules, controlObjectRenderState } from "../../utils/page-init-util.js";
+import { caculateShowCondition, getFormPropName } from "../../utils/page-helper-util.js";
+import { getPropClassName } from "../../utils/common-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "object-render",
   props: {
@@ -12,6 +13,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props) {
+    var _a;
     const props = __props;
     if (props.configure.style == void 0) {
       props.configure.style = {};
@@ -24,17 +26,25 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let handleShowFlag = ref(true);
     let showFlag = ref(true);
     if (props.configure && props.configure.props) {
-      if (props.configure.props.showConditions) {
-        const showConditions = props.configure.props.showConditions;
-        if (showConditions.length > 0) {
-          showFlag = computed(() => {
-            if (!handleShowFlag.value) {
-              return false;
-            }
-            return caculateShowCondition(props.pageContext, props.configure, showConditions);
-          });
+      let showConditions = [];
+      if ((_a = props.configure.props.base) == null ? void 0 : _a.showConditions) {
+        if (typeof props.configure.props.base.showConditions === "string") {
+          showConditions = JSON.parse(props.configure.props.base.showConditions);
+        } else {
+          showConditions = props.configure.props.base.showConditions;
         }
       }
+      showFlag = computed(() => {
+        var _a2;
+        if (!handleShowFlag.value) {
+          return false;
+        }
+        const state = (_a2 = props.configure.props.base) == null ? void 0 : _a2.state;
+        if (state && state === "hidden") {
+          return false;
+        }
+        return caculateShowCondition(props.pageContext, props.configure, showConditions);
+      });
       if (props.configure.props.editConditions) {
         const editConditions = props.configure.props.editConditions;
         if (editConditions.length > 0) {
@@ -58,9 +68,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const thisRef = ref(null);
     const runtimeStyle = ref({});
     const runtimeClass = ref("");
+    const propClassName = getPropClassName(props.configure);
+    if (propClassName) {
+      runtimeClass.value = propClassName;
+    }
     const commonRuntime = props.configure.runtime && props.configure.runtime.common ? props.configure.runtime.common : {};
     if (commonRuntime.class) {
-      runtimeClass.value = commonRuntime.class;
+      runtimeClass.value += " " + commonRuntime.class;
     }
     if (commonRuntime.style) {
       Object.assign(runtimeStyle.value, commonRuntime.style);
@@ -97,9 +111,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (props.configure.code) {
         addComponentRefByCode(props.pageContext, props.configure.code, thisRef);
       } else if (props.configure.props && props.configure.props.base) {
-        const propsBase = props.configure.props.base;
-        if (propsBase.prop) {
-          let propName = propsBase.prop;
+        const propsBase2 = props.configure.props.base;
+        if (propsBase2.prop) {
+          let propName = propsBase2.prop;
           if (propName.startsWith("${")) {
             propName = propName.substring(2, propName.length - 1);
           }
@@ -109,6 +123,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           addComponentRefByCode(props.pageContext, propName, thisRef);
         }
       }
+      const propsBase = props.configure.props ? props.configure.props.base : null;
+      if (propsBase && propsBase.prop) {
+        let propName = propsBase.prop;
+        propName = getFormPropName(propName);
+        controlObjectRenderState(props.pageContext, propName);
+      }
     }
     onMounted(() => {
       if (!thisRef.value || !thisRef.value.parentNode) {

package/dist/es/components/runtime/views/assemblys/workflow/workflow-button/workflowbutton-runtime.vue2.js

@@ -20,8 +20,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let activityNameColor = "";
     if (props.configure.props.base.showActivityName) {
       activityNameColor = props.configure.props.base.activityNameColor || "red";
-      if (props.pageContext.entity && props.pageContext.entity.task && props.pageContext.entity.task.name) {
-        taskName.value = props.pageContext.entity.task.name;
+      if (props.pageContext.entity && props.pageContext.entity.data) {
+        taskName.value = props.pageContext.entity.data["CURRENT_ACTIVITY_NAME"] || props.pageContext.entity.data["current_activity_name"];
       }
     }
     props.configure.items.forEach((item) => {

package/dist/es/components/runtime/views/super-page.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, onMounted, onUpdated, nextTick, onUnmounted, openBlock, createElementBlock, normalizeClass, normalizeStyle, Fragment, renderList, createBlock, unref, createCommentVNode, createElementVNode, watch } from "vue";
 import _sfc_main$1 from "./assemblys/object-render.vue.js";
 import { updateOptionDatasources, updateChartDatasources } from "../utils/page-helper-util.js";
-import { queryPageSuperGrids, queryPageDesignByCode, convertToPageContext } from "../utils/page-init-util.js";
+import { queryPageSuperGrids, queryPageDesignByCode, convertToPageContext, packageAdditionalMapWithRoute } from "../utils/page-init-util.js";
 import { addComponentRef, removePageAllRef, initComponentRefState } from "../utils/global-refs.js";
 import { removeCustomFuncFromWindow, handleEvent, initPageEvents } from "../utils/events/event-util.js";
 import _sfc_main$2 from "./assemblys/common/export-form-report-dialog.vue.js";
@@ -19,6 +19,7 @@ import { useRoute, useRouter } from "vue-router";
 import { jumpToPage } from "agilebuilder-ui/src/utils/jump-page-utils";
 import { setSessionCache } from "agilebuilder-ui/src/utils/auth";
 import { deepCopy } from "../utils/common-util.js";
+const _hoisted_1 = { class: "app-container" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
   props: {
@@ -109,6 +110,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (tempContext.isTest && props.dimensions) {
         tempContext.dimensions = props.dimensions;
       }
+      packageAdditionalMapWithRoute(route, tempContext.entity.request);
       pageContext.value = tempContext;
       if (pageContext.value == null) {
         return;
@@ -334,8 +336,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (!_selectFile_.value) {
           return;
         }
-        if (_selectFile_.value.value === "" || _selectFile_.value.value === null)
-          return;
+        if (_selectFile_.value.value === "" || _selectFile_.value.value === null) return;
         const fileObj = _selectFile_.value.files[0];
         if (fileObj) {
           _selectFile_.value.value = null;
@@ -421,9 +422,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           popPageSetting.parentPageVersion = parentPageContext.value.version;
           popPageSetting.isNewPage = true;
           if (jumpMode === "popup") {
-            eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
-              closeFunc(params);
-            });
             jumpPageSetting.value = popPageSetting;
             isShowDialog.value = true;
           } else if (jumpMode === "refresh") {
@@ -432,6 +430,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               query: popPageSetting
             });
           }
+          if (jumpMode === "popup" || jumpMode === "refresh") {
+            eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
+              closeFunc(params);
+            });
+          }
         } else {
           console.error("页面配置信息不存在");
         }
@@ -477,7 +480,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       isShowDialog.value = false;
     }
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", null, [
+      return openBlock(), createElementBlock("div", _hoisted_1, [
         isShowPage.value ? (openBlock(), createElementBlock("div", {
           key: 0,
           ref_key: "thisRef",

package/dist/es/style.css

@@ -0,0 +1,3 @@
+.el-form-item[data-v-a0860ff0] {
+  margin-bottom: 0px;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.76",
+  "version": "2.0.81",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -48,7 +48,7 @@
     "@vitejs/plugin-vue-jsx": "^3.1.0",
     "@vue/eslint-config-prettier": "^8.0.0",
     "@vue/test-utils": "^2.4.4",
-    "agilebuilder-ui": "1.0.55",
+    "agilebuilder-ui": "1.0.57",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",