@nocobase/plugin-flow-engine 2.1.0-beta.24 → 2.1.0-beta.26

package/dist/server/flow-surfaces/builder.js

@@ -54,6 +54,8 @@ var import_catalog = require("./catalog");
 var import_chart_config = require("./chart-config");
 var import_approval = require("./approval");
 var import_service_utils = require("./service-utils");
+var import_public_compatibility = require("./public-compatibility");
+var import_hidden_popup_contract = require("./hidden-popup-contract");
 const JS_BLOCK_DEFAULT_CODE = [
   "// Welcome to the JS block",
   "ctx.render(`",
@@ -122,11 +124,75 @@ const CALENDAR_QUICK_CREATE_ACTION_KEY = "quickCreateAction";
 const CALENDAR_EVENT_VIEW_ACTION_KEY = "eventViewAction";
 const KANBAN_QUICK_CREATE_ACTION_KEY = "quickCreateAction";
 const KANBAN_CARD_VIEW_ACTION_KEY = "cardViewAction";
+const KANBAN_LEGACY_PARENT_CARD_POPUP_PROP_KEYS = [
+  "cardOpenMode",
+  "cardPopupSize",
+  "cardPopupTemplateUid",
+  "cardPopupPageModelClass",
+  "cardPopupTargetUid"
+];
+const KANBAN_LEGACY_QUICK_CREATE_POPUP_PROP_KEYS = [
+  "popupMode",
+  "popupSize",
+  "popupTemplateUid",
+  "popupPageModelClass",
+  "popupTargetUid"
+];
+const KANBAN_BLOCK_CARD_POPUP_STEP_PARAMS_PATH = ["cardSettings", "popup"];
 const CALENDAR_READONLY_ACTION_MODEL_USES = /* @__PURE__ */ new Set([
   "CalendarNavActionModel",
   "CalendarTitleActionModel",
   "CalendarViewSelectActionModel"
 ]);
+function resolveModelStepParamsOrLegacyObject(model, path, legacyValue) {
+  if (import_lodash.default.has(model.stepParams, path)) {
+    const value = import_lodash.default.get(model.stepParams, path);
+    return import_lodash.default.isPlainObject(value) ? value : {};
+  }
+  return import_lodash.default.isPlainObject(legacyValue) ? legacyValue : void 0;
+}
+function resolvePersistableModelStepParamsOrLegacyObject(model, path, legacyValue) {
+  const value = resolveModelStepParamsOrLegacyObject(model, path, legacyValue);
+  if (!import_lodash.default.isPlainObject(value)) {
+    return void 0;
+  }
+  const normalized = normalizeInitialKanbanPopupSettings(value);
+  return Object.keys(normalized).length ? normalized : void 0;
+}
+function extractPersistableModelStepParamsOrLegacyObject(model, path, legacyValue) {
+  const value = resolvePersistableModelStepParamsOrLegacyObject(model, path, legacyValue);
+  import_lodash.default.unset(model.stepParams, path);
+  return value;
+}
+function persistModelPopupStepParams(model, path, popupSettings) {
+  if (!import_lodash.default.isPlainObject(popupSettings)) {
+    return;
+  }
+  import_lodash.default.set(model.stepParams, path, import_lodash.default.cloneDeep(popupSettings));
+}
+function normalizeInitialKanbanPopupSettings(popupSettings) {
+  return (0, import_hidden_popup_contract.normalizeHiddenPopupSettings)(popupSettings);
+}
+function normalizeInitialKanbanPopupSettingsFromProps(actionKey, props) {
+  if (!import_lodash.default.isPlainObject(props)) {
+    return void 0;
+  }
+  const rawSettings = actionKey === KANBAN_QUICK_CREATE_ACTION_KEY ? (0, import_service_utils.buildDefinedPayload)({
+    mode: props.popupMode,
+    size: props.popupSize,
+    popupTemplateUid: props.popupTemplateUid,
+    pageModelClass: props.popupPageModelClass,
+    uid: props.popupTargetUid
+  }) : (0, import_service_utils.buildDefinedPayload)({
+    mode: props.cardOpenMode,
+    size: props.cardPopupSize,
+    popupTemplateUid: props.cardPopupTemplateUid,
+    pageModelClass: props.cardPopupPageModelClass,
+    uid: props.cardPopupTargetUid
+  });
+  const normalized = normalizeInitialKanbanPopupSettings(rawSettings);
+  return Object.keys(normalized).length ? normalized : void 0;
+}
 const JS_ACTION_DEFAULT_CODE_BY_USE = {
   JSCollectionActionModel: [
     "const rows = ctx.resource?.getSelectedRows?.() || [];",
@@ -217,7 +283,7 @@ function buildSyntheticRootPageTabModel(options) {
   };
 }
 function buildBlockTree(options) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const use = (0, import_catalog.resolveSupportedBlockCatalogItem)(
     {
       type: options.type,
@@ -266,6 +332,9 @@ function buildBlockTree(options) {
   } else if (Object.keys(normalizedResourceInit).length) {
     import_lodash.default.set(baseStepParams, ["resourceSettings", "init"], normalizedResourceInit);
   }
+  if (options.enableDefaultSorting) {
+    applyDefaultSortingIfMissing(baseStepParams, use);
+  }
   const model = {
     ...use === "CalendarBlockModel" || use === "KanbanBlockModel" ? { uid: (0, import_utils.uid)() } : {},
     use,
@@ -365,10 +434,38 @@ function buildBlockTree(options) {
   } else if (use === "KanbanBlockModel") {
     const blockUid = model.uid || (0, import_utils.uid)();
     model.uid = blockUid;
+    const quickCreatePopupSettings = resolvePersistableModelStepParamsOrLegacyObject(
+      model,
+      ["kanbanSettings", "popup"],
+      (_a = model.props) == null ? void 0 : _a.quickCreatePopupSettings
+    ) || normalizeInitialKanbanPopupSettingsFromProps(KANBAN_QUICK_CREATE_ACTION_KEY, model.props);
+    const cardPopupSettings = extractPersistableModelStepParamsOrLegacyObject(
+      model,
+      KANBAN_BLOCK_CARD_POPUP_STEP_PARAMS_PATH,
+      (_b = model.props) == null ? void 0 : _b.cardPopupSettings
+    ) || normalizeInitialKanbanPopupSettingsFromProps(KANBAN_CARD_VIEW_ACTION_KEY, model.props);
+    persistModelPopupStepParams(model, ["kanbanSettings", "popup"], quickCreatePopupSettings);
+    if (model.props) {
+      delete model.props.quickCreatePopupSettings;
+      delete model.props.cardPopupSettings;
+      for (const propKey of KANBAN_LEGACY_QUICK_CREATE_POPUP_PROP_KEYS) {
+        delete model.props[propKey];
+      }
+      for (const propKey of KANBAN_LEGACY_PARENT_CARD_POPUP_PROP_KEYS) {
+        delete model.props[propKey];
+      }
+    }
     model.subModels = {
       item: {
         uid: (0, import_utils.uid)(),
         use: "KanbanCardItemModel",
+        ...cardPopupSettings && import_lodash.default.isPlainObject(cardPopupSettings) ? {
+          stepParams: {
+            cardSettings: {
+              popup: import_lodash.default.cloneDeep(cardPopupSettings)
+            }
+          }
+        } : {},
         subModels: {
           grid: {
             uid: (0, import_utils.uid)(),
@@ -379,29 +476,47 @@ function buildBlockTree(options) {
       [KANBAN_QUICK_CREATE_ACTION_KEY]: buildKanbanPopupActionNode({
         actionKey: KANBAN_QUICK_CREATE_ACTION_KEY,
         blockUid,
-        resourceInit: normalizedResourceInit
+        resourceInit: normalizedResourceInit,
+        popupSettings: quickCreatePopupSettings
       }),
       [KANBAN_CARD_VIEW_ACTION_KEY]: buildKanbanPopupActionNode({
         actionKey: KANBAN_CARD_VIEW_ACTION_KEY,
         blockUid,
-        resourceInit: normalizedResourceInit
+        resourceInit: normalizedResourceInit,
+        popupSettings: cardPopupSettings
       })
     };
   } else if (use === "CalendarBlockModel") {
     const blockUid = model.uid || (0, import_utils.uid)();
     model.uid = blockUid;
+    const quickCreatePopupSettings = resolveModelStepParamsOrLegacyObject(
+      model,
+      ["calendarSettings", "quickCreatePopupSettings"],
+      (_c = model.props) == null ? void 0 : _c.quickCreatePopupSettings
+    );
+    const eventPopupSettings = resolveModelStepParamsOrLegacyObject(
+      model,
+      ["calendarSettings", "eventPopupSettings"],
+      (_d = model.props) == null ? void 0 : _d.eventPopupSettings
+    );
+    persistModelPopupStepParams(model, ["calendarSettings", "quickCreatePopupSettings"], quickCreatePopupSettings);
+    persistModelPopupStepParams(model, ["calendarSettings", "eventPopupSettings"], eventPopupSettings);
+    if (model.props) {
+      delete model.props.quickCreatePopupSettings;
+      delete model.props.eventPopupSettings;
+    }
     model.subModels = {
       [CALENDAR_QUICK_CREATE_ACTION_KEY]: buildCalendarPopupActionNode({
         actionKey: CALENDAR_QUICK_CREATE_ACTION_KEY,
         blockUid,
         resourceInit: normalizedResourceInit,
-        popupSettings: (_a = model.props) == null ? void 0 : _a.quickCreatePopupSettings
+        popupSettings: quickCreatePopupSettings
       }),
       [CALENDAR_EVENT_VIEW_ACTION_KEY]: buildCalendarPopupActionNode({
         actionKey: CALENDAR_EVENT_VIEW_ACTION_KEY,
         blockUid,
         resourceInit: normalizedResourceInit,
-        popupSettings: (_b = model.props) == null ? void 0 : _b.eventPopupSettings
+        popupSettings: eventPopupSettings
       })
     };
   }
@@ -424,29 +539,12 @@ function buildKanbanPopupActionNode(options) {
   };
 }
 function buildKanbanPopupOpenView(options) {
-  var _a, _b, _c;
-  const defaults = import_lodash.default.pickBy(
-    {
-      mode: "drawer",
-      size: "medium",
-      pageModelClass: "ChildPageModel",
-      uid: options.actionUid,
-      collectionName: (_a = options.resourceInit) == null ? void 0 : _a.collectionName,
-      dataSourceKey: ((_b = options.resourceInit) == null ? void 0 : _b.dataSourceKey) || (((_c = options.resourceInit) == null ? void 0 : _c.collectionName) ? "main" : void 0)
-    },
-    (value) => !import_lodash.default.isUndefined(value)
-  );
-  const current = import_lodash.default.cloneDeep(options.popupSettings || {});
-  return import_lodash.default.pickBy(
-    {
-      ...defaults,
-      ...current,
-      uid: current.uid || defaults.uid,
-      collectionName: current.collectionName || defaults.collectionName,
-      dataSourceKey: current.dataSourceKey || defaults.dataSourceKey
-    },
-    (value) => !import_lodash.default.isUndefined(value)
-  );
+  return (0, import_hidden_popup_contract.buildHiddenPopupOpenView)({
+    actionUid: options.actionUid,
+    resourceInit: options.resourceInit,
+    popupSettings: options.popupSettings,
+    normalizePopupSettings: normalizeInitialKanbanPopupSettings
+  });
 }
 function buildCalendarPopupActionNode(options) {
   const actionUid = `${options.blockUid}-${options.actionKey}`;
@@ -465,29 +563,7 @@ function buildCalendarPopupActionNode(options) {
   };
 }
 function buildCalendarPopupOpenView(options) {
-  var _a, _b, _c;
-  const defaults = import_lodash.default.pickBy(
-    {
-      mode: "drawer",
-      size: "medium",
-      pageModelClass: "ChildPageModel",
-      uid: options.actionUid,
-      collectionName: (_a = options.resourceInit) == null ? void 0 : _a.collectionName,
-      dataSourceKey: ((_b = options.resourceInit) == null ? void 0 : _b.dataSourceKey) || (((_c = options.resourceInit) == null ? void 0 : _c.collectionName) ? "main" : void 0)
-    },
-    (value) => !import_lodash.default.isUndefined(value)
-  );
-  const current = import_lodash.default.cloneDeep(options.popupSettings || {});
-  return import_lodash.default.pickBy(
-    {
-      ...defaults,
-      ...current,
-      uid: current.uid || defaults.uid,
-      collectionName: current.collectionName || defaults.collectionName,
-      dataSourceKey: current.dataSourceKey || defaults.dataSourceKey
-    },
-    (value) => !import_lodash.default.isUndefined(value)
-  );
+  return (0, import_hidden_popup_contract.buildHiddenPopupOpenView)(options);
 }
 function buildPopupPageTree(options) {
   const pageUid = options.pageUid || (0, import_utils.uid)();
@@ -855,8 +931,10 @@ function inferActionDefaultProps(use, scope) {
       icon: "DownOutlined"
     },
     BulkDeleteActionModel: {
-      title: '{{t("Delete")}}',
-      icon: "DeleteOutlined"
+      title: "",
+      tooltip: '{{t("Delete")}}',
+      icon: "DeleteOutlined",
+      position: "right"
     },
     BulkEditActionModel: {
       title: '{{t("Bulk edit")}}',
@@ -995,6 +1073,27 @@ function applyContainerActionStyle(props, containerUse) {
   }
   return props;
 }
+const BLOCK_DEFAULT_SORTING_PATH_BY_USE = {
+  KanbanBlockModel: ["kanbanSettings", "defaultSorting", "sort"],
+  TreeBlockModel: ["treeSettings", "defaultSorting", "sort"],
+  TableBlockModel: ["tableSettings", "defaultSorting", "sort"],
+  DetailsBlockModel: ["detailsSettings", "defaultSorting", "sort"],
+  ListBlockModel: ["listSettings", "defaultSorting", "sort"],
+  GridCardBlockModel: ["GridCardSettings", "defaultSorting", "sort"],
+  MapBlockModel: ["createMapBlock", "lineSort", "sort"]
+};
+function applyDefaultSortingIfMissing(stepParams, use) {
+  const path = BLOCK_DEFAULT_SORTING_PATH_BY_USE[use];
+  if (!path) {
+    return;
+  }
+  const currentSorting = import_lodash.default.get(stepParams, path);
+  if (Array.isArray(currentSorting) || import_lodash.default.isNull(currentSorting) || import_lodash.default.isUndefined(currentSorting)) {
+    if (!import_lodash.default.has(stepParams, path) || import_lodash.default.isNull(currentSorting) || import_lodash.default.isUndefined(currentSorting)) {
+      import_lodash.default.set(stepParams, path, import_lodash.default.cloneDeep(import_public_compatibility.FLOW_SURFACE_DEFAULT_SORTING));
+    }
+  }
+}
 function buildBlockDefaults(use) {
   if (use === "JSBlockModel") {
     return {
@@ -1060,6 +1159,21 @@ function buildBlockDefaults(use) {
       }
     };
   }
+  if (use === "TableBlockModel") {
+    return {};
+  }
+  if (use === "DetailsBlockModel") {
+    return {};
+  }
+  if (use === "ListBlockModel") {
+    return {};
+  }
+  if (use === "GridCardBlockModel") {
+    return {};
+  }
+  if (use === "MapBlockModel") {
+    return {};
+  }
   return {};
 }
 function getStandaloneFieldDefaults(use) {

package/dist/server/flow-surfaces/catalog.js

@@ -154,7 +154,7 @@ const OPEN_VIEW_PATH_SCHEMAS = {
   "openView.tryTemplate": BOOLEAN_SCHEMA
 };
 const CONFIRM_ALLOWED_PATHS = ["confirm.enable", "confirm.title", "confirm.content"];
-const TABLE_COLUMN_ALLOWED_PATHS = ["title.title"];
+const TABLE_COLUMN_ALLOWED_PATHS = ["title.title", "fieldNames.label"];
 const FILTER_FORM_ITEM_ALLOWED_PATHS = [
   "init.defaultTargetUid",
   "init.filterField.name",
@@ -327,6 +327,8 @@ const CALENDAR_SETTINGS_GROUP = {
     "quickCreateEvent.enableQuickCreateEvent",
     "showLunar.showLunar",
     "weekStart.weekStart",
+    "quickCreatePopupSettings",
+    "eventPopupSettings",
     "dataScope.filter",
     "linkageRules.value"
   ],
@@ -342,6 +344,8 @@ const CALENDAR_SETTINGS_GROUP = {
     "quickCreateEvent.enableQuickCreateEvent": BOOLEAN_SCHEMA,
     "showLunar.showLunar": BOOLEAN_SCHEMA,
     "weekStart.weekStart": NUMBER_SCHEMA,
+    quickCreatePopupSettings: OBJECT_SCHEMA,
+    eventPopupSettings: OBJECT_SCHEMA,
     "dataScope.filter": FILTER_GROUP_SCHEMA,
     "linkageRules.value": ARRAY_SCHEMA
   }
@@ -390,8 +394,20 @@ const KANBAN_SETTINGS_GROUP = {
     "popup.mode",
     "popup.size",
     "popup.popupTemplateUid",
+    "popup.popupTemplateContext",
+    "popup.popupTemplateMode",
+    "popup.popupTemplateHasFilterByTk",
+    "popup.popupTemplateHasSourceId",
     "popup.pageModelClass",
     "popup.uid",
+    "popup.collectionName",
+    "popup.dataSourceKey",
+    "popup.associationName",
+    "popup.filterByTk",
+    "popup.sourceId",
+    "popup.title",
+    "popup.template",
+    "popup.tryTemplate",
     "pageSize.pageSize",
     "columnWidth.columnWidth",
     "dataScope.filter"
@@ -412,8 +428,20 @@ const KANBAN_SETTINGS_GROUP = {
     "popup.mode": STRING_SCHEMA,
     "popup.size": STRING_SCHEMA,
     "popup.popupTemplateUid": NULLABLE_STRING_SCHEMA,
+    "popup.popupTemplateContext": BOOLEAN_SCHEMA,
+    "popup.popupTemplateMode": STRING_SCHEMA,
+    "popup.popupTemplateHasFilterByTk": BOOLEAN_SCHEMA,
+    "popup.popupTemplateHasSourceId": BOOLEAN_SCHEMA,
     "popup.pageModelClass": NULLABLE_STRING_SCHEMA,
     "popup.uid": NULLABLE_STRING_SCHEMA,
+    "popup.collectionName": STRING_SCHEMA,
+    "popup.dataSourceKey": STRING_SCHEMA,
+    "popup.associationName": NULLABLE_STRING_SCHEMA,
+    "popup.filterByTk": STRING_SCHEMA,
+    "popup.sourceId": STRING_SCHEMA,
+    "popup.title": STRING_SCHEMA,
+    "popup.template": OBJECT_SCHEMA,
+    "popup.tryTemplate": BOOLEAN_SCHEMA,
     "pageSize.pageSize": NUMBER_SCHEMA,
     "columnWidth.columnWidth": NUMBER_SCHEMA,
     "dataScope.filter": FILTER_GROUP_SCHEMA
@@ -1141,8 +1169,20 @@ KANBAN_CARD_ITEM_CONTRACT.domains.stepParams = groupedDomain({
       "popup.mode",
       "popup.size",
       "popup.popupTemplateUid",
+      "popup.popupTemplateContext",
+      "popup.popupTemplateMode",
+      "popup.popupTemplateHasFilterByTk",
+      "popup.popupTemplateHasSourceId",
       "popup.pageModelClass",
       "popup.uid",
+      "popup.collectionName",
+      "popup.dataSourceKey",
+      "popup.associationName",
+      "popup.filterByTk",
+      "popup.sourceId",
+      "popup.title",
+      "popup.template",
+      "popup.tryTemplate",
       "layout.layout",
       "layout.labelAlign",
       "layout.labelWidth",
@@ -1157,8 +1197,20 @@ KANBAN_CARD_ITEM_CONTRACT.domains.stepParams = groupedDomain({
       "popup.mode": STRING_SCHEMA,
       "popup.size": STRING_SCHEMA,
       "popup.popupTemplateUid": NULLABLE_STRING_SCHEMA,
+      "popup.popupTemplateContext": BOOLEAN_SCHEMA,
+      "popup.popupTemplateMode": STRING_SCHEMA,
+      "popup.popupTemplateHasFilterByTk": BOOLEAN_SCHEMA,
+      "popup.popupTemplateHasSourceId": BOOLEAN_SCHEMA,
       "popup.pageModelClass": NULLABLE_STRING_SCHEMA,
       "popup.uid": NULLABLE_STRING_SCHEMA,
+      "popup.collectionName": STRING_SCHEMA,
+      "popup.dataSourceKey": STRING_SCHEMA,
+      "popup.associationName": NULLABLE_STRING_SCHEMA,
+      "popup.filterByTk": STRING_SCHEMA,
+      "popup.sourceId": STRING_SCHEMA,
+      "popup.title": STRING_SCHEMA,
+      "popup.template": OBJECT_SCHEMA,
+      "popup.tryTemplate": BOOLEAN_SCHEMA,
       "layout.layout": STRING_SCHEMA,
       "layout.labelAlign": STRING_SCHEMA,
       "layout.labelWidth": NULLABLE_NUMBER_OR_STRING_SCHEMA,
@@ -1381,7 +1433,8 @@ ACTION_COLUMN_CONTRACT.domains.stepParams = groupedDomain({
     allowedPaths: TABLE_COLUMN_ALLOWED_PATHS,
     mergeStrategy: "deep",
     pathSchemas: {
-      "title.title": STRING_SCHEMA
+      "title.title": STRING_SCHEMA,
+      "fieldNames.label": STRING_SCHEMA
     }
   }
 });
@@ -1485,6 +1538,7 @@ TABLE_COLUMN_CONTRACT.domains.stepParams = groupedDomain({
     mergeStrategy: "deep",
     pathSchemas: {
       "title.title": STRING_SCHEMA,
+      "fieldNames.label": STRING_SCHEMA,
       "model.use": STRING_SCHEMA
     }
   }
@@ -1508,7 +1562,8 @@ JS_COLUMN_CONTRACT.domains.stepParams = groupedDomain({
     allowedPaths: TABLE_COLUMN_ALLOWED_PATHS,
     mergeStrategy: "deep",
     pathSchemas: {
-      "title.title": STRING_SCHEMA
+      "title.title": STRING_SCHEMA,
+      "fieldNames.label": STRING_SCHEMA
     }
   },
   jsSettings: RUN_JS_SETTINGS_GROUP

package/dist/server/flow-surfaces/configure-options.js

@@ -678,6 +678,10 @@ function getActionConfigureOptionsByUse(use) {
     case "ViewActionModel":
     case "EditActionModel":
     case "PopupCollectionActionModel":
+    case "CalendarQuickCreateActionModel":
+    case "CalendarEventViewActionModel":
+    case "KanbanQuickCreateActionModel":
+    case "KanbanCardViewActionModel":
     case "UploadActionModel":
       return merged(ACTION_OPEN_VIEW_OPTIONS, ACTION_LINKAGE_OPTIONS);
     case "DeleteActionModel":

package/dist/server/flow-surfaces/default-block-actions.js

@@ -47,6 +47,8 @@ const FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY = "__flowSurfac
 const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
   table: [
     { type: "filter", scope: "actions" },
+    { type: "refresh", scope: "actions" },
+    { type: "bulkDelete", scope: "actions" },
     {
       type: "addNew",
       scope: "actions",
@@ -54,11 +56,11 @@ const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
         tryTemplate: true,
         [FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
       }
-    },
-    { type: "refresh", scope: "actions" }
+    }
   ],
   list: [
     { type: "filter", scope: "actions" },
+    { type: "refresh", scope: "actions" },
     {
       type: "addNew",
       scope: "actions",
@@ -66,11 +68,11 @@ const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
         tryTemplate: true,
         [FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
       }
-    },
-    { type: "refresh", scope: "actions" }
+    }
   ],
   gridCard: [
     { type: "filter", scope: "actions" },
+    { type: "refresh", scope: "actions" },
     {
       type: "addNew",
       scope: "actions",
@@ -78,11 +80,11 @@ const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
         tryTemplate: true,
         [FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
       }
-    },
-    { type: "refresh", scope: "actions" }
+    }
   ],
   calendar: [
     { type: "filter", scope: "actions" },
+    { type: "refresh", scope: "actions" },
     {
       type: "addNew",
       scope: "actions",
@@ -90,11 +92,11 @@ const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
         tryTemplate: true,
         [FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
       }
-    },
-    { type: "refresh", scope: "actions" }
+    }
   ],
   kanban: [
     { type: "filter", scope: "actions" },
+    { type: "refresh", scope: "actions" },
     {
       type: "addNew",
       scope: "actions",
@@ -102,8 +104,7 @@ const FLOW_SURFACE_DEFAULT_BLOCK_ACTIONS = {
         tryTemplate: true,
         [FLOW_SURFACE_INTERNAL_AUTO_SAVE_DEFAULT_POPUP_TEMPLATE_KEY]: true
       }
-    },
-    { type: "refresh", scope: "actions" }
+    }
   ],
   createForm: [{ type: "submit", scope: "actions" }],
   editForm: [{ type: "submit", scope: "actions" }],

package/dist/server/flow-surfaces/hidden-popup-calendar.d.ts

@@ -0,0 +1,86 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import _ from 'lodash';
+export declare const CALENDAR_POPUP_ACTION_KEYS: readonly ["quickCreateAction", "eventViewAction"];
+export type CalendarPopupActionKey = (typeof CALENDAR_POPUP_ACTION_KEYS)[number];
+export declare const CALENDAR_POPUP_PROP_KEYS: readonly ["quickCreatePopupSettings", "eventPopupSettings"];
+export type HiddenPopupOpenViewNormalizer = (actionName: string, value: any, options: {
+    transaction?: any;
+    popupTemplateHostUid?: string;
+    popupActionContext?: {
+        hasCurrentRecord?: boolean;
+    };
+}) => Promise<Record<string, any> | undefined> | Record<string, any> | undefined;
+export type HiddenPopupTemplateOpenViewBuilder = (input: {
+    actionName: string;
+    actionUid: string;
+    openView: Record<string, any>;
+    popupSettings?: Record<string, any>;
+    existingHost?: any;
+    transaction?: any;
+    hasCurrentRecord?: boolean;
+    normalizePopupSettings: (popupSettings?: Record<string, any>) => Record<string, any>;
+    mergeDisplaySettings: (openView: Record<string, any>, popupSettings?: Record<string, any>, fallbackOpenView?: Record<string, any> | null) => Record<string, any>;
+}) => Promise<Record<string, any>> | Record<string, any>;
+export type HiddenPopupHostDefaultContentEnsurer = (input: {
+    actionName: string;
+    actionUid: string;
+    popupSettings?: Record<string, any>;
+    transaction?: any;
+    hasCurrentRecord?: boolean;
+    mergeDisplaySettings: (openView: Record<string, any>, popupSettings?: Record<string, any>, fallbackOpenView?: Record<string, any> | null) => Record<string, any>;
+}) => Promise<boolean> | boolean;
+export type HiddenPopupHostRuntime = {
+    repository: {
+        findModelById: (uid: string, options?: any) => Promise<any>;
+        patch: (payload: Record<string, any>, options?: any) => Promise<any>;
+        upsertModel: (payload: Record<string, any>, options?: any) => Promise<any>;
+    };
+    buildPopupOpenViewWithTemplate: HiddenPopupTemplateOpenViewBuilder;
+    clearFlowTemplateUsagesForNodeTree: (uid: string, transaction?: any) => Promise<any>;
+    ensurePopupHostDefaultContent: HiddenPopupHostDefaultContentEnsurer;
+    reconcilePopupOpenViewTransition: (uid: string, currentOpenView: Record<string, any> | null | undefined, nextOpenView: Record<string, any>, transaction?: any) => Promise<any>;
+    removeNodeTreeWithBindings: (uid: string, transaction?: any) => Promise<any>;
+    syncFlowTemplateUsagesForNodeTree: (uid: string, transaction?: any) => Promise<any>;
+};
+export declare function normalizeCalendarPopupSettings(actionKey: CalendarPopupActionKey, popupSettings?: Record<string, any>): Record<string, any>;
+export declare function getCalendarPopupActionUse(actionKey: CalendarPopupActionKey): "CalendarQuickCreateActionModel" | "CalendarEventViewActionModel";
+export declare function getCalendarPopupPropKey(actionKey: CalendarPopupActionKey): "quickCreatePopupSettings" | "eventPopupSettings";
+export declare function getCalendarPopupActionUid(calendarUid: string, actionKey: CalendarPopupActionKey): string;
+export declare function getCalendarBlockResourceInit(blockNode: any): any;
+export declare function getCalendarPopupStoredSettings(blockNode: any, actionKey: CalendarPopupActionKey): Record<string, any>;
+export declare function replaceCalendarStoredPopupSettings(runtime: Pick<HiddenPopupHostRuntime, 'repository'>, blockNode: any, actionKey: CalendarPopupActionKey, popupSettings: Record<string, any>, transaction?: any): Promise<void>;
+export declare function buildCalendarInitialStepParams(input: {
+    stepParams?: Record<string, any>;
+    props?: Record<string, any>;
+    settings?: Record<string, any>;
+}): Record<string, any>;
+export declare function buildCalendarPopupOpenView(input: {
+    blockNode: any;
+    actionKey: CalendarPopupActionKey;
+    resourceInit?: Record<string, any>;
+    popupSettings?: Record<string, any>;
+}): _.Dictionary<any>;
+export declare function mergeCalendarPopupSettings(actionKey: CalendarPopupActionKey, current: any, value: any): Record<string, any>;
+export declare function stripCalendarPopupTargetSettingsForResourceChange(actionKey: CalendarPopupActionKey, popupSettings?: Record<string, any>): Record<string, any>;
+export declare function normalizeCalendarPopupConfigureValue(input: {
+    actionName: string;
+    blockUid: string;
+    actionKey: CalendarPopupActionKey;
+    value: any;
+    transaction?: any;
+    normalizeOpenView: HiddenPopupOpenViewNormalizer;
+}): Promise<Record<string, any>>;
+export declare function normalizeCalendarInlineSettingsForConfigure(settings?: Record<string, any>): Record<string, any>;
+export declare function resolveCalendarInitialPopupOverride(settings: Record<string, any> | undefined, primaryKey: 'quickCreatePopup' | 'eventPopup', legacyKey: 'quickCreatePopupSettings' | 'eventPopupSettings'): any;
+export declare function ensureCalendarBlockPopupHosts(runtime: HiddenPopupHostRuntime, blockNode: any, transaction?: any, popupSettingsOverrides?: Partial<Record<CalendarPopupActionKey, Record<string, any> | undefined>>, options?: {
+    displayFallbackOpenViews?: Partial<Record<CalendarPopupActionKey, Record<string, any> | undefined>>;
+}): Promise<any>;
+export declare function projectCalendarBlockPopupHosts<T = any>(node: T): T;
+export declare function projectCalendarBlockPopupHostsInTree<T = any>(node: T): T;