super-page-runtime 2.0.25 → 2.0.28

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

@@ -0,0 +1,96 @@
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createVNode, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString } from "vue";
+import "agilebuilder-ui";
+import { handleEvent } from "../../../../utils/events/event-util.js";
+import _sfc_main$1 from "../button/button-runtime.vue2.js";
+const _hoisted_1 = { key: 1 };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "printlabel-runtime",
+  props: {
+    pageContext: {},
+    configure: {}
+  },
+  setup(__props) {
+    const props = __props;
+    const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
+    const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    const showDropdown = ref(false);
+    if (designProperty.value.template && designProperty.value.template.length > 1) {
+      showDropdown.value = true;
+    }
+    const runtimeStyle = runtimeInfo.style;
+    const runtimeClass = runtimeInfo.class;
+    return (_ctx, _cache) => {
+      const _component_el_button = resolveComponent("el-button");
+      const _component_ArrowDown = resolveComponent("ArrowDown");
+      const _component_el_icon = resolveComponent("el-icon");
+      const _component_el_text = resolveComponent("el-text");
+      const _component_el_dropdown_item = resolveComponent("el-dropdown-item");
+      const _component_el_dropdown_menu = resolveComponent("el-dropdown-menu");
+      const _component_el_dropdown = resolveComponent("el-dropdown");
+      return !showDropdown.value ? (openBlock(), createBlock(_sfc_main$1, {
+        key: 0,
+        configure: _ctx.configure,
+        pageContext: _ctx.pageContext
+      }, null, 8, ["configure", "pageContext"])) : (openBlock(), createBlock(_component_el_dropdown, {
+        key: 1,
+        class: normalizeClass(unref(runtimeClass)),
+        style: normalizeStyle(unref(runtimeStyle)),
+        placement: designProperty.value.placement,
+        "split-button": designProperty.value.splitButton,
+        disabled: designProperty.value.state === "disabled",
+        type: designProperty.value.buttonType,
+        size: designProperty.value.size,
+        trigger: designProperty.value.trigger
+      }, {
+        dropdown: withCtx(() => [
+          createVNode(_component_el_dropdown_menu, null, {
+            default: withCtx(() => [
+              (openBlock(true), createElementBlock(Fragment, null, renderList(designProperty.value.template, (item, index) => {
+                return openBlock(), createBlock(_component_el_dropdown_item, {
+                  key: item,
+                  onClick: ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "click", { menuItem: item })
+                }, {
+                  default: withCtx(() => [
+                    createTextVNode(toDisplayString(item.label), 1)
+                  ]),
+                  _: 2
+                }, 1032, ["onClick"]);
+              }), 128))
+            ]),
+            _: 1
+          })
+        ]),
+        default: withCtx(() => [
+          designProperty.value.triggerElement === "button" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
+            !designProperty.value.splitButton ? (openBlock(), createBlock(_component_el_button, {
+              key: 0,
+              size: designProperty.value.size,
+              type: designProperty.value.buttonType,
+              onClick: _cache[0] || (_cache[0] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "menuClick"))
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(designProperty.value.title), 1)
+              ]),
+              _: 1
+            }, 8, ["size", "type"])) : (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(designProperty.value.title), 1))
+          ], 64)) : (openBlock(), createBlock(_component_el_text, { key: 1 }, {
+            default: withCtx(() => [
+              createTextVNode(toDisplayString(designProperty.value.title) + " ", 1),
+              createVNode(_component_el_icon, null, {
+                default: withCtx(() => [
+                  createVNode(_component_ArrowDown)
+                ]),
+                _: 1
+              })
+            ]),
+            _: 1
+          }))
+        ]),
+        _: 1
+      }, 8, ["class", "style", "placement", "split-button", "disabled", "type", "size", "trigger"]));
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

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

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         justify: designProperty.value.flexJustify,
         gutter: designProperty.value.flexGutter,
         align: designProperty.value.alignItems,
