super-page-runtime 2.1.48 → 2.1.50

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

@@ -1,4 +1,4 @@
-import { deepCopy, getBaseUrl, getRealRestApiPath, upperFirstCase, isWorkflowPage, packageTemplateFiles, isArrayFn } from "../common-util.js";
+import { deepCopy, getBaseUrl, getRealRestApiPath, upperFirstCase, isWorkflowPage, packageTemplateFiles, isArrayFn, getListCode } from "../common-util.js";
 import http from "agilebuilder-ui/src/utils/request";
 import { getI18n } from "agilebuilder-ui/src/utils/util";
 import { ElMessage, ElMessageBox } from "element-plus";
@@ -6,13 +6,13 @@ import { getToken, getSessionCache, setSessionCache } from "agilebuilder-ui/src/
 import { getComponentRef } from "../global-refs.js";
 import eventBus from "../eventBus.js";
 import axios from "axios";
-import { getTableUuid, doAfterClickEvent, handleEvent } from "./event-util.js";
+import { getTableUuid, handleEvent, doAfterClickEvent } from "./event-util.js";
 import { setStoreInfo } from "../store-util.js";
-import { refreshPage } from "../api/api-util.js";
 import { getPermissionCodes, getDefaultValue, getModelFields } from "../page-init-util.js";
 import { updateChartDatasources, getVariableValue, setVariableValue } from "../page-helper-util.js";
 import printLabelUtil from "./print-label.js";
 import { getTableNameByTableUuid } from "../table-utils.js";
