super-page-runtime 2.0.22 → 2.0.27

package/dist/es/components/runtime/views/assemblys/form/input-text/inputtext-runtime.vue2.js

@@ -1,8 +1,9 @@
-import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createSlots, createTextVNode } from "vue";
+import { defineComponent, computed, ref, watch, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode, createVNode, createSlots, createTextVNode } from "vue";
 import { SuperIcon } from "agilebuilder-ui";
 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 { formatScanRuleSets, analysisScanValue, setScanAnalysisValue } from "../../../../utils/form/scan-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "inputtext-runtime",
   props: {
@@ -10,6 +11,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     configure: {}
   },
   setup(__props, { expose: __expose }) {
+    var _a, _b;
     const props = __props;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
     let dynamicFields = getFormModelFields(props.pageContext, props.configure);
@@ -23,6 +25,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    let scanRuleSets = {};
+    if (((_a = designProperty.value.scan) == null ? void 0 : _a.enable) && ((_b = designProperty.value.scan.ruleList) == null ? void 0 : _b.length) > 0) {
+      setScanRuleSets();
+      watchScanValueChange();
+    }
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
@@ -32,6 +39,22 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     function setValue(value) {
       return setVariableValue(entity, dynamicFields, value);
     }
+    function setScanRuleSets() {
+      formatScanRuleSets(designProperty.value.scan.ruleList).then((res) => {
+        scanRuleSets = res;
+      });
+    }
+    function watchScanValueChange() {
+      watch(
+        () => dynamicModelMethod.value,
+        (newValue) => {
+          const valueSet = analysisScanValue(newValue, scanRuleSets);
+          if (valueSet) {
+            setScanAnalysisValue(props.pageContext, valueSet.scanSet, valueSet.params);
+          }
+        }
+      );
+    }
     __expose({
       getValue,
       setValue

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

@@ -26,7 +26,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
-    let contentVariable = designProperty.value;
+    let contentVariable = designProperty.value.value;
     const initValue = formatVariableValue(props.pageContext, contentVariable);
     const quillEditorRef = ref(null);
     const quill = ref(null);
@@ -79,6 +79,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       placeholder: designProperty.value.placeholder,
       readOnly: designProperty.value.state == "readonly"
     });
+    function updateEditorHeight() {
+      if (quill.value && quill.value) {
+        if (quill.value.container) {
+          const parentNode = quill.value.container.parentNode;
+          const parentRect = parentNode.getBoundingClientRect();
+          const thisRect = quill.value.container.getBoundingClientRect();
+          let newHeight = parentRect.height - (thisRect.top - parentRect.top);
+          if (newHeight < 100) {
+            newHeight = 100;
+          }
+          quill.value.container.style.height = newHeight + "px";
+        }
+      }
+    }
     const handleUpload = (e) => {
       const files = Array.prototype.slice.call(e.target.files);
       if (!files) {
@@ -123,7 +137,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         }
         setVariableValue(entity, dynamicFields, quill.value.root.innerHTML);
       });
-      updateEditorHeibusght();
+      updateEditorHeight();
     });
     onBeforeUnmount(() => {
       if (quillEditorRef.value) {
@@ -146,8 +160,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "Content-Type": "multipart/form-data"
         }
       };
+      let baseUrl = props.pageContext.backendUrl;
+      if (!baseUrl) {
+        baseUrl = window["$vueApp"].config.globalProperties.baseURL;
+      }
       return http.post(
-        window.$vueApp.config.globalProperties.baseURL + "/common/fs-upload/rich-editor-image",
+        baseUrl + "/common/fs-upload/rich-editor-image",
         params,
         config
       );

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

@@ -17,6 +17,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       props.configure.style = {};
     }
     const permissionCodes = getPermissionCodes(props.configure, props.pageContext);
+    if (props.configure && props.configure.props && props.configure.props.base) {
+      props.configure.props.base.functionCode = permissionCodes;
+    }
     packageFormRules(props.pageContext, props.configure);
     let handleShowFlag = ref(true);
     let showFlag = ref(true);
@@ -139,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

@@ -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 } from "../utils/page-init-util.js";
 import { addComponentRef, removePageAllRef, initComponentRefState } from "../utils/global-refs.js";
-import { removeCustomFuncFromWindow, initPageEvents, handleEvent } from "../utils/events/event-util.js";
+import { removeCustomFuncFromWindow, handleEvent, initPageEvents } 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";
@@ -173,12 +173,14 @@ 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", ({ isNeedValueMapping, dataModel, sourceTableName }) => {
-        closeDialog({ isNeedValueMapping, dataModel, sourceTableName });
-      });
-      getFormData(pageContext.value);
+      eventBus.$on(
+        eventPageInfo.value + "close-dialog",
+        ({ isNeedValueMapping, dataModel, sourceTableName }) => {
+          closeDialog({ isNeedValueMapping, dataModel, sourceTableName });
+        }
+      );
       watch(
         () => pageContext.value.isRefresh,
         (newValue) => {
@@ -191,6 +193,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       );
+      return getFormData(pageContext.value);
     }
     function initOptionDatas(pageContext2, optionConfigs) {
       if (!optionConfigs || optionConfigs.length == 0) {
@@ -216,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;
@@ -248,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) {
@@ -268,6 +280,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       eventBus.$off(eventPageInfo.value + "choose-return-node");
       eventBus.$off(eventPageInfo.value + "remove-signer");
       eventBus.$off(eventPageInfo.value + "prohibit-edit");
+      if (pageContext.value) {
+        handleEvent(null, pageContext.value, pageContext.value, "onUnmounted");
+      }
     });
     function closeExportFormDialog() {
       showExportForm.value = false;
@@ -331,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 = {};
@@ -374,9 +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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.22",
+  "version": "2.0.27",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",
@@ -35,7 +35,8 @@
     "vue-awesome": "^4.5.0",
     "vue-codemirror": "^6.1.1",
     "vue-draggable-plus": "^0.3.5",
-    "vue-echarts": "^6.6.9"
+    "vue-echarts": "^6.6.9",
+    "vue-plugin-hiprint": "^0.0.56"
   },
   "devDependencies": {
     "@element-plus/icons": "^0.0.11",
@@ -47,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.18",
+    "agilebuilder-ui": "1.0.22",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",