super-page-runtime 2.0.22 → 2.0.27

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

@@ -11,6 +11,9 @@ import { doAfterClickEvent, handleEvent } from "./event-util.js";
 import { setStoreInfo } from "../store-util.js";
 import { refreshPage } from "../api/api-util.js";
 import { updateWithPageValue } from "agilebuilder-ui/src/utils/jump-page-utils";
+import { getPermissionCodes } from "../page-init-util.js";
+import { updateChartDatasources } from "../page-helper-util.js";
+import printLabelUtil from "./print-label.js";
 const standardEvents = {
   // 表单标准事件保存save
   save: function(params) {
@@ -205,6 +208,37 @@ const standardEvents = {
   lineEditCreate: function(params) {
     console.log("列表行编辑 新建lineEditCreate--params=", params);
     return lineEditCreateFunc(params);
+  },
+  printLabel: function(params) {
+    console.log("打印标签 打印标签事件--params=", params);
+    return printLabel(params);
+  },
+  queryCharts: function(params) {
+    console.log("查询统计图--params=", params);
+    const pageContext = params.pageContext;
+    const chartConfigs = pageContext.initChartServiceConfigs;
+    if (!chartConfigs || chartConfigs.length == 0) {
+      console.log("无需要查询的统计图数据");
+      return;
+    }
+    const configure = params.configureObj;
+    let runtimeProps = null;
+    if (configure && configure.runtime) {
+      runtimeProps = configure.runtime.props;
+    }
+    const hisState = runtimeProps ? runtimeProps.state : void 0;
+    if (runtimeProps) {
+      runtimeProps.state = "disabled";
+    }
+    updateChartDatasources(pageContext, chartConfigs, void 0).then(() => {
+      if (runtimeProps) {
+        runtimeProps.state = hisState;
+      }
+    }).catch(() => {
+      if (runtimeProps) {
+        runtimeProps.state = hisState;
+      }
+    });
   }
 };
 function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
@@ -219,6 +253,7 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
   const backendUrl = pageContext.backendUrl;
   const viewModels = pageContext.entity.data;
   const isPermission = button.isPermission === void 0 || button.isPermission === "true" || button.isPermission;
+  const functionCodes = getPermissionCodes(configureObj, pageContext);
   const param = {
     entity: viewModels,
     fileName: templateUUID,
@@ -228,16 +263,18 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
     beanName,
     isWorkflowForm,
     // 是否是流程表单
-    functionCode: button.functionCode,
+    functionCode: functionCodes,
     tableName,
     isPermission: isPermission + "",
     systemCode,
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   };
   if (logSetting) {
     param["logSettingText"] = logSetting;
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   let exportResult;
   if (isPdf) {
@@ -348,19 +385,25 @@ function saveFunc(params, isListButton) {
     }
   });
 }
-function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids) {
+function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids, row) {
   const isWorkflow = pageContext.workflowCode ? true : false;
   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);
+  let entity = row;
+  if (!entity) {
+    entity = pageContext.entity.data;
+  }
   const param = {
-    entity: pageContext.entity.data,
-    pageModel: pageContext.entity.page,
+    entity,
     tableName: pageContext.tableName,
     formNoRuleCode: pageContext.formNoRuleCode,
     isWorkflowEntity: isWorkflow,
-    functionCode: configureObj.props.base.functionCode,
+    functionCode: functionCodes,
     isPermission: isPermission + "",
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   };
   if (ids) {
     param["ids"] = ids;
@@ -380,14 +423,6 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
       param["dataConversionRule"] = conversionCodes;
     }
   }
-  const autoSetValueData = configureObj.props.base.setValueList;
-  if (autoSetValueData) {
-    if (isArrayFn(autoSetValueData)) {
-      param["autoSetValueData"] = autoSetValueData.join(",");
-    } else if (typeof autoSetValueData === "string") {
-      param["autoSetValueData"] = autoSetValueData;
-    }
-  }
   const logSetting = configureObj.props.logSetting;
   if (logSetting) {
     param["logSettingText"] = logSetting;
@@ -405,14 +440,14 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
   if (mainDefaultValueColumns) {
     param["mainDefaultValueColumns"] = mainDefaultValueColumns;
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   if (isUnControlVersion !== void 0) {
     param["unControlVersion"] = isUnControlVersion;
   }
   return param;
 }
-function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo) {
+function getSaveFormRequestWithRow(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, row) {
   const systemCode = pageContext.systemCode;
   const backendUrl = pageContext.backendUrl;
   const param = getCommonFormRequestParam(
@@ -421,10 +456,22 @@ function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion,
     isUnControlVersion,
     mainDefaultValueColumns,
     dynamicColumnInfo,
-    null
+    null,
+    row
   );
   return getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data);
 }
