super-page-runtime 2.1.50-temp1 → 2.1.54

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

@@ -1,11 +1,12 @@
-import { setValueForVariableName } from "../page-helper-util.js";
-import { getComponentRefByCode } from "../global-refs.js";
+import { setValueForVariableName, getOptionDatasSourceMap, getComponentOptionDatasFromPage, getVariableValue, setVariableValue } from "../page-helper-util.js";
+import { getComponentRefByCode, getComponentRef } from "../global-refs.js";
 import eventBus from "../eventBus.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { getAdditionalParamMap, refreshPage } from "../events/standard-event.js";
 import { updateFormItemEditState, dsiabledAllFields } from "../events/validator-util.js";
-import { getBaseUrl } from "../common-util.js";
+import { getBaseUrl, deepCopy } from "../common-util.js";
 import { isMobileBrowser } from "agilebuilder-ui/src/utils/common-util";
+import { getFormModelFields, getModelFields } from "../page-init-util.js";
 const functions = {
   /**
    * 展示页面中的某个组件元素
@@ -319,8 +320,114 @@ const functions = {
   // 根据编码获取组件引用对象
   getComponentRefByCode(pageContext, code) {
     return getComponentRefByCode(pageContext, code);
+  },
+  // 获得表单数据查看信息，例如：下拉框选项名等
+  getFormViewData(pageContext) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    const entity = pageContext.entity ? pageContext.entity : {};
+    const viewEntity = deepCopy(entity);
+    const optionSourceMap = getOptionDatasSourceMap(pageContext);
+    for (let uuid in optionSourceMap) {
+      const cacheOptions = getComponentOptionDatasFromPage(pageContext, uuid);
+      const componentRef = getComponentRef(pageContext, uuid);
+      if (componentRef) {
+        const componentConfigure = componentRef.getConfigure();
+        if (componentConfigure) {
+          if (((_b = (_a = componentConfigure.props) == null ? void 0 : _a.dataOrigin) == null ? void 0 : _b.optionValueSetType) && (((_d = (_c = componentConfigure.props) == null ? void 0 : _c.dataOrigin) == null ? void 0 : _d.optionValueSetType) === "static" || ((_f = (_e = componentConfigure.props) == null ? void 0 : _e.dataOrigin) == null ? void 0 : _f.optionValueSetType) === "optionGroup")) {
+            if (componentConfigure.name && (componentConfigure.name === "select" && ((_h = (_g = componentConfigure.props) == null ? void 0 : _g.base) == null ? void 0 : _h.multiple) || componentConfigure.name === "checkbox")) {
+              let dynamicFields = getFormModelFields(pageContext, componentConfigure);
+              const propValue = getVariableValue(viewEntity, dynamicFields);
+              if (propValue) {
+                const propValues = propValue.split(",");
+                const label = getSelectShowLable(propValues, cacheOptions);
+                setVariableValue(viewEntity, dynamicFields, label);
+              }
+            } else {
+              let dynamicFields = getFormModelFields(pageContext, componentConfigure);
+              const propValue = getVariableValue(viewEntity, dynamicFields);
+              const label = getSelectShowLable(propValue, cacheOptions);
+              setVariableValue(viewEntity, dynamicFields, label);
+            }
+          }
+        }
+      }
+    }
+    const listCodesMap = pageContext.listCodesMap;
+    for (let listCode in listCodesMap) {
+      let tableUuid;
+      if (listCode.indexOf("__") > 0) {
+        tableUuid = listCode.substring(listCode.lastIndexOf("__") + "__".length);
+      }
+      if (tableUuid) {
+        const componentRef = getComponentRef(pageContext, tableUuid);
+        if (componentRef) {
+          const componentConfigure = componentRef.getConfigure();
+          const prop = componentConfigure.code ? componentConfigure.code : listCode;
+          let dynamicFields = getModelFields(componentConfigure, prop);
+          const gridData = getVariableValue(viewEntity, dynamicFields);
+          const subTableOptions = componentRef.getTableSelectOptions(listCode);
+          packageSubTableShowLable(subTableOptions, gridData);
+        }
+      }
+    }
+    return viewEntity.data;
   }
 };
+function packageSubTableShowLable(subTableOptions, subData) {
+  if (subTableOptions && subData) {
+    subData.forEach((rowData) => {
+      const props = Object.keys(subTableOptions);
+      props.forEach((prop) => {
+        const propValue = rowData[prop];
+        const values = subTableOptions[prop];
+        const propSelectOptions = values.options;
+        const column = values.column;
+        let propLabel;
+        if (column && column.componentType && (column.componentType === "multiselect" || column.componentType === "checkbox")) {
+          if (propValue) {
+            const propValues = propValue.split(",");
+            propLabel = getSelectShowLable(propValues, propSelectOptions);
+          }
+        } else {
+          propLabel = getSelectShowLable(propValue, propSelectOptions);
+        }
+        rowData[prop] = propLabel;
+      });
+    });
+  }
+}
+function getSelectShowLable(propValue, propSelectOptions) {
+  let showLabel;
+  if (propValue !== void 0 && propValue !== null && propSelectOptions) {
+    if (Array.isArray(propValue)) {
+      showLabel = "";
+      propValue.forEach((val) => {
+        showLabel = showLabel + getSingleSelectShowLable(propValue, propSelectOptions) + ",";
+      });
+      if (showLabel.indexOf(",") > 0) {
+        showLabel = showLabel.substring(0, showLabel.lastIndexOf(","));
+      }
+    } else {
+      showLabel = propValue;
+      showLabel = getSingleSelectShowLable(propValue, propSelectOptions);
+    }
+  }
+  return showLabel;
+}
+function getSingleSelectShowLable(propValue, propSelectOptions) {
+  let showLabel = propValue;
+  if (propValue !== void 0 && propValue !== null && propSelectOptions) {
+    for (let i = 0; i < propSelectOptions.length; i++) {
+      const optValue = propSelectOptions[i].value;
+      const optLabel = propSelectOptions[i].label ? propSelectOptions[i].label : propSelectOptions[i].name;
+      if (propValue + "" === optValue + "" && (optLabel !== void 0 && optLabel !== null)) {
+        showLabel = optLabel;
+        break;
+      }
+    }
+  }
+  return showLabel;
+}
 function packageInitInfo(pageContext, type, settings) {
   if (!pageContext.initInfo) {
     pageContext.initInfo = {};

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

@@ -1,11 +1,15 @@
 import { setValueForVariableName, getValueFromSource, formatVariableValue } 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;
   }
+  handleChartEvent(pageContext, configure, "beforeUpdateChart", chartOption, {
+    resultData
+  });
   const result = resultData && resultData.result ? resultData.result : {};
   let groupValue = resultData && resultData.groupValue ? resultData.groupValue : void 0;
   const dataSetField = configure.serviceDataField;
@@ -312,6 +316,9 @@ function updateChartOption(pageContext, configure, chartOption, resultData) {
     configure.highlightInfos = [];
     setValueForVariableName(pageContext.entity, selGroupVariable, null);
   }
+  handleChartEvent(pageContext, configure, "afterUpdateChart", chartOption, {
+    resultData
+  });
   configure.groupFields = realGroupFilds;
   configure.cacheDatas = datas;
   configure.rawResult = resultData;

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

@@ -127,6 +127,20 @@ function initChartOption(configure, chartOption) {
       if (yAxis.data) {
         yAxis.data = [];
       }
+      if (yAxis._dataMin === "auto") {
+        yAxis.min = function(value) {
+          if (value.min) {
+            return Math.floor(value.min / 10) * 10;
+          }
+        };
+      }
+      if (yAxis._dataMax === "auto") {
+        yAxis.max = function(value) {
+          if (value.max) {
+            return Math.ceil(value.max / 10) * 10;
+          }
+        };
+      }
     }
   }
   configure.defaultYaxis = defaultYaxis;

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

@@ -26,3 +26,4 @@ export declare function getPropClassName(configure: Component): any;
 export declare function isNumber(numStr: any): boolean;
 export declare function isWorkflowPage(pageContext: PageContext): boolean;
 export declare function refreshMobileDialogType(jumpPageSetting: any, isMobile: boolean): void;
+export declare function isVariableInvalidValue(values: any, variable: string): boolean;

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

@@ -162,6 +162,9 @@ function refreshMobileDialogType(jumpPageSetting, isMobile) {
     jumpPageSetting.jumpPageMobileOpenMode = openMode;
   }
 }
+function isVariableInvalidValue(values, variable) {
+  return values[variable] === null || values[variable] === void 0 || values[variable] === "";
+}
 export {
   deepCopy,
   getBaseUrl,
@@ -171,6 +174,7 @@ export {
   getWorkflowId,
   isArrayFn,
   isNumber,
+  isVariableInvalidValue,
   isWorkflowPage,
   packageTemplateFiles,
   refreshMobileDialogType,

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

@@ -86,3 +86,4 @@ export declare function fileUploadDeleted(pageContext: any, configureObj: any, p
  * @param configure 组件配置
  */
 export declare function isShowComponent(configure: Component): boolean;
+export declare function handleChartEvent(pageContext: PageContext, configure: Component, eventType: string, chartOption: object, otherParams?: object): any;

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

@@ -674,7 +674,9 @@ function isShowComponent(configure) {
   if (!isMobile) {
     const events = configure && configure.events ? configure.events : [];
     if (events) {
-      const eventArr = events.filter((item) => item.name === "click" && item.isStandard && item.eventName && item.eventName === "showSearch");
+      const eventArr = events.filter(
+        (item) => item.name === "click" && item.isStandard && item.eventName && item.eventName === "showSearch"
+      );
       if (eventArr && eventArr.length > 0) {
         isShow = false;
       }
@@ -682,6 +684,16 @@ function isShowComponent(configure) {
   }
   return isShow;
 }
+function handleChartEvent(pageContext, configure, eventType, chartOption, otherParams) {
+  const events = configure && configure.runtime && configure.runtime.events ? configure.runtime.events : [];
+  const eventFun = getEventFuncByType(pageContext, events, eventType);
+  return callItemEvent(pageContext, configure, eventFun, {
+    configure,
+    pageContext,
+    chartOption,
+    ...otherParams
+  });
+}
 export {
   appendDefaultMethods,
   canExecuteButton,
@@ -700,6 +712,7 @@ export {
   gridSelectAllRecords,
   gridSelectRecord,
   gridSelectionChange,
+  handleChartEvent,
   handleEvent,
   handleFormEvent,
   headerClick,

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

@@ -13,6 +13,7 @@ import { updateChartDatasources, getVariableValue, setVariableValue } from "../p
 import printLabelUtil from "./print-label.js";
 import { getTableNameByTableUuid } from "../table-utils.js";
 import { packageCustomRules, getWorkflowRules } from "./validator-util.js";
+import { functions } from "../api/page-expose-util.js";
 const standardEvents = {
   // 表单标准事件保存save
   save: function(params) {
@@ -338,7 +339,8 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   const button = configureObj.props.base;
   const tableName = configureObj.tableName ? configureObj.tableName : pageContext.tableName;
   const backendUrl = pageContext.backendUrl;
-  const viewModels = pageContext.entity.data;
+  const viewModels = functions.getFormViewData(pageContext);
+  console.log("exportFormReport----viewModels=", viewModels);
   const isPermission = button.isPermission === void 0 || button.isPermission === "true" || button.isPermission;
   const functionCodes = getPermissionCodes(configureObj, pageContext);
   const param = {
@@ -2162,7 +2164,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

@@ -75,10 +75,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) {
@@ -104,7 +119,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"] = "";
@@ -122,6 +137,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,
@@ -134,11 +154,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);
         }
       }
     }
@@ -251,7 +271,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/interfaces/page-design-types.d.ts

@@ -69,6 +69,7 @@ export interface PageDesign extends Component {
     subTablePageInfo?: object;
     customEvents?: Array<any>;
     contextParam?: object;
+    systemtParam?: object;
     subTableWatchProps?: object;
 }
 /**

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

@@ -20,6 +20,12 @@ export declare function initComponentDataSources(component: Component, pageConte
  * @param dataSourceConfs 初始化数据配置参数
  */
 export declare function updateChartDatasources(pageContext: PageContext, dataSourceConfs: Array<any>, appendParams: any, isInit?: boolean): Promise<any>;
+/**
+ * 更新指定uuid图表的数据
+ * @param pageContext 页面上下文
+ * @param componentUuid 组件uuid
+ */
+export declare function updateChartDatasourcesByComponent(pageContext: PageContext, componentUuid: string): void;
 /**
  * 初始化数据源
  * @param pageContext 页面上下文
@@ -32,6 +38,18 @@ export declare function updateOptionDatasources(pageContext: PageContext, dataSo
  * @param configure
  */
 export declare function getOptionDatasFromPage(pageContext: PageContext, configure: Component): any;
+/**
+ * 从页面缓存中获取查询到的选项组数据
+ * @param pageContext
+ * @param configure
+ */
+export declare function getComponentOptionDatasFromPage(pageContext: PageContext, configureUuid: string): any;
+/**
+ * 从页面缓存中获取查询到的选项组数据
+ * @param pageContext
+ * @param configure
+ */
+export declare function getOptionDatasSourceMap(pageContext: PageContext): any;
 /**
  * 从页面缓存中获取查询到的统计图数据
  * @param pageContext

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

@@ -80,7 +80,8 @@ function getTableQueryInfo(dataOriginInfo, pageContext2) {
           }
         }
       }
-      if (f.propValue) ;
+      if (f.propValue)
+        ;
       searchForm.push(tempObj);
     }
     infoObj.props.searchForm = searchForm;
@@ -187,6 +188,14 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams, isI
     });
   });
 }
+function updateChartDatasourcesByComponent(pageContext2, componentUuid) {
+  const chartDataSource = pageContext2.initChartServiceConfigs.find(
+    (item) => item.uuid === componentUuid
+  );
+  if (chartDataSource) {
+    updateChartDatasources(pageContext2, [chartDataSource], null, false);
+  }
+}
 function updateOptionDatasources(pageContext2, dataSourceConfs, query) {
   return new Promise((resolve, reject) => {
     if (!dataSourceConfs || dataSourceConfs.length == 0) {
@@ -234,12 +243,20 @@ function updateOptionDatasources(pageContext2, dataSourceConfs, query) {
   });
 }
 function getOptionDatasFromPage(pageContext2, configure2) {
-  if (!pageContext2 || !pageContext2.optionSourceMap || !configure2) {
-    return [];
-  }
-  const cacheOptions = pageContext2.optionSourceMap[configure2.uuid];
+  return getComponentOptionDatasFromPage(pageContext2, configure2.uuid);
+}
+function getComponentOptionDatasFromPage(pageContext2, configureUuid) {
+  const optionSourceMap = getOptionDatasSourceMap(pageContext2);
+  const cacheOptions = optionSourceMap[configureUuid];
   return cacheOptions ? cacheOptions : [];
 }
+function getOptionDatasSourceMap(pageContext2) {
+  if (!pageContext2 || !pageContext2.optionSourceMap) {
+    return {};
+  }
+  const cacheOptions = pageContext2.optionSourceMap;
+  return cacheOptions ? cacheOptions : {};
+}
 function getChartDatasFromPage(pageContext2, configure2) {
   if (!pageContext2 || !pageContext2.chartDataSourceMap || !configure2) {
     return null;
@@ -661,8 +678,10 @@ export {
   formatVariableValue,
   getChartDatasFromPage,
   getComponentOptionConfigs,
+  getComponentOptionDatasFromPage,
   getFormPropName,
   getOptionDatasFromPage,
+  getOptionDatasSourceMap,
   getParamNames,
   getSizeConfig,
   getValueFromSource,
@@ -675,5 +694,6 @@ export {
   setVariableValue,
   setVariableValueWithProp,
   updateChartDatasources,
+  updateChartDatasourcesByComponent,
   updateOptionDatasources
 };

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

@@ -56,7 +56,7 @@ function convertToPageContext(pageDesign, pageRequest) {
       //初始化request对象
       page: {},
       context: pageDesign.contextParam,
-      system: {}
+      system: pageDesign.systemParam
     }
   };
   if (pageDesign.props && pageDesign.props.notIdInitializationList) {
@@ -74,6 +74,8 @@ function convertToPageContext(pageDesign, pageRequest) {
       if (variable.name) {
         if (variable.isArrayElement) {
           pageObj[variable.name] = [];
+        } else if (variable.defaultValue) {
+          pageObj[variable.name] = variable.defaultValue;
         } else {
           pageObj[variable.name] = void 0;
         }
@@ -138,7 +140,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/button/button/button-runtime.vue2.js

@@ -22,7 +22,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return props.pageContext.canClick !== void 0 && props.pageContext.clickUuid !== void 0 ? !props.pageContext.canClick && props.pageContext.clickUuid === props.configure.uuid : false;
     }
     onMounted(() => {
-      console.log("select-runtime onMounted");
+      console.log("button-----onMounted");
     });
     return (_ctx, _cache) => {
       const _component_el_button = resolveComponent("el-button");

package/dist/es/components/runtime/views/assemblys/chart/column-line/column-line-runtime.vue2.js

@@ -155,7 +155,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     }
     __expose({
       updateChartDatas,
-      exportChart
+      exportChart,
+      chartOption
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {

package/dist/es/components/runtime/views/assemblys/chart/table/table-pageination.vue.js

@@ -0,0 +1,64 @@
+import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, createVNode } from "vue";
+const _hoisted_1 = { style: { "padding": "5px", "text-align": "center" } };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "table-pageination",
+  props: {
+    configure: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    pageContext: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    column: {
+      type: Object,
+      default: () => {
+        return {};
+      }
+    },
+    total: {
+      type: Number,
+      default: 0
+    }
+  },
+  emits: ["pageChange", "pageSizeChange"],
+  setup(__props, { emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    const currentPage = ref(1);
+    const pageSize = ref(props.configure.pageination.pageSize);
+    const handleCurrentChange = (val) => {
+      currentPage.value = val;
+      emits("pageChange", currentPage.value, pageSize.value);
+    };
+    const handleSizeChange = (val) => {
+      pageSize.value = val;
+      emits("pageSizeChange", currentPage.value, pageSize.value);
+    };
+    return (_ctx, _cache) => {
+      const _component_el_pagination = resolveComponent("el-pagination");
+      return openBlock(), createElementBlock("div", _hoisted_1, [
+        createVNode(_component_el_pagination, {
+          "current-page": currentPage.value,
+          "onUpdate:currentPage": _cache[0] || (_cache[0] = ($event) => currentPage.value = $event),
+          "page-size": pageSize.value,
+          "onUpdate:pageSize": _cache[1] || (_cache[1] = ($event) => pageSize.value = $event),
+          "page-sizes": [10, 30, 50, 100],
+          size: "small",
+          layout: "total, sizes, prev, pager, next, jumper",
+          total: __props.total,
+          onCurrentChange: handleCurrentChange,
+          onSizeChange: handleSizeChange
+        }, null, 8, ["current-page", "page-size", "total"])
+      ]);
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/dist/es/components/runtime/views/assemblys/chart/table/table-pageination.vue2.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./table-pageination.vue.js";
+export {
+  _sfc_main as default
+};