super-page-runtime 2.1.19 → 2.1.20

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

@@ -296,8 +296,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';
 
 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;
 /**
  * 封装模板文件列表

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);
     }

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.20",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",

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

@@ -1 +0,0 @@
-