super-page-runtime 2.0.49 → 2.0.53

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

@@ -84,17 +84,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       hisGroupValue = headerInfo.groupValue;
       refresh();
     });
-    function refresh() {
+    function refresh(isHandle) {
       if (!dataConfig) {
         console.log("无数据源配置，不需要查询!");
         return;
       }
       dataConfig.services[0].groupValue = headerInfo.groupValue;
-      dataConfig.isRefresh = true;
+      if (isHandle !== true) {
+        dataConfig.autoRefresh = true;
+      }
       updateChartDatasources(props.pageContext, [dataConfig], headerInfo.drillParams);
     }
     const monitorFields = headerInfo.monitorFields;
-    monitorFieldChange(props.pageContext, monitorFields, refresh);
+    monitorFieldChange(props.pageContext, monitorFields, () => {
+      refresh(true);
+    });
     function updateChartDatas(resultData) {
       if (!resultData) {
         resultData = [];
@@ -109,17 +113,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       }
       resultData.hasRender = true;
-      if (!dataConfig.isRefresh) {
+      if (!dataConfig.autoRefresh) {
         hisGroupValue = resultData.groupValue;
         if (hisGroupValue && headerInfo.groupComponent !== "checkbox") {
           hisGroupValue = hisGroupValue.join(",");
         }
         headerInfo.groupValue = hisGroupValue;
       }
-      if (!dataConfig.isRefresh || !enableDrill) {
+      if (!dataConfig.autoRefresh || !enableDrill) {
         clearChartSelected(props.pageContext, props.configure, chartRef.value.chart);
       }
-      dataConfig.isRefresh = false;
+      dataConfig.autoRefresh = false;
       updateChartOption(props.pageContext, props.configure, chartOption, resultData);
       console.log("chartOption--pie", chartOption);
     }

package/dist/es/components/runtime/views/assemblys/common/export-form-report-dialog.vue.js

@@ -77,7 +77,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return templateShowName;
     }
     function exportForm(row) {
-      emits("export", row);
+      emits("export", props.configure, row);
     }
     function closeExportForm() {
       emits("close");

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

@@ -90,7 +90,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function getUrlToListData() {
       let urlToListData2 = baseURL + "/dsc/commons/list";
       if (urlToListData2) {
-        urlToListData2 = getRealRestApiPath(urlToListData2, systemCode, backendUrl);
+        urlToListData2 = getRealRestApiPath(urlToListData2, systemCode, backendUrl, pageContext.isTest);
       }
       return urlToListData2;
     }
@@ -163,7 +163,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!backendUrl && !tableName) {
         return;
       }
-      getDataTypeMapRequest(backendUrl, tableName).then((result) => {
+      getDataTypeMapRequest(backendUrl, tableName, pageContext.isTest).then((result) => {
         if (!pageContext["dataTypeMaps"]) {
           pageContext["dataTypeMaps"] = {};
         }

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

@@ -0,0 +1,4 @@
+import _sfc_main from "./tree-runtime.vue2.js";
+export {
+  _sfc_main as default
+};

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

@@ -0,0 +1,48 @@
+import { defineComponent, computed, ref, resolveComponent, openBlock, createElementBlock, normalizeClass, unref, createVNode, normalizeStyle } from "vue";
+import { getFormModelFields } from "../../../../utils/page-init-util.js";
+import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "tree-runtime",
+  props: {
+    pageContext: {},
+    configure: {}
+  },
+  setup(__props) {
+    const props = __props;
+    const entity = props.pageContext.entity ? props.pageContext.entity : {};
+    let dynamicFields = getFormModelFields(props.pageContext, props.configure);
+    computed({
+      get() {
+        return getVariableValue(entity, dynamicFields);
+      },
+      set(value) {
+        setVariableValue(entity, dynamicFields, value);
+      }
+    });
+    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
+    const runtimeStyle = runtimeInfo.style;
+    const runtimeClass = runtimeInfo.class;
+    runtimeInfo.headerStyle;
+    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    return (_ctx, _cache) => {
+      const _component_el_tree = resolveComponent("el-tree");
+      return openBlock(), createElementBlock("div", {
+        class: normalizeClass(unref(runtimeClass))
+      }, [
+        createVNode(_component_el_tree, {
+          style: normalizeStyle([unref(runtimeStyle), { "width": "fit-content" }]),
+          data: designProperty.value.staticData,
+          "default-expand-all": designProperty.value.defaultExpandAll,
+          "expand-on-click-node": designProperty.value.expandOnClickNode,
+          indent: designProperty.value.retractWidth ? designProperty.value.retractWidth : 18,
+          accordion: designProperty.value.accordion,
+          "show-checkbox": designProperty.value.showCheckbox,
+          props: _ctx.defaultProps
+        }, null, 8, ["style", "data", "default-expand-all", "expand-on-click-node", "indent", "accordion", "show-checkbox", "props"])
+      ], 2);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

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

@@ -67,7 +67,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         autoSetAfterSelect(props.configure, props.pageContext, autoSets, selItems);
       }
-      handleEvent(value, props.pageContext, props.configure, "change");
+      handleFormEvent(value, props.pageContext, props.configure, "change");
     }
     function updateOptions(newOptions) {
       listOptions.value = newOptions ? newOptions : [];

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

@@ -1,8 +1,8 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createElementVNode, createTextVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { queryOptions, formatVariableValue, formatValueByType } from "../../../../utils/page-helper-util.js";
+import { getVariableValue, formatValueByType } from "../../../../utils/page-helper-util.js";
 import { SuperIcon } from "agilebuilder-ui";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { getCustomFunc, handleFormEvent } from "../../../../utils/events/event-util.js";
 const _hoisted_1 = { style: { "overflow": "hidden", "white-space": "nowrap" } };
 const _hoisted_2 = ["title"];
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -11,9 +11,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     pageContext: {},
     configure: {}
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const props = __props;
-    getFormModelFields(props.pageContext, props.configure);
+    const entity = props.pageContext.entity ? props.pageContext.entity : {};
+    let dynamicFields = getFormModelFields(props.pageContext, props.configure);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
@@ -21,28 +22,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const appendClass = runtimeInfo.appendClass;
     const appendStyle = runtimeInfo.appendStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    const listOptions = designProperty.value.options ? designProperty.value.options : [];
-    const dataOrigin = props.configure.props && props.configure.props.dataOrigin ? props.configure.props.dataOrigin : {};
-    const valueType = dataOrigin.optionValueSetType;
-    if (valueType == "dynamicData" || valueType == "dynamicData" || valueType == "service") {
-      queryOptions(props.configure, props.pageContext, "").then((results) => {
-        listOptions.value = results;
-      }).catch((error) => {
-        console.log("lable组件查询数据源失败!", error);
-      });
-    }
-    let contentVariable = designProperty.value.formatting;
-    if (!contentVariable) {
-      const propsBase = props.configure.props.base ? props.configure.props.base : {};
-      contentVariable = propsBase.prop;
-    }
-    if (!contentVariable) {
-      contentVariable = "${page." + props.configure.uuid + "}";
-    }
+    const listOptions = ref(designProperty.value.options ? designProperty.value.options : []);
     const formatType = designProperty.value.formatType;
+    console.log("designProperty.value", designProperty.value);
     const dynamicValue = computed(() => {
-      let resultValue = formatVariableValue(props.pageContext, contentVariable);
-      console.log("formatType", formatType);
+      let resultValue = getVariableValue(entity, dynamicFields);
       if (formatType) {
         if (designProperty.value.hasOptions) {
           let selItems = null;
@@ -52,11 +36,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (selItems && selItems.length > 0) {
             resultValue = selItems[0].label;
           }
+        } else if ("custom" === formatType) {
+          const func = getCustomFunc(props.pageContext, designProperty.value.formatFunc);
+          if (func) {
+            resultValue = func.apply(func, [
+              {
+                pageContext: props.pageContext,
+                configureObj: props.configure,
+                value: resultValue
+              }
+            ]);
+          }
         } else {
           resultValue = formatValueByType(resultValue, formatType, designProperty.value);
         }
       }
-      return resultValue == void 0 || resultValue == null ? "" : resultValue;
+      resultValue = resultValue === void 0 || resultValue === null ? "" : resultValue;
+      return resultValue;
+    });
+    function updateOptions(newOptions) {
+      listOptions.value = newOptions ? newOptions : [];
+    }
+    __expose({
+      updateOptions
     });
     return (_ctx, _cache) => {
       const _component_el_form_item = resolveComponent("el-form-item");
@@ -81,7 +83,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             createElementVNode("span", _hoisted_1, [
               designProperty.value.preIconValue || designProperty.value.preText ? (openBlock(), createElementBlock("span", {
                 key: 0,
-                class: normalizeClass({ "el-input__suffix": designProperty.value.iconPosition != "outer", "el-input-group__append": designProperty.value.iconPosition == "outer" }),
+                class: normalizeClass({
+                  "el-input__suffix": designProperty.value.iconPosition != "outer",
+                  "el-input-group__append": designProperty.value.iconPosition == "outer"
+                }),
                 style: normalizeStyle(unref(appendStyle))
               }, [
                 designProperty.value.preIconType && designProperty.value.preIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
@@ -95,7 +100,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             ]),
             designProperty.value.sufIconValue || designProperty.value.sufText ? (openBlock(), createElementBlock("span", {
               key: 0,
-              class: normalizeClass({ "el-input__suffix": designProperty.value.iconPosition != "outer", "el-input-group__append": designProperty.value.iconPosition == "outer" })
+              class: normalizeClass({
+                "el-input__suffix": designProperty.value.iconPosition != "outer",
+                "el-input-group__append": designProperty.value.iconPosition == "outer"
+              })
             }, [
               designProperty.value.sufIconType && designProperty.value.sufIconValue ? (openBlock(), createBlock(unref(SuperIcon), {
                 key: 0,

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

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createTextVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { formatVariableValue } from "../../../../utils/page-helper-util.js";
+import { getVariableValue } from "../../../../utils/page-helper-util.js";
 import { handleFormEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "link-runtime",
@@ -10,29 +10,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    getFormModelFields(props.pageContext, props.configure);
+    const modelFields = getFormModelFields(props.pageContext, props.configure);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    let contentVariable = designProperty.value.formatting;
-    if (!contentVariable) {
-      const propsBase = props.configure.props.base ? props.configure.props.base : {};
-      contentVariable = propsBase.prop;
-    }
-    if (!contentVariable) {
-      contentVariable = "${page." + props.configure.uuid + "}";
-    }
+    console.log("designProperty", designProperty.value);
+    let formatting = designProperty.value.formatting;
+    const entity = props.pageContext.entity ? props.pageContext.entity : {};
     const dynamicValue = computed(() => {
-      const resultValue = formatVariableValue(props.pageContext, contentVariable);
-      return resultValue == void 0 || resultValue == null ? "" : resultValue;
+      let resultValue = getVariableValue(entity, modelFields);
+      resultValue = resultValue == void 0 || resultValue == null ? "" : resultValue;
+      if (formatting) {
+        resultValue = formatting.replace(/\${value}/g, resultValue);
+      }
+      return resultValue;
     });
     let tooltipVariable = designProperty.value.tooltip;
-    const tooltipValue = computed(() => {
-      const resultValue = formatVariableValue(props.pageContext, tooltipVariable);
-      return resultValue == void 0 || resultValue == null ? "" : resultValue;
-    });
+    let tooltipValue = null;
+    if (tooltipVariable) {
+      tooltipValue = computed(() => {
+        let resultValue = getVariableValue(entity, modelFields);
+        resultValue = resultValue == void 0 || resultValue == null ? "" : resultValue;
+        return tooltipVariable.replace(/\${value}/g, resultValue);
+      });
+    }
     return (_ctx, _cache) => {
       const _component_el_link = resolveComponent("el-link");
       const _component_el_tooltip = resolveComponent("el-tooltip");
@@ -50,8 +53,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ]),
         default: withCtx(() => [
           createVNode(_component_el_tooltip, {
-            disabled: !tooltipValue.value,
-            content: tooltipValue.value
+            disabled: !unref(tooltipValue),
+            content: unref(tooltipValue)
           }, {
             default: withCtx(() => [
               createVNode(_component_el_link, {

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

@@ -1,6 +1,6 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createTextVNode } from "vue";
+import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList, createTextVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { formatVariableValue } from "../../../../utils/page-helper-util.js";
+import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { handleFormEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "tag-runtime",
@@ -10,24 +10,61 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    getFormModelFields(props.pageContext, props.configure);
+    const modelFields = getFormModelFields(props.pageContext, props.configure);
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    let contentVariable = designProperty.value.formatting;
-    if (!contentVariable) {
-      const propsBase = props.configure.props.base ? props.configure.props.base : {};
-      contentVariable = propsBase.prop;
-    }
-    if (!contentVariable) {
-      contentVariable = "${page." + props.configure.uuid + "}";
-    }
-    const dynamicValue = computed(() => {
-      const resultValue = formatVariableValue(props.pageContext, contentVariable);
-      return resultValue == void 0 || resultValue == null ? "" : resultValue;
+    let formatting = designProperty.value.formatting;
+    const entity = props.pageContext.entity ? props.pageContext.entity : {};
+    const dynamicValues = computed(() => {
+      let resultValue = getVariableValue(entity, modelFields);
+      if (resultValue === void 0 || resultValue === null) {
+        resultValue = [];
+      }
+      if (!Array.isArray(resultValue)) {
+        resultValue = (resultValue + "").split(",");
+      }
+      const options = [];
+      let no = 1;
+      for (const val of resultValue) {
+        if (val === void 0 || val === null || val === "") {
+          continue;
+        }
+        const o = {
+          value: val,
+          label: val
+        };
+        if (formatting) {
+          o.label = formatting.replace(/\${value}/g, o.value).replace(/\${no}/g, no);
+        }
+        options.push(o);
+        no++;
+      }
+      return options;
     });
+    function closeTag($event, tag) {
+      if (designProperty.value.closable) {
+        let resultValue = getVariableValue(entity, modelFields);
+        if (resultValue === void 0 || resultValue === null) {
+          resultValue = [];
+        }
+        const isArray = Array.isArray(resultValue);
+        if (!isArray) {
+          resultValue = (resultValue + "").split(",");
+        }
+        const index = resultValue.indexOf(tag.value);
+        if (index > -1) {
+          resultValue.splice(index, 1);
+        }
+        if (!isArray) {
+          resultValue = resultValue.join(",");
+        }
+        setVariableValue(entity, modelFields, resultValue);
+      }
+      handleFormEvent($event, props.pageContext, props.configure, "remove");
+    }
     return (_ctx, _cache) => {
       const _component_el_tag = resolveComponent("el-tag");
       const _component_el_form_item = resolveComponent("el-form-item");
@@ -44,18 +81,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
-          createVNode(_component_el_tag, {
-            size: designProperty.value.size,
-            closable: designProperty.value.closable,
-            type: designProperty.value.type,
-            onClose: _cache[0] || (_cache[0] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "remove")),
-            onClick: _cache[1] || (_cache[1] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
-          }, {
-            default: withCtx(() => [
-              createTextVNode(toDisplayString(dynamicValue.value), 1)
-            ]),
-            _: 1
-          }, 8, ["size", "closable", "type"])
+          (openBlock(true), createElementBlock(Fragment, null, renderList(dynamicValues.value, (tag) => {
+            return openBlock(), createBlock(_component_el_tag, {
+              key: tag,
+              size: designProperty.value.size,
+              closable: designProperty.value.closable,
+              type: designProperty.value.type,
+              style: { "margin-right": "4px" },
+              onClose: ($event) => closeTag($event, tag),
+              onClick: _cache[0] || (_cache[0] = ($event) => unref(handleFormEvent)($event, _ctx.pageContext, _ctx.configure, "click"))
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(tag.label), 1)
+              ]),
+              _: 2
+            }, 1032, ["size", "closable", "type", "onClose"]);
+          }), 128))
         ]),
         _: 1
       }, 8, ["required", "class", "label-width", "style"]);

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, openBlock, createElementBlock, Fragment, renderList, createBlock, createCommentVNode } from "vue";
+import { defineComponent, ref, openBlock, createElementBlock, Fragment, renderList, createBlock, createCommentVNode, unref, normalizeStyle, toDisplayString } from "vue";
 import _sfc_main$1 from "../../object-render.vue.js";
 import { getClickEventFuncByType } from "../../../../utils/events/event-util.js";
 import { isVisibleWorkflowButton } from "../../../../utils/events/standard-event.js";
@@ -16,6 +16,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const buttonInfo = props.pageContext.workflowButtonComponent;
     const completeTaskParam = props.pageContext.completeTaskParam;
     const visibleBtns = ref([]);
+    let taskName = ref("");
+    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;
+      }
+    }
     props.configure.items.forEach((item) => {
       if (isVisibleBtn(item)) {
         visibleBtns.value.push(item);
@@ -50,7 +58,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               configure: element
             }, null, 8, ["pageContext", "configure"])) : createCommentVNode("", true)
           ], 64);
-        }), 256))
+        }), 256)),
+        unref(taskName) ? (openBlock(), createElementBlock("span", {
+          key: 0,
+          style: normalizeStyle({ color: unref(activityNameColor) })
+        }, " 当前环节： " + toDisplayString(unref(taskName)), 5)) : createCommentVNode("", true)
       ]);
     };
   }

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

@@ -1,5 +1,4 @@
 import { defineComponent, ref, resolveComponent, openBlock, createBlock, withCtx, createCommentVNode } from "vue";
-import "element-plus";
 import _sfc_main$1 from "./super-page.vue.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page-dialog",
@@ -20,8 +19,16 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const pageCode = ref(null);
     const dataId = ref(null);
     const taskId = ref(null);
+    const dialogType = ref(null);
     const pageRequest = ref({});
+    const draggable = ref(false);
+    const overflow = ref(false);
+    const showPosition = ref("rtl");
     if (myJumpPageSetting) {
+      dialogType.value = myJumpPageSetting && myJumpPageSetting["dialogType"] ? myJumpPageSetting["dialogType"] : "dialog";
+      draggable.value = myJumpPageSetting && myJumpPageSetting["draggable"] ? myJumpPageSetting["draggable"] : false;
+      overflow.value = myJumpPageSetting && myJumpPageSetting["overflow"] ? myJumpPageSetting["overflow"] : false;
+      showPosition.value = myJumpPageSetting && myJumpPageSetting["showPosition"] ? myJumpPageSetting["showPosition"] : "rtl";
       title.value = myJumpPageSetting && myJumpPageSetting["jumpPageTitle"] ? myJumpPageSetting["jumpPageTitle"] : null;
       width.value = myJumpPageSetting && myJumpPageSetting["jumpPageWidth"] ? myJumpPageSetting["jumpPageWidth"] : "100%";
       pageCode.value = myJumpPageSetting && myJumpPageSetting["pageCode"];
@@ -52,12 +59,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     return (_ctx, _cache) => {
       const _component_el_drawer = resolveComponent("el-drawer");
-      return openBlock(), createBlock(_component_el_drawer, {
+      const _component_el_dialog = resolveComponent("el-dialog");
+      return dialogType.value && dialogType.value === "drawer" ? (openBlock(), createBlock(_component_el_drawer, {
+        key: 0,
         modelValue: showContent.value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => showContent.value = $event),
-        "with-header": !title.value,
         title: title.value,
-        direction: "btt",
+        direction: showPosition.value,
         size: width.value,
         onOpen: _cache[1] || (_cache[1] = ($event) => emits("open")),
         onOpened: _cache[2] || (_cache[2] = ($event) => emits("opened")),
@@ -72,7 +80,29 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, null, 8, ["pageCode", "pageRequest"])) : createCommentVNode("", true)
         ]),
         _: 1
-      }, 8, ["modelValue", "with-header", "title", "size"]);
+      }, 8, ["modelValue", "title", "direction", "size"])) : (openBlock(), createBlock(_component_el_dialog, {
+        key: 1,
+        "model-value": "",
+        title: title.value,
+        "close-on-click-modal": false,
+        "append-to-body": "",
+        width: width.value,
+        draggable: draggable.value,
+        overflow: overflow.value,
+        onOpen: _cache[5] || (_cache[5] = ($event) => _ctx.$emit("open")),
+        onOpend: _cache[6] || (_cache[6] = ($event) => _ctx.$emit("opend")),
+        onClose: _cache[7] || (_cache[7] = ($event) => emits("close")),
+        onClosed: _cache[8] || (_cache[8] = ($event) => _ctx.$emit("closed"))
+      }, {
+        default: withCtx(() => [
+          pageCode.value ? (openBlock(), createBlock(_sfc_main$1, {
+            key: 0,
+            pageCode: pageCode.value,
+            pageRequest: pageRequest.value
+          }, null, 8, ["pageCode", "pageRequest"])) : createCommentVNode("", true)
+        ]),
+        _: 1
+      }, 8, ["title", "width", "draggable", "overflow"]));
     };
   }
 });

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

