super-page-runtime 2.1.35 → 2.1.37

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

@@ -5,6 +5,7 @@ import http from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap } from "../events/standard-event.js";
 import { i18nValidatePropRulesMessage } from "../events/validator-util.js";
 import { getBaseUrl } from "../common-util.js";
+import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
 const functions = {
   /**
    * 展示页面中的某个组件元素
@@ -300,10 +301,14 @@ const functions = {
   getAdditionalParams(pageContext) {
     return getAdditionalParamMap(pageContext);
   },
-  // 获得附加参数对象
+  // 获得某附加参数值
   getAdditionalParamValue(pageContext, key) {
     const param = getAdditionalParamMap(pageContext);
     return param ? param[key] : null;
+  },
+  // 是否是移动端
+  isMobile() {
+    return isMobileBrowser();
   }
 };
 function packageAllFeildsRules(pageContext, item) {

package/dist/es/components/runtime/utils/common-util.d.ts

@@ -25,3 +25,4 @@ export declare function getWorkflowId(pageContext: any): any;
 export declare function getPropClassName(configure: Component): any;
 export declare function isNumber(numStr: any): boolean;
 export declare function isWorkflowPage(pageContext: PageContext): boolean;
+export declare function refreshMobileDialogType(jumpPageSetting: any, isMobile: boolean): void;

package/dist/es/components/runtime/utils/common-util.js

@@ -140,6 +140,28 @@ function isWorkflowPage(pageContext) {
   }
   return isWorkflow;
 }
+function refreshMobileDialogType(jumpPageSetting, isMobile) {
+  if (jumpPageSetting && isMobile) {
+    let openMode = jumpPageSetting.jumpPageMobileOpenMode;
+    if (!openMode) {
+      if (jumpPageSetting.jumpPageOpenMode) {
+        openMode = jumpPageSetting.jumpPageOpenMode;
+        if (openMode === "newTab") {
+          openMode = "refresh";
+        }
+      } else {
+        openMode = "refresh";
+      }
+    }
+    if (openMode === "refresh") {
+      jumpPageSetting.dialogType = "drawer";
+      jumpPageSetting.jumpPageWidth = "100%";
+      jumpPageSetting.isRefreshWhenClosePopup = true;
+    }
+    jumpPageSetting.jumpMode = openMode;
+    jumpPageSetting.jumpPageMobileOpenMode = openMode;
+  }
+}
 export {
   deepCopy,
   getBaseUrl,
@@ -151,5 +173,6 @@ export {
   isNumber,
   isWorkflowPage,
   packageTemplateFiles,
+  refreshMobileDialogType,
   upperFirstCase
 };

package/dist/es/components/runtime/utils/events/event-util.d.ts

@@ -81,3 +81,8 @@ export declare function fileUploadBeforeUpload(params: any): any;
 export declare function fileUploadUploaded(pageContext: any, configureObj: any, params: any): any;
 export declare function fileUploadBeforeDelete(pageContext: any, configureObj: any, params: any): any;
 export declare function fileUploadDeleted(pageContext: any, configureObj: any, params: any): any;
+/**
+ * 当前按钮的点击事件是否是列表的 显示查询 事件。移动端时才需要显示这个按钮。
+ * @param configure 组件配置
+ */
+export declare function isShowComponent(configure: Component): boolean;

package/dist/es/components/runtime/utils/events/event-util.js

@@ -1,4 +1,4 @@
-import { isPromise } from "agilebuilder-ui/src/utils/common-util";
+import { isPromise, isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
 import { judgeDataNumber, standardEvents, getAdditionalParamMap, dealAfterOperate } from "./standard-event.js";
 import { validateDataModelFunc } from "./validator-util.js";
 import { getComponentRef, getComponentRefByCode } from "../global-refs.js";
@@ -668,6 +668,20 @@ function headerClick(pageContext, configureObj, params) {
 function fileUploadBeforeUpload(params) {
   return getHandleEvent(null, params.pageContext, params.configureObj, "before-upload", params);
 }
+function isShowComponent(configure) {
+  let isShow = true;
+  const isMobile = isMobileBrowser();
+  if (!isMobile) {
+    const events = configure && configure.events ? configure.events : [];
+    if (events) {
+      const eventArr = events.filter((item) => item.name === "click" && item.isStandard && item.eventName && item.eventName === "showSearch");
+      if (eventArr && eventArr.length > 0) {
+        isShow = false;
+      }
+    }
+  }
+  return isShow;
+}
 export {
   appendDefaultMethods,
   canExecuteButton,
@@ -690,6 +704,7 @@ export {
   handleFormEvent,
   headerClick,
   initPageEvents,
+  isShowComponent,
   removeCustomFuncFromWindow,
   rowClick,
   rowDblClick,

package/dist/es/components/runtime/utils/events/standard-event.d.ts

@@ -17,6 +17,7 @@ export declare const standardEvents: {
     import: (params: any) => void;
     export: (params: any) => Promise<unknown>;
     search: (params: any) => void;
+    showSearch: (params: any) => void;
     workflowSave: (params: any) => Promise<unknown>;
     submitProcess: (params: any) => Promise<unknown>;
     submitTask: (params: any) => Promise<unknown>;

package/dist/es/components/runtime/utils/events/standard-event.js

@@ -103,12 +103,19 @@ const standardEvents = {
   },
   // 列表标准事件 查询search
   search: function(params) {
-    console.log("列表标准事件 查询search--params=", params);
+    console.log("列表标准事件 刷新列表 search--params=", params);
     const pageContext = params.pageContext;
     const tableUuid = params.tableUuid;
     const gridRef = getComponentRef(pageContext, tableUuid);
     gridRef.refresh();
   },
+  showSearch: function(params) {
+    console.log("列表标准事件 显示查询区域 showSearch--params=", params);
+    const pageContext = params.pageContext;
+    const tableUuid = params.tableUuid;
+    const gridRef = getComponentRef(pageContext, tableUuid);
+    gridRef.showMobileSearch();
+  },
   // 流程表单标准事件 暂存workflowSave
   workflowSave: function(params) {
     console.log("流程表单标准事件 暂存workflowSave--params=", params);

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

@@ -425,6 +425,11 @@ const standardFuncUrlMap = {
     label: "查询",
     functions: []
   },
+  showMobileSearch: {
+    group: "列表功能",
+    label: "显示移动端查询区域",
+    functions: []
+  },
   downloadTemplate: {
     group: "列表功能",
     label: "下载导入模板",

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

@@ -50,6 +50,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const superGridItems = pageContext.superGridItems;
     const superGridSetting = superGridItems ? superGridItems[configure.uuid] : null;
     console.log("superGridSetting1111===", superGridItems, superGridSetting);
+    const isCanShowMobileSearch = ref(false);
     onMounted(() => {
       window.addEventListener("message", recieveMessage);
       eventBus.$on(
@@ -677,6 +678,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function isDeleteChange(value) {
       gridRef.value.isDeleteChange(value);
     }
+    function showMobileSearch() {
+      if (isCanShowMobileSearch.value) {
+        gridRef.value.showMobileSearch();
+      }
+    }
+    function canShowMobileSearch(listCode2) {
+      isCanShowMobileSearch.value = true;
+    }
     __expose({
       refresh,
       createRow,
@@ -685,7 +694,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getSelectionIds,
       getTableConfigure,
       isDeleteChange,
-      validatorSunTableListData
+      validatorSunTableListData,
+      showMobileSearch
     });
     return (_ctx, _cache) => {
       const _component_super_grid = resolveComponent("super-grid");
@@ -708,7 +718,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           onRowDblclick: rowDblClickEvent,
           onHeaderClick: headerClickEvent,
           onRefresh: clearSelections,
-          onNewOpenGridDialog: unref(popupToPage)
+          onNewOpenGridDialog: unref(popupToPage),
+          onCanShowMobileSearch: canShowMobileSearch
         }, null, 8, ["url", "options", "code", "settings", "search-form-info", "list-toolbar-form-data", "onNewOpenGridDialog"])
       ]);
     };

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

@@ -54,6 +54,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         gridRef.value.isDeleteChange(value);
       }
     }
+    function showMobileSearch() {
+      gridRef.value.showMobileSearch();
+    }
     __expose({
       refresh,
       createRow,
@@ -62,7 +65,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       getSelectionIds,
       getTableConfigure,
       isDeleteChange,
-      validatorSunTableListData
+      validatorSunTableListData,
+      showMobileSearch
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", null, [

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

@@ -82,13 +82,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         if (isRange) {
           const values = [];
           let value1 = getVariableValue(entity, dynamicFields);
-          values.push(value1);
+          values.push(formatDate(value1, designProperty.value.valueFormat));
           let value2 = getVariableValue(entity, dynamicFields2);
-          values.push(value2);
+          values.push(formatDate(value2, designProperty.value.valueFormat));
           return values;
         } else {
           let value1 = getVariableValue(entity, dynamicFields);
-          return value1;
+          return formatDate(value1, designProperty.value.valueFormat);
         }
       },
       set(value) {

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

@@ -96,10 +96,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             "limit-file-size": designProperty.value.limitFileSize,
             "file-info": fileInfo.value,
             "file-list": fileList.value,
+            "system-code": _ctx.pageContext.systemCode,
             "on-success": onSuccess,
             "on-remove": onRemove,
             "before-upload": beforeUpload
-          }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list"])
+          }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list", "system-code"])
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createBlock(unref(FsUploadNew), {
@@ -114,10 +115,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "limit-file-size": designProperty.value.limitFileSize,
         "file-info": fileInfo.value,
         "file-list": fileList.value,
+        "system-code": _ctx.pageContext.systemCode,
         "on-success": onSuccess,
         "on-remove": onRemove,
         "before-upload": beforeUpload
-      }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list"]));
+      }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list", "system-code"]));
     };
   }
 });

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

@@ -1,10 +1,11 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createElementVNode, createTextVNode } from "vue";
+import { defineComponent, ref, computed, onMounted, resolveComponent, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle, createElementVNode, toDisplayString, createBlock, withCtx, createCommentVNode, createTextVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, formatValueByType } from "../../../../utils/page-helper-util.js";
 import { SuperIcon } from "agilebuilder-ui";
 import { getCustomFunc, handleFormEvent } from "../../../../utils/events/event-util.js";
