super-page-runtime 2.1.93 → 2.1.932

package/dist/es/components/runtime/utils/charts/chart-columnline-util.js

@@ -1,9 +1,8 @@
-import { setValueForVariableName, getValueFromSource, formatVariableValue } from "../page-helper-util.js";
+import { getValueFromSource, formatVariableValue, setValueForVariableName } from "../page-helper-util.js";
 import { deepCopy } from "../common-util.js";
 import { CommonName, caculateFormulaValue, sortDatas, limitDatas, executeChartFormula } from "./chart-util.js";
 import { handleChartEvent } from "../events/event-util.js";
 function updateChartOption(pageContext, configure, chartOption, resultData) {
-  var _a;
   if (!resultData || !resultData.result) {
     return;
   }
@@ -28,9 +27,6 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
   if (!datas) {
     datas = [];
   }
-  if ((_a = configure.runtime.dataConfig) == null ? void 0 : _a.resultSet) {
-    setValueForVariableName(pageContext.entity, configure.runtime.dataConfig.resultSet, datas);
-  }
   configure.runtime.dataConfig.runtimeData = datas;
   let confGroups = configure.props ? configure.props.groups : null;
   if (!confGroups) {

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

@@ -2238,8 +2238,7 @@ 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,25 +76,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) {
@@ -120,7 +105,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"] = "";
@@ -138,11 +123,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,
@@ -155,11 +135,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);
         }
       }
     }
@@ -272,7 +252,7 @@ function validateCommon(dataModel, pageContext, rules) {
     if (!rules || Object.keys(rules).length === 0) {
       resolve(true);
     } 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

@@ -81,8 +81,7 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue)
-        ;
+      if (f.propValue) ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -152,7 +151,10 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
             serviceInputs.forEach((inParam) => {
               const paramName = inParam.name;
               const paramValue = inParam.value;
-              services[0].serviceInParams[paramName] = getValueFromVariable(pageContext2.entity, paramValue);
+              services[0].serviceInParams[paramName] = getValueFromVariable(
+                pageContext2.entity,
+                paramValue
+              );
             });
           }
         }
@@ -185,6 +187,7 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
     const baseUrl = getBaseUrl(backendUrl, pageContext2.isTest);
     const url = baseUrl + "/common/common-data/find-chart-datas";
     http.post(url, param).then((result) => {
+      var _a, _b;
       if (!pageContext2.chartDataSourceMap) {
         pageContext2.chartDataSourceMap = {};
       }
@@ -196,6 +199,30 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
           if (!isInit || chartConfig && chartConfig.initializationQuery) {
             if (componentObj.updateChartDatas) {
               componentObj.updateChartDatas(result[uuid]);
+              if ((_b = (_a = chartConfig.runtime) == null ? void 0 : _a.dataConfig) == null ? void 0 : _b.resultSet) {
+                const serviceData = result[uuid] && result[uuid].length > 0 ? result[uuid][0] : {};
+                const chartData = serviceData && serviceData.result ? serviceData.result : {};
+                let datas = null;
+                if (chartConfig.serviceDataField) {
+                  datas = result[chartConfig.dataSetField];
+                } else {
+                  if (chartData) {
+                    if (Array.isArray(chartData)) {
+                      datas = chartData;
+                    } else {
+                      datas = [chartData];
+                    }
+                  }
+                }
+                if (!datas) {
+                  datas = [];
+                }
+                setValueForVariableName(
+                  pageContext2.entity,
+                  chartConfig.runtime.dataConfig.resultSet,
+                  datas
+                );
+              }
             }
           }
         }

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

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

@@ -238,8 +238,7 @@ 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,8 +71,7 @@ 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/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-96fc65d8"]]);
 export {

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

@@ -361,8 +361,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.93",
+  "version": "2.1.932",
   "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 @@
-