+function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo) {
+  return getSaveFormRequestWithRow(
+    pageContext,
+    configureObj,
+    url,
+    isUnControlVersion,
+    mainDefaultValueColumns,
+    dynamicColumnInfo,
+    null
+  );
+}
 function getSaveFormRequestByParam(systemCode, backendUrl, param, url, formData) {
   const baseUrl = getBaseUrl(backendUrl);
   let path = baseUrl + url;
@@ -468,7 +515,7 @@ function dealAfterWithForm(pageContext, configureObj, data, successTip) {
   }
 }
 function afterSuccessOperateInForm(pageContext, configureObj, dataModel) {
-  let successOperation = configureObj.props.base.successOperation;
+  const successOperation = configureObj.props.base.successOperation;
   if (!successOperation || successOperation === null) {
     return;
   }
@@ -498,7 +545,11 @@ function closeDialog(pageContext, dataModel, isNeedValueMapping) {
     const isNeedValueMappingFinal = isNeedValueMapping !== void 0 && isNeedValueMapping === true && dataModel && dataModel !== void 0;
     const parentPageCode = pageContext.entity && pageContext.entity.request ? pageContext.entity.request.parentPageCode : null;
     const eventPageInfo = parentPageCode + "_";
-    eventBus.$emit(eventPageInfo + "close-dialog", { isNeedValueMapping: isNeedValueMappingFinal, dataModel, sourceTableName });
+    eventBus.$emit(eventPageInfo + "close-dialog", {
+      isNeedValueMapping: isNeedValueMappingFinal,
+      dataModel,
+      sourceTableName
+    });
   } else if (jumpMode === "openWindow" || jumpMode === "newTab") {
     if (window.parent) {
       window.parent.close();
@@ -616,7 +667,8 @@ function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion
         isUnControlVersion,
         mainDefaultValueColumns,
         dynamicColumnInfo,
-        ids
+        ids,
+        null
       );
       getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data).then((result) => {
         resolve(result);
@@ -659,13 +711,16 @@ function deleteFunc(params) {
       path = getRealRestApiPath(path, systemCode, backendUrl);
       const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
       const isWorkflow = pageContext.workflowCode ? true : false;
+      const functionCodes = getPermissionCodes(configureObj, pageContext);
       const param = {
         ids,
-        functionCode: configureBase.functionCode,
+        functionCode: functionCodes,
         isPermission: isPermission + "",
         systemCode,
         isWorkflowEntity: isWorkflow,
-        tableNames: pageContext.tableNames
+        tableNames: pageContext.tableNames,
+        pageCode: pageContext.code,
+        pageVersion: pageContext.version
       };
       if (configureBase.beanName) {
         param["beanName"] = configureBase.beanName;
@@ -689,7 +744,8 @@ function deleteFunc(params) {
       http.delete(path, {
         data: param
       }).then((data) => {
-        const gridRef = getComponentRef(pageContext, params.tableUuid);
+        const tableUuid = configureObj.props.base.tableUuid;
+        const gridRef = getComponentRef(pageContext, tableUuid);
         if (gridRef) {
           gridRef.isDeleteChange(true);
           gridRef.clearSelections();
@@ -744,12 +800,19 @@ function downloadTemplateFunc(params) {
   if (pageContext.beanName) {
     param += "&beanName=" + pageContext.beanName;
   }
-  if (configureBase.functionCode) {
-    param += "&functionCode=" + configureBase.functionCode;
+  const functionCodes = getPermissionCodes(configureObj, pageContext);
+  if (functionCodes) {
+    param += "&functionCode=" + functionCodes;
   }
   if (pageContext.tableName) {
     param += "&tableName=" + pageContext.tableName;
   }
+  if (pageContext.code) {
+    param += "&pageCode=" + pageContext.code;
+  }
+  if (pageContext.version) {
+    param += "&pageVersion=" + pageContext.version;
+  }
   if (configureBase) {
     const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
     param += "&isPermission=" + isPermission;
@@ -802,10 +865,11 @@ function doImportFinally(params, fileObj) {
   if (isWorkflowEntity !== null && isWorkflowEntity !== void 0) {
     param.append("isWorkflowEntity", isWorkflowEntity + "");
   }
-  if (buttonConfigureBase.functionCode) {
-    param.append("functionCode", buttonConfigureBase.functionCode);
+  const functionCodes = getPermissionCodes(buttonConfigureObj, pageContext);
+  if (functionCodes) {
+    param.append("functionCode", functionCodes);
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param.append("additionalParamMapStr", JSON.stringify(additionalParamMap));
   const isPermission = buttonConfigureBase.isPermission === void 0 || buttonConfigureBase.isPermission === "true" || buttonConfigureBase.isPermission;
   param.append("isPermission", isPermission + "");
@@ -897,12 +961,13 @@ function exportFunc(params) {
       isAsync = false;
     }
     const isPermission = configureBase.isPermission === void 0 || configureBase.isPermission === "true" || configureBase.isPermission;
+    const functionCodes = getPermissionCodes(params.configureObj, pageContext);
     const exportFileName = pageName;
     window["$vueApp"].config.globalProperties.$exportDataNew(
       dataParam,
       exportFileName,
       listCode,
-      configureBase.functionCode,
+      functionCodes,
       null,
       null,
       isAsync,
@@ -916,10 +981,10 @@ function getWorkflowSaveParams(params) {
   const configureObj = params.configureObj;
   const dataModel = pageContext.entity.data;
   const systemCode = pageContext.systemCode;
-  const permissionPrefix = systemCode + "." + pageContext.code;
-  let functionCode = configureObj.props.base.functionCode;
-  if (!functionCode) {
-    functionCode = permissionPrefix + ".xxx";
+  const permissionPrefix = pageContext.code;
+  let functionCodes = getPermissionCodes(configureObj, pageContext);
+  if (!functionCodes) {
+    functionCodes = permissionPrefix + ".xxx";
   }
   if (!dataModel.id && !dataModel.ID) {
     dataModel["pageCode"] = pageContext.code;
@@ -932,9 +997,11 @@ function getWorkflowSaveParams(params) {
     tableName: pageContext.tableName,
     emailTemplateCode: pageContext.emailTemplateCode,
     definitionId: pageContext.definitionId,
-    functionCode,
+    functionCode: functionCodes,
     systemCode,
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   };
   if (pageContext.completeTaskParam) {
     param["completeTaskParam"] = {
@@ -957,14 +1024,6 @@ function getWorkflowSaveParams(params) {
       param["dataConversionRule"] = conversionCodes;
     }
   }
-  const autoSetValueData = configureObj.props.base.setValueList;
-  if (autoSetValueData) {
-    if (isArrayFn(autoSetValueData)) {
-      param["autoSetValueData"] = autoSetValueData.join(",");
-    } else if (typeof autoSetValueData === "string") {
-      param["autoSetValueData"] = autoSetValueData;
-    }
-  }
   if (pageContext.beanName) {
     param["beanName"] = pageContext.beanName;
   }
@@ -975,7 +1034,7 @@ function getWorkflowSaveParams(params) {
   if (!param.systemCode) {
     param.systemCode = systemCode;
   }
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
   if (additionalParamMap.ids && additionalParamMap.ids.length > 0) {
     param["ids"] = additionalParamMap.ids;
@@ -1180,21 +1239,21 @@ function doAssign(params, selectNodeInfo) {
 function getTransactTaskParam(params) {
   const pageContext = params.pageContext;
   const dataModel = pageContext.entity.data;
-  const pageModel = pageContext.entity.page;
   const systemCode = pageContext.systemCode;
-  const permissionPrefix = systemCode + "." + pageContext.code;
+  const permissionPrefix = pageContext.code;
   const additionalParamMap = getAdditionalParamMap(pageContext);
   const dataId = dataModel.ID !== void 0 && dataModel.ID !== null ? dataModel.ID : dataModel.id;
   ({
     beanName: pageContext.beanName,
     id: dataId,
     entity: dataModel,
-    pageModel,
     additionalParamMap,
     tableName: pageContext.tableName,
     functionCode: permissionPrefix + ".xxx",
     isWorkflowEntity: true,
-    tableNames: pageContext.tableNames
+    tableNames: pageContext.tableNames,
+    pageCode: pageContext.code,
+    pageVersion: pageContext.version
   });
   ({
     taskId: pageContext.completeTaskParam.taskId,
@@ -1385,8 +1444,8 @@ function getTaskInformitions(params) {
     });
     return;
   }
-  const permissionPrefix = systemCode + "." + pageContext.code;
-  let additionalParamMap = getAdditionalParamMap(pageContext);
+  const permissionPrefix = pageContext.code;
+  const additionalParamMap = getAdditionalParamMap(pageContext);
   const requestParams = {
     beanName: pageContext.beanName,
     additionalParamMap,
@@ -1485,6 +1544,22 @@ function lineEditCreateFunc(params) {
     gridRef.createRow(params);
   }
 }
+function printLabel(params) {
+  let templateUuid = null;
+  try {
+    if (params.menuItem) {
+      templateUuid = params.menuItem.templateUuid;
+    } else {
+      templateUuid = params.configureObj.props.base.template[0].templateUuid;
+    }
+    if (!templateUuid) {
+      throw new Error("未找到模板");
+    }
+  } catch (e) {
+    console.error("打印标签失败，未在配置中找到找到模板", e, params);
+  }
+  printLabelUtil.printLabel(params, templateUuid);
+}
 function isVisibleWorkflowButton(standardEventName, buttonInfo, completeTaskParam) {
   let isVisible = true;
   if (standardEventName && buttonInfo) {
@@ -1683,6 +1758,7 @@ export {
   getAdditionalParamMap,
   getRemoveSigner,
   getSaveFormRequest,
+  getSaveFormRequestWithRow,
   getTaskInformitions,
   isVisibleWorkflowButton,
   judgeDataNumber,

package/dist/es/components/runtime/utils/form/scan-util.js

@@ -0,0 +1,191 @@
+import http from "agilebuilder-ui/src/utils/request";
+import { setValueForVariableName } from "../page-helper-util.js";
+function formatScanRuleSets(ruleList) {
+  const scanRuleSets2 = {};
+  ruleList.forEach((ruleSet) => {
+    if (ruleSet.type === "group") {
+      ruleSet.outs.forEach((valueSet) => {
+        if (!scanRuleSets2[valueSet.ruleCode]) {
+          scanRuleSets2[valueSet.ruleCode] = { outs: [], adaptations: [] };
+        }
+        scanRuleSets2[valueSet.ruleCode].outs.push(valueSet);
+      });
+    } else {
+      scanRuleSets2[ruleSet.code] = { outs: ruleSet.outs, adaptations: [] };
+    }
+  });
+  return packageScanRuleSets(scanRuleSets2);
+}
+function packageScanRuleSets(scanRuleSets2) {
+  return new Promise((resolve, reject) => {
+    if (Object.keys(scanRuleSets2).length > 0) {
+      http.post("/dc/setting-barcode-analysis/by-codes", Object.keys(scanRuleSets2)).then((res2) => {
+        res2.forEach((rule) => {
+          const ruleOuts = JSON.parse(rule.barcodeAnalysisOuts);
+          const needOutsFields = /* @__PURE__ */ new Set();
+          const outsFiledsSet = {};
+          scanRuleSets2[rule.code].outs.forEach((valueSet) => {
+            needOutsFields.add(valueSet.returnedValue);
+            outsFiledsSet[valueSet.returnedValue] = valueSet.pageVariable;
+          });
+          const filteredOutsField = [];
+          ruleOuts.forEach((outFiled) => {
+            if (needOutsFields.has(outFiled.code)) {
+              outFiled.pageVariable = outsFiledsSet[outFiled.code];
+              filteredOutsField.push(outFiled);
+            }
+          });
+          scanRuleSets2[rule.code].outs = filteredOutsField;
+          scanRuleSets2[rule.code].adaptations = JSON.parse(rule.barcodeAnalysisAdaptations);
+          resolve(scanRuleSets2);
+        });
+      });
+    } else {
+      resolve(null);
+    }
+  });
+}
+function analysisScanValue(scanValue, scanRuleSets) {
+  if (!scanValue) {
+    return null;
+  }
+  const scanSets = Object.values(scanRuleSets);
+  for (let i = 0; i < scanSets.length; i++) {
+    const scanSet = scanSets[i];
+    const adaptations = scanSet.adaptations;
+    let validStr = "";
+    for (let k = 0; k < adaptations.length; k++) {
+      const adap = adaptations[k];
+      const indexs = _getScanIndexs(scanValue, adap.startIndex, adap.endIndex);
+      const startIndex = indexs[0];
+      const endIndex = indexs[1];
+      let paramValue = scanValue.substring(startIndex, endIndex);
+      let compareValue = adap.value;
+      let operate = adap.operate;
+      if (operate == "times") {
+        const realValue = paramValue.split(compareValue == void 0 ? "" : compareValue).length - 1;
+        compareValue = realValue;
+        paramValue = adap.times;
+        operate = "=";
+      }
+      if (isNaN(paramValue) || isNaN(compareValue)) {
+        paramValue = "'" + paramValue + "'";
+        compareValue = "'" + compareValue + "'";
+      }
+      if (adap.leftBracket) {
+        validStr += adap.leftBracket;
+      }
+      if (operate == "<>") {
+        operate = "!=";
+      } else if (operate == "=") {
+        operate = "==";
+      }
+      if (operate == "include" || operate == "notinclude") {
+        validStr += paramValue + ".indexOf(" + compareValue + ")";
+        if (operate == "include") {
+          validStr += ">-1";
+        } else {
+          validStr += "<0";
+        }
+      } else {
+        validStr += paramValue + operate + compareValue;
+      }
+      if (adap.rightBracket) {
+        validStr += adap.rightBracket;
+      }
+      if (adap.joinStr && k + 1 < adaptations.length) {
+        const joinStr = adap.joinStr == "and" ? "&&" : "||";
+        validStr += joinStr;
+      }
+    }
+    let res = false;
+    if (validStr) {
+      try {
+        console.log("validStr", validStr);
+        res = eval("(" + validStr + ")");
+        console.log("res", res);
+      } catch (e) {
+        console.log(e);
+      }
+    } else {
+      res = true;
+    }
+    if (res) {
+      return executeAnalysisForScan(scanValue, scanSet);
+    }
+  }
+  return null;
+}
+function executeAnalysisForScan(scanValue2, scanSet2) {
+  if (!scanSet2 || !scanValue2) {
+    return;
+  }
+  const outs = scanSet2.outs;
+  const params = {};
+  outs.forEach((outJson) => {
+    const fieldName = outJson.fieldName;
+    if (outJson.fixedValue != void 0) {
+      params[fieldName] = outJson.fixedValue;
+    } else {
+      let pValue = scanValue2;
+      if (outJson.splitChar && outJson.splitNum) {
+        const splitChar = outJson.splitChar == "|" ? outJson.splitChar : outJson.splitChar;
+        const strs = scanValue2.split(splitChar);
+        const splitNum = outJson.splitNum < 1 ? 1 : outJson.splitNum;
+        console.log(pValue, splitChar, strs, splitNum);
+        if (splitNum <= strs.length) {
+          pValue = strs[splitNum - 1];
+        } else {
+          pValue = "";
+        }
+      }
+      if (outJson.splitChar2 && outJson.splitNum2) {
+        const splitChar2 = outJson.splitChar2 == "|" ? outJson.splitChar2 : outJson.splitChar2;
+        const strs = pValue.split(splitChar2);
+        const splitNum2 = outJson.splitNum2 < 1 ? 1 : outJson.splitNum2;
+        console.log(pValue, splitChar2, strs, splitNum2);
+        if (splitNum2 <= strs.length) {
+          pValue = strs[splitNum2 - 1];
+        } else {
+          pValue = "";
+        }
+      }
+      if (pValue.length > 0) {
+        const indexs = _getScanIndexs(pValue, outJson.startIndex, outJson.endIndex);
+        const startIndex = indexs[0];
+        const endIndex = indexs[1];
+        pValue = pValue.substring(startIndex, endIndex);
+      }
+      params[fieldName] = pValue;
+    }
+  });
+  return { value: scanValue2, params, scanSet: scanSet2 };
+}
+function _getScanIndexs(value, startIndex, endIndex) {
+  startIndex = startIndex == void 0 ? 0 : startIndex - 1;
+  startIndex = startIndex < 0 ? 0 : startIndex;
+  startIndex = startIndex > value.length - 1 ? value.length - 1 : startIndex;
+  endIndex = endIndex == void 0 ? value.length : endIndex;
+  endIndex = endIndex > value.length ? value.length : endIndex;
+  endIndex = endIndex < 1 ? 1 : endIndex;
+  if (endIndex < startIndex) {
+    endIndex = startIndex;
+  }
+  return [startIndex, endIndex];
+}
+function setScanAnalysisValue(pageContext, scanSet2, params) {
+  if (!scanSet2) {
+    return;
+  }
+  const outs = scanSet2.outs;
+  outs.forEach((outField) => {
+    const fieldName = outField.fieldName;
+    const value = params[fieldName];
+    setValueForVariableName(pageContext.entity, outField.pageVariable, value);
+  });
+}
+export {
+  analysisScanValue,
+  formatScanRuleSets,
+  setScanAnalysisValue
+};

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

@@ -156,7 +156,11 @@ function updateChartDatasources(pageContext2, dataSourceConfs, appendParams) {
       systemCode: pageContext2.systemCode,
       pageCode: pageContext2.code
     };
-    const url = window["$vueApp"].config.globalProperties.baseURL + "/common/common-data/find-chart-datas";
+    let baseUrl = pageContext2.backendUrl;
+    if (!baseUrl) {
+      baseUrl = window["$vueApp"].config.globalProperties.baseURL;
+    }
+    const url = baseUrl + "/common/common-data/find-chart-datas";
     http.post(url, param).then((result) => {
       if (!pageContext2.chartDataSourceMap) {
         pageContext2.chartDataSourceMap = {};
@@ -198,7 +202,11 @@ function updateOptionDatasources(pageContext2, dataSourceConfs, query) {
       systemCode: pageContext2.systemCode,
       query
     };
-    const url = window["$vueApp"].config.globalProperties.baseURL + "/common/common-data/find-datas";
+    let baseUrl = pageContext2.backendUrl;
+    if (!baseUrl) {
+      baseUrl = window["$vueApp"].config.globalProperties.baseURL;
+    }
+    const url = baseUrl + "/common/common-data/find-datas";
     http.post(url, param).then((result) => {
       if (!pageContext2.optionSourceMap) {
         pageContext2.optionSourceMap = {};
@@ -331,6 +339,7 @@ function setValueForVariableName(entity, variableName, newValue) {
   setVariableValue(entity, fields, newValue);
 }
 function setVariableValue(entity, fields, newValue) {
+  debugger;
   if (!entity || !fields || fields.length == 0) {
     return;
   }
@@ -611,6 +620,13 @@ function getMonitorFieldValues(monitorFieldInfos, entity) {
   }
   return values;
 }
+function getFormPropName(prop) {
+  if (prop && prop.indexOf("${") >= 0) {
+    return prop.substring(prop.indexOf(".") + 1, prop.lastIndexOf("}"));
+  } else {
+    return prop;
+  }
+}
 export {
   autoSetAfterSelect,
   caculateShowCondition,
@@ -618,6 +634,7 @@ export {
   formatVariableValue,
   getChartDatasFromPage,
   getComponentOptionConfigs,
+  getFormPropName,
   getOptionDatasFromPage,
   getValueFromSource,
   getVariableValue,

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

@@ -22,7 +22,7 @@ export declare function convertToPageContext(pageDesign: PageDesign, pageRequest
  * @param pageContext 页面对象
  * @param formItemConfigure 表单元素配置参数
  */
-export declare function getFormModelFields(pageContext: PageContext, formItemConfigure: Component): string[];
+export declare function getFormModelFields(pageContext: PageContext, formItemConfigure: Component, prop?: string): string[];
 /**
  * 获取组件的权限编码
  * @param configure