-const _hoisted_1 = { style: { "overflow": "hidden", "white-space": "nowrap" } };
-const _hoisted_2 = ["title"];
+const _hoisted_1 = { style: { "width": "100%", "text-align": "center", "font-weight": "700", "font-size": "24px", "margin-bottom": "20px" } };
+const _hoisted_2 = { style: { "overflow": "hidden", "white-space": "nowrap" } };
+const _hoisted_3 = ["title"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "label-runtime",
   props: {
@@ -54,6 +55,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       resultValue = resultValue === void 0 || resultValue === null ? "" : resultValue;
       return resultValue;
     });
+    onMounted(() => {
+    });
     function updateOptions(newOptions) {
       listOptions.value = newOptions ? newOptions : [];
     }
@@ -62,8 +65,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       const _component_el_form_item = resolveComponent("el-form-item");
-      return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
+      return designProperty.value.whetherTittle ? (openBlock(), createElementBlock("div", {
         key: 0,
+        class: normalizeClass(unref(runtimeClass)),
+        style: normalizeStyle(unref(runtimeStyle))
+      }, [
+        createElementVNode("div", _hoisted_1, toDisplayString(designProperty.value.title), 1)
+      ], 6)) : designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
+        key: 1,
         required: designProperty.value.required ? true : false,
         class: normalizeClass(unref(runtimeClass)),
         "label-width": designProperty.value.labelWidth,
