super-page-runtime 2.0.75 → 2.0.80

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

@@ -74,9 +74,9 @@ const standardEvents = {
   back: function(params) {
     console.log("表单标准事件返回back--params=", params);
     const pageContext = params.pageContext;
-    const dataModel = pageContext.entity ? pageContext.entity.data : {};
+    const dataModel2 = pageContext.entity ? pageContext.entity.data : {};
     const isNeedValueMapping = params.configureObj.props && params.configureObj.props.base ? params.configureObj.props.base.isNeedValueMapping : false;
-    closeDialog(pageContext, dataModel, isNeedValueMapping);
+    closeDialog(pageContext, dataModel2, isNeedValueMapping);
   },
   // 列表标准事件删除delete
   delete: function(params) {
@@ -243,10 +243,11 @@ const standardEvents = {
   }
 };
 function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
+  var _a;
   const templateUUID = templateFile.templateUuid;
   const fileName = templateFile.templateName;
   const systemCode = pageContext.systemCode;
-  const logSetting = configureObj.props.logSetting;
+  const logSetting = (_a = configureObj.props.base) == null ? void 0 : _a.logSetting;
   const isWorkflowForm = pageContext.workflowCode ? true : false;
   const beanName = pageContext.beanName;
   const button = configureObj.props.base;
@@ -273,7 +274,7 @@ function exportFormReport(pageContext, configureObj, templateFile, isPdf) {
     pageVersion: pageContext.version
   };
   if (logSetting) {
-    param["logSettingText"] = logSetting;
+    param["logSettingText"] = logSetting.join("");
   }
   const additionalParamMap = getAdditionalParamMap(pageContext);
   param["additionalParamMap"] = additionalParamMap;
@@ -387,6 +388,7 @@ function saveFunc(params, isListButton) {
   });
 }
 function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo, ids2, row) {
+  var _a;
   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;
@@ -424,9 +426,18 @@ function getCommonFormRequestParam(pageContext, configureObj, isUnControlVersion
       param["dataConversionRule"] = conversionCodes;
     }
   }
-  const logSetting = configureObj.props.logSetting;
+  console.log("getCommonFormRequestParam--------configureObj----", configureObj);
+  const autoSetValueData = configureObj.props.setValueList;
+  if (autoSetValueData) {
+    if (isArrayFn(autoSetValueData)) {
+      param["autoSetValueData"] = JSON.stringify(autoSetValueData);
+    } else if (typeof autoSetValueData === "string") {
+      param["autoSetValueData"] = autoSetValueData;
+    }
+  }
+  const logSetting = (_a = configureObj.props.base) == null ? void 0 : _a.logSetting;
   if (logSetting) {
-    param["logSettingText"] = logSetting;
+    param["logSettingText"] = logSetting.join("");
   }
   if (!param["systemCode"]) {
     param["systemCode"] = systemCode;
@@ -465,7 +476,14 @@ function getSaveFormRequestWithRow(pageContext, configureObj, url, isUnControlVe
       param.tableName = otherParams.tableName;
     }
   }
