super-page-runtime 2.1.54 → 2.1.60

package/dist/es/components/runtime/views/assemblys/form/rich-text/richtext-runtime.vue2.js

@@ -1,9 +1,9 @@
-import { defineComponent, ref, watch, onMounted, onBeforeUnmount, resolveComponent, openBlock, createElementBlock, Fragment, createBlock, normalizeClass, unref, normalizeStyle, withCtx, toDisplayString, createCommentVNode, createElementVNode } from "vue";
+import { defineComponent, ref, watch, onMounted, nextTick, onBeforeUnmount, resolveComponent, openBlock, createElementBlock, Fragment, createBlock, normalizeClass, unref, normalizeStyle, withCtx, toDisplayString, createCommentVNode, createElementVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { formatVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
+import { formatVariableValue, setVariableValue, getVariableValue } from "../../../../utils/page-helper-util.js";
 import Quill from "quill";
 import "quill/dist/quill.snow.css";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { handleAfterInitEvent, handleFormEvent } from "../../../../utils/events/event-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { $t } from "../../../../utils/i18n-util.js";
 import { getToken } from "agilebuilder-ui/src/utils/auth";
@@ -107,6 +107,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     const previewList = ref([]);
     const showViewer = ref(false);
+    const formItemRef = ref(null);
+    const componentRef = ref(null);
+    const titleRef = ref(null);
     onMounted(() => {
       var _a;
       quill = new Quill(quillEditorRef.value, option.value);
@@ -154,6 +157,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
       updateEditorHeight();
+      nextTick(() => {
+        const value = getVariableValue(entity, dynamicFields);
+        handleAfterInitEvent(
+          value,
+          props.pageContext,
+          props.configure,
+          {
+            formItemRef: formItemRef.value,
+            componentRef: componentRef.value,
+            titleRef: titleRef.value,
+            value,
+            entity: props.pageContext.entity.data,
+            pageData: props.pageContext.entity.page
+          }
+        );
+      });
     });
     onBeforeUnmount(() => {
       if (quillEditorRef.value) {

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

@@ -1,7 +1,7 @@
-import { defineComponent, ref, computed, watch, onMounted, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode, createVNode, renderList, createElementVNode } from "vue";
+import { defineComponent, ref, computed, watch, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode, createVNode, renderList, createElementVNode } from "vue";
 import { getVariableValue, setVariableValue, getOptionDatasFromPage, queryOptionDatasources, autoSetAfterSelect } from "../../../../utils/page-helper-util.js";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { handleFormEvent, handleAfterInitEvent } from "../../../../utils/events/event-util.js";
 import _sfc_main$1 from "../common/title-suffix-element.vue.js";
 import { $t } from "../../../../utils/i18n-util.js";
 const _hoisted_1 = { style: { "float": "left" } };
@@ -25,7 +25,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const dynamicModelMethod = computed({
       get() {
         let val = getVariableValue(entity, dynamicFields);
-        console.log("select组件----dynamicModelMethod---get-111-val", val);
         if (val !== void 0 && val !== null) {
           val = val + "";
         }
@@ -34,7 +33,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             val = val.split(",");
           }
         }
-        console.log("select组件----dynamicModelMethod---get222--val", val);
         return val;
       },
       set(value) {
@@ -43,7 +41,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             value = value.join(",");
           }
         }
-        console.log("select组件----dynamicModelMethod---set--value", value);
         setVariableValue(entity, dynamicFields, value);
       }
     });
@@ -52,7 +49,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     if (cacheOptions.length > 0) {
       listOptions.value = cacheOptions;
     }
-    console.log("select组件----listOptions.value=", listOptions.value);
     const queryLoadingFlag = ref(false);
     const dataOrigin = props.configure.props && props.configure.props.dataOrigin ? props.configure.props.dataOrigin : {};
     const valueType = dataOrigin.optionValueSetType;
@@ -163,10 +159,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function updateOptions(newOptions) {
       listOptions.value = newOptions ? newOptions : [];
-      console.log("updateOptions", newOptions);
     }
+    const formItemRef = ref(null);
+    const componentRef = ref(null);
+    const titleRef = ref(null);
     onMounted(() => {
-      console.log("select-----onMounted");
+      nextTick(() => {
+        const value = dynamicModelMethod.value;
+        handleAfterInitEvent(
+          value,
+          props.pageContext,
+          props.configure,
+          {
+            formItemRef: formItemRef.value,
+            componentRef: componentRef.value,
+            titleRef: titleRef.value,
+            value,
+            entity: props.pageContext.entity.data,
+            pageData: props.pageContext.entity.page
+          }
+        );
+      });
     });
     __expose({
       updateOptions
@@ -176,6 +189,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       const _component_el_select = resolveComponent("el-select");
       const _component_el_form_item = resolveComponent("el-form-item");
       return openBlock(), createBlock(_component_el_form_item, {
+        ref_key: "formItemRef",
+        ref: formItemRef,
         required: designProperty.value.required ? true : false,
         class: normalizeClass(unref(runtimeClass)),
         "label-width": designProperty.value.labelWidth,
@@ -184,6 +199,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
+            ref_key: "titleRef",
+            ref: titleRef,
             style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
           }, [
             designProperty.value.prefixType ? (openBlock(), createBlock(_sfc_main$1, {
@@ -197,6 +214,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ]),
         default: withCtx(() => [
           createVNode(_component_el_select, {
+            ref_key: "componentRef",
+            ref: componentRef,
             style: { "width": "100%" },
             disabled: designProperty.value.state === "disabled",
             size: designProperty.value.size,

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

@@ -1,6 +1,7 @@
-import { defineComponent, ref, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, createElementVNode, createBlock, createCommentVNode, createTextVNode, toDisplayString } from "vue";
+import { defineComponent, ref, onMounted, nextTick, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, createElementVNode, createBlock, createCommentVNode, createTextVNode, toDisplayString } from "vue";
 import { SuperIcon } from "agilebuilder-ui";
 import { $t } from "../../../../utils/i18n-util.js";
+import { handleAfterInitEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "separatelabel-runtime",
   props: {
@@ -14,6 +15,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
+    onMounted(() => {
+      nextTick(() => {
+        const value = $t(props.configure.props.base.title);
+        handleAfterInitEvent(
+          value,
+          props.pageContext,
+          props.configure,
+          {
+            componentRef: thisRef.value,
+            value,
+            entity: props.pageContext.entity.data,
+            pageData: props.pageContext.entity.page
+          }
+        );
+      });
+    });
     __expose({});
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {

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

@@ -1,7 +1,7 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
+import { defineComponent, ref, computed, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { handleAfterInitEvent, handleFormEvent } from "../../../../utils/events/event-util.js";
 import { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "switch-runtime",
@@ -28,7 +28,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const switchStyle = runtimeInfo.switchStyle;
     const dynamicModelMethod = computed({
       get() {
-        debugger;
         let val = getVariableValue(entity, dynamicFields);
         if (val !== void 0 && val !== null) {
           val = val + "";
@@ -36,14 +35,36 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return val;
       },
       set(value) {
-        debugger;
         setVariableValue(entity, dynamicFields, value);
       }
     });
+    const formItemRef = ref(null);
+    const componentRef = ref(null);
+    const titleRef = ref(null);
+    onMounted(() => {
+      nextTick(() => {
+        const value = dynamicModelMethod.value;
+        handleAfterInitEvent(
+          value,
+          props.pageContext,
+          props.configure,
+          {
+            formItemRef: formItemRef.value,
+            componentRef: componentRef.value,
+            titleRef: titleRef.value,
+            value,
+            entity: props.pageContext.entity.data,
+            pageData: props.pageContext.entity.page
+          }
+        );
+      });
+    });
     return (_ctx, _cache) => {
       const _component_el_switch = resolveComponent("el-switch");
       const _component_el_form_item = resolveComponent("el-form-item");
       return openBlock(), createBlock(_component_el_form_item, {
+        ref_key: "formItemRef",
+        ref: formItemRef,
         required: designProperty.value.required,
         class: normalizeClass(unref(runtimeClass)),
         "label-width": designProperty.value.labelWidth,
@@ -52,11 +73,15 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
+            ref_key: "titleRef",
+            ref: titleRef,
             style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
           }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           createVNode(_component_el_switch, {
+            ref_key: "componentRef",
+            ref: componentRef,
             disabled: designProperty.value.state === "disabled",
             "active-value": designProperty.value.activeValue,
             "active-text": designProperty.value.activeText,

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

@@ -1,7 +1,7 @@
-import { defineComponent, ref, computed, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList, createTextVNode } from "vue";
+import { defineComponent, ref, computed, onMounted, nextTick, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, Fragment, renderList, createTextVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { handleAfterInitEvent, handleFormEvent } from "../../../../utils/events/event-util.js";
 import { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "tag-runtime",
@@ -67,10 +67,31 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
       handleFormEvent($event, props.pageContext, props.configure, "remove");
     }
+    const formItemRef = ref(null);
+    const titleRef = ref(null);
+    onMounted(() => {
+      nextTick(() => {
+        const value = dynamicValues.value;
+        handleAfterInitEvent(
+          value,
+          props.pageContext,
+          props.configure,
+          {
+            formItemRef: formItemRef.value,
+            titleRef: titleRef.value,
+            value,
+            entity: props.pageContext.entity.data,
+            pageData: props.pageContext.entity.page
+          }
+        );
+      });
+    });
     return (_ctx, _cache) => {
       const _component_el_tag = resolveComponent("el-tag");
       const _component_el_form_item = resolveComponent("el-form-item");
       return openBlock(), createBlock(_component_el_form_item, {
+        ref_key: "formItemRef",
+        ref: formItemRef,
         required: designProperty.value.required,
         class: normalizeClass(unref(runtimeClass)),
         "label-width": designProperty.value.labelWidth,
@@ -79,6 +100,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
+            ref_key: "titleRef",
+            ref: titleRef,
             style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
           }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
         ]),

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

@@ -1,7 +1,7 @@
-import { defineComponent, computed, ref, resolveComponent, openBlock, createElementBlock, createVNode, normalizeClass, unref, normalizeStyle, withCtx, createBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode } from "vue";
+import { defineComponent, computed, ref, onMounted, nextTick, resolveComponent, openBlock, createElementBlock, createVNode, normalizeClass, unref, normalizeStyle, withCtx, createBlock, Fragment, createTextVNode, toDisplayString, createCommentVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
-import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { handleAfterInitEvent, handleFormEvent } from "../../../../utils/events/event-util.js";
 import _sfc_main$1 from "../common/title-suffix-element.vue.js";
 import { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -28,11 +28,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const titleExceedStyle = runtimeInfo.titleExceedStyle;
+    const formItemRef = ref(null);
+    const componentRef = ref(null);
+    const titleRef = ref(null);
+    onMounted(() => {
+      nextTick(() => {
+        const value = dynamicModelMethod.value;
+        handleAfterInitEvent(
+          value,
+          props.pageContext,
+          props.configure,
+          {
+            formItemRef: formItemRef.value,
+            componentRef: componentRef.value,
+            titleRef: titleRef.value,
+            value,
+            entity: props.pageContext.entity.data,
+            pageData: props.pageContext.entity.page
+          }
+        );
+      });
+    });
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       const _component_el_form_item = resolveComponent("el-form-item");
       return openBlock(), createElementBlock("div", null, [
         createVNode(_component_el_form_item, {
+          ref_key: "formItemRef",
+          ref: formItemRef,
           required: designProperty.value.required ? true : false,
           class: normalizeClass(unref(runtimeClass)),
           "label-width": designProperty.value.labelWidth,
@@ -41,6 +64,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           label: withCtx(() => [
             designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
               key: 0,
+              ref_key: "titleRef",
+              ref: titleRef,
               style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
             }, [
               designProperty.value.prefixType ? (openBlock(), createBlock(_sfc_main$1, {
@@ -54,6 +79,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           default: withCtx(() => [
             createVNode(_component_el_input, {
+              ref_key: "componentRef",
+              ref: componentRef,
               disabled: designProperty.value.state === "disabled",
               readonly: designProperty.value.state === "readonly",
               size: designProperty.value.size,

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

@@ -14,13 +14,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props) {
-    var _a;
+    var _a, _b;
     const props = __props;
     if (props.configure.style == void 0) {
       props.configure.style = {};
     }
     const permissionCodes = getPermissionCodes(props.configure, props.pageContext);
-    console.log("Object-Render---permissionCodes=", permissionCodes);
     if (props.configure && props.configure.props && props.configure.props.base) {
       props.configure.props.base.functionCode = permissionCodes;
     }
@@ -51,13 +50,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             }
           }
         }
-        console.log("obj-render-dynamicShowFlag", dynamicShowFlag);
         return dynamicShowFlag;
       });
       const propConfigure = props.configure;
       propConfigure._dynamicShowFlag = showFlag;
-      if (props.configure.props.editConditions) {
-        const editConditions = props.configure.props.editConditions;
+      if ((_b = props.configure.props.base) == null ? void 0 : _b.editConditions) {
+        const editConditions = props.configure.props.base.editConditions;
         if (editConditions.length > 0) {
           const runtime = props.configure.runtime ? props.configure.runtime : {};
           const property = runtime.props ? runtime.props : {};

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

@@ -3,7 +3,7 @@ import _sfc_main$1 from "./assemblys/object-render.vue.js";
 import { updateOptionDatasources, updateChartDatasources } from "../utils/page-helper-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 { removeCustomFuncFromWindow, handleEvent, initPageEvents, getCustomFunc } from "../utils/events/event-util.js";
 import _sfc_main$2 from "./assemblys/common/export-form-report-dialog.vue.js";
 import _sfc_main$3 from "./assemblys/common/task-informition-dialog.vue.js";
 import _sfc_main$4 from "./assemblys/common/remove-signer-dialog.vue.js";
@@ -17,10 +17,11 @@ import { i18nValidateRulesMessage } from "../utils/events/validator-util.js";
 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 { setSessionCache, getUsername } from "agilebuilder-ui/src/utils/auth";
 import { deepCopy, isNumber, refreshMobileDialogType } from "../utils/common-util.js";
 import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
 import { usePageContextStore } from "../utils/page-store.js";
+import imatrixUiStore from "agilebuilder-ui/src/store";
 const _hoisted_1 = { class: "app-container" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
@@ -236,7 +237,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageContext2.initChartData = {};
       pageContext2.initChartData.data = deepCopy(pageContext2.entity.data);
       pageContext2.initChartData.page = deepCopy(pageContext2.entity.page);
-      console.log("pageContext.chartConfigs:", chartConfigs);
       if (chartConfigs && chartConfigs.length > 0) {
         updateChartDatasources(pageContext2, chartConfigs, null, true);
       }
@@ -271,8 +271,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         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;
+              queryPageSuperGrids(props.pageDesign, pageContext.value, props.publishVersion).then((result) => {
+                pageContext.value.isWorkflowEntity = result.isWorkflowEntity;
+                pageContext.value.dataTypeMaps = result.dataTypeMaps;
+                pageContext.value.superGridItems = result.superGrids;
               }).catch((error) => {
                 console.log("queryPageSuperGrids error", error);
               }).finally(() => {
@@ -406,6 +408,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         } else {
           const myJumpPageSetting = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
           if (myJumpPageSetting && myJumpPageSetting.jumpPageUrl) {
+            if (myJumpPageSetting.isNewPage !== false && myJumpPageSetting.isNewPage !== true) {
+              myJumpPageSetting.isNewPage = true;
+            }
             const additionalParamMap = getAdditionalParamMap(pageContext);
             const isNeedId = ((_a = parentConfigureObj.value.props.linkPage) == null ? void 0 : _a.isNeedId) ? true : false;
             console.log(
@@ -443,6 +448,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       });
     }
+    function getCurrentUserPermissionsWhenPopPageDiff(popPageSetting, jumpMode) {
+      const loginName = getUsername();
+      return new Promise((resolve, reject) => {
+        if (loginName) {
+          debugger;
+          if ((jumpMode === "popup" || isMobile) && parentPageContext.value.systemCode !== popPageSetting.customSystem) {
+            const systemCode = popPageSetting.customSystem;
+            imatrixUiStore.dispatch("getCurrentUserPermissions", { loginName, systemCode }).then(() => {
+              resolve(true);
+            }).catch(() => {
+              console.log("获得用户权限失败");
+              resolve(true);
+            });
+          } else {
+            resolve(true);
+          }
+        } else {
+          resolve(true);
+        }
+      });
+    }
     const router = useRouter();
     function openDialog(configureObj, eventParams, myJumpPageSetting) {
       getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then((openPageParams) => {
@@ -469,31 +495,32 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           popPageSetting.isNewPage = true;
           if (jumpMode === "popup" || jumpMode === "refresh") {
             const linkType = popPageSetting.linkType;
-            if (isMobile && (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url")) {
-              popPageSetting._isIframe = true;
-              if (jumpMode === "refresh") {
-                popPageSetting.dialogType = "drawer";
-                popPageSetting.jumpPageWidth = "100%";
-              }
-              jumpPageSetting.value = popPageSetting;
-              isShowDialog.value = true;
-            } else {
-              popPageSetting._isIframe = false;
-              if (jumpMode === "popup" || isMobile && jumpMode === "refresh") {
+            getCurrentUserPermissionsWhenPopPageDiff(popPageSetting, jumpMode).then(() => {
+              if (isMobile && (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url")) {
+                popPageSetting._isIframe = true;
                 if (jumpMode === "refresh") {
                   popPageSetting.dialogType = "drawer";
                   popPageSetting.jumpPageWidth = "100%";
                 }
-                debugger;
                 jumpPageSetting.value = popPageSetting;
                 isShowDialog.value = true;
-              } else if (jumpMode === "refresh") {
-                router.push({
-                  path: "/dsc/page",
-                  query: popPageSetting
-                });
+              } else {
+                popPageSetting._isIframe = false;
+                if (jumpMode === "popup" || isMobile && jumpMode === "refresh") {
+                  if (jumpMode === "refresh") {
+                    popPageSetting.dialogType = "drawer";
+                    popPageSetting.jumpPageWidth = "100%";
+                  }
+                  jumpPageSetting.value = popPageSetting;
+                  isShowDialog.value = true;
+                } else if (jumpMode === "refresh") {
+                  router.push({
+                    path: "/dsc/page",
+                    query: popPageSetting
+                  });
+                }
               }
-            }
+            });
             eventBus.$on(eventPageInfo.value + "close-dialog", (params) => {
               closeFunc(params);
             });
@@ -512,6 +539,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }
     }
     function closeDialog(params) {
+      const closeEventName = jumpPageSetting.value.closeEvent;
+      const isRefreshWhenClosePopup = jumpPageSetting.value.isRefreshWhenClosePopup;
       let dataModel;
       let sourceTableName;
       if (params) {
@@ -528,20 +557,54 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
       }
       const targetTableName = parentPageContext.value.tableName;
-      handleEvent(null, parentPageContext.value, parentConfigureObj.value, "closePopup", {
+      let currentParentConfigureObj;
+      const columnProp = parentEventParams.value.columnProp ? parentEventParams.value.columnProp : null;
+      if (columnProp) {
+        const columnConfigures = parentConfigureObj.value.items.filter(
+          (column) => {
+            var _a, _b, _c, _d;
+            return ((_b = (_a = column.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop) && ((_d = (_c = column.props) == null ? void 0 : _c.base) == null ? void 0 : _d.prop) === columnProp;
+          }
+        );
+        currentParentConfigureObj = columnConfigures && columnConfigures.length > 0 ? columnConfigures[0] : null;
+      } else {
+        currentParentConfigureObj = parentConfigureObj.value;
+      }
+      handleEvent(null, parentPageContext.value, currentParentConfigureObj, "closePopup", {
         sourceModel: dataModel,
         sourceTableName,
         jumpPageSetting,
         entity: parentPageContext.value.entity.data,
-        targetTableName
+        targetTableName,
+        pageContext: pageContext.value,
+        parentPageContext: parentPageContext.value,
+        parentConfigureObj: currentParentConfigureObj,
+        columnProp
       });
-      refreshFormOrListPage(parentPageContext.value, parentConfigureObj.value);
+      handleCloseDialogEvent(closeEventName, columnProp, currentParentConfigureObj);
+      refreshFormOrListPage(parentPageContext.value, parentConfigureObj.value, isRefreshWhenClosePopup);
       parentPageContext.value = null;
       parentConfigureObj.value = null;
       parentEventParams.value = null;
       eventBus.$off(eventPageInfo.value + "close-dialog");
       isShowDialog.value = false;
     }
+    function handleCloseDialogEvent(closeEventName, columnProp, currentParentConfigureObj) {
+      if (closeEventName) {
+        const func = getCustomFunc(parentPageContext.value, closeEventName);
+        if (func) {
+          func.apply(func, [
+            {
+              pageContext: pageContext.value,
+              parentPageContext: parentPageContext.value,
+              parentConfigureObj: currentParentConfigureObj,
+              jumpPageSetting,
+              columnProp
+            }
+          ]);
+        }
+      }
+    }
     function pickFileDone(data) {
       let componentId = data.componentId;
       let listCode = data.listCode;

package/dist/es/i18n/langs/cn.js

@@ -47,7 +47,9 @@ const cn = {
     formatMismatch: "{label}格式不匹配",
     overMaxLength: "{label}最多只能输入{value}字符",
     limitMinLength: "{label}至少输入{value}字符",
-    flowNotStart: "流程未提交"
+    flowNotStart: "流程未提交",
+    pleaseInputOpinion: "请输入意见",
+    opinion: "意见"
   }
 };
 export {

package/dist/es/i18n/langs/en.js

@@ -47,7 +47,9 @@ const en = {
     formatMismatch: "{label} Format mismatch",
     overMaxLength: "{label} can only input a maximum of {value} characters",
     limitMinLength: "Enter at least {value} characters for {label}",
-    flowNotStart: "Workflow Not Started"
+    flowNotStart: "Workflow Not Started",
+    pleaseInputOpinion: "Please input opinion",
+    opinion: "Opinion"
   }
 };
 export {

package/dist/es/style.css

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

package/package.json

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