super-page-runtime 2.1.19 → 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);
@@ -296,8 +292,7 @@ function formatAdditionalParamMapIds(ids) {
       ids = ids.split(",");
     } else if (typeof ids === "number") {
       ids = [ids];
-    } else
-      ;
+    } else ;
   }
   return ids;
 }

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

@@ -1,7 +1,7 @@
-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: any, isTest?: boolean): any;
+export declare function getBaseUrl(backendUrl: string | null | undefined, isTest?: boolean): any;
 export declare function getRealRestApiPath(orgRestApiPath: any, systemCode: any, backendUrl: any, 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

@@ -11,7 +11,11 @@ function getBaseUrl(backendUrl, isTest) {
   if (isTest) {
     return backendUrl;
   } else {
-    let baseUrl = window["$vueApp"].config.globalProperties.baseURL;
+    const { baseURL, projectModel } = window["$vueApp"].config.globalProperties;
+    let baseUrl = baseURL;
+    if (projectModel === "developing.model") {
+      return baseUrl;
+    }
     if (backendUrl) {
       baseUrl = getSystemBackendUrl(backendUrl);
     }
@@ -128,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,
@@ -137,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/dist/es/components/runtime/utils/events/validator-util.js

@@ -75,25 +75,10 @@ function getEndObjectRule(rule, props, currentProp) {
 }
 function getValidator(columns) {
   const rules = {};
-  if (columns) {
-    columns.forEach((editField) => {
-      const prop = editField.model;
-      if (prop && editField.validations) {
-        const validations = editField.validations;
-        if (prop.indexOf(".") > 0) {
-          setObjectPropRule(editField.prop, rules, validations);
-        } else {
-          if (validations && validations.length > 0) {
-            rules[prop] = [...validations];
-          }
-        }
-      }
-    });
-  }
   return rules;
 }
 function validator(entity, rules, columns, rowIndex, isSql) {
-  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
+  return validatorEntity(entity, rules, columns, rowIndex, true);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -119,7 +104,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator(columns);
+    validateRules = getValidator();
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -137,11 +122,6 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       if (errors) {
         result = errors[0].message;
         fieldName = errors[0]["field"];
-        if (typeof rowIndex !== "undefined" && rowIndex !== null) {
-          result = getI18n().t("superPageRuntimeMessage.recordLine", {
-            row: rowIndex + 1
-          }) + "，" + result;
-        }
         ElMessage({
           message: result,
           showClose: true,
@@ -154,11 +134,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (isSql !== void 0 && isSql === true && reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
           const copyEntity = JSON.parse(JSON.stringify(entity));
           copyEntity[fieldName.toUpperCase()] = entity[fieldName.toLowerCase()];
           delete copyEntity[fieldName.toLowerCase()];
-          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false);
         }
       }
     }
@@ -206,7 +186,7 @@ function validateWorkflowFormDataModel(dataModel, pageContext) {
     if (!rules || Object.keys(rules).length === 0) {
       result = true;
     } else {
-      result = validator(handleModels, rules, null, null, true);
+      result = validator(handleModels, rules, null, null);
     }
     if (result === true) {
       const workflowFieldPermissionRules = pageContext.workflowRules;
@@ -270,7 +250,7 @@ function validateCommonFormDataModel(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(handleModels);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null, true);
+      const validateEntityResult = validator(handleModels, rules, null, null);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

package/dist/es/components/runtime/utils/page-helper-util.js

@@ -80,8 +80,7 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue)
-        ;
+      if (f.propValue) ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;

package/dist/es/components/runtime/utils/page-init-util.js

@@ -138,8 +138,7 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  if (requestObj["_t_"])
-    ;
+  if (requestObj["_t_"]) ;
   return requestObj;
 }
 function packageAdditionalMapWithRoute(route, requestObj) {

package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, onMounted, watch, onUnmounted, resolveComponent, openBlock, createElementBlock, createVNode, unref } from "vue";
 import "agilebuilder-ui";
 import { setTableEvents, getEventFuncByType, canExecuteButton, doAfterClickEvent, getEventNameByType, doBeforeClickEvent, getHandleEvent, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
-import { getListCode, getRealRestApiPath } from "../../../../utils/common-util.js";
+import { getBaseUrl, getListCode, getRealRestApiPath } from "../../../../utils/common-util.js";
 import { getAdditionalParamMap, getSaveFormRequestWithRow, standardEvents } from "../../../../utils/events/standard-event.js";
 import { isPromise } from "agilebuilder-ui/src/utils/common-util";
 import { getDataTypeMapRequest, popupToPage } from "../../../../utils/table-utils.js";
@@ -32,7 +32,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
     const tableName = configure.props && configure.props.dataOrigin && configure.props.dataOrigin.tableName;
-    let baseURL = pageContext.backendUrl;
+    let baseURL = getBaseUrl(pageContext.backendUrl, pageContext.isTest);
     if (!baseURL) {
       baseURL = window["$vueApp"].config.globalProperties.baseURL;
     }
@@ -541,7 +541,14 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       if (!gridRef.value) {
         return;
       }
-      console.log("objectRender---configure.name=", props.configure.name, "props.configure=", props.configure, "runtimeStyle.value=", runtimeStyle);
+      console.log(
+        "objectRender---configure.name=",
+        props.configure.name,
+        "props.configure=",
+        props.configure,
+        "runtimeStyle.value=",
+        runtimeStyle
+      );
       const sizeConfig = getSizeConfig(props.pageContext, props.configure);
       if (sizeConfig && sizeConfig["isCalcHeight"]) {
         let thisRefDom = gridRef.value.$el;
@@ -553,7 +560,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return;
         }
         const rect = thisRefDom.getBoundingClientRect();
-        return window.innerHeight - rect.y - 80;
+        return window.innerHeight - rect.y - 90;
       }
     }
     function customButtonClick(originalValue, formatValue, row, column, rowIndex, button) {

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue.js

@@ -1,5 +1,5 @@
 import _sfc_main from "./placeholder-runtime.vue2.js";
-import "./placeholder-runtime.vue3.js";
+/* empty css                         */
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-a0860ff0"]]);
 export {

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

@@ -346,8 +346,7 @@ 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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.1.19",
+  "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",

package/dist/es/components/runtime/views/assemblys/form/placeholder/placeholder-runtime.vue3.js

@@ -1 +0,0 @@
-