-  return getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data, pageContext.isTest);
+  return getSaveFormRequestByParam(
+    systemCode,
+    backendUrl,
+    param,
+    url,
+    pageContext.entity.data,
+    pageContext.isTest
+  );
 }
 function getSaveFormRequest(pageContext, configureObj, url, isUnControlVersion, mainDefaultValueColumns, dynamicColumnInfo) {
   return getSaveFormRequestWithRow(
@@ -495,8 +513,11 @@ function dealAfterOperate(pageContext, configureObj, data, successTip, isListBut
   const buttonForPageType = getPageType(pageContext, configureObj, isListButton);
   if (buttonForPageType && buttonForPageType === "list") {
     dealAfterWithList(pageContext, configureObj, data, successTip);
+    pageContext.canClick = true;
   } else if (buttonForPageType && buttonForPageType === "form") {
     dealAfterWithForm(pageContext, configureObj, data, successTip);
+  } else {
+    pageContext.canClick = true;
   }
 }
 function getPageType(pageContext, configureObj, isListButton) {
@@ -514,15 +535,17 @@ function getPageType(pageContext, configureObj, isListButton) {
 function dealAfterWithForm(pageContext, configureObj, data, successTip) {
   if (data) {
     const commonEntity = data;
-    let dataModel;
+    let dataModel2;
     if (commonEntity.entity) {
-      dataModel = commonEntity.entity;
+      dataModel2 = commonEntity.entity;
     }
     if (commonEntity.formNo) {
       pageContext.initFormNo = commonEntity.formNo;
     }
-    const totalModel = { ...dataModel, ...pageContext.entity.page };
+    const totalModel = { ...dataModel2, ...pageContext.entity.page };
     afterSuccessOperateInForm(pageContext, configureObj, totalModel);
+  } else {
+    pageContext.canClick = true;
   }
   if (successTip) {
     ElMessage({
@@ -532,26 +555,30 @@ function dealAfterWithForm(pageContext, configureObj, data, successTip) {
     });
   }
 }
-function afterSuccessOperateInForm(pageContext, configureObj, dataModel) {
+function afterSuccessOperateInForm(pageContext, configureObj, dataModel2) {
   const successOperation = configureObj.props.base.successOperation;
   if (!successOperation || successOperation === null) {
     return;
   }
   const isNeedValueMapping = configureObj.props.base.isNeedValueMapping;
   if (successOperation === "noOperation") {
-    if (dataModel) {
-      pageContext.entity.data = dataModel;
+    if (dataModel2) {
+      pageContext.entity.data = dataModel2;
     }
+    pageContext.canClick = true;
   } else if (successOperation === "refresh") {
-    if (dataModel && (dataModel.id || dataModel.ID)) {
-      refreshPage(pageContext);
+    if (dataModel2 && (dataModel2.id || dataModel2.ID)) {
+      refreshPage(pageContext, dataModel2.ID ? dataModel2.ID : dataModel2.id);
+    } else {
+      pageContext.canClick = true;
     }
   } else if (successOperation === "closeWindow" || successOperation === "closeWindowAndRefresh") {
-    closeDialog(pageContext, dataModel, isNeedValueMapping);
+    closeDialog(pageContext, dataModel2, isNeedValueMapping);
+    pageContext.canClick = true;
     console.log("afterSuccessOperateInForm--successOperation=--", successOperation);
   }
 }
-function closeDialog(pageContext, dataModel, isNeedValueMapping) {
+function closeDialog(pageContext, dataModel2, isNeedValueMapping) {
   const jumpMode = pageContext.entity && pageContext.entity.request ? pageContext.entity.request.jumpMode : null;
   if (jumpMode === "openWindow" || jumpMode === "newTab") {
     if (window.parent) {
@@ -561,12 +588,12 @@ function closeDialog(pageContext, dataModel, isNeedValueMapping) {
     }
   } else {
     const sourceTableName = pageContext.tableName;
-    const isNeedValueMappingFinal = isNeedValueMapping !== void 0 && isNeedValueMapping === true && dataModel && dataModel !== void 0;
+    const isNeedValueMappingFinal = isNeedValueMapping !== void 0 && isNeedValueMapping === true && dataModel2 && dataModel2 !== 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,
+      dataModel: dataModel2,
       sourceTableName,
       jumpMode
     });
@@ -599,7 +626,7 @@ function updateWithPageValue(sourceModel, valueMappings, parentPageContext) {
       const sourceFields = sourceField.split(".");
       const targetValue = getVariableValue(sourceEntity, sourceFields);
       const targetField = valueMapping.target;
-      const targetFields = getModelFields(parentPageContext, null, targetField);
+      const targetFields = getModelFields(null, targetField);
       setVariableValue(parentPageContext.entity, targetFields, targetValue);
     });
   }
@@ -648,7 +675,7 @@ function refreshFormOrListPage(pageContext, configureObj) {
         console.error("tableUuid is empty");
       }
     } else if (buttonForPageType && buttonForPageType === "form") {
-      refreshPage(pageContext);
+      refreshPage(pageContext, dataModel.ID ? dataModel.ID : dataModel.id);
     }
   }
 }
@@ -749,12 +776,13 @@ function deleteFunc(params) {
         type: "warning"
       }
     ).then(() => {
+      var _a;
       const pageContext = params.pageContext;
       const configureObj = params.configureObj;
       const configureBase = configureObj.props.base;
       const systemCode = pageContext.systemCode;
       const backendUrl = pageContext.backendUrl;
-      let tableUuid = configureObj.props.base.tableUuid;
+      const tableUuid = configureObj.props.base.tableUuid;
       const tableName = getTableNameByTableUuid(pageContext, tableUuid);
       const baseUrl = getBaseUrl(backendUrl, pageContext.isTest);
       let path = baseUrl + "/dsc/commons/" + tableName;
@@ -783,9 +811,9 @@ function deleteFunc(params) {
           param["deleteLogicSetting"] = deleteLogicSetting;
         }
       }
-      const logSetting = configureObj.props.logSetting;
+      const logSetting = (_a = configureObj.props.base) == null ? void 0 : _a.logSetting;
       if (logSetting) {
-        param["logSettingText"] = logSetting;
+        param["logSettingText"] = logSetting.join("");
       }
       const isSafeDelete = configureObj.props.base.isSafeDelete;
       if (isSafeDelete) {
@@ -816,6 +844,7 @@ function deleteFunc(params) {
   });
 }
 function downloadTemplateFunc(params) {
+  var _a;
   const pageContext = params.pageContext;
   const configureObj = params.configureObj;
   const configureBase = configureObj.props.base;
@@ -834,10 +863,12 @@ function downloadTemplateFunc(params) {
     param += "&fileName=" + encodeURI(templateUUID) + "&showName=" + encodeURI(showName);
   } else if (showName) {
     param += "&showName=" + encodeURI(showName);
+  } else if (pageContext.label) {
+    param += "&showName=" + encodeURI(pageContext.label) + ".xlsx";
   }
-  const logSetting = configureObj.props.logSetting;
-  if (logSetting && logSetting !== "") {
-    param += "&logSettingText=" + logSetting;
+  const logSetting = (_a = configureObj.props.base) == null ? void 0 : _a.logSetting;
+  if (logSetting) {
+    param += "&logSettingText=" + logSetting.join("");
   }
   if (systemCode) {
     param += "&systemCode=" + systemCode;
@@ -866,7 +897,7 @@ function downloadTemplateFunc(params) {
   if (token) {
     param += "&JWT=" + token;
   }
-  let runCurrentRoleKey = "_RUN_CURRENT_ROLE";
+  const runCurrentRoleKey = "_RUN_CURRENT_ROLE";
   const currentRole = getSessionCache(runCurrentRoleKey);
   if (currentRole) {
     param += "&" + runCurrentRoleKey + "=" + currentRole;
@@ -1022,7 +1053,8 @@ function exportFunc(params) {
     const functionCodes = getPermissionCodes(params.configureObj, pageContext);
     const exportFileName = pageName;
     const exportOptions = {
-      backendUrl: pageContext.backendUrl
+      backendUrl: pageContext.backendUrl,
+      pageContext
     };
     console.log("exportFunc======exportOptions=", exportOptions);
     window["$vueApp"].config.globalProperties.$exportDataNew(
@@ -1039,21 +1071,22 @@ function exportFunc(params) {
   });
 }
 function getWorkflowSaveParams(params) {
+  var _a;
   const pageContext = params.pageContext;
   const configureObj = params.configureObj;
-  const dataModel = pageContext.entity.data;
+  const dataModel2 = pageContext.entity.data;
   const systemCode = pageContext.systemCode;
   const permissionPrefix = pageContext.code;
   let functionCodes = getPermissionCodes(configureObj, pageContext);
   if (!functionCodes) {
     functionCodes = permissionPrefix + ".xxx";
   }
-  if (!dataModel.id && !dataModel.ID) {
-    dataModel["page_code"] = pageContext.code;
-    dataModel["page_version"] = pageContext.version;
+  if (!dataModel2.id && !dataModel2.ID) {
+    dataModel2["page_code"] = pageContext.code;
+    dataModel2["page_version"] = pageContext.version;
   }
   const param = {
-    entity: dataModel,
+    entity: dataModel2,
     pageMoel: pageContext.entity.page,
     formNoRuleCode: pageContext.formNoRuleCode,
     tableName: pageContext.tableName,
@@ -1086,12 +1119,21 @@ function getWorkflowSaveParams(params) {
       param["dataConversionRule"] = conversionCodes;
     }
   }
+  console.log("getWorkflowSaveParams----configureObj=", configureObj);
+  const autoSetValueData = configureObj.props.setValueList;
+  if (autoSetValueData) {
+    if (isArrayFn(autoSetValueData)) {
+      param["autoSetValueData"] = JSON.stringify(autoSetValueData);
+    } else if (typeof autoSetValueData === "string") {
+      param["autoSetValueData"] = autoSetValueData;
+    }
+  }
   if (pageContext.beanName) {
     param["beanName"] = pageContext.beanName;
   }
-  const logSetting = configureObj.props.logSetting;
+  const logSetting = (_a = configureObj.props.base) == null ? void 0 : _a.logSetting;
   if (logSetting) {
-    param["logSettingText"] = logSetting;
+    param["logSettingText"] = logSetting.join("");
   }
   if (!param.systemCode) {
     param.systemCode = systemCode;
@@ -1119,7 +1161,7 @@ function getWorkflowSaveParams(params) {
 function workflowSaveFunc(params) {
   return new Promise((resolve, reject) => {
     const pageContext = params.pageContext;
-    const dataModel = pageContext.entity.data;
+    const dataModel2 = pageContext.entity.data;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
     let path = getBaseUrl(backendUrl, pageContext.isTest) + "/dsc/workflow-commons";
@@ -1134,7 +1176,7 @@ function workflowSaveFunc(params) {
     }
     const param = getWorkflowSaveParams(params);
     let request;
-    if (dataModel.id || dataModel.ID) {
+    if (dataModel2.id || dataModel2.ID) {
       request = http.put(path, param);
     } else {
       request = http.post(path, param);
@@ -1311,15 +1353,15 @@ function doAssign(params, selectNodeInfo) {
 }
 function getTransactTaskParam(params) {
   const pageContext = params.pageContext;
-  const dataModel = pageContext.entity.data;
+  const dataModel2 = pageContext.entity.data;
   const systemCode = pageContext.systemCode;
   const permissionPrefix = pageContext.code;
   const additionalParamMap = getAdditionalParamMap(pageContext);
-  const dataId = dataModel.ID !== void 0 && dataModel.ID !== null ? dataModel.ID : dataModel.id;
+  const dataId = dataModel2.ID !== void 0 && dataModel2.ID !== null ? dataModel2.ID : dataModel2.id;
   const requestParams = {
     beanName: pageContext.beanName,
     id: dataId,
-    entity: dataModel,
+    entity: dataModel2,
     additionalParamMap,
     tableName: pageContext.tableName,
     functionCode: permissionPrefix + ".xxx",

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

@@ -9,4 +9,5 @@ export declare function validateDataModelFunc(pageContext: any, configureObj: an
  */
 export declare function packageCustomRules(orgCustomRules: any, orgRules: any): any;
 export declare function i18nValidateRulesMessage(rules: any): {};
+export declare function i18nValidatePropRulesMessage(propRules: any, isResetMessage: boolean): void;
 export declare function getWorkflowRules(pageContext: any): any;

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

@@ -360,35 +360,7 @@ function i18nValidateRulesMessage(rules) {
   for (let i = 0; i < propNames.length; i++) {
     const propName = propNames[i];
     const propRules = rules[propName];
-    propRules.forEach((rule) => {
-      const label = rule["label"];
-      const i18nLabel = getI18n().t(label);
-      if (rule["required"]) {
-        rule["message"] = getI18n().t("superPageRuntimeMessage.required", { label: i18nLabel });
-      }
-      if (rule["myType"]) {
-        rule["message"] = getI18n().t("superPageRuntimeMessage.formatMismatch", {
-          label: i18nLabel
-        });
-      }
-      if (rule["patternType"]) {
-        rule["message"] = getI18n().t("superPageRuntimeMessage.formatMismatch", {
-          label: i18nLabel
-        });
-      }
-      if (rule["max"] !== void 0 && rule["max"] !== null) {
-        rule["message"] = getI18n().t("superPageRuntimeMessage.overMaxLength", {
-          label: i18nLabel,
-          value: rule["max"]
-        });
-      }
-      if (rule["min"] !== void 0 && rule["min"] !== null) {
-        rule["message"] = getI18n().t("superPageRuntimeMessage.limitMinLength", {
-          label: i18nLabel,
-          value: rule["min"]
-        });
-      }
-    });
+    i18nValidatePropRulesMessage(propRules, true);
     if (propName.indexOf(".") > 0) {
       setObjectPropRule(propName, newRules, propRules);
     } else {
@@ -399,6 +371,40 @@ function i18nValidateRulesMessage(rules) {
   }
   return newRules;
 }
+function i18nValidatePropRulesMessage(propRules, isResetMessage) {
+  propRules.forEach((rule) => {
+    if (rule.message && !isResetMessage) {
+      return;
+    }
+    const label = rule["label"];
+    const i18nLabel = getI18n().t(label);
+    if (rule["required"]) {
+      rule["message"] = getI18n().t("superPageRuntimeMessage.required", { label: i18nLabel });
+    }
+    if (rule["myType"]) {
+      rule["message"] = getI18n().t("superPageRuntimeMessage.formatMismatch", {
+        label: i18nLabel
+      });
+    }
+    if (rule["patternType"]) {
+      rule["message"] = getI18n().t("superPageRuntimeMessage.formatMismatch", {
+        label: i18nLabel
+      });
+    }
+    if (rule["max"] !== void 0 && rule["max"] !== null) {
+      rule["message"] = getI18n().t("superPageRuntimeMessage.overMaxLength", {
+        label: i18nLabel,
+        value: rule["max"]
+      });
+    }
+    if (rule["min"] !== void 0 && rule["min"] !== null) {
+      rule["message"] = getI18n().t("superPageRuntimeMessage.limitMinLength", {
+        label: i18nLabel,
+        value: rule["min"]
+      });
+    }
+  });
+}
 function getWorkflowRules(pageContext) {
   const dataModel = pageContext.entity.data;
   const pageModel = pageContext.entity.page;
@@ -463,6 +469,7 @@ function validateCustomRuleEvents(pageContext) {
 }
 export {
   getWorkflowRules,
+  i18nValidatePropRulesMessage,
   i18nValidateRulesMessage,
   packageCustomRules,
   setObjectPropRule,

package/dist/es/components/runtime/utils/global-refs.d.ts

@@ -57,3 +57,9 @@ export declare function removePageAllRef(pageContext: PageContext): void;
  * @param pageVersion
  */
 export declare function initComponentRefState(pageContext: PageContext): void;
+/**
+ * 获取所有组件引用对象
+ * @param pageDesign 页面设计对象
+ * @returns
+ */
+export declare function getAllComponentRefs(pageContext: PageContext): any;

package/dist/es/components/runtime/utils/global-refs.js

@@ -67,9 +67,20 @@ function getPageRefKey(pageCode, pageVersion) {
 function getPageRefKeyByCode(pageCode, pageVersion) {
   return getPageRefKey(pageCode, pageVersion) + "-code";
 }
+function getAllComponentRefs(pageContext) {
+  if (!pageContext) {
+    return;
+  }
+  const cacheKey = getPageRefKeyByCode(pageContext.code, pageContext.version);
+  if (!globalRefs[cacheKey]) {
+    globalRefs[cacheKey] = {};
+  }
+  return globalRefs[cacheKey];
+}
 export {
   addComponentRef,
   addComponentRefByCode,
+  getAllComponentRefs,
   getComponentRef,
   getComponentRefByCode,
   initComponentRefState,

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

@@ -17,7 +17,8 @@ export declare function queryPageDesignByCode(pageCode: string): Promise<any>;
  * @param pageDesign 页面设计对象
  */
 export declare function convertToPageContext(pageDesign: PageDesign, pageRequest: object): PageContext | null;
-export declare function getModelFields(pageContext: PageContext, formItemConfigure: Component, prop?: string): string[];
+export declare function packageAdditionalMapWithRoute(route: any, requestObj: any): void;
+export declare function getModelFields(formItemConfigure: any, prop?: string): string[];
 /**
  * 获取表单元素模型名称
  * @param pageContext 页面对象
@@ -39,3 +40,4 @@ export declare function getPermissionCodes(configure: Component, pageContext: Pa
  */
 export declare function queryPageSuperGrids(pageDesign: any, pageContext: any, publishVersion: any): Promise<any>;
 export declare function packageFormRules(pageContext: PageContext, configure: any): void;
+export declare function controlObjectRenderState(pageContext: PageContext, propName: string): void;

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

@@ -1,9 +1,11 @@
 import http from "agilebuilder-ui/src/utils/request";
-import { useRoute } from "vue-router";
+import "vue-router";
 import { getAdditionalParamMap } from "./events/standard-event.js";
 import { PageDimensions } from "./interfaces/page-design-types.js";
-import { formatVariableValue, getFormPropName, setVariableValue } from "./page-helper-util.js";
+import { setVariableValue, formatVariableValue, getFormPropName } from "./page-helper-util.js";
 import { getSessionCache } from "agilebuilder-ui/src/utils/auth";
+import { functions } from "./api/page-expose-util.js";
+import { deepCopy } from "./common-util.js";
 function queryPageDesignByCode(pageCode) {
   return http.get(
     window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
@@ -29,20 +31,17 @@ function convertToPageContext(pageDesign, pageRequest) {
     // 表格uuid集合
     listCodes: pageDesign.listCodes,
     // 当前页面中表格对应的数据表名集合，后台保存子表记录时需要
-    formNoRuleCode: pageDesign.formNoRuleCode,
+    formNoRuleCode: pageDesign.props ? pageDesign.props.formNoRuleCode : null,
     // 表单编号规则
-    judgeHeavyList: pageDesign.judgeHeavyList,
+    judgeHeavyList: pageDesign.props && pageDesign.props.judgeHeavyList.length > 0 ? pageDesign.props.judgeHeavyList : null,
     // 判重组合字段集合配置
-    conversionCodes: pageDesign.conversionCodes,
-    // 数据转换规则
+    // conversionCodes: pageDesign.conversionCodes, // 数据转换规则。按钮上配置的，此处不需要
     pageType: pageDesign.pageType,
     // 页面类型：form、list、chart
-    beanName: pageDesign.beanName,
+    beanName: pageDesign.props ? pageDesign.props.beanName : null,
     // 业务处理类，继承CommonBaseService接口的类
-    importBeanName: pageDesign.importBeanName,
+    importBeanName: pageDesign.props ? pageDesign.props.importBeanName : null,
     // 导入处理类，继承ImportDefinitionService接口的类
-    notIdInitializationList: pageDesign.notIdInitializationList,
-    // 无ID或taskId时初始条件配置
     subTablePageInfo: pageDesign.subTablePageInfo,
     // 列表分页信息，格式是：{列表编码: 每页显示多少条记录}，表单页面中校验有分页的子表时提示使用，提示信息格式：第 {pageNum} 页第 {row} 行记录
     workflowCode: pageDesign.workflowCode,
@@ -57,6 +56,15 @@ function convertToPageContext(pageDesign, pageRequest) {
       system: {}
     }
   };
+  if (pageDesign.props && pageDesign.props.notIdInitializationList) {
+    let notIdInitializationList = pageDesign.props.notIdInitializationList;
+    if (typeof notIdInitializationList === "string") {
+      notIdInitializationList = JSON.parse(notIdInitializationList);
+    }
+    if (notIdInitializationList.length > 0) {
+      pageContext["notIdInitializationList"] = notIdInitializationList;
+    }
+  }
   if (pageDesign.variables) {
     const pageObj = pageContext.entity.page;
     for (const variable of pageDesign.variables) {
@@ -90,7 +98,12 @@ function getPageDimensions() {
 function getRequestObject(pageRequest) {
   const requestObj = {};
   if (pageRequest) {
+    console.log("getRequestObject11----pageRequest=", pageRequest);
+    const paramStoreId = pageRequest.paramStoreId;
+    packageAdditionalMap(paramStoreId, requestObj);
+    delete pageRequest.paramStoreId;
     Object.assign(requestObj, pageRequest);
+    console.log("getRequestObject22----requestObj=", requestObj);
   }
   let url = decodeURI(window.location.href);
   if (url && url.includes("?")) {
@@ -101,33 +114,39 @@ function getRequestObject(pageRequest) {
       requestObj[paramStrs[0]] = paramStrs.length > 1 ? paramStrs[1] : "";
     }
   }
-  const route = useRoute();
+  if (requestObj["_t_"])
+    ;
+  return requestObj;
+}
+function packageAdditionalMapWithRoute(route, requestObj) {
+  console.log("packageAdditionalMapWithRoute----route=", route);
   if (route) {
     if (route.params) {
       Object.assign(requestObj, route.params);
     }
+    console.log("packageAdditionalMapWithRoute----route.query=", route.query);
     if (route.query) {
       Object.assign(requestObj, route.query);
       const paramStoreId = route.query.paramStoreId;
-      if (paramStoreId) {
-        const additionalParamMapJson = getSessionCache(paramStoreId);
-        if (additionalParamMapJson) {
-          const additionalParamMap = JSON.parse(additionalParamMapJson);
-          Object.assign(requestObj, additionalParamMap);
-          console.log("已获取到附加参数", additionalParamMap);
-        }
-      }
+      packageAdditionalMap(paramStoreId, requestObj);
+    }
+    console.log("packageAdditionalMapWithRoute----requestObj=", requestObj);
+  }
+}
+function packageAdditionalMap(paramStoreId, requestObj) {
+  if (paramStoreId) {
+    const additionalParamMapJson = getSessionCache(paramStoreId);
+    if (additionalParamMapJson) {
+      const additionalParamMap = JSON.parse(additionalParamMapJson);
+      Object.assign(requestObj, additionalParamMap);
+      console.log("已获取到附加参数", additionalParamMap);
     }
   }
-  if (requestObj["_t_"])
-    ;
-  return requestObj;
 }
-function getModelFields(pageContext, formItemConfigure, prop) {
+function getModelFields(formItemConfigure, prop) {
   if (!formItemConfigure) {
     return ["temp"];
   }
-  pageContext.entity;
   let propsBase;
   let propName = prop;
   if (!prop) {
@@ -154,7 +173,7 @@ function getModelFields(pageContext, formItemConfigure, prop) {
   return fields;
 }
 function getFormModelFields(pageContext, formItemConfigure, prop) {
-  const fields = getModelFields(pageContext, formItemConfigure, prop);
+  const fields = getModelFields(formItemConfigure, prop);
   const entity = pageContext.entity;
   if (entity.data.ID == void 0 && entity.data.id == void 0) {
     let propsBase;
@@ -175,10 +194,8 @@ function getFormModelFields(pageContext, formItemConfigure, prop) {
 }
 function getDefaultValue(pageContext, defaultValueSet, componentType, multiple) {
   let defaultValue;
-  console.log("pageRuntime11---getDefaultValue---defaultValueSet---", defaultValueSet, "pageContext=", pageContext);
   if (defaultValueSet) {
     defaultValue = formatVariableValue(pageContext, defaultValueSet);
-    console.log("pageRuntime22---getDefaultValue---defaultValue---", defaultValue);
     if (defaultValue != null && defaultValue != void 0 && componentType) {
       let isMultiple = false;
       if (componentType == "checkbox") {
@@ -290,12 +307,52 @@ function packageFormRules(pageContext, configure) {
     }
   }
 }
+function controlObjectRenderState(pageContext, propName) {
+  if (pageContext.initInfo) {
+    const types = ["dynamicControlFormEdit", "disableElement", "enableElement", "hideElement", "showElement"];
+    types.forEach((type) => {
+      const infos = pageContext.initInfo[type];
+      if (infos) {
+        if (type === "dynamicControlFormEdit") {
+          let settings = infos.filter((item) => item.name === "_all_fields" || item.name === propName);
+          if (settings && settings.length > 0) {
+            settings = settings.filter((item) => item.name === "_all_fields");
+            if (settings && settings.length > 0) {
+              const copySetting = deepCopy(settings[0]);
+              copySetting.name = propName;
+              settings = [copySetting];
+            }
+          }
+          functions.dynamicControlFormEdit(pageContext, settings, false);
+        } else if (type === "disableElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.disableElement(pageContext, [propName], false);
+          }
+        } else if (type === "enableElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.enableElement(pageContext, [propName], false);
+          }
+        } else if (type === "hideElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.hideElement(pageContext, [propName], false);
+          }
+        } else if (type === "showElement") {
+          if (infos.indexOf(propName) >= 0) {
+            functions.showElement(pageContext, [propName], false);
+          }
+        }
+      }
+    });
+  }
+}
 export {
+  controlObjectRenderState,
   convertToPageContext,
   getDefaultValue,
   getFormModelFields,
   getModelFields,
   getPermissionCodes,
+  packageAdditionalMapWithRoute,
   packageFormRules,
   queryPageDesignByCode,
   queryPageSuperGrids