fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-08 06:59:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into develop

Browse Source
This commit is contained in:
nocobase[bot] 2025-02-26 04:35:45 +00:00
commit 84f4e6f309
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/core/client/src/schema-component/antd/record-picker/util.tsx
View File

@ -30,9 +30,15 @@ export const getDatePickerLabels = (props): string => {
return isArr(labels) ? labels.join('~') : labels; return isArr(labels) ? labels.join('~') : labels;
}; };
export const getLabelFormatValue = (labelUiSchema: ISchema, value: any, isTag = false, TitleRenderer?: any): any => { export const getLabelFormatValue = (
labelUiSchema: ISchema,
value: any,
isTag = false,
targetTitleCollectionField,
TitleRenderer?: any,
): any => {
if (TitleRenderer) { if (TitleRenderer) {
return <TitleRenderer value={value} />; return <TitleRenderer value={value} collectionField={targetTitleCollectionField} />;
} }
if (Array.isArray(labelUiSchema?.enum) && value) { if (Array.isArray(labelUiSchema?.enum) && value) {
const opt: any = labelUiSchema.enum.find((option: any) => option.value === value); const opt: any = labelUiSchema.enum.find((option: any) => option.value === value);

8
packages/plugins/@nocobase/plugin-calendar/src/client/calendar/Calendar.tsx
View File

@ -169,7 +169,13 @@ const useEvents = (
if (res) return out; if (res) return out;
const targetTitleCollectionField = fields.find((v) => v.name === fieldNames.title); const targetTitleCollectionField = fields.find((v) => v.name === fieldNames.title);
const targetTitle = plugin.getTitleFieldInterface(targetTitleCollectionField.interface); const targetTitle = plugin.getTitleFieldInterface(targetTitleCollectionField.interface);
const title = getLabelFormatValue(labelUiSchema, get(item, fieldNames.title), true, targetTitle?.TitleRenderer); const title = getLabelFormatValue(
labelUiSchema,
get(item, fieldNames.title),
true,
targetTitleCollectionField,
targetTitle?.TitleRenderer,
);
const event: Event = { const event: Event = {
id: get(item, fieldNames.id || 'id'), id: get(item, fieldNames.id || 'id'),