@nocobase/plugin-flow-engine 2.1.0-alpha.28 → 2.1.0-alpha.29

package/dist/externalVersion.js

@@ -8,16 +8,16 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.28",
+  "@nocobase/client": "2.1.0-alpha.29",
   "lodash": "4.18.1",
-  "@nocobase/database": "2.1.0-alpha.28",
-  "@nocobase/data-source-manager": "2.1.0-alpha.28",
-  "@nocobase/resourcer": "2.1.0-alpha.28",
-  "@nocobase/utils": "2.1.0-alpha.28",
-  "@nocobase/cache": "2.1.0-alpha.28",
-  "@nocobase/plugin-localization": "2.1.0-alpha.28",
-  "@nocobase/server": "2.1.0-alpha.28",
-  "@nocobase/actions": "2.1.0-alpha.28",
+  "@nocobase/database": "2.1.0-alpha.29",
+  "@nocobase/data-source-manager": "2.1.0-alpha.29",
+  "@nocobase/resourcer": "2.1.0-alpha.29",
+  "@nocobase/utils": "2.1.0-alpha.29",
+  "@nocobase/cache": "2.1.0-alpha.29",
+  "@nocobase/plugin-localization": "2.1.0-alpha.29",
+  "@nocobase/server": "2.1.0-alpha.29",
+  "@nocobase/actions": "2.1.0-alpha.29",
   "@formily/json-schema": "2.3.7",
-  "@nocobase/ai": "2.1.0-alpha.28"
+  "@nocobase/ai": "2.1.0-alpha.29"
 };

package/dist/node_modules/ses/package.json

