mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-08 06:59:26 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
73ec41a414
@ -7,7 +7,6 @@
|
|||||||
* For more information, please refer to: https://www.nocobase.com/agreement.
|
* For more information, please refer to: https://www.nocobase.com/agreement.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { ISchema } from '@formily/react';
|
|
||||||
import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
|
import { CollectionFieldInterface, interfacesProperties } from '@nocobase/client';
|
||||||
import { MapTypes } from '../constants';
|
import { MapTypes } from '../constants';
|
||||||
import { generateNTemplate } from '../locale';
|
import { generateNTemplate } from '../locale';
|
||||||
@ -53,11 +52,4 @@ export class CommonSchema extends CollectionFieldInterface {
|
|||||||
enum: MapTypes,
|
enum: MapTypes,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
schemaInitialize(schema: ISchema, { block }) {
|
|
||||||
if (block === 'Form') {
|
|
||||||
Object.assign(schema, {
|
|
||||||
'x-designer': 'Map.Designer',
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -13,9 +13,10 @@ import { MapBlockOptions } from './block';
|
|||||||
import { mapActionInitializers, mapActionInitializers_deprecated } from './block/MapActionInitializers';
|
import { mapActionInitializers, mapActionInitializers_deprecated } from './block/MapActionInitializers';
|
||||||
import { mapBlockSettings } from './block/MapBlock.Settings';
|
import { mapBlockSettings } from './block/MapBlock.Settings';
|
||||||
import { useMapBlockProps } from './block/MapBlockProvider';
|
import { useMapBlockProps } from './block/MapBlockProvider';
|
||||||
// import { Configuration, Map } from './components';
|
import { Configuration, Map } from './components';
|
||||||
import { lazy } from '@nocobase/client';
|
|
||||||
const { Configuration, Map } = lazy(() => import('./components'), 'Configuration', 'Map');
|
// 懒加载会把 Map.Designer 的值变成 undefined,进而导致地图字段不显示 settings
|
||||||
|
// const { Configuration, Map } = lazy(() => import('./components'), 'Configuration', 'Map');
|
||||||
|
|
||||||
import { fields } from './fields';
|
import { fields } from './fields';
|
||||||
import { fieldSettingsComponentMap } from './fields/fieldSettingsComponentMap';
|
import { fieldSettingsComponentMap } from './fields/fieldSettingsComponentMap';
|
||||||
|
Loading…
x
Reference in New Issue
Block a user