-        style: normalizeStyle(unref(runtimeStyle)),
+        style: normalizeStyle([{ "display": "flex" }, unref(runtimeStyle)]),
         class: normalizeClass(unref(runtimeClass))
       }, {
         default: withCtx(() => [

package/dist/es/components/runtime/views/assemblys/data/bar-code/barcode-runtime.vue2.js

@@ -2,6 +2,7 @@ import { defineComponent, computed, ref, onMounted, watch, resolveComponent, ope
 import qrcode from "qrcode";
 import JsBarcode from "jsbarcode";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
+import { generateCodeByRule } from "../../../../utils/barcode-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
 import { handleEvent } from "../../../../utils/events/event-util.js";
 import "agilebuilder-ui/src/utils/request";
@@ -78,7 +79,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             () => props.pageContext.entity.data[item.fieldName],
             (newValue, oldValue) => {
               if (newValue !== void 0 && newValue !== null) {
-                generateCodeByRule(rule);
+                const codeValue = generateCodeByRule(rule, props.pageContext.entity.data);
+                if (codeValue) {
+                  generateCode(codeValue);
+                }
               }
             }
           );
@@ -101,38 +105,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         generateCode(barCodeValue);
       }
     }
-    function generateCodeByRule(rule) {
-      let allVariablesPresent = true;
-      let value = "";
-      rule.forEach((item) => {
-        if (item.fieldName !== "-1" && item.fieldName !== -1) {
-          const filedValue = props.pageContext.entity.data[item.fieldName];
-          if (item.suppliement && item.fieldLength) {
-            if (!filedValue) {
-              value += "".padEnd(item.fieldLength, item.suppliement);
-            } else {
-              if (filedValue.length > item.fieldLength) {
-                value += filedValue.substring(0, item.fieldLength);
-              } else {
-                value += filedValue.padEnd(item.fieldLength, item.suppliement);
-              }
-            }
-          } else {
-            if (!filedValue) {
-              allVariablesPresent = false;
-            } else {
-              value += filedValue;
-            }
-          }
-        } else {
-          value += item.fixedValue;
-        }
-      });
-      console.log(value);
-      if (allVariablesPresent) {
-        generateCode(value);
-      }
-    }
     function generateCode(value) {
       createCode(value);
       setValue(value);

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

@@ -4,7 +4,7 @@ import { setTableEvents, getEventFuncByType, canExecuteButton, doAfterClickEvent
 import { getListCode, getRealRestApiPath } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from "../../../../utils/events/standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
-import { getDataTypeMap, popupToPage } from "../../../../utils/table-utils.js";
+import { getDataTypeMapRequest, popupToPage } from "../../../../utils/table-utils.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { getPermissionCodes } from "../../../../utils/page-init-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -22,7 +22,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    const tableName = pageContext.tableName;
+    debugger;
+    const tableName = configure.props && configure.props.dataOrigin && configure.props.dataOrigin.tableName;
     let baseURL = pageContext.backendUrl;
     if (!baseURL) {
       baseURL = window["$vueApp"].config.globalProperties.baseURL;
@@ -155,7 +156,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!backendUrl && !tableName) {
         return;
       }
-      getDataTypeMap(backendUrl, tableName).then((result) => {
+      getDataTypeMapRequest(backendUrl, tableName).then((result) => {
         if (!pageContext["dataTypeMaps"]) {
           pageContext["dataTypeMaps"] = {};
         }

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

@@ -16,8 +16,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const props = __props;
     const pageContext = props.pageContext;
     const configure = props.configure;
+    const listCode = getListCode(pageContext.code, pageContext.version, configure.uuid);
     const dataModel = pageContext.entity.data;
-    const prop = configure.props && configure.props.base ? configure.props.base.prop : null;
+    const prop = listCode;
     const additionalParamMap = getAdditionalParamMap(pageContext);
     const tableEvents = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
     const selections = ref([]);
@@ -28,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
-    let dynamicFields = getFormModelFields(props.pageContext, props.configure);
+    let dynamicFields = getFormModelFields(props.pageContext, props.configure, prop);
     const listViewShowFlag = ref(false);
     const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
@@ -50,13 +51,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (runtimeClass) {
       listViewOptions.value["tableClass"] = runtimeClass;
     }
-    if (configure.props && configure.props.base && configure.props.base.subPaging === void 0 || configure.props.base.subPaging === null || configure.props.base.subPaging === false) {
-      listViewOptions.value.showPageArea = false;
-    } else {
+    if (configure.props && configure.props.base && configure.props.base.subPaging === true) {
       listViewOptions.value.showPageArea = true;
+    } else {
+      listViewOptions.value.showPageArea = false;
     }
     const gridRef = ref(null);
-    const listCode = getListCode(pageContext.code, pageContext.version, configure.uuid);
     function currencyListViewSetting(canRrefreshSubtableData) {
       if (canRrefreshSubtableData === void 0) {
         canRrefreshSubtableData = judgeInitializationSubTable();
@@ -115,11 +115,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return getVariableValue(entity, dynamicFields);
     }
     function changeInitializationSubTable(canRrefreshSubtableData) {
+      debugger;
       currencyListViewSetting(canRrefreshSubtableData);
       listViewOptions.value["isPageInfo"] = false;
-      listViewOptions.value["subTableData"] = null;
+      listViewOptions.value["subTableData"] = getValue();
       listViewOptions.value.extraParam["subTableListViewCode"] = listCode;
-      listViewOptions.value.extraParam["subtableSetting"] = configure.props || !configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings.subtableSetting) : null;
+      listViewOptions.value.extraParam["subtableSetting"] = configure.props && configure.props.otherSettings ? JSON.stringify(configure.props.otherSettings.subtableSetting) : null;
       listViewOptions.value.extraParam["additionalParamMap"] = additionalParamMap;
       listViewOptions.value.extraParam["entityMap"] = pageContext.entity.data;
       setGridDataEventOptions();
@@ -129,7 +130,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         setGridToStore();
       }, 10);
     }
-    changeInitializationSubTable();
     function setGridDataEventOptions() {
       setSubTableValidateInfo();
       setTableEvents(listViewOptions.value, tableEvents, pageContext, configure);
@@ -164,6 +164,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         listViewOptions.value["actionPermission"] = actionPermission;
       }
+      if (!listViewOptions.value["operations"]) {
+        listViewOptions.value["operations"] = {};
+      }
       const subTableOperations = getOperations();
       listViewOptions.value["operations"]["operation"] = subTableOperations;
       listViewOptions.value["subTableCanAdd"] = isShowAdd();
@@ -175,6 +178,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageContext.tableUuids.push(configure.uuid);
     }
     function getOperations() {
+      debugger;
       let operations = [];
       if (isShowAdd()) {
         const addButton = {
@@ -207,6 +211,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       return operations;
     }
+    changeInitializationSubTable();
     function getEntityId(row) {
       if (row && row.id) {
         return row.id;
@@ -281,6 +286,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       gridRef.value.deleteRow(rowIndex, listCode, false);
     }
     function changeGridData(gridData) {
+      debugger;
       setVariableValue(entity, dynamicFields, gridData);
     }
     function changeRowsPerpage(pageSize) {

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

@@ -19,7 +19,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const tableUuid = props.configure.uuid;
     const superGridItems = props.pageContext.superGridItems;
     const superGridSetting = superGridItems ? superGridItems[tableUuid] : null;
-    tableConfigure.value = superGridSetting.configure ? JSON.parse(superGridSetting.configure) : null;
+    tableConfigure.value = superGridSetting ? superGridSetting.configure ? JSON.parse(superGridSetting.configure) : null : props.configure;
+    debugger;
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     runtimeInfo.style;
     runtimeInfo.class;
@@ -71,7 +72,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ref_key: "gridRef",
           ref: gridRef,
           pageContext: _ctx.pageContext,
-          configure: _ctx.configure
+          configure: tableConfigure.value
         }, null, 8, ["pageContext", "configure"])) : (openBlock(), createBlock(_sfc_main$2, {
           key: 1,
           ref_key: "gridRef",

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

@@ -1,7 +1,7 @@
 import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
-import { handleEvent } from "../../../../utils/events/event-util.js";
+import { getCustomFunc, handleEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "datepicker-runtime",
   props: {
@@ -25,6 +25,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    if (designProperty.value.shortcutsFunc) {
+      const func = getCustomFunc(props.pageContext, designProperty.value.shortcutsFunc);
+      if (func) {
+        let returns = func.apply(func, [
+          {
+            pageContext: props.pageContext,
+            configureObj: props.configure
+          }
+        ]);
+        if (returns) {
+          if (typeof returns === "object") {
+            returns = [returns];
+          }
+          if (!designProperty.value.shortcuts) {
+            designProperty.value.shortcuts = [];
+          }
+          for (let r of returns) {
+            if (r.text && r.value) {
+              designProperty.value.shortcuts.push(r);
+            }
+          }
+        }
+      }
+    }
     return (_ctx, _cache) => {
       const _component_el_time_picker = resolveComponent("el-time-picker");
       const _component_el_date_picker = resolveComponent("el-date-picker");

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

@@ -1,6 +1,8 @@
-import { defineComponent, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
+import { defineComponent, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
-import { fileUploadBeforeUpload, fileUploadUploaded, fileUploadBeforeDelete, fileUploadDeleted } from "../../../../utils/events/event-util.js";
+import { fileUploadBeforeUpload } from "../../../../utils/events/event-util.js";
+import http from "agilebuilder-ui/src/utils/request";
+import FsUploadNew from "agilebuilder-ui";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "fileupload-runtime",
   props: {
@@ -14,25 +16,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
-    const fileSetObj = designProperty.value.fileSetObj;
-    fileSetObj.beforeUpload = beforeUpload;
-    fileSetObj.pageContext = props.pageContext;
-    fileSetObj.configureObj = props.configure;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     const propsBase = props.configure.props.base ? props.configure.props.base : {};
-    propsBase.prop;
     const pathFields = getFieldsByVariable(propsBase.prop);
     const nameFields = getFieldsByVariable(propsBase.propName);
-    const initNames = getVariableValue(entity, nameFields);
     const initPaths = getVariableValue(entity, pathFields);
-    const fileInfo = ref({
-      name: initNames ? initNames : "",
-      serverPath: initPaths ? initPaths : ""
-    });
-    watch(fileInfo, () => {
-      setVariableValue(entity, nameFields, fileInfo.name);
-      setVariableValue(entity, pathFields, fileInfo.serverPath);
-    });
+    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 names = [];
+          for (let index = 0; index < uuids.length; index++) {
+            const uuid = uuids[index];
+            names.push(result[uuid]);
+            fileList.value.push({ showName: result[uuid], serverPath: uuid });
+          }
+          if (designProperty.value.displayType === "input") {
+            fileInfo.value.showName = names.join(",");
+            fileInfo.value.serverPath = uuids.join(",");
+          }
+        });
+      }
+    }
     function getFieldsByVariable(variableName) {
       if (!variableName) {
         return [];
@@ -45,17 +58,30 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function beforeUpload(params) {
       return fileUploadBeforeUpload(params);
     }
-    function uploaded(params) {
-      return fileUploadUploaded(props.pageContext, props.configure, params);
-    }
-    function beforeDelete(params) {
-      return fileUploadBeforeDelete(props.pageContext, props.configure, params);
-    }
-    function deleted(params) {
-      return fileUploadDeleted(props.pageContext, props.configure, params);
+    const onSuccess = (response, uploadFile, uploadFiles) => {
+      updateValue();
+    };
+    const onRemove = (file) => {
+      updateValue();
+    };
+    const updateValue = () => {
+      const names = [];
+      const uuids = [];
+      for (let index = 0; index < fileList.value.length; index++) {
+        names.push(fileList.value[index].showName);
+        uuids.push(fileList.value[index].serverPath);
+      }
+      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_FsUploadList = resolveComponent("FsUploadList");
       const _component_el_form_item = resolveComponent("el-form-item");
       return designProperty.value.tittleShow ? (openBlock(), createBlock(_component_el_form_item, {
         key: 0,
@@ -71,25 +97,37 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
-          createVNode(_component_FsUploadList, {
+          createVNode(unref(FsUploadNew), {
             disabled: designProperty.value.state == "disabled",
-            fileSetObj: designProperty.value.fileSetObj,
-            fileInfo: fileInfo.value,
-            onUploaded: uploaded,
-            onBeforeDelete: beforeDelete,
-            onDeleted: deleted
-          }, null, 8, ["disabled", "fileSetObj", "fileInfo"])
+            displayType: designProperty.value.displayType,
+            accept: designProperty.value.accept,
+            multiple: designProperty.value.multiple,
+            placeholder: designProperty.value.placeholder,
+            limit: designProperty.value.limit,
+            "limit-file-size": designProperty.value.limitFileSize,
+            "file-info": fileInfo.value,
+            "file-list": fileList.value,
+            "on-success": onSuccess,
+            "on-remove": onRemove,
+            "before-upload": beforeUpload
+          }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list"])
         ]),
         _: 1
-      }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createBlock(_component_FsUploadList, {
+      }, 8, ["required", "class", "label-width", "style"])) : (openBlock(), createBlock(unref(FsUploadNew), {
         key: 1,
         disabled: designProperty.value.state == "disabled",
-        fileSetObj: designProperty.value.fileSetObj,
-        fileInfo: fileInfo.value,
-        onUploaded: uploaded,
-        onBeforeDelete: beforeDelete,
-        onDeleted: deleted
-      }, null, 8, ["disabled", "fileSetObj", "fileInfo"]));
+        displayType: designProperty.value.displayType,
+        accept: designProperty.value.accept,
+        multiple: designProperty.value.multiple,
+        placeholder: designProperty.value.placeholder,
+        limit: designProperty.value.limit,
+        "limit-file-size": designProperty.value.limitFileSize,
+        "file-info": fileInfo.value,
+        "file-list": fileList.value,
+        "on-success": onSuccess,
+        "on-remove": onRemove,
+        "before-upload": beforeUpload
+      }, null, 8, ["disabled", "displayType", "accept", "multiple", "placeholder", "limit", "limit-file-size", "file-info", "file-list"]));
     };
   }
 });

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

@@ -142,7 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         pageContext: _ctx.pageContext
       }, null, 8, ["style", "class", "configure", "pageContext"])), [
         [vShow, unref(showFlag)],
-        [_directive_permission, unref(permissionCodes)]
+        [_directive_permission, unref(permissionCodes) ? unref(permissionCodes) : "true"]
       ]);
     };
   }

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

@@ -40,6 +40,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         } catch (error) {
           console.error(error);
         }
+        if (dataId.value === null || dataId.value === void 0) {
+          dataId.value = props.parentPageEventParams["id"];
+        }
       }
       pageRequest.value["parentPageCode"] = myJumpPageSetting && myJumpPageSetting["parentPageCode"] ? myJumpPageSetting["parentPageCode"] : null;
       pageRequest.value["parentPageVersion"] = myJumpPageSetting && myJumpPageSetting["parentPageVersion"] ? myJumpPageSetting["parentPageVersion"] : null;

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