@@ -1 +1 @@
-{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-05-03T23:59:02.475Z"}
+{"name":"ses","version":"1.14.0","description":"Hardened JavaScript for Fearless Cooperation","keywords":["lockdown","harden","Compartment","assert","security","confinement","isolation","object capabilities","ocaps","secure execution","third-party code","prototype pollution","supply-chain attack","plugin"],"author":"Agoric","license":"Apache-2.0","homepage":"https://github.com/Agoric/SES-shim/tree/master/packages/ses#readme","repository":{"type":"git","url":"git+https://github.com/endojs/endo.git","directory":"packages/ses"},"bugs":{"url":"https://github.com/endojs/endo/issues"},"type":"module","main":"./dist/ses.cjs","module":"./index.js","unpkg":"./dist/ses.umd.js","types":"./types.d.ts","exports":{".":{"import":{"types":"./types.d.ts","xs":"./src-xs/index.js","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./lockdown":{"import":{"types":"./types.d.ts","default":"./index.js"},"require":{"types":"./dist/types.d.cts","default":"./dist/ses.cjs"}},"./hermes":{"require":{"types":"./dist/types.d.cts","default":"./dist/ses-hermes.cjs"}},"./tools.js":"./tools.js","./assert-shim.js":"./assert-shim.js","./lockdown-shim.js":{"xs":"./src-xs/lockdown-shim.js","default":"./lockdown-shim.js"},"./compartment-shim.js":{"xs":"./src-xs/compartment-shim.js","default":"./compartment-shim.js"},"./console-shim.js":"./console-shim.js","./package.json":"./package.json"},"scripts":{"build:vanilla":"node scripts/bundle.js","build:hermes":"node scripts/bundle.js hermes","build":"yarn build:vanilla && yarn build:hermes","clean":"rm -rf dist","cover":"c8 ava","demo":"python3 -m http.server","lint":"yarn lint:types && yarn lint:eslint","lint-fix":"eslint --fix .","lint:eslint":"eslint .","lint:types":"tsc","prepare":"npm run clean && npm run build","qt":"ava","test":"tsd && ava","test:hermes":"./scripts/hermes-test.sh","test:xs":"xst dist/ses.umd.js test/_lockdown-safe.js && node scripts/generate-test-xs.js && xst tmp/test-xs.js && rm -rf tmp","postpack":"git clean -fX \"*.d.ts*\" \"*.d.cts*\" \"*.d.mts*\" \"*.tsbuildinfo\""},"dependencies":{"@endo/cache-map":"^1.1.0","@endo/env-options":"^1.1.11","@endo/immutable-arraybuffer":"^1.1.2"},"devDependencies":{"@babel/generator":"^7.26.3","@babel/parser":"~7.26.2","@babel/traverse":"~7.25.9","@babel/types":"~7.26.0","@endo/compartment-mapper":"^1.6.3","@endo/module-source":"^1.3.3","@endo/test262-runner":"^0.1.48","@types/babel__traverse":"^7.20.5","ava":"^6.1.3","babel-eslint":"^10.1.0","c8":"^7.14.0","core-js":"^3.31.0","eslint":"^8.57.1","eslint-config-airbnb-base":"^15.0.0","eslint-config-prettier":"^9.1.0","eslint-plugin-eslint-comments":"^3.2.0","eslint-plugin-import":"^2.31.0","hermes-engine-cli":"^0.12.0","prettier":"^3.5.3","terser":"^5.16.6","tsd":"^0.31.2","typescript":"~5.8.3"},"files":["./*.d.ts","./*.js","./*.map","LICENSE*","SECURITY*","dist","lib","src","tools"],"publishConfig":{"access":"public"},"eslintConfig":{"extends":["plugin:@endo/ses"]},"ava":{"files":["test/**/*.test.*"],"timeout":"2m"},"typeCoverage":{"atLeast":81.17},"gitHead":"9815aea9541f241389d2135c6097a7442bdffa17","_lastModified":"2026-05-04T14:27:34.834Z"}

package/dist/node_modules/zod/package.json

@@ -1 +1 @@
-{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-05-03T23:59:03.568Z"}
+{"name":"zod","version":"4.3.5","type":"module","license":"MIT","author":"Colin McDonnell <zod@colinhacks.com>","description":"TypeScript-first schema declaration and validation library with static type inference","homepage":"https://zod.dev","llms":"https://zod.dev/llms.txt","llmsFull":"https://zod.dev/llms-full.txt","mcpServer":"https://mcp.inkeep.com/zod/mcp","funding":"https://github.com/sponsors/colinhacks","sideEffects":false,"files":["src","**/*.js","**/*.mjs","**/*.cjs","**/*.d.ts","**/*.d.mts","**/*.d.cts","**/package.json"],"keywords":["typescript","schema","validation","type","inference"],"main":"./index.cjs","types":"./index.d.cts","module":"./index.js","zshy":{"exports":{"./package.json":"./package.json",".":"./src/index.ts","./mini":"./src/mini/index.ts","./locales":"./src/locales/index.ts","./v3":"./src/v3/index.ts","./v4":"./src/v4/index.ts","./v4-mini":"./src/v4-mini/index.ts","./v4/mini":"./src/v4/mini/index.ts","./v4/core":"./src/v4/core/index.ts","./v4/locales":"./src/v4/locales/index.ts","./v4/locales/*":"./src/v4/locales/*"},"conditions":{"@zod/source":"src"}},"exports":{"./package.json":"./package.json",".":{"@zod/source":"./src/index.ts","types":"./index.d.cts","import":"./index.js","require":"./index.cjs"},"./mini":{"@zod/source":"./src/mini/index.ts","types":"./mini/index.d.cts","import":"./mini/index.js","require":"./mini/index.cjs"},"./locales":{"@zod/source":"./src/locales/index.ts","types":"./locales/index.d.cts","import":"./locales/index.js","require":"./locales/index.cjs"},"./v3":{"@zod/source":"./src/v3/index.ts","types":"./v3/index.d.cts","import":"./v3/index.js","require":"./v3/index.cjs"},"./v4":{"@zod/source":"./src/v4/index.ts","types":"./v4/index.d.cts","import":"./v4/index.js","require":"./v4/index.cjs"},"./v4-mini":{"@zod/source":"./src/v4-mini/index.ts","types":"./v4-mini/index.d.cts","import":"./v4-mini/index.js","require":"./v4-mini/index.cjs"},"./v4/mini":{"@zod/source":"./src/v4/mini/index.ts","types":"./v4/mini/index.d.cts","import":"./v4/mini/index.js","require":"./v4/mini/index.cjs"},"./v4/core":{"@zod/source":"./src/v4/core/index.ts","types":"./v4/core/index.d.cts","import":"./v4/core/index.js","require":"./v4/core/index.cjs"},"./v4/locales":{"@zod/source":"./src/v4/locales/index.ts","types":"./v4/locales/index.d.cts","import":"./v4/locales/index.js","require":"./v4/locales/index.cjs"},"./v4/locales/*":{"@zod/source":"./src/v4/locales/*","types":"./v4/locales/*","import":"./v4/locales/*","require":"./v4/locales/*"}},"repository":{"type":"git","url":"git+https://github.com/colinhacks/zod.git"},"bugs":{"url":"https://github.com/colinhacks/zod/issues"},"support":{"backing":{"npm-funding":true}},"scripts":{"clean":"git clean -xdf . -e node_modules","build":"zshy --project tsconfig.build.json","postbuild":"tsx ../../scripts/write-stub-package-jsons.ts && pnpm biome check --write .","test:watch":"pnpm vitest","test":"pnpm vitest run","prepublishOnly":"tsx ../../scripts/check-versions.ts"},"_lastModified":"2026-05-04T14:27:35.902Z"}

package/dist/server/flow-surfaces/blueprint/compile-blocks.js

@@ -47,6 +47,7 @@ var import_default_block_actions = require("../default-block-actions");
 var import_public_data_surface_default_filter = require("../public-data-surface-default-filter");
 var import_public_compatibility = require("../public-compatibility");
 var import_defaults = require("./defaults");
+var import_hidden_popup_contract = require("../hidden-popup-contract");
 var import_private_utils = require("./private-utils");
 var import_field_type_resolver = require("../field-type-resolver");
 const APPLY_BLUEPRINT_BLOCK_TYPE_ENUM = [
@@ -163,6 +164,24 @@ function assertNoBlockLevelLayout(input, context) {
     (0, import_errors.throwBadRequest)(`${context}.layout is not supported; layout is only allowed on tabs[] and popup`);
   }
 }
+function normalizeApplyBlueprintCalendarPopupSettings(settings, blockContext, defaultsMetadata) {
+  return (0, import_hidden_popup_contract.normalizeBlockHiddenPopupSettings)(
+    settings,
+    blockContext,
+    ["quickCreatePopup", "eventPopup"],
+    defaultsMetadata,
+    import_errors.throwBadRequest
+  );
+}
+function normalizeApplyBlueprintKanbanPopupSettings(settings, blockContext, defaultsMetadata) {
+  return (0, import_hidden_popup_contract.normalizeBlockHiddenPopupSettings)(
+    settings,
+    blockContext,
+    ["quickCreatePopup", "cardPopup"],
+    defaultsMetadata,
+    import_errors.throwBadRequest
+  );
+}
 function assertApplyBlueprintFieldsLayoutHost(block, context) {
   if (!Object.prototype.hasOwnProperty.call(block, "fieldsLayout")) {
     return;
@@ -1026,6 +1045,11 @@ function compileBlocks(input, scopePrefix, assets, context, defaults, requiredEx
       type: blockType,
       settings
     });
+    if (blockType === "calendar") {
+      settings = normalizeApplyBlueprintCalendarPopupSettings(settings, blockContext, popupDefaultsMetadata);
+    } else if (blockType === "kanban") {
+      settings = normalizeApplyBlueprintKanbanPopupSettings(settings, blockContext, popupDefaultsMetadata);
+    }
     const template = ensureOptionalTemplate(block.template, `${blockContext}.template`);
     const blockDefaultFilter = (0, import_public_data_surface_default_filter.normalizeFlowSurfacePublicBlockDefaultFilter)("applyBlueprint", block.defaultFilter, {
       blockType,

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

@@ -54,6 +54,7 @@ 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_hidden_popup_contract = require("./hidden-popup-contract");
 const JS_BLOCK_DEFAULT_CODE = [
   "// Welcome to the JS block",
   "ctx.render(`",
@@ -122,11 +123,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 +282,7 @@ function buildSyntheticRootPageTabModel(options) {
   };
 }
 function buildBlockTree(options) {
-  var _a, _b;
+  var _a, _b, _c, _d;
   const use = (0, import_catalog.resolveSupportedBlockCatalogItem)(
     {
       type: options.type,
@@ -365,10 +430,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 +472,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 +535,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 +559,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)();

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

@@ -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,

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/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;