@nocobase/client-v2 2.1.5 → 2.1.7

package/src/flow/models/fields/__tests__/DisplayDateTimeFieldModel.test.tsx

@@ -0,0 +1,96 @@
+/**
+ * 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 { FlowEngine } from '@nocobase/flow-engine';
+import { render, screen } from '@testing-library/react';
+import { describe, expect, it } from 'vitest';
+import { DisplayDateTimeFieldModel } from '../DisplayDateTimeFieldModel';
+
+describe('DisplayDateTimeFieldModel', () => {
+  it('uses dateFormat, showTime, and timeFormat when rendering read pretty datetime text', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayDateTimeFieldModel });
+
+    const model = engine.createModel<DisplayDateTimeFieldModel>({
+      use: DisplayDateTimeFieldModel,
+      uid: 'display-datetime-field-format',
+      props: {
+        value: '2026-06-15 13:05:06',
+        dateFormat: 'YYYY-MM-DD',
+        showTime: true,
+        timeFormat: 'HH:mm:ss',
+      },
+    });
+
+    render(model.render());
+
+    expect(screen.getByText('2026-06-15 13:05:06')).toBeInTheDocument();
+  });
+
+  it('does not reuse a time-only format when rendering datetime text', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayDateTimeFieldModel });
+
+    const model = engine.createModel<DisplayDateTimeFieldModel>({
+      use: DisplayDateTimeFieldModel,
+      uid: 'display-datetime-field-stale-time-format',
+      props: {
+        value: '2026-06-15 13:05:06',
+        format: 'HH:mm:ss',
+        showTime: true,
+        timeFormat: 'HH:mm:ss',
+      },
+    });
+
+    render(model.render());
+
+    expect(screen.getByText('2026-06-15 13:05:06')).toBeInTheDocument();
+    expect(screen.queryByText('13:05:06')).not.toBeInTheDocument();
+  });
+
+  it('keeps an existing complete datetime format when no split format props are configured', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayDateTimeFieldModel });
+
+    const model = engine.createModel<DisplayDateTimeFieldModel>({
+      use: DisplayDateTimeFieldModel,
+      uid: 'display-datetime-field-complete-format',
+      props: {
+        value: '2026-06-15 13:05:06',
+        format: 'YYYY/MM/DD HH:mm:ss',
+      },
+    });
+
+    render(model.render());
+
+    expect(screen.getByText('2026/06/15 13:05:06')).toBeInTheDocument();
+  });
+
+  it('renders only the date for date-only fields even when a datetime format remains', () => {
+    const engine = new FlowEngine();
+    engine.registerModels({ DisplayDateTimeFieldModel });
+
+    const model = engine.createModel<DisplayDateTimeFieldModel>({
+      use: DisplayDateTimeFieldModel,
+      uid: 'display-datetime-field-date-only',
+      props: {
+        value: '2026-06-15 13:05:06',
+        dateOnly: true,
+        format: 'YYYY-MM-DD HH:mm:ss',
+        showTime: false,
+        timeFormat: 'HH:mm:ss',
+      },
+    });
+
+    render(model.render());
+
+    expect(screen.getByText('2026-06-15')).toBeInTheDocument();
+    expect(screen.queryByText('2026-06-15 13:05:06')).not.toBeInTheDocument();
+  });
+});

package/src/flow/models/fields/__tests__/SelectFieldModel.test.tsx

@@ -0,0 +1,43 @@
+/**
+ * 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 React from 'react';
+import { describe, expect, it } from 'vitest';
+import { SelectFieldModel } from '../SelectFieldModel';
+
+function mockT(text: string) {
+  if (text === '{{t("Yes")}}') return '是';
+  if (text === '{{t("No")}}') return '否';
+  return text;
+}
+
+describe('SelectFieldModel', () => {
+  it('translates enum fallback labels for selected values', () => {
+    const model = {
+      props: {
+        value: true,
+      },
+      context: {
+        collectionField: {
+          uiSchema: {
+            enum: [
+              { label: '{{t("Yes")}}', value: true },
+              { label: '{{t("No")}}', value: false },
+            ],
+          },
+        },
+      },
+      translate: mockT,
+    } as unknown as SelectFieldModel;
+
+    const element = SelectFieldModel.prototype.render.call(model) as React.ReactElement;
+
+    expect(element.props.value).toEqual({ label: '是', value: true });
+  });
+});

package/src/flow/utils/__tests__/dateTimeFormat.test.ts

@@ -48,6 +48,264 @@ describe('dateTimeFormat', () => {
     });
   });
 
+  it('uses the association title field when deciding the format schema', () => {
+    const ctx = {
+      model: {
+        props: {
+          titleField: 'shipmentsTime',
+        },
+        context: {
+          collectionField: {
+            type: 'belongsTo',
+            targetCollection: {
+              getField: (name) =>
+                name === 'shipmentsTime'
+                  ? {
+                      type: 'time',
+                      interface: 'time',
+                    }
+                  : null,
+            },
+          },
+        },
+      },
+    };
+
+    expect(Object.keys(dateTimeFormat.uiSchema(ctx))).toEqual(['timeFormat']);
+  });
+
+  it('saves association title time field format as a time format', () => {
+    const setProps = vi.fn();
+    const ctx = {
+      model: {
+        props: {
+          titleField: 'shipmentsTime',
+        },
+        context: {
+          collectionField: {
+            type: 'belongsTo',
+            targetCollection: {
+              getField: (name) =>
+                name === 'shipmentsTime'
+                  ? {
+                      type: 'time',
+                      interface: 'time',
+                    }
+                  : null,
+            },
+          },
+        },
+        setProps,
+      },
+    };
+
+    dateTimeFormat.handler(ctx, { timeFormat: 'hh:mm:ss a' });
+
+    expect(setProps).toHaveBeenCalledWith({
+      timeFormat: 'hh:mm:ss a',
+      format: 'hh:mm:ss a',
+    });
+  });
+
+  it('applies and persists date time format params when settings are saved', async () => {
+    const setProps = vi.fn();
+    const save = vi.fn();
+    const ctx = {
+      model: {
+        props: {
+          titleField: 'shipmentsDatetime',
+        },
+        context: {
+          collectionField: {
+            type: 'belongsTo',
+            targetCollection: {
+              getField: (name) =>
+                name === 'shipmentsDatetime'
+                  ? {
+                      type: 'datetime',
+                      interface: 'datetime',
+                    }
+                  : null,
+            },
+          },
+        },
+        setProps,
+        save,
+      },
+    };
+
+    await dateTimeFormat.beforeParamsSave(ctx, {
+      picker: 'date',
+      dateFormat: 'YYYY-MM-DD',
+      showTime: true,
+      timeFormat: 'hh:mm:ss a',
+    });
+
+    expect(setProps).toHaveBeenCalledWith({
+      picker: 'date',
+      dateFormat: 'YYYY-MM-DD',
+      showTime: true,
+      timeFormat: 'hh:mm:ss a',
+      format: 'YYYY-MM-DD hh:mm:ss a',
+    });
+    expect(save).toHaveBeenCalled();
+  });
+
+  it('syncs table association column props when title date time format settings are saved', async () => {
+    const setProps = vi.fn();
+    const save = vi.fn();
+    const setParentProps = vi.fn();
+    const model = {
+      props: {
+        titleField: 'shipmentsDatetime',
+      },
+      context: {
+        collectionField: {
+          type: 'belongsTo',
+          targetCollection: {
+            getField: (name) =>
+              name === 'shipmentsDatetime'
+                ? {
+                    type: 'datetime',
+                    interface: 'datetime',
+                  }
+                : null,
+          },
+        },
+      },
+      setProps,
+      save,
+      parent: {
+        use: 'TableColumnModel',
+        collectionField: {
+          isAssociationField: () => true,
+        },
+        setProps: setParentProps,
+      },
+    };
+    model.parent['subModels'] = {
+      field: model,
+    };
+
+    await dateTimeFormat.beforeParamsSave(
+      { model },
+      {
+        picker: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        showTime: true,
+        timeFormat: 'hh:mm:ss a',
+      },
+    );
+
+    expect(setParentProps).toHaveBeenCalledWith({
+      picker: 'date',
+      dateFormat: 'YYYY-MM-DD',
+      showTime: true,
+      timeFormat: 'hh:mm:ss a',
+      format: 'YYYY-MM-DD hh:mm:ss a',
+    });
+    expect(save).toHaveBeenCalled();
+  });
+
+  it('hides time format for association title date-only fields', () => {
+    const ctx = {
+      model: {
+        props: {
+          titleField: 'shipmentsDateOnly',
+          showTime: true,
+        },
+        context: {
+          collectionField: {
+            type: 'belongsTo',
+            targetCollection: {
+              getField: (name) =>
+                name === 'shipmentsDateOnly'
+                  ? {
+                      type: 'dateOnly',
+                      interface: 'date',
+                      getComponentProps: () => ({
+                        dateOnly: true,
+                        showTime: false,
+                      }),
+                    }
+                  : null,
+            },
+          },
+        },
+      },
+    };
+    const schema = dateTimeFormat.uiSchema(ctx);
+    const timeFormatField: any = schema.timeFormat;
+    const showTimeField: any = schema.showTime;
+    const timeFormatState = {
+      hidden: false,
+      form: {
+        values: {
+          picker: 'date',
+          showTime: true,
+        },
+      },
+    };
+    const showTimeState = {
+      hidden: false,
+      value: true,
+      form: {
+        values: {
+          picker: 'date',
+        },
+      },
+    };
+
+    timeFormatField['x-reactions'][0](timeFormatState);
+    showTimeField['x-reactions'][1](showTimeState);
+
+    expect(timeFormatState.hidden).toBe(true);
+    expect(showTimeState.hidden).toBe(true);
+    expect(showTimeState.value).toBe(false);
+    expect(dateTimeFormat.defaultParams(ctx)).toMatchObject({
+      showTime: false,
+    });
+  });
+
+  it('saves association title date-only field format without time even when params contain showTime', () => {
+    const setProps = vi.fn();
+    const ctx = {
+      model: {
+        props: {
+          titleField: 'shipmentsDateOnly',
+        },
+        context: {
+          collectionField: {
+            type: 'belongsTo',
+            targetCollection: {
+              getField: (name) =>
+                name === 'shipmentsDateOnly'
+                  ? {
+                      type: 'dateOnly',
+                      interface: 'date',
+                    }
+                  : null,
+            },
+          },
+        },
+        setProps,
+      },
+    };
+
+    dateTimeFormat.handler(ctx, {
+      dateFormat: 'YYYY-MM-DD',
+      showTime: true,
+      timeFormat: 'HH:mm:ss',
+    });
+
+    expect(setProps).toHaveBeenCalledWith({
+      dateFormat: 'YYYY-MM-DD',
+      showTime: false,
+      timeFormat: 'HH:mm:ss',
+      format: 'YYYY-MM-DD',
+    });
+  });
+
   it('uses format as the default time format when timeFormat is missing', () => {
     const ctx = {
       model: {

package/src/flow/utils/dateTimeDisplayProps.ts

@@ -0,0 +1,135 @@
+/**
+ * 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 type { FlowModelContext } from '@nocobase/flow-engine';
+
+type DateTimeDisplayProps = {
+  dateOnly?: boolean;
+  dateFormat?: string;
+  format?: string;
+  picker?: string;
+  showTime?: boolean;
+  timeFormat?: string;
+};
+
+type DateTimeCollectionField = {
+  type?: string;
+  interface?: string;
+  getComponentProps?: () => DateTimeDisplayProps;
+  targetCollection?: {
+    getField?: (name?: string) => DateTimeCollectionField | undefined;
+  };
+};
+
+type DateTimeModelContext = FlowModelContext & {
+  collectionField?: DateTimeCollectionField;
+};
+
+type DateTimeModel = {
+  props?: DateTimeDisplayProps & {
+    titleField?: string;
+  };
+  context?: DateTimeModelContext;
+  getStepParams?: (flowKey: string, stepKey: string) => DateTimeDisplayProps | undefined;
+};
+
+type ResolveDateTimeDisplayPropsOptions = {
+  model?: DateTimeModel;
+  collectionField?: DateTimeCollectionField;
+  titleField?: string;
+  currentProps?: DateTimeDisplayProps;
+  params?: DateTimeDisplayProps;
+  withDefaults?: boolean;
+};
+
+const dateTimeDisplayPropKeys: Array<keyof DateTimeDisplayProps> = [
+  'dateOnly',
+  'dateFormat',
+  'format',
+  'picker',
+  'showTime',
+  'timeFormat',
+];
+
+const pickDateTimeDisplayProps = (source?: DateTimeDisplayProps) => {
+  if (!source) {
+    return {};
+  }
+
+  const result: DateTimeDisplayProps = {};
+  for (const key of dateTimeDisplayPropKeys) {
+    if (key === 'dateOnly' || key === 'showTime') {
+      if (typeof source[key] !== 'undefined') {
+        result[key] = source[key];
+      }
+    } else if (typeof source[key] !== 'undefined') {
+      result[key] = source[key];
+    }
+  }
+  return result;
+};
+
+const stripUndefined = (props: DateTimeDisplayProps) =>
+  Object.fromEntries(Object.entries(props).filter(([, value]) => typeof value !== 'undefined')) as DateTimeDisplayProps;
+
+const getModelCollectionField = (model?: DateTimeModel) => model?.context?.collectionField;
+
+export const getDateTimeFormatCollectionField = (options: ResolveDateTimeDisplayPropsOptions) => {
+  const collectionField = options.collectionField || getModelCollectionField(options.model);
+  const titleField = options.titleField || options.model?.props?.titleField;
+  return collectionField?.targetCollection?.getField?.(titleField) || collectionField;
+};
+
+export const isTimeCollectionField = (collectionField?: DateTimeCollectionField) =>
+  collectionField?.type === 'time' || collectionField?.interface === 'time';
+
+export const isDateOnlyCollectionField = (collectionField?: DateTimeCollectionField) =>
+  collectionField?.type === 'dateOnly' || collectionField?.interface === 'dateOnly';
+
+export const getSavedDateTimeFormatParams = (model?: DateTimeModel) =>
+  model?.getStepParams?.('datetimeSettings', 'dateFormat') || model?.getStepParams?.('timeSettings', 'dateFormat');
+
+export const resolveDateTimeDisplayProps = (options: ResolveDateTimeDisplayPropsOptions) => {
+  const collectionField = options.collectionField || getModelCollectionField(options.model);
+  const targetCollectionField = getDateTimeFormatCollectionField(options);
+  const mergedProps = {
+    ...pickDateTimeDisplayProps(collectionField?.getComponentProps?.()),
+    ...pickDateTimeDisplayProps(
+      targetCollectionField !== collectionField ? targetCollectionField?.getComponentProps?.() : undefined,
+    ),
+    ...pickDateTimeDisplayProps(options.currentProps || options.model?.props),
+    ...pickDateTimeDisplayProps(getSavedDateTimeFormatParams(options.model)),
+    ...pickDateTimeDisplayProps(options.params),
+  };
+
+  if (isTimeCollectionField(targetCollectionField)) {
+    const timeFormat = mergedProps.timeFormat || mergedProps.format || 'HH:mm:ss';
+    return stripUndefined({
+      ...mergedProps,
+      timeFormat,
+      format: timeFormat,
+    });
+  }
+
+  const picker = mergedProps.picker || (options.withDefaults ? 'date' : undefined);
+  const dateFormat = mergedProps.dateFormat || (options.withDefaults ? 'YYYY-MM-DD' : undefined);
+  const timeFormat = mergedProps.timeFormat || (options.withDefaults ? 'HH:mm:ss' : undefined);
+  const showTime = isDateOnlyCollectionField(targetCollectionField) ? false : mergedProps.showTime;
+  const finalDateFormat = dateFormat || 'YYYY-MM-DD';
+  const finalTimeFormat = timeFormat || 'HH:mm:ss';
+
+  return stripUndefined({
+    ...mergedProps,
+    picker,
+    dateFormat,
+    timeFormat,
+    showTime,
+    format: showTime ? `${finalDateFormat} ${finalTimeFormat}` : finalDateFormat,
+  });
+};

package/src/settings-center/plugin-manager/index.tsx

@@ -86,6 +86,9 @@ export const PluginManagerPage: React.FC = () => {
     async () => {
       const response = await app.apiClient.request({
         url: 'pm:list',
+        params: {
+          v2: true,
+        },
         skipNotify: true,
       });
       return Array.isArray(response?.data?.data) ? response.data.data : [];