@nocobase/plugin-map 0.11.0-alpha.1 → 0.11.1-alpha.2

package/lib/client/block/MapBlockInitializer.js

@@ -53,11 +53,12 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 const MapBlockInitializer = props => {
   const insert = props.insert;
   const options = (0, _react2().useContext)(_react().SchemaOptionsContext);
-  console.log('🚀 ~ file: MapBlockInitializer.tsx:12 ~ MapBlockInitializer ~ options:', options);
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollectionFieldsOptions = _useCollectionManager.getCollectionFieldsOptions;
   const _useMapTranslation = (0, _locale.useMapTranslation)(),
     t = _useMapTranslation.t;
+  const _useGlobalTheme = (0, _client().useGlobalTheme)(),
+    theme = _useGlobalTheme.theme;
   return _react2().default.createElement(_client().DataBlockInitializer, _objectSpread(_objectSpread({}, props), {}, {
     componentType: 'Map',
     icon: _react2().default.createElement(_icons().TableOutlined, null),
@@ -67,7 +68,7 @@ const MapBlockInitializer = props => {
       }) {
         const mapFieldOptions = getCollectionFieldsOptions(item.name, ['point', 'lineString', 'polygon']);
         const markerFieldOptions = getCollectionFieldsOptions(item.name, 'string');
-        const values = yield (0, _antdV().FormDialog)(t('Create map block'), () => {
+        const values = yield (0, _client().FormDialog)(t('Create map block'), () => {
           var _mapFieldOptions$;
           return _react2().default.createElement(_client().SchemaComponentOptions, {
             scope: options.scope,
@@ -104,7 +105,7 @@ const MapBlockInitializer = props => {
               }
             }
           })));
-        }).open({
+        }, theme).open({
           initialValues: {}
         });
         insert((0, _utils.createMapBlockSchema)({

package/lib/client/components/AMap/Map.js

@@ -147,6 +147,8 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
   const _editor = (0, _react2().useRef)(null);
   const navigate = (0, _reactRouterDom().useNavigate)();
   const id = (0, _react2().useRef)(`nocobase-map-${type || ''}-${Date.now().toString(32)}`);
+  const _App$useApp = _antd().App.useApp(),
+    modal = _App$useApp.modal;
   const _useState5 = (0, _react2().useState)(_objectSpread({
       strokeWeight: 5,
       strokeColor: '#4e9bff',
@@ -250,7 +252,7 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
       }
       onChange === null || onChange === void 0 ? void 0 : onChange(null);
     };
-    _antd().Modal.confirm({
+    modal.confirm({
       title: t('Clear the canvas'),
       content: t('Are you sure to clear the canvas?'),
       okText: t('Confirm'),

package/lib/client/components/GoogleMaps/Map.js

@@ -142,6 +142,8 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     errMessage = _useState4[0],
     setErrMessage = _useState4[1];
   const api = (0, _client().useAPIClient)();
+  const _App$useApp = _antd().App.useApp(),
+    modal = _App$useApp.modal;
   const type = (0, _react2().useMemo)(() => {
     if (props.type) return props.type;
     const collectionField = getField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.name);
@@ -376,7 +378,7 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
       drawingManagerRef.current.setDrawingMode(drawingMode.current);
       onChange === null || onChange === void 0 ? void 0 : onChange(null);
     };
-    _antd().Modal.confirm({
+    modal.confirm({
       title: t('Clear the canvas'),
       content: t('Are you sure to clear the canvas?'),
       okText: t('Confirm'),

package/lib/client/hooks/useMapConfiguration.js

@@ -25,7 +25,6 @@ const getSSKey = type => {
 };
 exports.getSSKey = getSSKey;
 const useMapConfiguration = type => {
-  var _useRequest$data;
   // cache
   const config = (0, _react().useMemo)(() => {
     const d = sessionStorage.getItem(getSSKey(type));
@@ -34,20 +33,22 @@ const useMapConfiguration = type => {
     }
     return d;
   }, [type]);
+  const _useRequest = (0, _client().useRequest)({
+      resource: MapConfigurationResourceKey,
+      action: 'get',
+      params: {
+        type
+      }
+    }, {
+      onSuccess(data) {
+        sessionStorage.setItem(getSSKey(type), JSON.stringify(data === null || data === void 0 ? void 0 : data.data));
+      },
+      refreshOnWindowFocus: false,
+      refreshDeps: [],
+      manual: config ? true : false
+    }),
+    data = _useRequest.data;
   if (config) return config;
-  return (_useRequest$data = (0, _client().useRequest)({
-    resource: MapConfigurationResourceKey,
-    action: 'get',
-    params: {
-      type
-    }
-  }, {
-    onSuccess(data) {
-      sessionStorage.setItem(getSSKey(type), JSON.stringify(data === null || data === void 0 ? void 0 : data.data));
-    },
-    refreshOnWindowFocus: false,
-    refreshDeps: [],
-    manual: config ? true : false
-  }).data) === null || _useRequest$data === void 0 ? void 0 : _useRequest$data.data;
+  return data === null || data === void 0 ? void 0 : data.data;
 };
 exports.useMapConfiguration = useMapConfiguration;

package/lib/client/index.d.ts

@@ -1,5 +1,4 @@
 import { Plugin } from '@nocobase/client';
-import './locale';
 export declare class MapPlugin extends Plugin {
     load(): Promise<void>;
 }

package/lib/client/locale/index.js

@@ -21,13 +21,10 @@ function _reactI18next() {
   };
   return data;
 }
-var _enUS = _interopRequireDefault(require("./en-US"));
-var _zhCN = _interopRequireDefault(require("./zh-CN"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const NAMESPACE = 'map';
+// i18n.addResources('zh-CN', NAMESPACE, zhCN);
+// i18n.addResources('en-US', NAMESPACE, enUS);
 exports.NAMESPACE = NAMESPACE;
-_client().i18n.addResources('zh-CN', NAMESPACE, _zhCN.default);
-_client().i18n.addResources('en-US', NAMESPACE, _enUS.default);
 function lang(key) {
   return _client().i18n.t(key, {
     ns: NAMESPACE

package/lib/client/locale/zh-CN.d.ts

@@ -1,4 +1,5 @@
 declare const locale: {
+    Map: string;
     'Map-based geometry': string;
     'Map type': string;
     Point: string;
@@ -43,5 +44,6 @@ declare const locale: {
     'Map field': string;
     'Marker field': string;
     'Load google maps failed, Please check the Api key and refresh the page': string;
+    'Create map block': string;
 };
 export default locale;

package/lib/client/locale/zh-CN.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 const locale = {
+  Map: '地图',
   'Map-based geometry': '基于地图的几何图形',
   'Map type': '地图类型',
   Point: '点',
@@ -49,7 +50,8 @@ const locale = {
   'Edit description': '编辑描述',
   'Map field': '地图字段',
   'Marker field': '标记字段',
-  'Load google maps failed, Please check the Api key and refresh the page': '加载谷歌地图失败，请检查 Api key 并刷新页面'
+  'Load google maps failed, Please check the Api key and refresh the page': '加载谷歌地图失败，请检查 Api key 并刷新页面',
+  'Create map block': '创建地图区块'
 };
 var _default = locale;
 exports.default = _default;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Map",
   "displayName.zh-CN": "地图",
-  "version": "0.11.0-alpha.1",
+  "version": "0.11.1-alpha.2",
   "description": "Provide map fields and blocks",
   "description.zh-CN": "提供地图字段和区块",
   "license": "AGPL-3.0",
@@ -31,12 +31,12 @@
     "@formily/core": "2.2.26",
     "@formily/react": "2.2.26",
     "@formily/shared": "2.2.26",
-    "@nocobase/actions": "0.11.0-alpha.1",
-    "@nocobase/client": "0.11.0-alpha.1",
-    "@nocobase/database": "0.11.0-alpha.1",
-    "@nocobase/server": "0.11.0-alpha.1",
-    "@nocobase/test": "0.11.0-alpha.1",
-    "@nocobase/utils": "0.11.0-alpha.1",
+    "@nocobase/actions": "0.11.1-alpha.2",
+    "@nocobase/client": "0.11.1-alpha.2",
+    "@nocobase/database": "0.11.1-alpha.2",
+    "@nocobase/server": "0.11.1-alpha.2",
+    "@nocobase/test": "0.11.1-alpha.2",
+    "@nocobase/utils": "0.11.1-alpha.2",
     "@types/react": "^17.0.0",
     "@types/react-dom": "^17.0.0",
     "antd": "^5.6.4",
@@ -45,5 +45,5 @@
     "react-i18next": "^11.15.1",
     "react-router-dom": "^6.11.2"
   },
-  "gitHead": "7581b6d3a3a54f09f06a9effb7e3e65328281b2b"
+  "gitHead": "8482aa720ea1c3abbbb9fe1208e73778bd63f1cf"
 }

package/src/client/block/MapBlockInitializer.tsx

@@ -1,7 +1,14 @@
 import { TableOutlined } from '@ant-design/icons';
-import { FormDialog, FormLayout } from '@formily/antd-v5';
+import { FormLayout } from '@formily/antd-v5';
 import { SchemaOptionsContext } from '@formily/react';
-import { DataBlockInitializer, SchemaComponent, SchemaComponentOptions, useCollectionManager } from '@nocobase/client';
+import {
+  DataBlockInitializer,
+  FormDialog,
+  SchemaComponent,
+  SchemaComponentOptions,
+  useCollectionManager,
+  useGlobalTheme,
+} from '@nocobase/client';
 import React, { useContext } from 'react';
 import { useMapTranslation } from '../locale';
 import { createMapBlockSchema } from './utils';
@@ -9,9 +16,9 @@ import { createMapBlockSchema } from './utils';
 export const MapBlockInitializer = (props) => {
   const { insert } = props;
   const options = useContext(SchemaOptionsContext);
-  console.log('🚀 ~ file: MapBlockInitializer.tsx:12 ~ MapBlockInitializer ~ options:', options);
   const { getCollectionFieldsOptions } = useCollectionManager();
   const { t } = useMapTranslation();
+  const { theme } = useGlobalTheme();
 
   return (
     <DataBlockInitializer
@@ -21,48 +28,52 @@ export const MapBlockInitializer = (props) => {
       onCreateBlockSchema={async ({ item }) => {
         const mapFieldOptions = getCollectionFieldsOptions(item.name, ['point', 'lineString', 'polygon']);
         const markerFieldOptions = getCollectionFieldsOptions(item.name, 'string');
-        const values = await FormDialog(t('Create map block'), () => {
-          return (
-            <SchemaComponentOptions scope={options.scope} components={{ ...options.components }}>
-              <FormLayout layout={'vertical'}>
-                <SchemaComponent
-                  schema={{
-                    properties: {
-                      field: {
-                        title: t('Map field'),
-                        enum: mapFieldOptions,
-                        required: true,
-                        'x-component': 'Select',
-                        'x-decorator': 'FormItem',
-                        default: mapFieldOptions[0]?.value,
-                      },
-                      marker: {
-                        title: t('Marker field'),
-                        enum: markerFieldOptions,
-                        'x-component': 'Select',
-                        'x-decorator': 'FormItem',
-                        'x-reactions': (field) => {
-                          const value = field.form.values.field;
-                          console.log('🚀 ~ file: MapBlockInitializer.tsx:45 ~ values ~ value:', value);
-                          console.log(
-                            '🚀 ~ file: MapBlockInitializer.tsx:50 ~ values ~ mapFieldOptions:',
-                            mapFieldOptions,
-                          );
+        const values = await FormDialog(
+          t('Create map block'),
+          () => {
+            return (
+              <SchemaComponentOptions scope={options.scope} components={{ ...options.components }}>
+                <FormLayout layout={'vertical'}>
+                  <SchemaComponent
+                    schema={{
+                      properties: {
+                        field: {
+                          title: t('Map field'),
+                          enum: mapFieldOptions,
+                          required: true,
+                          'x-component': 'Select',
+                          'x-decorator': 'FormItem',
+                          default: mapFieldOptions[0]?.value,
+                        },
+                        marker: {
+                          title: t('Marker field'),
+                          enum: markerFieldOptions,
+                          'x-component': 'Select',
+                          'x-decorator': 'FormItem',
+                          'x-reactions': (field) => {
+                            const value = field.form.values.field;
+                            console.log('🚀 ~ file: MapBlockInitializer.tsx:45 ~ values ~ value:', value);
+                            console.log(
+                              '🚀 ~ file: MapBlockInitializer.tsx:50 ~ values ~ mapFieldOptions:',
+                              mapFieldOptions,
+                            );
 
-                          if (!value) {
-                            return;
-                          }
-                          const item = mapFieldOptions.find((item) => item.value === value).type;
-                          field.hidden = item !== 'point';
+                            if (!value) {
+                              return;
+                            }
+                            const item = mapFieldOptions.find((item) => item.value === value).type;
+                            field.hidden = item !== 'point';
+                          },
                         },
                       },
-                    },
-                  }}
-                />
-              </FormLayout>
-            </SchemaComponentOptions>
-          );
-        }).open({
+                    }}
+                  />
+                </FormLayout>
+              </SchemaComponentOptions>
+            );
+          },
+          theme,
+        ).open({
           initialValues: {},
         });
         insert(

package/src/client/components/AMap/Map.tsx

@@ -4,7 +4,7 @@ import { SyncOutlined } from '@ant-design/icons';
 import { useFieldSchema } from '@formily/react';
 import { css, useCollection } from '@nocobase/client';
 import { useMemoizedFn } from 'ahooks';
-import { Alert, Button, Modal, Spin } from 'antd';
+import { Alert, App, Button, Spin } from 'antd';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useMapConfiguration } from '../../hooks';
@@ -102,6 +102,7 @@ export const AMapComponent = React.forwardRef<AMapForwardedRefProps, AMapCompone
   const editor = useRef(null);
   const navigate = useNavigate();
   const id = useRef(`nocobase-map-${type || ''}-${Date.now().toString(32)}`);
+  const { modal } = App.useApp();
 
   const [commonOptions] = useState<AMap.PolylineOptions & AMap.PolygonOptions>({
     strokeWeight: 5,
@@ -210,7 +211,7 @@ export const AMapComponent = React.forwardRef<AMapForwardedRefProps, AMapCompone
       }
       onChange?.(null);
     };
-    Modal.confirm({
+    modal.confirm({
       title: t('Clear the canvas'),
       content: t('Are you sure to clear the canvas?'),
       okText: t('Confirm'),

package/src/client/components/GoogleMaps/Map.tsx

@@ -3,7 +3,7 @@ import { useFieldSchema } from '@formily/react';
 import { Loader } from '@googlemaps/js-api-loader';
 import { css, useAPIClient, useCollection } from '@nocobase/client';
 import { useMemoizedFn } from 'ahooks';
-import { Alert, Button, Modal, Spin } from 'antd';
+import { Alert, App, Button, Spin } from 'antd';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { defaultImage } from '../../constants';
@@ -88,6 +88,7 @@ export const GoogleMapsComponent = React.forwardRef<GoogleMapForwardedRefProps,
     const [needUpdateFlag, forceUpdate] = useState([]);
     const [errMessage, setErrMessage] = useState('');
     const api = useAPIClient();
+    const { modal } = App.useApp();
 
     const type = useMemo<MapEditorType>(() => {
       if (props.type) return props.type;
@@ -352,7 +353,7 @@ export const GoogleMapsComponent = React.forwardRef<GoogleMapForwardedRefProps,
         drawingManagerRef.current.setDrawingMode(drawingMode.current);
         onChange?.(null);
       };
-      Modal.confirm({
+      modal.confirm({
         title: t('Clear the canvas'),
         content: t('Are you sure to clear the canvas?'),
         okText: t('Confirm'),

package/src/client/hooks/useMapConfiguration.ts

@@ -16,9 +16,9 @@ export const useMapConfiguration = (type: string) => {
     return d;
   }, [type]);
 
-  if (config) return config;
-
-  return useRequest(
+  const { data } = useRequest<{
+    data: any;
+  }>(
     {
       resource: MapConfigurationResourceKey,
       action: 'get',
@@ -34,5 +34,9 @@ export const useMapConfiguration = (type: string) => {
       refreshDeps: [],
       manual: config ? true : false,
     },
-  ).data?.data;
+  );
+
+  if (config) return config;
+
+  return data?.data;
 };

package/src/client/index.tsx

@@ -10,7 +10,6 @@ import { MapBlockOptions } from './block';
 import { Configuration, Map } from './components';
 import { interfaces } from './fields';
 import { MapInitializer } from './initialize';
-import './locale';
 import { useMapTranslation } from './locale';
 
 const MapProvider = React.memo((props) => {

package/src/client/locale/index.ts

@@ -1,12 +1,10 @@
 import { i18n } from '@nocobase/client';
 import { useTranslation } from 'react-i18next';
-import enUS from './en-US';
-import zhCN from './zh-CN';
 
 export const NAMESPACE = 'map';
 
-i18n.addResources('zh-CN', NAMESPACE, zhCN);
-i18n.addResources('en-US', NAMESPACE, enUS);
+// i18n.addResources('zh-CN', NAMESPACE, zhCN);
+// i18n.addResources('en-US', NAMESPACE, enUS);
 
 export function lang(key: string) {
   return i18n.t(key, { ns: NAMESPACE });

package/src/client/locale/zh-CN.ts

@@ -1,4 +1,5 @@
 const locale = {
+  Map: '地图',
   'Map-based geometry': '基于地图的几何图形',
   'Map type': '地图类型',
   Point: '点',
@@ -45,6 +46,7 @@ const locale = {
   'Marker field': '标记字段',
   'Load google maps failed, Please check the Api key and refresh the page':
     '加载谷歌地图失败，请检查 Api key 并刷新页面',
+  'Create map block': '创建地图区块',
 };
 
 export default locale;