super-page-runtime 2.1.20 → 2.1.21

package/dist/es/components/runtime/utils/api/api-util.js

@@ -1,6 +1,6 @@
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
 import http from "agilebuilder-ui/src/utils/request";
-import { getBaseUrl, getListCode } from "../common-util.js";
+import { isWorkflowPage, getBaseUrl, getListCode } from "../common-util.js";
 import { getAdditionalParamMap, dealCompleteTaskParam } from "../events/standard-event.js";
 import { packageCustomRules, getWorkflowRules } from "../events/validator-util.js";
 import { handleEvent } from "../events/event-util.js";
@@ -11,15 +11,11 @@ function refreshPage(pageContext, id) {
   });
 }
 function getFormData(pageContext, id) {
-  var _a;
   const pageType = pageContext.pageType;
   if (pageType && pageType === "form") {
     console.log("获取表单数据getData--pageContext=", pageContext);
     pageContext.canClick = false;
-    let isWorkflow = false;
-    if ((_a = pageContext.props) == null ? void 0 : _a.activeWorkflow) {
-      isWorkflow = pageContext.workflowCode ? true : false;
-    }
+    const isWorkflow = isWorkflowPage(pageContext);
     if (isWorkflow) {
       return getWorkflowFormData(pageContext, id);
     } else {
@@ -204,7 +200,7 @@ function changePermissionListToMap(pageContext) {
   changeActionPermissionToMap(pageContext);
 }
 function changeFieldPermissionToMap(pageContext) {
-  let fieldPermissionMap = /* @__PURE__ */ new Map();
+  const fieldPermissionMap = /* @__PURE__ */ new Map();
   const fieldPermissions = pageContext.fieldPermissions;
   if (typeof fieldPermissions !== "undefined") {
     for (let i = 0; i < fieldPermissions.length; i++) {
@@ -262,7 +258,7 @@ function changeFieldPermissionToMap(pageContext) {
 }
 function changeActionPermissionToMap(pageContext) {
   const fieldPermissionMap = pageContext.fieldPermissionMap;
-  let actionPermissionMap = /* @__PURE__ */ new Map();
+  const actionPermissionMap = /* @__PURE__ */ new Map();
   const actionPermissions = pageContext.actionPermissions;
   if (typeof actionPermissions !== "undefined" && actionPermissions !== null) {
     const subModelNames = Object.keys(actionPermissions);

package/dist/es/components/runtime/utils/common-util.d.ts

@@ -1,4 +1,4 @@
-import { Component } from './interfaces/page-design-types';
+import { Component, PageContext } from './interfaces/page-design-types';
 
 export declare function isArrayFn(value: any): boolean;
 export declare function getBaseUrl(backendUrl: string | null | undefined, isTest?: boolean): any;
@@ -24,3 +24,4 @@ export declare function getWorkflowId(pageContext: any): any;
  */
 export declare function getPropClassName(configure: Component): any;
 export declare function isNumber(numStr: any): boolean;
+export declare function isWorkflowPage(pageContext: PageContext): boolean;

package/dist/es/components/runtime/utils/common-util.js

@@ -132,6 +132,14 @@ function isNumber(numStr) {
     return false;
   }
 }
+function isWorkflowPage(pageContext) {
+  var _a;
+  let isWorkflow = false;
+  if ((_a = pageContext.props) == null ? void 0 : _a.activeWorkflow) {
+    isWorkflow = pageContext.workflowCode ? true : false;
+  }
+  return isWorkflow;
+}
 export {
   deepCopy,
   getBaseUrl,
@@ -141,6 +149,7 @@ export {
   getWorkflowId,
   isArrayFn,
   isNumber,
+  isWorkflowPage,
   packageTemplateFiles,
   upperFirstCase
 };

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

@@ -98,14 +98,11 @@ function handleFormEvent($event, pageContext, configure, eventType, otherParams)
   if (eventType && eventType === "change") {
     const subTableWatchProps = pageContext.subTableWatchProps;
     if (subTableWatchProps) {
-      for (let tableUuid in subTableWatchProps) {
+      for (const tableUuid in subTableWatchProps) {
         const mainFormProps = subTableWatchProps[tableUuid];
         const propName = (_b = (_a = configure.props) == null ? void 0 : _a.base) == null ? void 0 : _b.prop;
         if (mainFormProps && mainFormProps.indexOf(propName) >= 0) {
-          eventBus.$emit(
-            "_refreshSubTable_" + tableUuid,
-            { propName }
-          );
+          eventBus.$emit("_refreshSubTable_" + tableUuid, { propName });
         }
       }
     }
@@ -267,7 +264,6 @@ function doValidateForm(pageContext, configure, eventParams) {
   });
 }
 function doBeforeClickEvent(pageContext, configure, otherParams) {
-  let result = true;
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
   const beforeClickFunc = getEventFuncByType(pageContext, events, "beforeClick");
   let beforeClickResult;
@@ -275,9 +271,9 @@ function doBeforeClickEvent(pageContext, configure, otherParams) {
     beforeClickResult = callItemEvent(pageContext, configure, beforeClickFunc, null, otherParams);
   }
   if (beforeClickResult === void 0) {
-    result = true;
+    return true;
   }
-  return result;
+  return beforeClickResult;
 }
 function doClickJumpPageEvent(pageContext, configure, eventParams) {
   const myPageCode = pageContext.code;

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

@@ -1,4 +1,4 @@
-import { getBaseUrl, getRealRestApiPath, upperFirstCase, packageTemplateFiles, deepCopy, isArrayFn } from "../common-util.js";
+import { getBaseUrl, getRealRestApiPath, upperFirstCase, isWorkflowPage, packageTemplateFiles, deepCopy, isArrayFn } from "../common-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { getI18n } from "agilebuilder-ui/src/utils/util";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -248,7 +248,7 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   const fileName = templateFile.templateName;
   const systemCode = pageContext.systemCode;
   const logSetting = (_a = configureObj.props.base) == null ? void 0 : _a.logSetting;
-  const isWorkflowForm = pageContext.workflowCode ? true : false;
+  const isWorkflowForm = isWorkflowPage(pageContext);
   const beanName = pageContext.beanName;
   const button = configureObj.props.base;
   const tableName = configureObj.tableName ? configureObj.tableName : pageContext.tableName;
@@ -389,7 +389,7 @@ function saveFunc(params, isListButton) {
 }
 function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids2, row) {
   var _a;
-  const isWorkflow = pageContext.workflowCode ? true : false;
+  const isWorkflow = isWorkflowPage(pageContext);
   const systemCode = pageContext.systemCode;
   const isPermission = configureObj.props.base.isPermission === void 0 || configureObj.props.base.isPermission === "true" || configureObj.props.base.isPermission;
   const functionCodes = getPermissionCodes(configureObj, pageContext);
@@ -442,7 +442,7 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
   if (!param["systemCode"]) {
     param["systemCode"] = systemCode;
   }
-  const beanName = configureObj.props.base.beanName;
+  const beanName = pageContext.beanName;
   if (beanName) {
     param["beanName"] = beanName;
   }
@@ -789,7 +789,7 @@ function deleteFunc(params) {
       let path = baseUrl + "/dsc/commons/" + tableName;
       path = getRealRestApiPath(path, systemCode, backendUrl, pageContext.isTest);
       const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
-      const isWorkflow = pageContext.workflowCode ? true : false;
+      const isWorkflow = isWorkflowPage(pageContext);
       const functionCodes = getPermissionCodes(configureObj, pageContext);
       const param = {
         ids: ids2,
@@ -952,7 +952,7 @@ function doImportFinally(params, fileObj) {
   }
   param.append("isAsync", isAsync + "");
   param.append("pageCode", pageContext.code);
-  const isWorkflowEntity = pageContext.workflowCode ? true : false;
+  const isWorkflowEntity = isWorkflowPage(pageContext);
   if (isWorkflowEntity !== null && isWorkflowEntity !== void 0) {
     param.append("isWorkflowEntity", isWorkflowEntity + "");
   }

package/package.json

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