super-page-runtime 2.1.37-temp6 → 2.1.38

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

@@ -2,6 +2,7 @@ import { defineComponent, computed, ref, watch, resolveComponent, openBlock, cre
 import { getVariableValue, setVariableValue, getOptionDatasFromPage, autoSetAfterSelect, queryOptionDatasources } from "../../../../utils/page-helper-util.js";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { handleFormEvent } from "../../../../utils/events/event-util.js";
+import { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "radio-runtime",
   props: {
@@ -28,6 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
+    const titleExceedStyle = runtimeInfo.titleExceedStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     const listOptions = ref(designProperty.value.options ? designProperty.value.options : []);
     const cacheOptions = getOptionDatasFromPage(props.pageContext, props.configure);
@@ -131,8 +133,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
-            style: normalizeStyle({ ...unref(headerStyle) })
-          }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
+            style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
+          }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           createVNode(_component_el_radio_group, {
@@ -148,7 +150,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                   key: item.value,
                   value: item.value,
                   label: item.label,
-                  onClick: ($event) => unref(handleFormEvent)(item.value, _ctx.pageContext, _ctx.configure, "click", { values: dynamicModelMethod.value })
+                  onClick: ($event) => unref(handleFormEvent)(item.value, _ctx.pageContext, _ctx.configure, "click", {
+                    values: dynamicModelMethod.value
+                  })
                 }, null, 8, ["value", "label", "onClick"]);
               }), 128))
             ]),

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

@@ -5,6 +5,7 @@ import Quill from "quill";
 import "quill/dist/quill.snow.css";
 import { handleFormEvent } from "../../../../utils/events/event-util.js";
 import http from "agilebuilder-ui/src/utils/request";
+import { $t } from "../../../../utils/i18n-util.js";
 const _hoisted_1 = { style: { "width": "100%", "height": "100%" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "richtext-runtime",
@@ -20,6 +21,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
+    const titleExceedStyle = runtimeInfo.titleExceedStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     let contentVariable = designProperty.value.value;
     const initValue = formatVariableValue(props.pageContext, contentVariable);
@@ -189,8 +191,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
-            style: normalizeStyle({ ...unref(headerStyle) })
-          }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
+            style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
+          }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           createElementVNode("div", _hoisted_1, [

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

@@ -3,6 +3,7 @@ import { getVariableValue, setVariableValue, getOptionDatasFromPage, queryOption
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
 import { 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 _hoisted_1 = { style: { "float": "left" } };
 const _hoisted_2 = { style: { "float": "right", "color": "var(--el-text-color-secondary)", "font-size": "13px" } };
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -34,6 +35,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
+    const titleExceedStyle = runtimeInfo.titleExceedStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     const listOptions = ref(designProperty.value.options ? designProperty.value.options : []);
     const cacheOptions = getOptionDatasFromPage(props.pageContext, props.configure);
@@ -161,14 +163,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
-            style: normalizeStyle({ ...unref(headerStyle) })
+            style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
           }, [
             designProperty.value.prefixType ? (openBlock(), createBlock(_sfc_main$1, {
               key: 0,
               pageContext: _ctx.pageContext,
               property: designProperty.value
             }, null, 8, ["pageContext", "property"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-              createTextVNode(toDisplayString(designProperty.value.title), 1)
+              createTextVNode(toDisplayString(unref($t)(designProperty.value.title)), 1)
             ], 64))
           ], 4)) : createCommentVNode("", true)
         ]),

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

@@ -1,5 +1,6 @@
 import { defineComponent, ref, openBlock, createElementBlock, normalizeStyle, unref, normalizeClass, createElementVNode, createBlock, createCommentVNode, createTextVNode, toDisplayString } from "vue";
 import { SuperIcon } from "agilebuilder-ui";
+import { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "separatelabel-runtime",
   props: {
@@ -31,7 +32,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             iconValue: _ctx.configure.props.iconValue,
             style: { "margin-right": "2px" }
           }, null, 8, ["iconType", "iconValue"])) : createCommentVNode("", true),
-          createTextVNode(" " + toDisplayString(_ctx.configure.props.base.title), 1)
+          createTextVNode(" " + toDisplayString(unref($t)(_ctx.configure.props.base.title)), 1)
         ], 4)
       ], 6);
     };

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

