super-page-runtime 2.0.43-beta3 → 2.0.43-beta4

package/dist/es/components/runtime/utils/events/event-util.js

@@ -7,6 +7,14 @@ import { analysisCondition } from "agilebuilder-ui/src/utils/util";
 import { getListCode } from "../common-util.js";
 import eventBus from "../eventBus.js";
 import { getValueFromSource } from "../page-helper-util.js";
+const skipValidateEvents = [
+  "downloadTemplate",
+  "back",
+  "exportForm",
+  "exportPDF",
+  "lineEditCreate",
+  "workflowSave"
+];
 function initPageEvents(pageDesign, pageContext) {
   if (pageDesign && pageDesign.customEvents) {
     const customEvents = transferToFunction(pageDesign.customEvents);
@@ -184,13 +192,20 @@ function buttonClickEvent(pageContext, configure, eventParams) {
 }
 function doValidateForm(pageContext, configure, eventParams) {
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
+  let isEnableRequired = true;
   const clickEventFunObj = getClickEventFuncByType(pageContext, events, "click");
   if (clickEventFunObj) {
     const isStandardEvent = clickEventFunObj.isStandard;
     const event = clickEventFunObj.event;
-    isNotNeedValidateRequired(isStandardEvent, event);
+    const isNotNeedValidate = isNotNeedValidateRequired(isStandardEvent, event);
+    if (isNotNeedValidate) {
+      isEnableRequired = false;
+    }
   }
-  validateDataModelFunc(pageContext, configure, true).then(() => {
+  validateDataModelFunc(pageContext, configure, isEnableRequired).then((validateReslut) => {
+    if (!validateReslut) {
+      return;
+    }
     const beforeClickResult = doBeforeClickEvent(pageContext, configure, eventParams);
     if (!beforeClickResult) {
       return;
@@ -271,7 +286,7 @@ function isNotDoAfterClick(isStandardEvent, clickEvent) {
   return isStandardEvent && (clickEvent.eventName === "exportForm" || clickEvent.eventName === "exportPDF" || clickEvent.eventName === "import" || clickEvent.eventName === "assign" || clickEvent.eventName === "copyTask" || clickEvent.eventName === "addSigner" || clickEvent.eventName === "returnTaskTo" || clickEvent.eventName === "removeSigner");
 }
 function isNotNeedValidateRequired(isStandardEvent, clickEvent) {
-  return isStandardEvent && (clickEvent.eventName === "downloadTemplate" || clickEvent.eventName === "back" || clickEvent.eventName === "exportForm" || clickEvent.eventName === "exportPDF" || clickEvent.eventName === "lineEditCreate");
+  return isStandardEvent && skipValidateEvents.includes(clickEvent.eventName);
 }
 function doAfterClickEvent(pageContext, configure, otherParams) {
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];

package/dist/es/components/runtime/utils/events/validator-util.js

@@ -149,16 +149,26 @@ function validateDataModelFunc(pageContext, configureObj, isEnableRequired) {
   const pageModel = pageContext.entity.page;
   const data = { ...pageModel, ...dataModel };
   const rules = pageContext.rules;
+  if (isEnableRequired === void 0 || isEnableRequired === null) {
+    isEnableRequired = configureObj.props.verification ? configureObj.props.verification.required : false;
+    if (typeof isEnableRequired === "undefined") {
+      isEnableRequired = false;
+    }
+  }
   return validateDataModel(isEnableRequired, data, rules, pageContext);
 }
 function validateDataModel(isEnableRequired, dataModel, rules, pageContext) {
-  {
+  if (isEnableRequired) {
     const isWorkflow = pageContext.workflowCode ? true : false;
     if (isWorkflow) {
       return validateWorkflowFormDataModel(dataModel, pageContext);
     } else {
       return validateCommonFormDataModel(dataModel, pageContext, rules);
     }
+  } else {
+    return new Promise((resolve, reject) => {
+      resolve(true);
+    });
   }
 }
 function validateWorkflowFormDataModel(dataModel, pageContext) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.43-beta3",
+  "version": "2.0.43-beta4",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",