@@ -18,6 +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 } from "../utils/common-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
   props: {
@@ -136,6 +137,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         buttonPageContext.value = params.pageContext;
         showExportForm.value = true;
       });
+      eventBus.$on(eventPageInfo.value + "export-pdf-report", (params) => {
+        buttonParams.value = params;
+        buttonConfigure.value = params.configureObj;
+        buttonPageContext.value = params.pageContext;
+        showExportForm.value = true;
+      });
       eventBus.$on(eventPageInfo.value + "import-file", (params) => {
         buttonParams.value = params;
         clickImport();
@@ -182,7 +189,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         parentPageContext.value = params.pageContext;
         parentConfigureObj.value = params.configureObj;
         parentEventParams.value = params.eventParams;
-        params.jumpPageSetting;
         openDialog(parentConfigureObj.value, parentEventParams.value, params.jumpPageSetting);
       });
       watch(
@@ -290,6 +296,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         removeCustomFuncFromWindow(pageDesignResult.value);
       }
       eventBus.$off(eventPageInfo.value + "export-form-report");
+      eventBus.$off(eventPageInfo.value + "export-pdf-report");
       eventBus.$off(eventPageInfo.value + "import-file");
       eventBus.$off(eventPageInfo.value + "assign-task");
       eventBus.$off(eventPageInfo.value + "copy-task");
@@ -306,8 +313,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       showExportForm.value = false;
       buttonParams.value = null;
     }
-    function doExportFormReport(templateFile) {
-      const isPdf = false;
+    function doExportFormReport(buttonConfigure2, templateFile) {
+      let isPdf = false;
+      if (buttonConfigure2.name === "export-pdf") {
+        isPdf = true;
+      }
       exportFormReport(
         buttonParams.value.pageContext,
         buttonParams.value.configureObj,
@@ -324,8 +334,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;
@@ -397,6 +406,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function openDialog(configureObj, eventParams, myJumpPageSetting) {
       getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then((openPageParams) => {
         if (openPageParams) {
+          const myJumpPageSettingOrg = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
+          if (myJumpPageSettingOrg) {
+            Object.assign(openPageParams, deepCopy(myJumpPageSettingOrg));
+          }
           const jumpMode = openPageParams.jumpMode;
           const popPageSetting = openPageParams;
           popPageSetting.parentPageCode = parentPageContext.value.code;

package/package.json

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