@@ -2,6 +2,7 @@ import { defineComponent, ref, computed, resolveComponent, openBlock, createBloc
 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 { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "switch-runtime",
   props: {
@@ -16,6 +17,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
+    const titleExceedStyle = runtimeInfo.titleExceedStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     if (designProperty.value.activeValue === void 0 || designProperty.value.activeValue === null) {
       designProperty.value.activeValue = "1";
@@ -50,8 +52,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
-            style: normalizeStyle({ ...unref(headerStyle) })
-          }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
+            style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
+          }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           createVNode(_component_el_switch, {

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

@@ -2,6 +2,7 @@ import { defineComponent, ref, computed, resolveComponent, openBlock, createBloc
 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 { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "tag-runtime",
   props: {
@@ -15,6 +16,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
+    const titleExceedStyle = runtimeInfo.titleExceedStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
     let formatting = designProperty.value.formatting;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
@@ -77,8 +79,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         label: withCtx(() => [
           designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
             key: 0,
-            style: normalizeStyle({ ...unref(headerStyle) })
-          }, toDisplayString(designProperty.value.title), 5)) : createCommentVNode("", true)
+            style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
+          }, toDisplayString(unref($t)(designProperty.value.title)), 5)) : createCommentVNode("", true)
         ]),
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(dynamicValues.value, (tag) => {

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

@@ -3,6 +3,7 @@ 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 _sfc_main$1 from "../common/title-suffix-element.vue.js";
+import { $t } from "../../../../utils/i18n-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "textarea-runtime",
   props: {
@@ -26,6 +27,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
+    const titleExceedStyle = runtimeInfo.titleExceedStyle;
     return (_ctx, _cache) => {
       const _component_el_input = resolveComponent("el-input");
       const _component_el_form_item = resolveComponent("el-form-item");
@@ -39,14 +41,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           label: withCtx(() => [
             designProperty.value.tittleShow ? (openBlock(), createElementBlock("div", {
               key: 0,
-              style: normalizeStyle({ ...unref(headerStyle) })
+              style: normalizeStyle({ ...unref(headerStyle), ...unref(titleExceedStyle) })
             }, [
               designProperty.value.prefixType ? (openBlock(), createBlock(_sfc_main$1, {
                 key: 0,
                 pageContext: _ctx.pageContext,
                 property: designProperty.value
               }, null, 8, ["pageContext", "property"])) : (openBlock(), createElementBlock(Fragment, { key: 1 }, [
-                createTextVNode(toDisplayString(designProperty.value.title), 1)
+                createTextVNode(toDisplayString(unref($t)(designProperty.value.title)), 1)
               ], 64))
             ], 4)) : createCommentVNode("", true)
           ]),

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

@@ -82,8 +82,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
   },
   emits: ["open", "opened", "close", "closed"],
   setup(__props, { expose: __expose, emit: __emit }) {
+    const pageContextUtil = usePageContextStore();
     const { t } = useI18n();
-    usePageContextStore();
     const props = __props;
     const thisRef = ref(null);
     const pageItems = ref([]);
@@ -142,6 +142,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       i18nValidateRulesMessage(pageContext.value.rules);
       handleEvent(null, pageContext.value, pageDesign, "beforeload");
       const myPageCode = pageContext.value.code;
+      pageContextUtil.setPageContext(pageContext.value);
       eventPageInfo.value = myPageCode + "_";
       eventBus.$on(eventPageInfo.value + "export-form-report", (params) => {
         buttonParams.value = params;
@@ -358,7 +359,8 @@ 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;
@@ -445,12 +447,17 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function openDialog(configureObj, eventParams, myJumpPageSetting) {
       getPopPageSetting(configureObj, eventParams, myJumpPageSetting).then((openPageParams) => {
         if (openPageParams) {
-          const openPageParamsResult = deepCopy(openPageParams);
           const myJumpPageSettingOrg = configureObj && configureObj["props"] && configureObj["props"].linkPage ? configureObj["props"].linkPage : null;
           if (myJumpPageSettingOrg) {
             Object.assign(openPageParams, deepCopy(myJumpPageSettingOrg));
           }
           refreshMobileDialogType(openPageParams, isMobile);
+          console.log(
+            "getPopPageSetting33-----openPageParams=",
+            openPageParams,
+            "configureObj=",
+            configureObj
+          );
           const jumpMode = openPageParams.jumpMode;
           const popPageSetting = openPageParams;
           if (!parentEventParams.value) {
@@ -462,23 +469,27 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           popPageSetting.isNewPage = true;
           if (jumpMode === "popup" || jumpMode === "refresh") {
             const linkType = popPageSetting.linkType;
-            if (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url") {
+            if (isMobile && (parentPageContext.value.systemCode !== popPageSetting.customSystem || linkType && linkType === "url")) {
+              popPageSetting._isIframe = true;
               if (jumpMode === "refresh") {
                 popPageSetting.dialogType = "drawer";
                 popPageSetting.jumpPageWidth = "100%";
               }
-              popPageSetting._isIframe = true;
               jumpPageSetting.value = popPageSetting;
               isShowDialog.value = true;
             } else {
               popPageSetting._isIframe = false;
-              if (jumpMode === "popup") {
+              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: openPageParamsResult
+                  query: popPageSetting
                 });
               }
             }
@@ -493,7 +504,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function closeFunc(params) {
       const jumpMode = params.jumpMode;
-      if (jumpMode && jumpMode === "popup") {
+      if (jumpMode && jumpMode === "popup" || isMobile && jumpMode === "refresh") {
         closeDialog(params);
       } else {
         router.go(-1);
@@ -532,37 +543,48 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function pickFileDone(data) {
       let componentId = data.componentId;
+      let listCode = data.listCode;
       console.log("superPage1111---pickFileDone--componentId=", componentId, "data=", data);
-      if (!componentId) {
+      if (!componentId && !listCode) {
         console.log("superPage2222---pickFileDone--componentId=", componentId, "data=", data);
         return;
       }
       console.log("superPage333---pickFileDone--componentId=", componentId, "data=", data);
-      eventBus.$emit(componentId + "-pickFileDone", data);
+      if (listCode) {
+        eventBus.$emit(listCode + "-pickFileDone", data);
+      } else {
+        eventBus.$emit(componentId + "-pickFileDone", data);
+      }
     }
     function uploadFileDone(data) {
       let componentId = data.componentId;
+      let listCode = data.listCode;
       console.log("superPage1111---uploadFileDone--componentId=", componentId, "data=", data);
-      if (!componentId) {
+      if (!componentId && !listCode) {
         console.log("superPage2222---uploadFileDone--componentId=", componentId, "data=", data);
         return;
       }
       console.log("superPage333---uploadFileDone--componentId=", componentId, "data=", data);
-      eventBus.$emit(componentId + "-uploadFileDone", data);
+      if (listCode) {
+        eventBus.$emit(listCode + "-uploadFileDone", data);
+      } else {
+        eventBus.$emit(componentId + "-uploadFileDone", data);
+      }
     }
     function scanDone(data) {
-      let pageCode = data.pageCode;
-      if (!pageCode) {
-        pageCode = props.pageCode;
+      let componentId = data.componentId;
+      let listCode = data.listCode;
+      console.log("superPage1111---scanDone--componentId=", componentId, "data=", data);
+      if (!componentId && !listCode) {
+        console.log("superPage2222---scanDone--componentId=", componentId, "data=", data);
+        return;
+      }
+      console.log("superPage3333---scanDone--componentId=", componentId, "data=", data);
+      if (listCode) {
+        eventBus.$emit(listCode + "-scanDone", data);
+      } else {
+        eventBus.$emit(componentId + "-scanDone", data);
       }
-      console.log(
-        "super-page-scanDone===data=",
-        JSON.stringify(data),
-        "pageCode=",
-        pageCode,
-        props.pageCode + "-scan"
-      );
-      eventBus.$emit(pageCode + "-scan", data);
     }
     __expose({
       pickFileDone,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.37-temp6",
+  "version": "2.1.38",
   "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.72",
+    "agilebuilder-ui": "1.0.76",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",
@@ -58,6 +58,7 @@
     "js-cookie": "^3.0.5",
     "jsdom": "^24.0.0",
     "mitt": "^3.0.1",
+    "pinia": "^2.1.7",
     "saas": "^1.0.0",
     "sass": "^1.72.0",
     "start-server-and-test": "^2.0.3",
@@ -67,7 +68,6 @@
     "vue": "^3.4.21",
     "vue-i18n": "^9.10.2",
     "vue-router": "^4.3.0",
-    "vuex": "^4.1.0",
-    "pinia": "^2.1.7"
+    "vuex": "^4.1.0"
   }
 }