super-page-runtime 2.0.28 → 2.0.31

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

@@ -33,7 +33,7 @@ function getCommonFormData(pageContext) {
     const pageCode = pageContext.code;
     const pageVersion = pageContext.version;
     const additionalParamMap = getAdditionalParamMap(pageContext);
-    const dataId = additionalParamMap ? additionalParamMap.id : null;
+    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : 1;
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
     const permissionPrefix = pageCode;
@@ -67,7 +67,7 @@ function getCommonFormData(pageContext) {
       param["taskId"] = taskId;
     }
     if (pageContext.tableUuids) {
-      let listCodes = [];
+      const listCodes = [];
       pageContext.tableUuids.forEach((tableUuid) => {
         const listCode = getListCode(pageCode, pageVersion, tableUuid);
         listCodes.push(listCode);
@@ -109,7 +109,7 @@ function getWorkflowFormData(pageContext) {
     const pageCode = pageContext.code;
     const pageVersion = pageContext.version;
     const additionalParamMap = getAdditionalParamMap(pageContext);
-    const dataId = additionalParamMap ? additionalParamMap.id : null;
+    const dataId = additionalParamMap && additionalParamMap.id ? additionalParamMap.id : null;
     const ids = additionalParamMap ? additionalParamMap.ids : null;
     const taskId = additionalParamMap ? additionalParamMap.taskId : null;
     const permissionPrefix = pageCode;
@@ -180,9 +180,8 @@ function changePermissionListToMap(pageContext) {
 }
 function changeFieldPermissionToMap(pageContext) {
   let fieldPermissionMap = pageContext.fieldPermissionMap;
-  pageContext.actionPermissionMap;
   const fieldPermissions = pageContext.fieldPermissions;
-  if (fieldPermissionMap === null) {
+  if (fieldPermissionMap === null || fieldPermissionMap === void 0) {
     fieldPermissionMap = /* @__PURE__ */ new Map();
   }
   if (typeof fieldPermissions !== "undefined") {
@@ -241,8 +240,11 @@ function changeFieldPermissionToMap(pageContext) {
 }
 function changeActionPermissionToMap(pageContext) {
   const fieldPermissionMap = pageContext.fieldPermissionMap;
-  const actionPermissionMap = pageContext.actionPermissionMap;
+  let actionPermissionMap = pageContext.actionPermissionMap;
   const actionPermissions = pageContext.actionPermissions;
+  if (actionPermissionMap === null || actionPermissionMap === void 0) {
+    actionPermissionMap = /* @__PURE__ */ new Map();
+  }
   if (typeof actionPermissions !== "undefined" && actionPermissions !== null) {
     const subModelNames = Object.keys(actionPermissions);
     subModelNames.forEach((subModelName) => {

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

@@ -19,6 +19,7 @@ export declare function getCustomFunc(pageContext: PageContext, funcName: any):
 export declare function removeCustomFuncFromWindow(pageDesign: PageDesign): void;
 export declare function handleEvent($event: any, pageContext: PageContext, configure: Component, eventType: string, otherParams?: object): any;
 export declare function getHandleEvent($event: any, pageContext: PageContext, configure: Component, eventType: string, otherParams?: object): any;
+export declare function getTableUuid(pageContext: PageContext, configure: Component): any;
 export declare function handleEventByEventName(pageContext: PageContext, configure: Component, eventName: string, otherParams?: object): any;
 export declare function doBeforeClickEvent(pageContext: PageContext, configure: Component, otherParams?: object): any;
 export declare function doAfterClickEvent(pageContext: PageContext, configure: Component, otherParams?: object): void;

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

@@ -91,7 +91,7 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
   const events = configure.runtime && configure.runtime.events ? configure.runtime.events : [];
   let eventFun;
   if (eventType && eventType === "click") {
-    const tableUuid = configure.props.base.tableUuid ? configure.props.base.tableUuid : pageContext.tableUuids && pageContext.tableUuids.length > 0 ? pageContext.tableUuids[0] : null;
+    const tableUuid = getTableUuid(pageContext, configure);
     if (tableUuid) {
       const gridRef = getComponentRef(pageContext, tableUuid);
       const selections = gridRef.getSelections();
@@ -122,6 +122,9 @@ function handleEventUtil($event, pageContext, configure, eventType, isExecute, o
     }
   }
 }
+function getTableUuid(pageContext, configure) {
+  return configure.props.base.tableUuid ? configure.props.base.tableUuid : pageContext.tableUuids && pageContext.tableUuids.length > 0 ? pageContext.tableUuids[0] : null;
+}
 function packageEventParams(pageContext, configureObj, $event, otherParams) {
   const params = {};
   if (otherParams) {
@@ -603,6 +606,7 @@ export {
   getEventFuncByType,
   getEventNameByType,
   getHandleEvent,
+  getTableUuid,
   gridSelectAllRecords,
   gridSelectRecord,
   gridSelectionChange,

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

@@ -52,6 +52,7 @@ export declare function getSaveFormRequest(pageContext: any, configureObj: any,
  */
 export declare function dealAfterOperate(pageContext: any, configureObj: any, data: any, successTip: any, isListButton?: boolean): void;
 export declare function updateValuesWhenCloseDialog(parentPageContext: any, parentConfigureObj: any, sourceModel: any, sourceTableName: any): void;
+export declare function refreshFormOrListPage(pageContext: any, configureObj: any): void;
 export declare function doImportFinally(params: any, fileObj: any): void;
 export declare function judgeDataNumber(buttonConfigureObj: any, ids: any): boolean;
 export declare function dealCompleteTaskParam(commonEntity: any, isInit: any, pageContext: any, params?: any, operationResult?: any): boolean;

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

@@ -2,17 +2,15 @@ import { getBaseUrl, getRealRestApiPath, upperFirstCase, packageTemplateFiles, i
 import http from "agilebuilder-ui/src/utils/request";
 import { getI18n } from "agilebuilder-ui/src/utils/util";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { useRoute, useRouter } from "vue-router";
-import { setSessionCache, getToken } from "agilebuilder-ui/src/utils/auth";
+import { getToken } from "agilebuilder-ui/src/utils/auth";
 import { getComponentRef } from "../global-refs.js";
 import eventBus from "../eventBus.js";
 import axios from "axios";
-import { doAfterClickEvent, handleEvent } from "./event-util.js";
+import { getTableUuid, 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 { getPermissionCodes, getModelFields } from "../page-init-util.js";
+import { updateChartDatasources, getVariableValue, setVariableValue } from "../page-helper-util.js";
 import printLabelUtil from "./print-label.js";
 const standardEvents = {
   // 表单标准事件保存save
@@ -485,15 +483,25 @@ function getSaveFormRequestByParam(systemCode, backendUrl, param, url, formData)
   return request;
 }
 function dealAfterOperate(pageContext, configureObj, data, successTip, isListButton) {
-  if (isListButton === void 0) {
-    isListButton = configureObj.props.base.tableUuid ? true : false;
-  }
-  if (isListButton) {
+  const buttonForPageType = getPageType(pageContext, configureObj, isListButton);
+  if (buttonForPageType && buttonForPageType === "list") {
     dealAfterWithList(pageContext, configureObj, data, successTip);
-  } else {
+  } else if (buttonForPageType && buttonForPageType === "form") {
     dealAfterWithForm(pageContext, configureObj, data, successTip);
   }
 }
+function getPageType(pageContext, configureObj, isListButton) {
+  let pageType;
+  if (isListButton === void 0) {
+    pageType = configureObj.props.base.tableUuid ? "list" : null;
+  } else if (isListButton === false) {
+    pageType = "form";
+  }
+  if (!pageType) {
+    pageType = pageContext.pageType;
+  }
+  return pageType;
+}
 function dealAfterWithForm(pageContext, configureObj, data, successTip) {
   if (data) {
     const commonEntity = data;
@@ -504,7 +512,9 @@ function dealAfterWithForm(pageContext, configureObj, data, successTip) {
     if (commonEntity.formNo) {
       pageContext.initFormNo = commonEntity.formNo;
     }
-    afterSuccessOperateInForm(pageContext, configureObj, dataModel);
+    debugger;
+    const totalModel = { ...dataModel, ...pageContext.entity.page };
+    afterSuccessOperateInForm(pageContext, configureObj, totalModel);
   }
   if (successTip) {
     ElMessage({
@@ -526,11 +536,6 @@ function afterSuccessOperateInForm(pageContext, configureObj, dataModel) {
     }
   } else if (successOperation === "refresh") {
     if (dataModel && (dataModel.id || dataModel.ID)) {
-      const dataIdSessio = dataModel.ID == null ? dataModel.id : dataModel.ID;
-      const route = useRoute();
-      if (route.query._t_) {
-        setSessionCache(route.query._t_ + "_id", dataIdSessio);
-      }
       refreshPage(pageContext);
     }
   } else if (successOperation === "closeWindow" || successOperation === "closeWindowAndRefresh") {
@@ -540,7 +545,13 @@ function afterSuccessOperateInForm(pageContext, configureObj, dataModel) {
 }
 function closeDialog(pageContext, dataModel, isNeedValueMapping) {
   const jumpMode = pageContext.entity && pageContext.entity.request ? pageContext.entity.request.jumpMode : null;
-  if (jumpMode && jumpMode === "popup") {
+  if (jumpMode === "openWindow" || jumpMode === "newTab") {
+    if (window.parent) {
+      window.parent.close();
+    } else {
+      window.close();
+    }
+  } else {
     const sourceTableName = pageContext.tableName;
     const isNeedValueMappingFinal = isNeedValueMapping !== void 0 && isNeedValueMapping === true && dataModel && dataModel !== void 0;
     const parentPageCode = pageContext.entity && pageContext.entity.request ? pageContext.entity.request.parentPageCode : null;
@@ -548,46 +559,51 @@ function closeDialog(pageContext, dataModel, isNeedValueMapping) {
     eventBus.$emit(eventPageInfo + "close-dialog", {
       isNeedValueMapping: isNeedValueMappingFinal,
       dataModel,
-      sourceTableName
+      sourceTableName,
+      jumpMode
     });
-  } else if (jumpMode === "openWindow" || jumpMode === "newTab") {
-    if (window.parent) {
-      window.parent.close();
-    } else {
-      window.close();
-    }
-  } else {
-    const router = useRouter();
-    router.go(-1);
   }
 }
 function updateValuesWhenCloseDialog(parentPageContext, parentConfigureObj, sourceModel, sourceTableName) {
-  const jumpPageSetting = parentConfigureObj.runtimeTemp && parentConfigureObj.runtimeTemp.jumpPageSetting ? parentConfigureObj.runtimeTemp.jumpPageSetting : null;
+  const valueMappings = parentConfigureObj.runtime && parentConfigureObj.runtime.linkPage && parentConfigureObj.runtime.linkPage.valueMappings ? parentConfigureObj.runtime.linkPage.valueMappings : null;
   const targetTableName = parentPageContext.tableName;
   console.log("update-value66-", sourceModel, sourceTableName);
-  updateWithPageValue(
-    sourceModel,
-    sourceTableName,
-    jumpPageSetting,
-    parentPageContext.entity.data,
-    targetTableName
-  );
-  handleEvent(null, parentPageContext, parentConfigureObj, "setValueCallback", {
+  updateWithPageValue(sourceModel, valueMappings, parentPageContext);
+  handleEvent(null, parentPageContext, parentConfigureObj, "setValue", {
     sourceModel,
     sourceTableName,
-    jumpPageSetting,
     entity: parentPageContext.entity.data,
     targetTableName
   });
 }
+function updateWithPageValue(sourceModel, valueMappings, parentPageContext) {
+  debugger;
+  const entity = parentPageContext.entity.data;
+  if (sourceModel && sourceModel !== null && entity && entity !== null && valueMappings) {
+    let sourceEntity = sourceModel;
+    if (Array.isArray(sourceModel) && sourceModel.length > 0) {
+      sourceEntity = sourceModel[0];
+    }
+    valueMappings.forEach((valueMapping) => {
+      const sourceField = valueMapping.source;
+      if (!sourceField) {
+        return;
+      }
+      const sourceFields = sourceField.split(".");
+      const targetValue = getVariableValue(sourceEntity, sourceFields);
+      const targetField = valueMapping.target;
+      const targetFields = getModelFields(parentPageContext, null, targetField);
+      setVariableValue(parentPageContext.entity, targetFields, targetValue);
+    });
+  }
+}
 function dealAfterWithList(pageContext, configureObj, row, successTip) {
   let successOperation = configureObj.props.base.successOperation;
   const isNeedValueMapping = configureObj.props.base.isNeedValueMapping;
-  const tableUuid = configureObj.props.base.tableUuid;
+  const tableUuid = getTableUuid(pageContext, configureObj);
   if (!successOperation) {
     successOperation = "refresh";
   }
-  console.log("dealAfterWithList--");
   if (successOperation === "refresh") {
     if (tableUuid) {
       const gridRef = getComponentRef(pageContext, tableUuid);
@@ -606,6 +622,26 @@ function dealAfterWithList(pageContext, configureObj, row, successTip) {
     });
   }
 }
+function refreshFormOrListPage(pageContext, configureObj) {
+  let successOperation = configureObj.props.base.successOperation;
+  const buttonForPageType = getPageType(pageContext, configureObj, false);
+  if (buttonForPageType && buttonForPageType === "list" && !successOperation) {
+    successOperation = "refresh";
+  }
+  if (successOperation === "refresh") {
+    if (buttonForPageType && buttonForPageType === "list") {
+      const tableUuid = getTableUuid(pageContext, configureObj);
+      if (tableUuid) {
+        const gridRef = getComponentRef(pageContext, tableUuid);
+        gridRef.refresh();
+      } else {
+        console.error("tableUuid is empty");
+      }
+    } else if (buttonForPageType && buttonForPageType === "form") {
+      refreshPage(pageContext);
+    }
+  }
+}
 function submitForm(params, isListButton, eventName, url) {
   return new Promise((resolve, reject) => {
     const pageContext = params.pageContext;
@@ -670,7 +706,10 @@ function getSubmitFormRequest(pageContext, configureObj, url, isUnControlVersion
         ids,
         null
       );
-      getSaveFormRequestByParam(systemCode, backendUrl, param, url, pageContext.entity.data).then((result) => {
+      const baseUrl = getBaseUrl(backendUrl);
+      let path = baseUrl + url;
+      path = getRealRestApiPath(path, systemCode, backendUrl);
+      http.post(path, param).then((result) => {
         resolve(result);
       }).catch((error) => {
         reject(error);
@@ -987,8 +1026,8 @@ function getWorkflowSaveParams(params) {
     functionCodes = permissionPrefix + ".xxx";
   }
   if (!dataModel.id && !dataModel.ID) {
-    dataModel["pageCode"] = pageContext.code;
-    dataModel["pageVersion"] = pageContext.version;
+    dataModel["page_code"] = pageContext.code;
+    dataModel["page_version"] = pageContext.version;
   }
   const param = {
     entity: dataModel,
@@ -1762,6 +1801,7 @@ export {
   getTaskInformitions,
   isVisibleWorkflowButton,
   judgeDataNumber,
+  refreshFormOrListPage,
   standardEvents,
   updateValuesWhenCloseDialog
 };

package/dist/es/components/runtime/utils/form/date-shortcuts.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 快捷选择生成方式
+ * @param dateScopeDetails
+ * @param dateType
+ * @param rangeType
+ */
+export declare function getDateShortCuts(dateScopeDetails: any[], dateType: string, rangeType: string): any;

package/dist/es/components/runtime/utils/form/date-shortcuts.js

@@ -0,0 +1,96 @@
+function getDateShortCuts(dateScopeDetails, dateType, rangeType) {
+  if (!dateScopeDetails) {
+    return void 0;
+  }
+  const shortcuts = [];
+  if (dateScopeDetails.includes("today") && !["week", "month", "year"].includes(dateType)) {
+    const dateParams = {
+      text: "今天",
+      value: () => {
+        return /* @__PURE__ */ new Date();
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.value = () => {
+        return [/* @__PURE__ */ new Date(), /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("yesterday") && !["week", "month", "year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    date.setTime(date.getTime() - 3600 * 1e3 * 24);
+    const dateParams = {
+      text: "昨天",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("oneWeek") && !["month", "year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    date.setTime(date.getTime() - 3600 * 1e3 * 24 * 7);
+    const dateParams = {
+      text: "一周前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一周";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("oneMonth") && !["year"].includes(dateType)) {
+    const date = /* @__PURE__ */ new Date();
+    if (date.getMonth() > 0) {
+      date.setMonth(date.getMonth() - 1);
+    } else {
+      date.setMonth(12);
+      date.setFullYear(date.getFullYear() - 1);
+    }
+    const dateParams = {
+      text: "一月前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一月";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  if (dateScopeDetails.includes("oneYear")) {
+    const date = /* @__PURE__ */ new Date();
+    date.setFullYear(date.getFullYear() - 1);
+    const dateParams = {
+      text: "一年前",
+      value: () => {
+        return date;
+      }
+    };
+    if (rangeType.endsWith("range")) {
+      dateParams.text = "一年";
+      dateParams.value = () => {
+        return [date, /* @__PURE__ */ new Date()];
+      };
+    }
+    shortcuts.push(dateParams);
+  }
+  return shortcuts;
+}
+export {
+  getDateShortCuts
+};

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

@@ -98,6 +98,12 @@ export declare function formatVariableValue(pageContext: PageContext, variable:
  * @returns
  */
 export declare function formatValueByType(value: any, formatType: string, formatInfo: any): any;
+/**
+ * 根据变量获取值
+ * @param entity
+ * @param variable
+ */
+export declare function getValueFromVariable(entity: any, variable: string): any;
 /**
  * 从对象中获取值
  * @param valueSource 源对象

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

@@ -339,7 +339,6 @@ function setValueForVariableName(entity, variableName, newValue) {
   setVariableValue(entity, fields, newValue);
 }
 function setVariableValue(entity, fields, newValue) {
-  debugger;
   if (!entity || !fields || fields.length == 0) {
     return;
   }
@@ -478,7 +477,7 @@ function getValueFromVariable(entity, variable) {
   }
 }
 function getValueFromSource(valueSource, paramName, paramType) {
-  if (!valueSource || !paramName) {
+  if (paramType != "context" && !valueSource || !paramName) {
     return void 0;
   }
   const firstIndex = paramName.indexOf(".");
@@ -492,8 +491,28 @@ function getValueFromSource(valueSource, paramName, paramType) {
     return getValueFromSource(childValue, newParamName, paramType);
   } else {
     if (paramType == "context") {
+      console.log("newDate", paramName);
       if (paramName == "currentDate" || paramName == "currentTime") {
         return /* @__PURE__ */ new Date();
+      } else if (paramName.startsWith("currentDate") && paramName.length > 11) {
+        const str = paramName.substring(11);
+        const symbol = str.substring(0, 1);
+        let num = parseInt(str.substring(1, str.length - 1), 10);
+        const unit = str.substring(str.length - 1);
+        const date = /* @__PURE__ */ new Date();
+        num = "+" === symbol ? num : -num;
+        if (unit === "d" || unit === "w") {
+          num = unit === "w" ? num * 7 : num;
+          date.setDate(date.getDate() + num);
+        } else if (unit === "m") {
+          date.setMonth(date.getMonth() + num);
+        } else if (unit === "y") {
+          date.setFullYear(date.getFullYear() + num);
+        }
+        return date;
+      }
+      if (!valueSource) {
+        return void 0;
       }
     }
     return valueSource[paramName];
@@ -637,6 +656,7 @@ export {
   getFormPropName,
   getOptionDatasFromPage,
   getValueFromSource,
+  getValueFromVariable,
   getVariableValue,
   monitorFieldChange,
   queryOptionDatasources,

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

@@ -17,12 +17,13 @@ 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[];
 /**
  * 获取表单元素模型名称
  * @param pageContext 页面对象
  * @param formItemConfigure 表单元素配置参数
  */
-export declare function getFormModelFields(pageContext: PageContext, formItemConfigure: Component, prop?: string): string[];
+export declare function getFormModelFields(pageContext: PageContext, formItemConfigure: any, prop?: string): string[];
 /**
  * 获取组件的权限编码
  * @param configure

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

@@ -4,7 +4,9 @@ import { getAdditionalParamMap } from "./events/standard-event.js";
 import { PageDimensions } from "./interfaces/page-design-types.js";
 import { formatVariableValue, setVariableValue, getFormPropName } from "./page-helper-util.js";
 function queryPageDesignByCode(pageCode) {
-  return http.get(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode);
+  return http.get(
+    window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/runtime/" + pageCode
+  );
 }
 function convertToPageContext(pageDesign, pageRequest) {
   if (pageDesign == null) {
@@ -39,6 +41,8 @@ function convertToPageContext(pageDesign, pageRequest) {
     // 无ID或taskId时初始条件配置
     subTablePageInfo: pageDesign.subTablePageInfo,
     // 列表分页信息，格式是：{列表编码: 每页显示多少条记录}，表单页面中校验有分页的子表时提示使用，提示信息格式：第 {pageNum} 页第 {row} 行记录
+    workflowCode: pageDesign.workflowCode,
+    workflowVersion: pageDesign.workflowVersion,
     entity: {
       data: {},
       task: {},
@@ -49,11 +53,6 @@ function convertToPageContext(pageDesign, pageRequest) {
       system: {}
     }
   };
-  if (pageDesign.props && pageDesign.props.activeWorkflow && pageDesign.props.workflowSource && pageDesign.props.workflowSource === "link") {
-    pageContext.workflowCode = pageDesign.props.linkWorkflowCode;
-  } else if (pageDesign.props && pageDesign.props.activeWorkflow && pageDesign.props.workflowSource && pageDesign.props.workflowSource === "create") {
-    pageContext.workflowCode = pageDesign.props.createWorkflowCode;
-  }
   if (pageDesign.variables) {
     const pageObj = pageContext.entity.page;
     for (const variable of pageDesign.variables) {
@@ -111,11 +110,11 @@ function getRequestObject(pageRequest) {
     ;
   return requestObj;
 }
-function getFormModelFields(pageContext, formItemConfigure, prop) {
+function getModelFields(pageContext, formItemConfigure, prop) {
   if (!formItemConfigure) {
     return ["temp"];
   }
-  const entity = pageContext.entity;
+  pageContext.entity;
   let propsBase;
   let propName = prop;
   if (!prop) {
@@ -127,14 +126,28 @@ function getFormModelFields(pageContext, formItemConfigure, prop) {
     fields = ["data", prop];
   } else if (!propName || !propName.startsWith("${")) {
     fields = ["page", formItemConfigure.uuid];
-  } else {
+  } else if (propName.startsWith("${")) {
     propName = propName.substring(2, propName.length - 1);
     fields = propName.split(".");
-    if (fields.length < 2) {
+    if (formItemConfigure && fields.length < 2) {
       fields = [formItemConfigure.uuid];
     }
+  } else if (formItemConfigure) {
+    fields = ["page", formItemConfigure.uuid];
+  }
+  if (!fields && !formItemConfigure) {
+    return ["temp"];
   }
-  if (entity.data.ID == void 0 && entity.data.ID == void 0) {
+  return fields;
+}
+function getFormModelFields(pageContext, formItemConfigure, prop) {
+  const fields = getModelFields(pageContext, formItemConfigure, prop);
+  const entity = pageContext.entity;
+  let propsBase;
+  if (formItemConfigure) {
+    propsBase = formItemConfigure.props.base ? formItemConfigure.props.base : {};
+  }
+  if (entity.data.ID == void 0 && entity.data.id == void 0) {
     if (propsBase && propsBase.defaultValue) {
       let defaultValue = formatVariableValue(pageContext, propsBase.defaultValue);
       if (defaultValue != null && defaultValue != void 0) {
@@ -190,12 +203,15 @@ function queryPageSuperGrids(pageDesign, pageContext, publishVersion) {
   if (additionalParamMap && Object.keys(additionalParamMap) > 0) {
     additionalParamMapJson = JSON.stringify(additionalParamMap);
   }
-  return http.post(window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/super-grids", {
-    tableRuntimes,
-    additionalParamMapJson,
-    pageCode,
-    publishVersion
-  });
+  return http.post(
+    window["$vueApp"].config.globalProperties.baseAPI + "/component/super-page-design/super-grids",
+    {
+      tableRuntimes,
+      additionalParamMapJson,
+      pageCode,
+      publishVersion
+    }
+  );
 }
 function packageFormRules(pageContext, configure) {
   const isWorkflow = pageContext.workflowCode ? true : false;
@@ -222,6 +238,7 @@ function packageFormRules(pageContext, configure) {
 export {
   convertToPageContext,
   getFormModelFields,
+  getModelFields,
   getPermissionCodes,
   packageFormRules,
   queryPageDesignByCode,

package/dist/es/components/runtime/views/assemblys/data/table/main-table-runtime.vue.js

@@ -22,7 +22,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const systemCode = pageContext.systemCode;
     const backendUrl = pageContext.backendUrl;
-    debugger;
     const tableName = configure.props && configure.props.dataOrigin && configure.props.dataOrigin.tableName;
     let baseURL = pageContext.backendUrl;
     if (!baseURL) {

package/dist/es/components/runtime/views/assemblys/data/table/sub-table-runtime.vue.js

@@ -1,7 +1,7 @@
 import { defineComponent, ref, resolveComponent, openBlock, createElementBlock, createBlock, unref, createCommentVNode } from "vue";
 import { setTableEvents, gridSelectRecord, gridSelectAllRecords, gridSelectionChange, cellClick, cellDblClick, rowClick, rowDblClick, headerClick } from "../../../../utils/events/event-util.js";
 import { setVariableValue, getVariableValue } from "../../../../utils/page-helper-util.js";
-import { getFormModelFields } from "../../../../utils/page-init-util.js";
+import { getModelFields } from "../../../../utils/page-init-util.js";
 import eventBus from "../../../../utils/eventBus.js";
 import { popupToPage } from "../../../../utils/table-utils.js";
 import { getListCode } from "../../../../utils/common-util.js";
@@ -29,7 +29,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeStyle = runtimeInfo.style;
     const runtimeClass = runtimeInfo.class;
     const entity = props.pageContext.entity ? props.pageContext.entity : {};
-    let dynamicFields = getFormModelFields(props.pageContext, props.configure, prop);
+    let dynamicFields = getModelFields(props.pageContext, props.configure, "${data." + prop + "}");
     const listViewShowFlag = ref(false);
     const baseURL = window["$vueApp"].config.globalProperties.baseURL;
     const listViewOptions = ref({
@@ -115,7 +115,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return getVariableValue(entity, dynamicFields);
     }
     function changeInitializationSubTable(canRrefreshSubtableData) {
-      debugger;
       currencyListViewSetting(canRrefreshSubtableData);
       listViewOptions.value["isPageInfo"] = false;
       listViewOptions.value["subTableData"] = getValue();
@@ -178,7 +177,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       pageContext.tableUuids.push(configure.uuid);
     }
     function getOperations() {
-      debugger;
       let operations = [];
       if (isShowAdd()) {
         const addButton = {
@@ -286,7 +284,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       gridRef.value.deleteRow(rowIndex, listCode, false);
     }
     function changeGridData(gridData) {
-      debugger;
       setVariableValue(entity, dynamicFields, gridData);
     }
     function changeRowsPerpage(pageSize) {

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

@@ -20,7 +20,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const superGridItems = props.pageContext.superGridItems;
     const superGridSetting = superGridItems ? superGridItems[tableUuid] : null;
     tableConfigure.value = superGridSetting ? superGridSetting.configure ? JSON.parse(superGridSetting.configure) : null : props.configure;
-    debugger;
     const runtimeInfo = props.configure.runtime ? props.configure.runtime : {};
     runtimeInfo.style;
     runtimeInfo.class;

package/dist/es/components/runtime/views/assemblys/form/date-picker/datepicker-runtime.vue2.js

@@ -1,6 +1,7 @@
 import { defineComponent, computed, ref, resolveComponent, openBlock, createBlock, normalizeClass, unref, normalizeStyle, withCtx, createElementBlock, toDisplayString, createCommentVNode } from "vue";
 import { getFormModelFields } from "../../../../utils/page-init-util.js";
-import { getVariableValue, setVariableValue } from "../../../../utils/page-helper-util.js";
+import { getDateShortCuts } from "../../../../utils/form/date-shortcuts.js";
+import { getVariableValue, setVariableValue, getValueFromVariable } from "../../../../utils/page-helper-util.js";
 import { getCustomFunc, handleEvent } from "../../../../utils/events/event-util.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "datepicker-runtime",
@@ -25,6 +26,34 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const runtimeClass = runtimeInfo.class;
     const headerStyle = runtimeInfo.headerStyle;
     const designProperty = ref(runtimeInfo.props ? runtimeInfo.props : {});
+    if (designProperty.value.dateType && designProperty.value.dateType.includes("range")) {
+      let hisValue = getVariableValue(entity, dynamicFields);
+      if (hisValue && !Array.isArray(hisValue)) {
+        hisValue = [hisValue];
+      }
+      if (!entity.data || !entity.data.id && !entity.data.ID) {
+        if (designProperty.value.defaultValue2) {
+          const defaultValue2 = getValueFromVariable(entity, designProperty.value.defaultValue2);
+          hisValue = !hisValue ? [] : hisValue;
+          if (hisValue.length == 0) {
+            hisValue.push(void 0);
+          }
+          if (hisValue.length > 1) {
+            hisValue[1] = defaultValue2;
+          } else {
+            hisValue.push(defaultValue2);
+          }
+        }
+      }
+      setVariableValue(entity, dynamicFields, hisValue);
+    }
+    const shortcuts = ref(
+      getDateShortCuts(
+        designProperty.value.dateScopeDetails,
+        designProperty.value.sourceType,
+        designProperty.value.dateType
+      )
+    );
     if (designProperty.value.shortcutsFunc) {
       const func = getCustomFunc(props.pageContext, designProperty.value.shortcutsFunc);
       if (func) {
@@ -35,18 +64,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           }
         ]);
         if (returns) {
-          if (typeof returns === "object") {
+          if (!Array.isArray(returns)) {
             returns = [returns];
           }
-          if (!designProperty.value.shortcuts) {
-            designProperty.value.shortcuts = [];
+          if (!shortcuts.value) {
+            shortcuts.value = [];
           }
           for (let r of returns) {
             if (r.text && r.value) {
-              designProperty.value.shortcuts.push(r);
+              shortcuts.value.push(r);
             }
           }
         }
+        console.log("shortcuts", shortcuts.value);
       }
     }
     return (_ctx, _cache) => {
@@ -80,7 +110,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             format: designProperty.value.format,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => dynamicModelMethod.value = $event),
-            shortcuts: designProperty.value.shortcuts,
+            shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
             onChange: _cache[1] || (_cache[1] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
             onBlur: _cache[2] || (_cache[2] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),
@@ -100,7 +130,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             format: designProperty.value.format,
             modelValue: dynamicModelMethod.value,
             "onUpdate:modelValue": _cache[7] || (_cache[7] = ($event) => dynamicModelMethod.value = $event),
-            shortcuts: designProperty.value.shortcuts,
+            shortcuts: shortcuts.value,
             type: designProperty.value.dateType,
             onChange: _cache[8] || (_cache[8] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "change")),
             onBlur: _cache[9] || (_cache[9] = ($event) => unref(handleEvent)($event, _ctx.pageContext, _ctx.configure, "blur")),

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

@@ -36,7 +36,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           if (pageParams["configureObj"]) {
             delete pageParams["configureObj"];
           }
-          Object.assign(pageRequest.value, props.parentPageEventParams);
+          Object.assign(pageRequest.value, pageParams);
         } catch (error) {
           console.error(error);
         }

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

@@ -9,14 +9,15 @@ import _sfc_main$3 from "./assemblys/common/task-informition-dialog.vue.js";
 import _sfc_main$4 from "./assemblys/common/remove-signer-dialog.vue.js";
 import eventBus from "../utils/eventBus.js";
 import { getFormData } from "../utils/api/api-util.js";
-import { getTaskInformitions, getRemoveSigner, exportFormReport, doImportFinally, doAddSigner, doCreateCopyTask, doAssign, doReturnTaskTo, doRemoveSigners, getAdditionalParamMap, updateValuesWhenCloseDialog } from "../utils/events/standard-event.js";
+import { getTaskInformitions, getRemoveSigner, exportFormReport, doImportFinally, doAddSigner, doCreateCopyTask, doAssign, doReturnTaskTo, doRemoveSigners, getAdditionalParamMap, updateValuesWhenCloseDialog, refreshFormOrListPage } from "../utils/events/standard-event.js";
 import { ElMessage } from "element-plus";
 import { useI18n } from "vue-i18n";
 import { DepartmentUserTree } from "agilebuilder-ui";
 import { i18nValidateRulesMessage } from "../utils/events/validator-util.js";
 import _sfc_main$5 from "./super-page-dialog.vue.js";
-import { useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { jumpToPage } from "agilebuilder-ui/src/utils/jump-page-utils";
+import { setSessionCache } from "agilebuilder-ui/src/utils/auth";
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "super-page",
   props: {
@@ -96,6 +97,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     let pageContext = ref(null);
     const buttonConfigure = ref(null);
     const buttonPageContext = ref(null);
+    const route = useRoute();
     function initPageDesign(pageDesign) {
       console.log("pageDesign==", pageDesign);
       pageContext.value = convertToPageContext(pageDesign, props.pageRequest);
@@ -175,12 +177,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         parentEventParams.value = params.eventParams;
         openDialog(parentConfigureObj.value, parentEventParams.value);
       });
-      eventBus.$on(
-        eventPageInfo.value + "close-dialog",
-        ({ isNeedValueMapping, dataModel, sourceTableName }) => {
-          closeDialog({ isNeedValueMapping, dataModel, sourceTableName });
-        }
-      );
       watch(
         () => pageContext.value.isRefresh,
         (newValue) => {
@@ -245,6 +241,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             } else {
               isShowPage.value = true;
             }
+            sessionCacheDataId();
           });
         }, 0);
       } else if (props.pageCode) {
@@ -254,12 +251,20 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             const pageConf = JSON.parse(designJson);
             pageDesignResult.value = pageConf;
             initPageDesign(pageConf).then(() => {
+              sessionCacheDataId();
               isShowPage.value = true;
             });
           }
         });
       }
     }
+    function sessionCacheDataId() {
+      const dataModel = pageContext.value.entity.data;
+      const dataIdSessio = dataModel.ID == null ? dataModel.id : dataModel.ID;
+      if (route.query._t_) {
+        setSessionCache(route.query._t_ + "_id", dataIdSessio);
+      }
+    }
     onUpdated(() => {
       nextTick(() => {
         if (pageContext.value && thisRef.value) {
@@ -280,6 +285,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       eventBus.$off(eventPageInfo.value + "choose-return-node");
       eventBus.$off(eventPageInfo.value + "remove-signer");
       eventBus.$off(eventPageInfo.value + "prohibit-edit");
+      eventBus.$off(eventPageInfo.value + "open-dialog");
       if (pageContext.value) {
         handleEvent(null, pageContext.value, pageContext.value, "onUnmounted");
       }
@@ -370,6 +376,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               popPageSetting.parentPageVersion = parentPageContext.value.version;
               popPageSetting.isNewPage = true;
               if (jumpMode === "popup") {
+                eventBus.$on(
+                  eventPageInfo.value + "close-dialog",
+                  (params) => {
+                    closeFunc(params);
+                  }
+                );
                 jumpPageSetting.value = popPageSetting;
                 isShowDialog.value = true;
               } else if (jumpMode === "refresh") {
@@ -385,11 +397,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         console.error("页面配置信息不存在");
       }
     }
+    function closeFunc(params) {
+      const jumpMode = params.jumpMode;
+      if (jumpMode && jumpMode === "popup") {
+        closeDialog(params);
+      } else {
+        router.go(-1);
+      }
+    }
     function closeDialog(params) {
+      let dataModel;
+      let sourceTableName;
       if (params) {
         const isNeedValueMapping = params.isNeedValueMapping;
-        const dataModel = params.dataModel;
-        const sourceTableName = params.sourceTableName;
+        dataModel = params.dataModel;
+        sourceTableName = params.sourceTableName;
         if (isNeedValueMapping) {
           updateValuesWhenCloseDialog(
             parentPageContext.value,
@@ -399,9 +421,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           );
         }
       }
+      const targetTableName = parentPageContext.value.tableName;
+      handleEvent(null, parentPageContext.value, parentConfigureObj.value, "closePopup", {
+        sourceModel: dataModel,
+        sourceTableName,
+        jumpPageSetting,
+        entity: parentPageContext.value.entity.data,
+        targetTableName
+      });
+      refreshFormOrListPage(parentPageContext.value, parentConfigureObj.value);
       parentPageContext.value = null;
       parentConfigureObj.value = null;
       parentEventParams.value = null;
+      eventBus.$off(eventPageInfo.value + "close-dialog");
       isShowDialog.value = false;
     }
     return (_ctx, _cache) => {

package/dist/es/index.d.ts

@@ -4,8 +4,10 @@ import { getStandPermissionInfo, getFunctionInfo, FuncType } from './components/
 import { getCustomTheme, getCustomThemeOptions, getNumFormatter } from './components/runtime/utils/charts/chart-util';
 import { default as cn } from './i18n/langs/cn.js';
 import { default as en } from './i18n/langs/en.js';
+import { getDateShortCuts } from './components/runtime/utils/form/date-shortcuts';
 
 export { SuperPageNew, SuperPageDialogNew, getComponentOptionConfigs };
 export { getStandPermissionInfo, getFunctionInfo, FuncType };
 export { getCustomTheme, getCustomThemeOptions, getNumFormatter as getNumFormatterForChart };
+export { getDateShortCuts };
 export { cn, en };

package/dist/es/index.js

@@ -5,6 +5,7 @@ import { FuncType, getFunctionInfo, getStandPermissionInfo } from "./components/
 import { getCustomTheme, getCustomThemeOptions, getNumFormatter } from "./components/runtime/utils/charts/chart-util.js";
 import { default as default4 } from "./i18n/langs/cn.js";
 import { default as default5 } from "./i18n/langs/en.js";
+import { getDateShortCuts } from "./components/runtime/utils/form/date-shortcuts.js";
 export {
   FuncType,
   default3 as SuperPageDialogNew,
@@ -14,6 +15,7 @@ export {
   getComponentOptionConfigs,
   getCustomTheme,
   getCustomThemeOptions,
+  getDateShortCuts,
   getFunctionInfo,
   getNumFormatter as getNumFormatterForChart,
   getStandPermissionInfo

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "super-page-runtime",
-  "version": "2.0.28",
+  "version": "2.0.31",
   "description": "AgileBuilder super page runtime",
   "license": "ISC",
   "main": "dist/es/index.js",