@@ -173,7 +173,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         parentPageContext.value = params.pageContext;
         parentConfigureObj.value = params.configureObj;
         parentEventParams.value = params.eventParams;
-        openDialog(parentConfigureObj.value);
+        openDialog(parentConfigureObj.value, parentEventParams.value);
       });
       eventBus.$on(
         eventPageInfo.value + "close-dialog",
@@ -181,7 +181,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           closeDialog({ isNeedValueMapping, dataModel, sourceTableName });
         }
       );
-      getFormData(pageContext.value);
       watch(
         () => pageContext.value.isRefresh,
         (newValue) => {
@@ -194,6 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       );
+      return getFormData(pageContext.value);
     }
     function initOptionDatas(pageContext2, optionConfigs) {
       if (!optionConfigs || optionConfigs.length == 0) {
@@ -219,28 +219,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     onMounted(() => {
-      if (props.pageDesign != null) {
-        pageDesignResult.value = props.pageDesign;
-        setTimeout(() => {
-          initPageDesign(props.pageDesign);
-          if (props.pageDesign.tableRuntimes && Object.keys(props.pageDesign.tableRuntimes).length > 0) {
-            queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((superGridItems) => {
-              pageContext.value.superGridItems = superGridItems;
-              isShowPage.value = true;
-            }).catch(() => {
-              isShowPage.value = true;
-            });
-          } else {
-            isShowPage.value = true;
-          }
-        }, 0);
-      } else if (props.pageCode) {
-        queryPageDesignByCode(props.pageCode).then((result) => {
-          pageDesignResult.value = result;
-          initPageDesign(result);
-          isShowPage.value = true;
-        });
-      }
+      initPage();
       if (thisRef.value) {
         setTimeout(() => {
           const parentNode = thisRef.value.parentNode ? thisRef.value.parentNode : thisRef.value;
@@ -251,6 +230,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }, 10);
       }
     });
+    function initPage() {
+      if (props.pageDesign != null) {
+        pageDesignResult.value = props.pageDesign;
+        setTimeout(() => {
+          initPageDesign(props.pageDesign).then(() => {
+            if (props.pageDesign.tableRuntimes && Object.keys(props.pageDesign.tableRuntimes).length > 0) {
+              queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((superGridItems) => {
+                pageContext.value.superGridItems = superGridItems;
+                isShowPage.value = true;
+              }).catch(() => {
+                isShowPage.value = true;
+              });
+            } else {
+              isShowPage.value = true;
+            }
+          });
+        }, 0);
+      } else if (props.pageCode) {
+        queryPageDesignByCode(props.pageCode).then((appPageDesign) => {
+          if (appPageDesign && appPageDesign.designJson) {
+            const designJson = appPageDesign.designJson;
+            const pageConf = JSON.parse(designJson);
+            pageDesignResult.value = pageConf;
+            initPageDesign(pageConf).then(() => {
+              isShowPage.value = true;
+            });
+          }
+        });
+      }
+    }
     onUpdated(() => {
       nextTick(() => {
         if (pageContext.value && thisRef.value) {
@@ -337,16 +346,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       doRemoveSigners(buttonParams.value, selectRemoveTasks);
     }
     const router = useRouter();
-    function openDialog(configureObj) {
+    function openDialog(configureObj, eventParams) {
       const myJumpPageSetting = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
       if (myJumpPageSetting && myJumpPageSetting.jumpPageUrl) {
         const additionalParamMap = getAdditionalParamMap(pageContext);
-        let dataId;
-        let ids;
-        if (additionalParamMap) {
-          dataId = additionalParamMap.id;
-          ids = additionalParamMap.ids;
-        }
+        let dataId = eventParams ? eventParams.id : null;
+        let ids = eventParams ? eventParams.ids : null;
         const dataModel = pageContext.value.entity.data;
         const pageModel = pageContext.value.entity.page;
         let entity = {};
@@ -380,14 +385,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.error("页面配置信息不存在");
       }
     }
-    function closeDialog({ isNeedValueMapping, dataModel, sourceTableName }) {
-      if (isNeedValueMapping) {
-        updateValuesWhenCloseDialog(
-          parentPageContext.value,
-          parentConfigureObj.value,
-          dataModel,
-          sourceTableName
-        );
+    function closeDialog(params) {
+      if (params) {
+        const isNeedValueMapping = params.isNeedValueMapping;
+        const dataModel = params.dataModel;
+        const sourceTableName = params.sourceTableName;
+        if (isNeedValueMapping) {
+          updateValuesWhenCloseDialog(
+            parentPageContext.value,
+            parentConfigureObj.value,
+            dataModel,
+            sourceTableName
+          );
+        }
       }
       parentPageContext.value = null;
       parentConfigureObj.value = null;