diff --git a/packages/core/client/src/schema-component/antd/record-picker/util.ts b/packages/core/client/src/schema-component/antd/record-picker/util.ts index e516483ca..506cf476a 100644 --- a/packages/core/client/src/schema-component/antd/record-picker/util.ts +++ b/packages/core/client/src/schema-component/antd/record-picker/util.ts @@ -21,6 +21,10 @@ export const getDatePickerLabels = (props): string => { }; export const getLabelFormatValue = (labelUiSchema: ISchema, value: any): string => { + if (Array.isArray(labelUiSchema?.enum) && value) { + const opt: any = labelUiSchema.enum.find((option: any) => option.value === value); + return opt?.label; + } switch (labelUiSchema?.['x-component']) { case 'DatePicker': return getDatePickerLabels({ ...labelUiSchema?.['x-component-props'], value }); diff --git a/packages/plugins/formula-field/src/server/migrations/20230213161904-alter-field.ts b/packages/plugins/formula-field/src/server/migrations/20230213161904-alter-field.ts index 621f9352a..0dc3889fb 100644 --- a/packages/plugins/formula-field/src/server/migrations/20230213161904-alter-field.ts +++ b/packages/plugins/formula-field/src/server/migrations/20230213161904-alter-field.ts @@ -32,8 +32,9 @@ export default class extends Migration { const repository = db.getRepository('applicationPlugins'); await repository.destroy({ filter: { - 'name.$in': ['math-formula-field', 'excel-formula-field'], + name: ['math-formula-field', 'excel-formula-field'], }, + transaction, }); }); }