@nocobase/plugin-flow-engine 2.1.0-beta.23 → 2.1.0-beta.25

package/dist/server/flow-surfaces/field-type-resolver.js

@@ -93,6 +93,7 @@ const FIELD_USE_TO_PUBLIC_FIELD_TYPE = {
   PopupSubTableFieldModel: "popupSubTable"
 };
 const FIELD_TYPES_WITH_FIELDS = /* @__PURE__ */ new Set([
+  "picker",
   "subForm",
   "subFormList",
   "subDetails",
@@ -100,7 +101,6 @@ const FIELD_TYPES_WITH_FIELDS = /* @__PURE__ */ new Set([
   "subTable",
   "popupSubTable"
 ]);
-const FIELD_TYPES_WITH_SELECTOR_FIELDS = /* @__PURE__ */ new Set(["picker"]);
 const FIELD_TYPES_WITH_TABLE_PROPS = /* @__PURE__ */ new Set(["subTable", "popupSubTable"]);
 function assertNoInternalFieldKeys(input, context) {
   if (!import_lodash.default.isPlainObject(input)) {
@@ -250,16 +250,9 @@ function resolveRelationFieldType(input) {
       break;
   }
   const explicitFields = normalizePublicFieldNameList(input.fields, `${input.context}.fields`);
-  const explicitSelectorFields = normalizePublicFieldNameList(input.selectorFields, `${input.context}.selectorFields`);
-  if (explicitFields && explicitSelectorFields) {
-    (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} cannot mix fields and selectorFields on the same field`);
-  }
   if (explicitFields && !FIELD_TYPES_WITH_FIELDS.has(fieldType)) {
     (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support fields`);
   }
-  if (explicitSelectorFields && !FIELD_TYPES_WITH_SELECTOR_FIELDS.has(fieldType)) {
-    (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support selectorFields`);
-  }
   if ((!import_lodash.default.isUndefined(input.openMode) || !import_lodash.default.isUndefined(input.popupSize)) && fieldType !== "picker") {
     (0, import_errors.throwBadRequest)(`flowSurfaces ${input.context} fieldType '${fieldType}' does not support openMode or popupSize`);
   }
@@ -268,15 +261,12 @@ function resolveRelationFieldType(input) {
   }
   const shouldApplyDefaults = input.applyDefaults !== false;
   const defaultTargetField = shouldApplyDefaults ? pickCollectionFallbackFieldName(targetCollection) : void 0;
-  const fields = explicitFields ?? (shouldApplyDefaults && usesNestedRelationFields(fieldUse) ? [defaultTargetField] : void 0);
-  const selectorFields = explicitSelectorFields ?? (shouldApplyDefaults && fieldType === "picker" && import_lodash.default.isUndefined(input.selectorFields) ? [defaultTargetField] : void 0);
+  const fields = explicitFields ?? (shouldApplyDefaults && (usesNestedRelationFields(fieldUse) || fieldType === "picker") ? [defaultTargetField] : void 0);
+  const selectorFields = ["picker", "popupSubTable"].includes(fieldType) ? fields : void 0;
   const titleField = import_lodash.default.isUndefined(input.titleField) ? defaultTargetField : String(input.titleField || "").trim() || void 0;
   if (fields == null ? void 0 : fields.length) {
     assertTargetFieldNamesExist(targetCollection, fields, `${input.context}.fields`);
   }
-  if (selectorFields == null ? void 0 : selectorFields.length) {
-    assertTargetFieldNamesExist(targetCollection, selectorFields, `${input.context}.selectorFields`);
-  }
   if (titleField && !(0, import_service_helpers.resolveFieldFromCollection)(targetCollection, titleField)) {
     (0, import_errors.throwBadRequest)(
       `flowSurfaces ${input.context}.titleField '${titleField}' does not exist on relation target collection`

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;