@@ -80,7 +89,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             style: { "display": "flex", "width": "100%", "justify-content": "space-between" },
             onClick: _cache[0] || (_cache[0] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
           }, [
-            createElementVNode("span", _hoisted_1, [
+            createElementVNode("span", _hoisted_2, [
               designProperty.value.preIconValue || designProperty.value.preText ? (openBlock(), createElementBlock("span", {
                 key: 0,
                 class: normalizeClass({
@@ -117,14 +126,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createElementBlock("span", {
-        key: 1,
+        key: 2,
         style: { "display": "flex", "justify-content": "space-between" },
         onClick: _cache[1] || (_cache[1] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
       }, [
         createElementVNode("span", {
           style: { "overflow": "hidden", "white-space": "nowrap" },
           title: dynamicValue.value
-        }, toDisplayString(designProperty.value.prefixIcon) + " " + toDisplayString(dynamicValue.value) + "222", 9, _hoisted_2),
+        }, toDisplayString(designProperty.value.prefixIcon) + " " + toDisplayString(dynamicValue.value) + "222", 9, _hoisted_3),
         designProperty.value.suffixTxt ? (openBlock(), createElementBlock("span", {
           key: 0,
           class: normalizeClass(unref(appendClass)),

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, computed, markRaw, onMounted, resolveDirective, withDirectives, openBlock, createBlock, resolveDynamicComponent, normalizeStyle, normalizeClass, vShow, unref, nextTick } from "vue";
+import { defineComponent, ref, computed, markRaw, onMounted, resolveDirective, unref, withDirectives, openBlock, createBlock, resolveDynamicComponent, normalizeStyle, normalizeClass, vShow, createCommentVNode, nextTick } from "vue";
 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";
@@ -6,6 +6,7 @@ import { addComponentRef, addComponentRefByCode } from "../../utils/global-refs.
 import { getPermissionCodes, packageFormRules, controlObjectRenderState } from "../../utils/page-init-util.js";
 import { caculateShowCondition, getFormPropName, getSizeConfig } from "../../utils/page-helper-util.js";
 import { getPropClassName, isNumber } from "../../utils/common-util.js";
+import { isShowComponent } from "../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "object-render",
   props: {
@@ -221,7 +222,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       const _directive_permission = resolveDirective("permission");
-      return withDirectives((openBlock(), createBlock(resolveDynamicComponent(dynamicComponent.value), {
+      return unref(isShowComponent)(_ctx.configure) ? withDirectives((openBlock(), createBlock(resolveDynamicComponent(dynamicComponent.value), {
+        key: 0,
         ref: setComponentRef,
         style: normalizeStyle(runtimeStyle.value),
         class: normalizeClass(runtimeClass.value),
@@ -230,7 +232,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, null, 8, ["style", "class", "configure", "pageContext"])), [
         [vShow, unref(showFlag)],
         [_directive_permission, unref(permissionCodes) ? unref(permissionCodes) : "true"]
-      ]);
+      ]) : createCommentVNode("", true);
     };
   }
 });

package/dist/es/components/runtime/views/assemblys/workflow/workflow-node/workflownode-runtime.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, onMounted, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, normalizeStyle, toDisplayString } from "vue";
+import { defineComponent, ref, onMounted, openBlock, createElementBlock, normalizeClass, unref, createElementVNode, normalizeStyle, toDisplayString, createCommentVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -9,6 +9,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props, { expose: __expose }) {
     const props = __props;
+    const showTaskName = ref(false);
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
@@ -16,10 +17,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     let taskName = ref("");
-    ref(false);
     if (props.pageContext.pageType === "form") {
       if (props.pageContext.entity && props.pageContext.entity.data) {
         taskName.value = props.pageContext.entity.data["CURRENT_ACTIVITY_NAME"] || props.pageContext.entity.data["current_activity_name"];
+        showTaskName.value = props.pageContext.entity.data["WORKFLOW_ID"] ? true : false;
       }
     }
     onMounted(() => {
@@ -35,16 +36,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       setValue
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", {
+      return showTaskName.value ? (openBlock(), createElementBlock("span", {
+        key: 0,
         class: normalizeClass(unref(runtimeClass))
       }, [
-        createElementVNode("div", {
+        createElementVNode("span", {
           style: normalizeStyle(unref(headerStyle))
         }, [
           createElementVNode("span", null, toDisplayString(designProperty.value.title), 1),
           createElementVNode("span", null, toDisplayString(unref(taskName)), 1)
         ], 4)
-      ], 2);
+      ], 2)) : createCommentVNode("", true);
     };
   }
 });

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

@@ -1,5 +1,7 @@
-import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createCommentVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createElementBlock, createCommentVNode } from "vue";
 import _sfc_main$1 from "./super-page.vue.js";
+const _hoisted_1 = ["src"];
+const _hoisted_2 = ["src"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page-dialog",
   props: {
@@ -25,7 +27,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const overflow = ref(false);
     const showPosition = ref("rtl");
     const contentHeight = ref(null);
+    const isIframe = ref(false);
+    const pageUrl = ref(null);
     if (myJumpPageSetting) {
+      console.log("弹出页面myJumpPageSetting=", myJumpPageSetting);
+      isIframe.value = myJumpPageSetting && myJumpPageSetting["_isIframe"] !== void 0 ? myJumpPageSetting["_isIframe"] : false;
+      pageUrl.value = myJumpPageSetting && myJumpPageSetting["_path"] ? myJumpPageSetting["_path"] : null;
       dialogType.value = myJumpPageSetting && myJumpPageSetting["dialogType"] ? myJumpPageSetting["dialogType"] : "dialog";
       draggable.value = myJumpPageSetting && myJumpPageSetting["draggable"] ? myJumpPageSetting["draggable"] : false;
       overflow.value = myJumpPageSetting && myJumpPageSetting["overflow"] ? myJumpPageSetting["overflow"] : false;
@@ -75,11 +82,18 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         onClosed: _cache[4] || (_cache[4] = ($event) => emits("closed"))
       }, {
         default: withCtx(() => [
-          pageCode.value ? (openBlock(), createBlock(_sfc_main$1, {
+          !isIframe.value && pageCode.value ? (openBlock(), createBlock(_sfc_main$1, {
             key: 0,
             pageCode: pageCode.value,
             pageRequest: pageRequest.value
-          }, null, 8, ["pageCode", "pageRequest"])) : createCommentVNode("", true)
+          }, null, 8, ["pageCode", "pageRequest"])) : isIframe.value ? (openBlock(), createElementBlock("iframe", {
+            key: 1,
+            height: "98%",
+            width: "100%",
+            src: pageUrl.value,
+            frameborder: "0",
+            allowtransparency: "no"
+          }, null, 8, _hoisted_1)) : createCommentVNode("", true)
         ]),
         _: 1
       }, 8, ["modelValue", "title", "direction", "size"])) : (openBlock(), createBlock(_component_el_dialog, {
@@ -97,12 +111,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         onClosed: _cache[8] || (_cache[8] = ($event) => _ctx.$emit("closed"))
       }, {
         default: withCtx(() => [
-          pageCode.value ? (openBlock(), createBlock(_sfc_main$1, {
+          !isIframe.value && pageCode.value ? (openBlock(), createBlock(_sfc_main$1, {
             key: 0,
             pageCode: pageCode.value,
             pageRequest: pageRequest.value,
             contentHeight: contentHeight.value
-          }, null, 8, ["pageCode", "pageRequest", "contentHeight"])) : createCommentVNode("", true)
+          }, null, 8, ["pageCode", "pageRequest", "contentHeight"])) : isIframe.value ? (openBlock(), createElementBlock("iframe", {
+            key: 1,
+            height: "98%",
+            width: "100%",
+            src: pageUrl.value,
+            frameborder: "0",
+            allowtransparency: "no"
+          }, null, 8, _hoisted_2)) : createCommentVNode("", true)
         ]),
         _: 1
       }, 8, ["title", "width", "draggable", "overflow"]));

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

@@ -18,7 +18,7 @@ import _sfc_main$5 from "./super-page-dialog.vue.js";
 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, isNumber } from "../utils/common-util.js";
+import { deepCopy, isNumber, refreshMobileDialogType } from "../utils/common-util.js";
 import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
 const _hoisted_1 = { class: "app-container" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -111,6 +111,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const buttonPageContext = ref(null);
     const route = useRoute();
     const pageKey = ref(0);
+    const isMobile = isMobileBrowser();
     function initPageDesign(pageDesign) {
       const tempContext = convertToPageContext(pageDesign, props.pageRequest);
       tempContext.isTest = props.isTest;
@@ -246,7 +247,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         let myContentHeight = props.contentHeight;
         if (!myContentHeight) {
           const rect = parentNode.getBoundingClientRect();
-          const isMobile = isMobileBrowser();
           console.log("setContextStyle-----isMobile=", isMobile);
           if (!isMobile) {
             myContentHeight = window.innerHeight - rect.y - 40;
@@ -444,10 +444,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function openDialog(configureObj, eventParams, myJumpPageSetting) {
       getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then((openPageParams) => {
         if (openPageParams) {
+          const openPageParamsResult = deepCopy(openPageParams);
           const myJumpPageSettingOrg = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
           if (myJumpPageSettingOrg) {
             Object.assign(openPageParams, deepCopy(myJumpPageSettingOrg));
           }
+          refreshMobileDialogType(openPageParams, isMobile);
           const jumpMode = openPageParams.jumpMode;
           const popPageSetting = openPageParams;
           if (!parentEventParams.value) {
@@ -457,16 +459,28 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           popPageSetting.parentPageCode = parentPageContext.value.code;
           popPageSetting.parentPageVersion = parentPageContext.value.version;
           popPageSetting.isNewPage = true;
-          if (jumpMode === "popup") {
-            jumpPageSetting.value = popPageSetting;
-            isShowDialog.value = true;
-          } else if (jumpMode === "refresh") {
-            router.push({
-              path: "/dsc/page",
-              query: popPageSetting
-            });
-          }
           if (jumpMode === "popup" || jumpMode === "refresh") {
+            const linkType = popPageSetting.linkType;
+            if (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url") {
+              if (jumpMode === "refresh") {
+                popPageSetting.dialogType = "drawer";
+                popPageSetting.jumpPageWidth = "100%";
+              }
+              popPageSetting._isIframe = true;
+              jumpPageSetting.value = popPageSetting;
+              isShowDialog.value = true;
+            } else {
+              popPageSetting._isIframe = false;
+              if (jumpMode === "popup") {
+                jumpPageSetting.value = popPageSetting;
+                isShowDialog.value = true;
+              } else if (jumpMode === "refresh") {
+                router.push({
+                  path: "/dsc/page",
+                  query: openPageParamsResult
+                });
+              }
+            }
             eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
               closeFunc(params);
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.35",
+  "version": "2.1.37",
   "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.70",
+    "agilebuilder-ui": "1.0.71",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",