+import { packageCustomRules, getWorkflowRules } from "./validator-util.js";
 const standardEvents = {
   // 表单标准事件保存save
   save: function(params) {
@@ -74,9 +74,9 @@ const standardEvents = {
   back: function(params) {
     console.log("表单标准事件返回back--params=", params);
     const pageContext = params.pageContext;
-    const dataModel2 = pageContext.entity ? pageContext.entity.data : {};
+    const dataModel = pageContext.entity ? pageContext.entity.data : {};
     const isNeedValueMapping = params.configureObj.props && params.configureObj.props.base ? params.configureObj.props.base.isNeedValueMapping : false;
-    closeDialog(pageContext, dataModel2, isNeedValueMapping);
+    closeDialog(pageContext, dataModel, isNeedValueMapping);
   },
   // 列表标准事件删除delete
   delete: function(params) {
@@ -228,7 +228,7 @@ const standardEvents = {
   resetCharts: function(params) {
     var _a, _b;
     console.log("重置统计图--params=", params);
-    let pageContext = params.pageContext;
+    const pageContext = params.pageContext;
     pageContext.entity.data = deepCopy((_a = pageContext.initChartData) == null ? void 0 : _a.data);
     pageContext.entity.page = deepCopy((_b = pageContext.initChartData) == null ? void 0 : _b.page);
     params.isInitChart = true;
@@ -281,7 +281,7 @@ function exportPageCharts(params) {
   if (runtimeProps) {
     runtimeProps.state = "disabled";
   }
-  let exportChartList = [];
+  const exportChartList = [];
   for (let i = 0; i < chartConfigs.length; i++) {
     const chartDataSourceConfig = chartConfigs[i];
     const chartUuid = chartDataSourceConfig.uuid;
@@ -312,11 +312,7 @@ function exportPageCharts(params) {
   const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
   const path = baseUrl + "/dsc/commons/exportChart";
   axios.defaults.headers.common.Authorization = getToken();
-  request = axios.post(
-    path,
-    param,
-    { responseType: "blob" }
-  );
+  request = axios.post(path, param, { responseType: "blob" });
   request.then((res) => {
     const link = document.createElement("a");
     link.style.display = "none";
@@ -624,14 +620,14 @@ function getPageType(pageContext, configureObj, isListButton) {
 function dealAfterWithForm(pageContext, configureObj, data, successTip) {
   if (data) {
     const commonEntity = data;
-    let dataModel2;
+    let dataModel;
     if (commonEntity.entity) {
-      dataModel2 = commonEntity.entity;
+      dataModel = commonEntity.entity;
     }
     if (commonEntity.formNo) {
       pageContext.initFormNo = commonEntity.formNo;
     }
-    const totalModel = { ...dataModel2, ...pageContext.entity.page };
+    const totalModel = { ...dataModel, ...pageContext.entity.page };
     afterSuccessOperateInForm(pageContext, configureObj, totalModel);
   } else {
     pageContext.canClick = true;
@@ -644,30 +640,30 @@ function dealAfterWithForm(pageContext, configureObj, data, successTip) {
     });
   }
 }
-function afterSuccessOperateInForm(pageContext, configureObj, dataModel2) {
+function afterSuccessOperateInForm(pageContext, configureObj, dataModel) {
   const successOperation = configureObj.props.base.successOperation;
   if (!successOperation || successOperation === null) {
     return;
   }
   const isNeedValueMapping = configureObj.props.base.isNeedValueMapping;
   if (successOperation === "noOperation") {
-    if (dataModel2) {
-      pageContext.entity.data = dataModel2;
+    if (dataModel) {
+      pageContext.entity.data = dataModel;
     }
     pageContext.canClick = true;
   } else if (successOperation === "refresh") {
-    if (dataModel2 && (dataModel2.id || dataModel2.ID)) {
-      refreshPage(pageContext, dataModel2.ID ? dataModel2.ID : dataModel2.id);
+    if (dataModel && (dataModel.id || dataModel.ID)) {
+      refreshPage(pageContext, dataModel.ID ? dataModel.ID : dataModel.id);
     } else {
       pageContext.canClick = true;
     }
   } else if (successOperation === "closeWindow" || successOperation === "closeWindowAndRefresh") {
-    closeDialog(pageContext, dataModel2, isNeedValueMapping);
+    closeDialog(pageContext, dataModel, isNeedValueMapping);
     pageContext.canClick = true;
     console.log("afterSuccessOperateInForm--successOperation=--", successOperation);
   }
 }
-function closeDialog(pageContext, dataModel2, isNeedValueMapping) {
+function closeDialog(pageContext, dataModel, isNeedValueMapping) {
   const jumpMode = pageContext.entity && pageContext.entity.request ? pageContext.entity.request.jumpMode : null;
   if (jumpMode === "openWindow" || jumpMode === "newTab") {
     if (window.parent) {
@@ -677,12 +673,12 @@ function closeDialog(pageContext, dataModel2, isNeedValueMapping) {
     }
   } else {
     const sourceTableName = pageContext.tableName;
-    const isNeedValueMappingFinal = isNeedValueMapping !== void 0 && isNeedValueMapping === true && dataModel2 && dataModel2 !== void 0;
+    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: dataModel2,
+      dataModel,
       sourceTableName,
       jumpMode
     });
@@ -764,6 +760,7 @@ function refreshFormOrListPage(pageContext, configureObj) {
         console.error("tableUuid is empty");
       }
     } else if (buttonForPageType && buttonForPageType === "form") {
+      const dataModel = pageContext.entity.data;
       refreshPage(pageContext, dataModel.ID ? dataModel.ID : dataModel.id);
     }
   }
@@ -780,8 +777,11 @@ function submitForm(params, isListButton, eventName, url) {
     if (successOperation && successOperation === "noOperation") {
       isUnControlVersion = true;
     }
-    const tableUuid = configureObj.props.base.tableUuid ? configureObj.props.base.tableUuid : params.tableUuid;
-    const tableName = getTableNameByTableUuid(pageContext, tableUuid);
+    let tableName = pageContext.tableName;
+    if (isListButton) {
+      const tableUuid = configureObj.props.base.tableUuid ? configureObj.props.base.tableUuid : params.tableUuid;
+      tableName = getTableNameByTableUuid(pageContext, tableUuid);
+    }
     const request = getSubmitFormRequest(
       pageContext,
       configureObj,
@@ -1169,19 +1169,19 @@ function getWorkflowSaveParams(params) {
   var _a;
   const pageContext = params.pageContext;
   const configureObj = params.configureObj;
-  const dataModel2 = pageContext.entity.data;
+  const dataModel = pageContext.entity.data;
   const systemCode = pageContext.systemCode;
   const permissionPrefix = pageContext.code;
   let functionCodes = getPermissionCodes(configureObj, pageContext);
   if (!functionCodes) {
     functionCodes = permissionPrefix + ".xxx";
   }
-  if (!dataModel2.id && !dataModel2.ID) {
-    dataModel2["page_code"] = pageContext.code;
-    dataModel2["page_version"] = pageContext.version;
+  if (!dataModel.id && !dataModel.ID) {
+    dataModel["page_code"] = pageContext.code;
+    dataModel["page_version"] = pageContext.version;
   }
   const param = {
-    entity: dataModel2,
+    entity: dataModel,
     pageMoel: pageContext.entity.page,
     formNoRuleCode: pageContext.formNoRuleCode,
     tableName: pageContext.tableName,
@@ -1256,7 +1256,7 @@ function getWorkflowSaveParams(params) {
 function workflowSaveFunc(params) {
   return new Promise((resolve, reject) => {
     const pageContext = params.pageContext;
-    const dataModel2 = pageContext.entity.data;
+    const dataModel = pageContext.entity.data;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
     let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons";
@@ -1271,7 +1271,7 @@ function workflowSaveFunc(params) {
     }
     const param = getWorkflowSaveParams(params);
     let request;
-    if (dataModel2.id || dataModel2.ID) {
+    if (dataModel.id || dataModel.ID) {
       request = http.put(path, param);
     } else {
       request = http.post(path, param);
@@ -1447,15 +1447,15 @@ function doAssign(params, selectNodeInfo) {
 }
 function getTransactTaskParam(params) {
   const pageContext = params.pageContext;
-  const dataModel2 = pageContext.entity.data;
+  const dataModel = pageContext.entity.data;
   const systemCode = pageContext.systemCode;
   const permissionPrefix = pageContext.code;
   const additionalParamMap = getAdditionalParamMap(pageContext);
-  const dataId = dataModel2.ID !== void 0 && dataModel2.ID !== null ? dataModel2.ID : dataModel2.id;
+  const dataId = dataModel.ID !== void 0 && dataModel.ID !== null ? dataModel.ID : dataModel.id;
   const requestParams = {
     beanName: pageContext.beanName,
     id: dataId,
-    entity: dataModel2,
+    entity: dataModel,
     additionalParamMap,
     tableName: pageContext.tableName,
     functionCode: permissionPrefix + ".xxx",
@@ -1962,6 +1962,302 @@ function cacheFormDataId(dataId, pageContext) {
     setSessionCache(additionalParamMap._t_ + "_id", dataId);
   }
 }
+function refreshPage(pageContext, id) {
+  if (!pageContext.entity.page) {
+    pageContext.entity.page = {};
+  }
+  pageContext.entity.page["_isRefresh"] = true;
+  getFormData(pageContext, id).then((commonEntity) => {
+    pageContext.isRefresh = true;
+  });
+}
+function getFormData(pageContext, id) {
+  const pageType = pageContext.pageType;
+  if (pageType && pageType === "form") {
+    console.log("获取表单数据getData--pageContext=", pageContext);
+    pageContext.canClick = false;
+    const isWorkflow = isWorkflowPage(pageContext);
+    if (isWorkflow) {
+      return getWorkflowFormData(pageContext, id);
+    } else {
+      return getCommonFormData(pageContext, id);
+    }
+  } else {
+    return new Promise((resolve, reject) => {
+      resolve(true);
+    });
+  }
+}
+function getCommonFormData(pageContext, id) {
+  return new Promise((resolve, reject) => {
+    const systemCode = pageContext.systemCode;
+    const pageCode = pageContext.code;
+    const pageVersion = pageContext.version;
+    const additionalParamMap = getAdditionalParamMap(pageContext);
+    const dataId = id ? id : additionalParamMap && additionalParamMap.id ? additionalParamMap.id : null;
+    const ids2 = id ? [id] : additionalParamMap ? additionalParamMap.ids : null;
+    const taskId = additionalParamMap ? additionalParamMap.taskId : null;
+    const permissionPrefix = pageCode;
+    console.log("getCommonFormData-----pageContext=", pageContext);
+    const backendUrl = getBaseUrl(pageContext.backendUrl, pageContext.isTest);
+    const param = {
+      pageCode,
+      pageVersion,
+      tableName: pageContext.tableName,
+      formNoRuleCode: pageContext.formNoRuleCode,
+      id: dataId,
+      systemCode,
+      functionCode: permissionPrefix + ".gets",
+      listCodesMap: pageContext.listCodesMap
+    };
+    if (!param.id && additionalParamMap && additionalParamMap._t_ && getSessionCache(additionalParamMap._t_ + "_id")) {
+      param.id = getSessionCache(additionalParamMap._t_ + "_id");
+    }
+    if (ids2) {
+      param["ids"] = formatAdditionalParamMapIds(ids2);
+    }
+    if (pageContext.notIdInitializationList) {
+      param["noIdAndTaskIdInitSetting"] = JSON.stringify(pageContext.notIdInitializationList);
+    }
+    if (additionalParamMap) {
+      param["additionalParamMap"] = additionalParamMap;
+    }
+    if (pageContext.beanName) {
+      param["beanName"] = pageContext.beanName;
+    }
+    if (taskId) {
+      param["taskId"] = taskId;
+    }
+    console.log("getCommonFormData---listCodesMap=", pageContext.listCodesMap);
+    if ((!pageContext.listCodesMap || Object.keys(pageContext.listCodesMap).length === 0) && pageContext.tableUuids) {
+      const listCodesMap = {};
+      pageContext.tableUuids.forEach((tableUuid) => {
+        const listCode = getListCode(pageCode, pageVersion, tableUuid);
+        listCodesMap[listCode] = listCode;
+      });
+      param["listCodesMap"] = listCodesMap;
+    }
+    if (pageContext.refercePropMap) {
+      param["refercePropMap"] = pageContext.refercePropMap;
+    }
+    const urlForView = backendUrl + "/dsc/commons/gets";
+    http.post(urlForView, param).then((commonEntity) => {
+      if (commonEntity) {
+        pageContext.entity.data = commonEntity.entity;
+        pageContext.initFormNo = commonEntity.formNo;
+      }
+      const customRules = pageContext.customRules;
+      const formRules = pageContext.rules;
+      const newFormRules = packageCustomRules(customRules, formRules);
+      pageContext.rules = newFormRules;
+      const pageDesign = {
+        runtime: { events: pageContext.events },
+        systemCode: "",
+        systemVersion: 0,
+        code: "",
+        version: 0,
+        workflowCode: "",
+        workflowVersion: 0,
+        name: "",
+        uuid: "",
+        label: ""
+      };
+      handleEvent(null, pageContext, pageDesign, "load");
+      pageContext.canClick = true;
+      resolve(commonEntity);
+    }).catch((error) => {
+      pageContext.canClick = true;
+      reject(error);
+    });
+  });
+}
+function getWorkflowFormData(pageContext, id) {
+  return new Promise((resolve, reject) => {
+    const systemCode = pageContext.systemCode;
+    const pageCode = pageContext.code;
+    const pageVersion = pageContext.version;
+    const additionalParamMap = getAdditionalParamMap(pageContext);
+    const dataId = id ? id : additionalParamMap && additionalParamMap.id ? additionalParamMap.id : null;
+    const ids2 = id ? [id] : additionalParamMap ? additionalParamMap.ids : null;
+    const taskId = additionalParamMap ? additionalParamMap.taskId : null;
+    const permissionPrefix = pageCode;
+    const param = {
+      pageCode,
+      pageVersion,
+      tableName: pageContext.tableName,
+      formNoRuleCode: pageContext.formNoRuleCode,
+      isWorkflowEntity: true,
+      systemCode,
+      functionCode: permissionPrefix + ".gets",
+      listCodesMap: pageContext.listCodesMap
+    };
+    console.log("getWorkflowFormData---listCodesMap=", pageContext.listCodesMap);
+    if ((!pageContext.listCodesMap || Object.keys(pageContext.listCodesMap).length === 0) && pageContext.tableUuids) {
+      const listCodesMap = {};
+      pageContext.tableUuids.forEach((tableUuid) => {
+        const listCode = getListCode(pageCode, pageVersion, tableUuid);
+        listCodesMap[listCode] = listCode;
+      });
+      param["listCodesMap"] = listCodesMap;
+    }
+    if (ids2) {
+      param["ids"] = formatAdditionalParamMapIds(ids2);
+    }
+    if (taskId) {
+      param["taskId"] = taskId;
+    } else if (dataId) {
+      param["id"] = dataId;
+    } else {
+      if (additionalParamMap && additionalParamMap._t_ && getSessionCache(additionalParamMap._t_ + "_id")) {
+        param["id"] = getSessionCache(additionalParamMap._t_ + "_id");
+      }
+      if (pageContext.notIdInitializationList) {
+        param["noIdAndTaskIdInitSetting"] = JSON.stringify(pageContext.notIdInitializationList);
+      }
+    }
+    if (additionalParamMap) {
+      param["additionalParamMap"] = additionalParamMap;
+    }
+    if (pageContext.beanName) {
+      param["beanName"] = pageContext.beanName;
+    }
+    if (pageContext.refercePropMap) {
+      param["refercePropMap"] = pageContext.refercePropMap;
+    }
+    const baseUrl = getBaseUrl(pageContext.backendUrl, pageContext.isTest);
+    const urlForView = baseUrl + "/dsc/workflow-commons/gets";
+    http.post(urlForView, param).then((commonEntity) => {
+      pageContext.definitionId = commonEntity.definitionId;
+      pageContext.entity.task = commonEntity.taskParamMap;
+      dealCompleteTaskParam(commonEntity, true, pageContext);
+      pageContext.workflowRules = getWorkflowRules(pageContext);
+      const pageType = pageContext.pageType;
+      if (pageType && pageType === "form") {
+        changePermissionListToMap(pageContext);
+        const pageDesign = {
+          runtime: { events: pageContext.events },
+          systemCode: "",
+          systemVersion: 0,
+          code: "",
+          version: 0,
+          workflowCode: "",
+          workflowVersion: 0,
+          name: "",
+          uuid: "",
+          label: ""
+        };
+        handleEvent(null, pageContext, pageDesign, "load");
+      }
+      pageContext.canClick = true;
+      resolve(commonEntity);
+    }).catch((error) => {
+      pageContext.canClick = true;
+      reject(error);
+    });
+  });
+}
+function formatAdditionalParamMapIds(ids2) {
+  if (ids2) {
+    if (typeof ids2 === "string") {
+      ids2 = ids2.split(",");
+    } else if (typeof ids2 === "number") {
+      ids2 = [ids2];
+    } else
+      ;
+  }
+  return ids2;
+}
+function changePermissionListToMap(pageContext) {
+  changeFieldPermissionToMap(pageContext);
+  changeActionPermissionToMap(pageContext);
+}
+function changeFieldPermissionToMap(pageContext) {
+  const fieldPermissionMap = /* @__PURE__ */ new Map();
+  const fieldPermissions = pageContext.fieldPermissions;
+  if (typeof fieldPermissions !== "undefined") {
+    for (let i = 0; i < fieldPermissions.length; i++) {
+      const prop = fieldPermissions[i].name;
+      if (prop) {
+        if (prop.indexOf("$") === 0 && prop.indexOf(".") > 0) {
+          const fieldPermissionOrg = fieldPermissions[i];
+          const fieldPermission = JSON.parse(JSON.stringify(fieldPermissionOrg));
+          const subModelName = prop.substring(1, prop.indexOf("."));
+          const subProp = prop.substring(prop.indexOf(".") + 1);
+          fieldPermission.name = subProp;
+          if (fieldPermission && fieldPermission.name === "all_fields") {
+            if (fieldPermission.canEdit === false) {
+              if (fieldPermission.rowIndexes) {
+                fieldPermissionMap.set(subModelName, [
+                  {
+                    name: "all_fields",
+                    canEdit: false,
+                    rowIndexes: fieldPermission.rowIndexes
+                  }
+                ]);
+              } else {
+                fieldPermissionMap.set(subModelName, [{ name: "all_fields", canEdit: false }]);
+              }
+            } else {
+              if (fieldPermission.rowIndexes) {
+                fieldPermissionMap.set(subModelName, [
+                  {
+                    name: "all_fields",
+                    canEdit: true,
+                    rowIndexes: fieldPermission.rowIndexes
+                  }
+                ]);
+              } else {
+                fieldPermissionMap.set(subModelName, [{ name: "all_fields", canEdit: true }]);
+              }
+            }
+          } else {
+            let subTableFieldPermission = fieldPermissionMap.get(subModelName);
+            if (subTableFieldPermission) {
+              subTableFieldPermission.push(fieldPermission);
+            } else {
+              subTableFieldPermission = [];
+              subTableFieldPermission.push(fieldPermission);
+            }
+            fieldPermissionMap.set(subModelName, subTableFieldPermission);
+          }
+        } else {
+          fieldPermissionMap.set(prop, fieldPermissions[i]);
+        }
+      }
+    }
+  }
+  pageContext.fieldPermissionMap = fieldPermissionMap;
+}
+function changeActionPermissionToMap(pageContext) {
+  const fieldPermissionMap = pageContext.fieldPermissionMap;
+  const actionPermissionMap = /* @__PURE__ */ new Map();
+  const actionPermissions = pageContext.actionPermissions;
+  if (typeof actionPermissions !== "undefined" && actionPermissions !== null) {
+    const subModelNames = Object.keys(actionPermissions);
+    subModelNames.forEach((subModelName) => {
+      const oneTableActionPermission = actionPermissions[subModelName];
+      const subTableFieldPermission = fieldPermissionMap.get(subModelName);
+      if (subTableFieldPermission && subTableFieldPermission.length > 0 && subTableFieldPermission[0].name === "all_fields" && subTableFieldPermission[0].canEdit === false) {
+        oneTableActionPermission.canUpdate = false;
+        oneTableActionPermission.canAdd = false;
+      } else {
+        const canUpdate = oneTableActionPermission.canUpdate;
+        const updateRowIndexes = oneTableActionPermission.updateRowIndexes;
+        if (canUpdate !== void 0 && canUpdate === false && updateRowIndexes !== void 0 && updateRowIndexes !== null && updateRowIndexes.length > 0) {
+          fieldPermissionMap.set(subModelName, [
+            {
+              name: "all_fields",
+              canEdit: false,
+              rowIndexes: updateRowIndexes
+            }
+          ]);
+        }
+      }
+      actionPermissionMap.set(subModelName, oneTableActionPermission);
+    });
+  }
+  pageContext.actionPermissionMap = actionPermissionMap;
+}
 export {
   dealAfterOperate,
   dealCompleteTaskParam,
@@ -1973,6 +2269,7 @@ export {
   doReturnTaskTo,
   exportFormReport,
   getAdditionalParamMap,
+  getFormData,
   getRemoveSigner,
   getSaveFormRequest,
   getSaveFormRequestWithRow,
@@ -1980,6 +2277,7 @@ export {
   isVisibleWorkflowButton,
   judgeDataNumber,
   refreshFormOrListPage,
+  refreshPage,
   standardEvents,
   updateValuesWhenCloseDialog
 };

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

@@ -109,7 +109,7 @@ export declare function formatValueByType(value: any, formatType: string, format
  * @param entity
  * @param variable
  */
-export declare function getValueFromVariable(entity: any, variable: string): any;
+export declare function getValueFromVariable(entity: any, variable: string, row?: any): any;
 /**
  * 从对象中获取值
  * @param valueSource 源对象
@@ -139,3 +139,5 @@ export declare function caculateShowCondition(pageContext: PageContext, configur
 export declare function monitorFieldChange(pageContext: PageContext, monitorFields: Array<string>, triggerFunc: Function): void;
 export declare function getFormPropName(prop: any): any;
 export declare function getSizeConfig(pageContext: PageContext, configure: Component): any;
+export declare function isPromise(p: any): boolean;
+export declare function decomposeVariable(variable: string): string[];

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

@@ -408,7 +408,7 @@ function formatValueByType(value, formatType, formatInfo) {
   }
   return value;
 }
-function getValueFromVariable(entity, variable) {
+function getValueFromVariable(entity, variable, row) {
   if (variable == null || variable == void 0) {
     return variable;
   }
@@ -442,8 +442,12 @@ function getValueFromVariable(entity, variable) {
       valueSource = entity.system;
     } else if (paramName.startsWith("fixed.")) {
       return paramName.substring(6);
+    } else if (paramName.startsWith("row.")) {
+      paramName = paramName.substring(4);
+      valueSource = row;
+      paramType = "row";
     }
-    if (!paramName || !paramName) {
+    if (!paramName) {
       console.log("获取变量失败", variable, entity);
       return "";
     }
@@ -628,6 +632,9 @@ function getSizeConfig(pageContext2, configure2) {
   if (configure2.props && configure2.props.size && configure2.props.size[pageModeType]) {
     sizeConfig = configure2.props.size[pageModeType];
   }
+  if (!sizeConfig && configure2.props && configure2.props.size) {
+    sizeConfig = configure2.props.size["pc"];
+  }
   return sizeConfig;
 }
 function getPageModeType(pageContext2) {
@@ -637,9 +644,20 @@ function getPageModeType(pageContext2) {
   }
   return dimensions;
 }
+function isPromise(p) {
+  return p && Object.prototype.toString.call(p) === "[object Promise]";
+}
+function decomposeVariable(variable) {
+  if (!variable) {
+    return [];
+  }
+  const paramNames = variable.match(/\${(.*?)}/);
+  return paramNames ? paramNames[1].split(".") : [];
+}
 export {
   autoSetAfterSelect,
   caculateShowCondition,
+  decomposeVariable,
   formatValueByType,
   formatVariableValue,
   getChartDatasFromPage,
@@ -651,6 +669,7 @@ export {
   getValueFromSource,
   getValueFromVariable,
   getVariableValue,
+  isPromise,
   monitorFieldChange,
   queryOptionDatasources,
   setValueForVariableName,