Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-03-03 02:05:05 +00:00
commit 73ec41a414
2 changed files with 4 additions and 11 deletions

View File

@ -7,7 +7,6 @@
* For more information, please refer to: https://www.nocobase.com/agreement.
*/
import { ISchema } from '@formily/react';
import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
import { MapTypes } from '../constants';
import { generateNTemplate } from '../locale';
@ -53,11 +52,4 @@ export class CommonSchema extends CollectionFieldInterface {
enum: MapTypes,
},
};
schemaInitialize(schema: ISchema, { block }) {
if (block === 'Form') {
Object.assign(schema, {
'x-designer': 'Map.Designer',
});
}
}
}

View File

@ -13,9 +13,10 @@ import { MapBlockOptions } from './block';
import { mapActionInitializers, mapActionInitializers_deprecated } from './block/MapActionInitializers';
import { mapBlockSettings } from './block/MapBlock.Settings';
import { useMapBlockProps } from './block/MapBlockProvider';
// import { Configuration, Map } from './components';
import { lazy } from '@nocobase/client';
const { Configuration, Map } = lazy(() => import('./components'), 'Configuration', 'Map');
import { Configuration, Map } from './components';
// 懒加载会把 Map.Designer 的值变成 undefined进而导致地图字段不显示 settings
// const { Configuration, Map } = lazy(() => import('./components'), 'Configuration', 'Map');
import { fields } from './fields';
import { fieldSettingsComponentMap } from './fields/fieldSettingsComponentMap';