super-page-runtime 2.1.82 → 2.1.85

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

@@ -2233,7 +2233,8 @@ function formatAdditionalParamMapIds(ids2) {
       ids2 = ids2.split(",");
     } else if (typeof ids2 === "number") {
       ids2 = [ids2];
-    } else ;
+    } else
+      ;
   }
   return ids2;
 }

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

@@ -76,10 +76,25 @@ 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);
+  return validatorEntity(entity, rules, columns, rowIndex, true, isSql);
 }
 function sublistVerify(rules) {
   if (!rules) {
@@ -105,7 +120,7 @@ function sublistVerify(rules) {
 function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdate, isSql) {
   let validateRules = sublistVerify(rules);
   if ((!rules || rules === null) && columns) {
-    validateRules = getValidator();
+    validateRules = getValidator(columns);
   }
   if (!validateRules || Object.keys(validateRules).length === 0) {
     entity["validateErrorField"] = "";
@@ -123,6 +138,11 @@ 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,
@@ -135,11 +155,11 @@ function validatorEntity(entity, rules, columns, rowIndex, isShouldRepeateValdat
       }
       if (fieldName && isShouldRepeateValdate === true) {
         const reg1 = /[A-Z]+/;
-        if (reg1.test(fieldName) && entity[fieldName.toLowerCase()] !== void 0) {
+        if (isSql !== void 0 && isSql === true && 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);
+          result = validatorEntity(copyEntity, rules, columns, rowIndex, false, isSql);
         }
       }
     }
@@ -252,7 +272,7 @@ function validateCommon(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(true);
     } else {
-      const validateEntityResult = validator(handleModels, rules, null, null);
+      const validateEntityResult = validator(handleModels, rules, null, null, true);
       if (validateEntityResult === true) {
         const validateResult = validateSubTables(pageContext);
         if (validateResult === true) {

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

@@ -81,7 +81,8 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue) ;
+      if (f.propValue)
+        ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -145,12 +146,15 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
         const configure = componentRef.getConfigure();
         const serviceInputs = (_a = configure == null ? void 0 : configure.props.dataOrigin) == null ? void 0 : _a.serviceInputs;
         if (serviceInputs) {
-          serviceInputs.forEach((inParam) => {
-            const paramName = inParam.name;
-            const paramValue = inParam.value;
-            item.serviceInParams = {};
-            item.serviceInParams[paramName] = getValueFromVariable(pageContext2.entity, paramValue);
-          });
+          const services = item.services;
+          if (services && services.length > 0) {
+            services[0].serviceInParams = {};
+            serviceInputs.forEach((inParam) => {
+              const paramName = inParam.name;
+              const paramValue = inParam.value;
+              services[0].serviceInParams[paramName] = getValueFromVariable(pageContext2.entity, paramValue);
+            });
+          }
         }
       }
     });

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

@@ -145,7 +145,8 @@ 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/chart/table/table-runtime.vue2.js

@@ -248,7 +248,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
       } else {
-        if (highOrder && highOrder.mergeColumn) ;
+        if (highOrder && highOrder.mergeColumn)
+          ;
         if (highOrder && highOrder.mergeRow && highOrder.mergeRow.includes(property)) {
           if (rowIndex === 0) {
             return {

package/dist/es/components/runtime/views/assemblys/data/tree/tree-runtime.vue2.js

@@ -71,7 +71,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       menuTree.value.filter(val);
     });
     const filterNode = (value, data) => {
-      if (!value) return true;
+      if (!value)
+        return true;
       return data.name.includes(value);
     };
     function handleNodeClick(data, node, nodeTree) {

package/dist/es/components/runtime/views/assemblys/form/dept-tree/depttree-runtime.vue2.js

@@ -36,24 +36,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       nextTick(() => {
         const value = dataModel ? dataModel[fieldName] : null;
-        handleAfterInitEvent(
+        handleAfterInitEvent(value, props.pageContext, props.configure, {
+          formItemRef: formItemRef.value,
+          componentRef: componentRef.value,
+          titleRef: titleRef.value,
           value,
-          props.pageContext,
-          props.configure,
-          {
-            formItemRef: formItemRef.value,
-            componentRef: componentRef.value,
-            titleRef: titleRef.value,
-            value,
-            entity: props.pageContext.entity.data,
-            pageData: props.pageContext.entity.page
-          }
-        );
+          entity: props.pageContext.entity.data,
+          pageData: props.pageContext.entity.page
+        });
       });
     });
     const autoSetFields = designProperty.value.autoSetFields ? designProperty.value.autoSetFields : [];
-    function changeValue(value) {
-      handleFormEvent(value, props.pageContext, props.configure, "change");
+    function changeValue(model, value) {
+      if (model === fieldName) {
+        handleFormEvent(value, props.pageContext, props.configure, "change");
+      }
     }
     function showTree() {
       handleFormEvent(null, props.pageContext, props.configure, "click");
@@ -97,7 +94,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             fields: unref(autoSetFields),
             size: designProperty.value.size,
             separator: designProperty.value.separator,
-            onChange: changeValue,
+            onSetValue: changeValue,
             onShowTree: showTree
           }, null, 8, ["disabled", "multiple", "treeType", "value", "models", "fields", "size", "separator"])
         ]),

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";
-/* empty css                         */
+import "./placeholder-runtime.vue3.js";
 import _export_sfc from "../../../../../../_virtual/_plugin-vue_export-helper.js";
 const placeholderRuntime = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-96fc65d8"]]);
 export {

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

@@ -0,0 +1 @@
+

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

@@ -361,7 +361,8 @@ 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.82",
+  "version": "2.1.85",
   "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.96",
+    "agilebuilder-ui": "1.0.97",
     "axios": "^1.6.8",
     "cypress": "^13.6.6",
     "element-plus": "^2.6.1",