@nocobase/plugin-map 0.10.1-alpha.1 → 0.11.0-alpha.1

package/client.d.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck
-export * from './lib/client';
-export { default } from './lib/client';
+export * from './src/client';
+export { default } from './src/client';
 

package/client.js

@@ -1,30 +1 @@
-"use strict";
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var _index = _interopRequireWildcard(require("./lib/client"));
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {};
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _index.default;
-  }
-});
-
-Object.keys(_index).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _index[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _index[key];
-    }
-  });
-});
+module.exports = require('./lib/client/index.js');

package/lib/client/block/MapBlockDesigner.js

@@ -18,9 +18,9 @@ function _client() {
   };
   return data;
 }
-function _set() {
-  const data = _interopRequireDefault(require("lodash/set"));
-  _set = function _set() {
+function _client2() {
+  const data = require("@nocobase/utils/client");
+  _client2 = function _client2() {
     return data;
   };
   return data;
@@ -132,7 +132,7 @@ const MapBlockDesigner = () => {
     onSubmit: ({
       zoom
     }) => {
-      (0, _set().default)(fieldSchema, 'x-component-props.zoom', zoom);
+      _client2().lodash.set(fieldSchema, 'x-component-props.zoom', zoom);
       Object.assign(field.componentProps, fieldSchema['x-component-props']);
       dn.emit('patch', {
         schema: {

package/lib/client/block/MapBlockInitializer.js

@@ -11,9 +11,9 @@ function _icons() {
   };
   return data;
 }
-function _antd() {
-  const data = require("@formily/antd");
-  _antd = function _antd() {
+function _antdV() {
+  const data = require("@formily/antd-v5");
+  _antdV = function _antdV() {
     return data;
   };
   return data;
@@ -67,12 +67,12 @@ const MapBlockInitializer = props => {
       }) {
         const mapFieldOptions = getCollectionFieldsOptions(item.name, ['point', 'lineString', 'polygon']);
         const markerFieldOptions = getCollectionFieldsOptions(item.name, 'string');
-        const values = yield (0, _antd().FormDialog)(t('Create map block'), () => {
+        const values = yield (0, _antdV().FormDialog)(t('Create map block'), () => {
           var _mapFieldOptions$;
           return _react2().default.createElement(_client().SchemaComponentOptions, {
             scope: options.scope,
             components: _objectSpread({}, options.components)
-          }, _react2().default.createElement(_antd().FormLayout, {
+          }, _react2().default.createElement(_antdV().FormLayout, {
             layout: 'vertical'
           }, _react2().default.createElement(_client().SchemaComponent, {
             schema: {

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

@@ -11,13 +11,6 @@ function _icons() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _react() {
   const data = require("@formily/react");
   _react = function _react() {
@@ -190,7 +183,7 @@ const AMapBlock = props => {
         label: {
           direction: 'bottom',
           offset: [0, 5],
-          content: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.marker) ? compile(item[fieldNames.marker]) : undefined
+          content: fieldNames !== null && fieldNames !== void 0 && fieldNames.marker ? compile(item[fieldNames.marker]) : undefined
         },
         extData: {
           id: item[getPrimaryKey()]
@@ -252,15 +245,15 @@ const AMapBlock = props => {
   }, [dataSource]);
   const mapRefCallback = instance => {
     mapRef.current = instance;
-    setIsMapInitialization(!!(instance === null || instance === void 0 ? void 0 : instance.map) && !instance.errMessage);
+    setIsMapInitialization(!!(instance !== null && instance !== void 0 && instance.map) && !instance.errMessage);
   };
   return _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         position: relative;
         height: 100%;
       `
   }, _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           position: absolute;
           left: 10px;
           top: 10px;

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

@@ -19,13 +19,6 @@ function _icons() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _react() {
   const data = require("@formily/react");
   _react = function _react() {
@@ -61,9 +54,9 @@ function _react2() {
   };
   return data;
 }
-function _reactRouter() {
-  const data = require("react-router");
-  _reactRouter = function _reactRouter() {
+function _reactRouterDom() {
+  const data = require("react-router-dom");
+  _reactRouterDom = function _reactRouterDom() {
     return data;
   };
   return data;
@@ -152,7 +145,7 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
   }, [props === null || props === void 0 ? void 0 : props.type, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.name]);
   const overlay = (0, _react2().useRef)();
   const _editor = (0, _react2().useRef)(null);
-  const navigate = (0, _reactRouter().useNavigate)();
+  const navigate = (0, _reactRouterDom().useNavigate)();
   const id = (0, _react2().useRef)(`nocobase-map-${type || ''}-${Date.now().toString(32)}`);
   const _useState5 = (0, _react2().useState)(_objectSpread({
       strokeWeight: 5,
@@ -226,7 +219,7 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
   });
   const executeMouseTool = (0, _ahooks().useMemoizedFn)((curType = type) => {
     var _editor$current;
-    if (!_mouseTool.current || ((_editor$current = _editor.current) === null || _editor$current === void 0 ? void 0 : _editor$current.getTarget())) return;
+    if (!_mouseTool.current || (_editor$current = _editor.current) !== null && _editor$current !== void 0 && _editor$current.getTarget()) return;
     const mapping = methodMapping[curType];
     if (!mapping) {
       return;
@@ -401,14 +394,14 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
     });
   }
   return _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         position: relative;
         height: 500px;
       `,
     id: id.current,
     style: props === null || props === void 0 ? void 0 : props.style
   }, !aMap.current && _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
             position: absolute;
             inset: 0;
             display: flex;
@@ -419,7 +412,7 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
     toCenter: toCenter,
     aMap: aMap.current
   }), _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
               position: absolute;
               bottom: 80px;
               right: 20px;
@@ -433,7 +426,7 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
     size: "large",
     icon: _react2().default.createElement(_icons().SyncOutlined, null)
   })), type !== 'point' ? _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
                 position: absolute;
                 bottom: 20px;
                 left: 10px;
@@ -444,7 +437,7 @@ const AMapComponent = _react2().default.forwardRef((props, ref) => {
     message: t('Click to select the starting point and double-click to end the drawing'),
     type: "info"
   })) : null, _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
               position: absolute;
               bottom: 20px;
               right: 20px;

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

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Search = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -92,12 +92,12 @@ const Search = props => {
     const place = options.find(o => {
       return o.value === value;
     });
-    if (place === null || place === void 0 ? void 0 : place.location) {
+    if (place !== null && place !== void 0 && place.location) {
       toCenter(place.location);
     }
   };
   return _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         position: absolute;
         top: 10px;
         left: 10px;
@@ -115,7 +115,7 @@ const Search = props => {
     onSearch: onSearch,
     onSelect: onSelect,
     options: options,
-    dropdownMatchSelectWidth: false
+    popupMatchSelectWidth: false
   }));
 };
 exports.Search = Search;

package/lib/client/components/Configuration.js

@@ -97,8 +97,7 @@ const BaseConfiguration = ({
     onFinish: onSubmit
   }, children, isDisabled ? _react().default.createElement(_antd().Button, {
     disabled: false,
-    onClick: disableAction.toggle,
-    type: "ghost"
+    onClick: disableAction.toggle
   }, t('Edit')) : _react().default.createElement(_antd().Form.Item, null, _react().default.createElement(_antd().Button, {
     disabled: false,
     type: "primary",

package/lib/client/components/Designer.js

@@ -18,9 +18,9 @@ function _client() {
   };
   return data;
 }
-function _set() {
-  const data = _interopRequireDefault(require("lodash/set"));
-  _set = function _set() {
+function _client2() {
+  const data = require("@nocobase/utils/client");
+  _client2 = function _client2() {
     return data;
   };
   return data;
@@ -64,7 +64,7 @@ const Designer = () => {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
-  return _react2().default.createElement(_client().GeneralSchemaDesigner, null, _react2().default.createElement(_client().GeneralSchemaItems, null), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && !(0, _client().isPatternDisabled)(fieldSchema) && _react2().default.createElement(_client().SchemaSettings.SelectItem, {
+  return _react2().default.createElement(_client().GeneralSchemaDesigner, null, _react2().default.createElement(_client().GeneralSchemaItems, null), form && !(form !== null && form !== void 0 && form.readPretty) && !(0, _client().isPatternDisabled)(fieldSchema) && _react2().default.createElement(_client().SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
     options: [{
@@ -141,7 +141,7 @@ const Designer = () => {
       zoom
     }) => {
       if (zoom) {
-        (0, _set().default)(fieldSchema, 'x-component-props.zoom', zoom);
+        _client2().lodash.set(fieldSchema, 'x-component-props.zoom', zoom);
         Object.assign(field.componentProps, fieldSchema['x-component-props']);
         dn.emit('patch', {
           schema: {

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

@@ -11,13 +11,6 @@ function _icons() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _react() {
   const data = require("@formily/react");
   _react = function _react() {
@@ -72,7 +65,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 const OVERLAY_KEY = 'google-maps-overlay-id';
 const OVERLAY_SELECtED = 'google-maps-overlay-selected';
-const labelClass = (0, _css().css)`
+const labelClass = (0, _client().css)`
   margin-top: 6px;
   padding: 2px 4px;
   background: #fff;
@@ -208,7 +201,7 @@ const GoogleMapsBlock = props => {
   });
   (0, _react2().useEffect)(() => {
     var _mapRef$current;
-    if (!field || !((_mapRef$current = mapRef.current) === null || _mapRef$current === void 0 ? void 0 : _mapRef$current.map)) return;
+    if (!field || !((_mapRef$current = mapRef.current) !== null && _mapRef$current !== void 0 && _mapRef$current.map)) return;
     const overlays = dataSource.map(item => {
       const data = item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.field];
       if (!data) return;
@@ -221,7 +214,7 @@ const GoogleMapsBlock = props => {
           fontFamily: 'inherit',
           fontSize: '13px',
           color: '#333',
-          text: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.marker) ? compile(item[markerName]) : undefined
+          text: fieldNames !== null && fieldNames !== void 0 && fieldNames.marker ? compile(item[markerName]) : undefined
         }
       });
       overlay.set(OVERLAY_KEY, item[getPrimaryKey()]);
@@ -276,15 +269,15 @@ const GoogleMapsBlock = props => {
   }, [dataSource]);
   const mapRefCallback = instance => {
     mapRef.current = instance;
-    setIsMapInitialization(!!(instance === null || instance === void 0 ? void 0 : instance.map) && !instance.errMessage);
+    setIsMapInitialization(!!(instance !== null && instance !== void 0 && instance.map) && !instance.errMessage);
   };
   return _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         position: relative;
         height: 100%;
       `
   }, isMapInitialization && _react2().default.createElement(_react2().default.Fragment, null, _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
               position: absolute;
               left: 10px;
               top: 10px;

package/lib/client/components/GoogleMaps/Map.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="google.maps" />
 import React from 'react';
 import { MapEditorType } from '../../types';
-export declare type OverlayOptions = google.maps.PolygonOptions & google.maps.MarkerOptions & google.maps.PolylineOptions;
+export type OverlayOptions = google.maps.PolygonOptions & google.maps.MarkerOptions & google.maps.PolylineOptions;
 export declare const getDrawingMode: (type: MapEditorType) => "polygon" | "circle" | "marker" | "polyline";
 export interface GoogleMapsComponentProps {
     value?: any;

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

@@ -11,13 +11,6 @@ function _icons() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
-    return data;
-  };
-  return data;
-}
 function _react() {
   const data = require("@formily/react");
   _react = function _react() {
@@ -60,9 +53,9 @@ function _react2() {
   };
   return data;
 }
-function _reactRouter() {
-  const data = require("react-router");
-  _reactRouter = function _reactRouter() {
+function _reactRouterDom() {
+  const data = require("react-router-dom");
+  _reactRouterDom = function _reactRouterDom() {
     return data;
   };
   return data;
@@ -165,7 +158,7 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     }, overlayCommonOptions)),
     _useState6 = _slicedToArray(_useState5, 1),
     commonOptions = _useState6[0];
-  const navigate = (0, _reactRouter().useNavigate)();
+  const navigate = (0, _reactRouterDom().useNavigate)();
   const mapContainerRef = (0, _react2().useRef)();
   const cleanupOverlayListenersRef = (0, _react2().useRef)(new Set());
   const onAndOffListenOverlay = (0, _ahooks().useMemoizedFn)(target => {
@@ -326,7 +319,7 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     // google maps api error
     const error = console.error;
     console.error = (err, ...args) => {
-      if (err === null || err === void 0 ? void 0 : err.includes('InvalidKeyMapError')) {
+      if (err !== null && err !== void 0 && err.includes('InvalidKeyMapError')) {
         setErrMessage(t('Load google maps failed, Please check the Api key and refresh the page'));
       }
       error(err, ...args);
@@ -404,12 +397,12 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     });
   }
   return _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
           position: relative;
           height: 500px;
         `
   }, !map.current && _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
               position: absolute;
               inset: 0;
               display: flex;
@@ -420,7 +413,7 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     toCenter: toCenter,
     mapRef: map
   }), _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
                 position: absolute;
                 bottom: 80px;
                 right: 20px;
@@ -434,7 +427,7 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     size: "large",
     icon: _react2().default.createElement(_icons().SyncOutlined, null)
   })), type === 'lineString' || type === 'polygon' ? _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
                   position: absolute;
                   bottom: 20px;
                   left: 10px;
@@ -445,7 +438,7 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     message: t('Click to select the starting point and double-click to end the drawing'),
     type: "info"
   })) : null, _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
                 position: absolute;
                 bottom: 20px;
                 right: 20px;
@@ -461,7 +454,7 @@ const GoogleMapsComponent = _react2().default.forwardRef((props, ref) => {
     danger: true
   }, t('Clear')))) : null, _react2().default.createElement("div", {
     ref: mapContainerRef,
-    className: (0, _css().css)`
+    className: (0, _client().css)`
             width: 100%;
             height: 100%;
           `,

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

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.Search = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -102,7 +102,7 @@ const Search = props => {
     });
   };
   return _react().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         position: absolute;
         top: 10px;
         left: 10px;

package/lib/client/components/Map.js

@@ -4,16 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Map = void 0;
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _react() {
+  const data = require("@formily/react");
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _react() {
-  const data = require("@formily/react");
-  _react = function _react() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
@@ -36,7 +36,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 const InternalMap = (0, _react().connect)(props => {
   return _react2().default.createElement("div", {
-    className: (0, _css().css)`
+    className: (0, _client().css)`
         height: 100%;
         border: 1px solid transparent;
         .ant-formily-item-error & {

package/lib/client/components/MapComponent.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const MapComponent: React.ForwardRefExoticComponent<Pick<any, string | number | symbol> & React.RefAttributes<any>>;
+export declare const MapComponent: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<any>>;

package/lib/client/index.d.ts

@@ -1,4 +1,6 @@
-import React from 'react';
+import { Plugin } from '@nocobase/client';
 import './locale';
-declare const MapProvider: React.NamedExoticComponent<object>;
-export default MapProvider;
+export declare class MapPlugin extends Plugin {
+    load(): Promise<void>;
+}
+export default MapPlugin;

package/lib/client/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = exports.MapPlugin = void 0;
 function _client() {
   const data = require("@nocobase/client");
   _client = function _client() {
@@ -25,6 +25,8 @@ var _initialize = require("./initialize");
 var _locale = require("./locale");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -58,5 +60,14 @@ const MapProvider = _react().default.memo(props => {
   }, props.children))))));
 });
 MapProvider.displayName = 'MapProvider';
-var _default = MapProvider;
+class MapPlugin extends _client().Plugin {
+  load() {
+    var _this = this;
+    return _asyncToGenerator(function* () {
+      _this.app.use(MapProvider);
+    })();
+  }
+}
+exports.MapPlugin = MapPlugin;
+var _default = MapPlugin;
 exports.default = _default;

package/lib/client/types.d.ts

@@ -1 +1 @@
-export declare type MapEditorType = 'point' | 'polygon' | 'lineString' | 'circle';
+export type MapEditorType = 'point' | 'polygon' | 'lineString' | 'circle';

package/lib/client/utils.d.ts

@@ -1 +0,0 @@
-

package/lib/server/fields/circle.d.ts

@@ -1,5 +1,4 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
 declare class Circle extends DataTypes.ABSTRACT {
     key: string;
 }

package/lib/server/fields/circle.js

@@ -11,20 +11,13 @@ function _database() {
   };
   return data;
 }
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
-    return data;
-  };
-  return data;
-}
 var _helpers = require("../helpers");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-class Circle extends _sequelize().DataTypes.ABSTRACT {
+class Circle extends _database().DataTypes.ABSTRACT {
   constructor(...args) {
     super(...args);
     this.key = 'Circle';
@@ -47,7 +40,7 @@ class CircleField extends _database().Field {
       },
       set(value) {
         var _value;
-        if (!((_value = value) === null || _value === void 0 ? void 0 : _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
+        if (!((_value = value) !== null && _value !== void 0 && _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
           value = value.join(',');
         }
         this.setDataValue(name, value);
@@ -58,7 +51,7 @@ class CircleField extends _database().Field {
     if ((0, _helpers.isPg)(this.context)) {
       return Circle;
     } else {
-      return _sequelize().DataTypes.JSON;
+      return _database().DataTypes.JSON;
     }
   }
 }

package/lib/server/fields/lineString.d.ts

@@ -1,5 +1,4 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
 declare class LineString extends DataTypes.ABSTRACT {
     key: string;
 }

package/lib/server/fields/lineString.js

@@ -11,20 +11,13 @@ function _database() {
   };
   return data;
 }
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
-    return data;
-  };
-  return data;
-}
 var _helpers = require("../helpers");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-class LineString extends _sequelize().DataTypes.ABSTRACT {
+class LineString extends _database().DataTypes.ABSTRACT {
   constructor(...args) {
     super(...args);
     this.key = 'Path';
@@ -46,7 +39,7 @@ class LineStringField extends _database().Field {
       },
       set(value) {
         var _value;
-        if (!((_value = value) === null || _value === void 0 ? void 0 : _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
+        if (!((_value = value) !== null && _value !== void 0 && _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
           value = (0, _helpers.joinComma)(value.map(_helpers.joinComma));
         } else if ((0, _helpers.isMysql)(context)) {
           value = {
@@ -63,9 +56,9 @@ class LineStringField extends _database().Field {
       return LineString;
     }
     if ((0, _helpers.isMysql)(this.context)) {
-      return _sequelize().DataTypes.GEOMETRY('LINESTRING');
+      return _database().DataTypes.GEOMETRY('LINESTRING');
     } else {
-      return _sequelize().DataTypes.JSON;
+      return _database().DataTypes.JSON;
     }
   }
 }

package/lib/server/fields/point.d.ts

@@ -1,5 +1,4 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
 declare class Point extends DataTypes.ABSTRACT {
     key: string;
 }

package/lib/server/fields/point.js

@@ -11,20 +11,13 @@ function _database() {
   };
   return data;
 }
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
-    return data;
-  };
-  return data;
-}
 var _helpers = require("../helpers");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-class Point extends _sequelize().DataTypes.ABSTRACT {
+class Point extends _database().DataTypes.ABSTRACT {
   constructor(...args) {
     super(...args);
     this.key = 'Point';
@@ -49,7 +42,7 @@ class PointField extends _database().Field {
       },
       set(value) {
         var _value;
-        if (!((_value = value) === null || _value === void 0 ? void 0 : _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
+        if (!((_value = value) !== null && _value !== void 0 && _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
           value = (0, _helpers.joinComma)(value);
         } else if ((0, _helpers.isMysql)(context)) {
           value = {
@@ -66,9 +59,9 @@ class PointField extends _database().Field {
       return Point;
     }
     if ((0, _helpers.isMysql)(this.context)) {
-      return _sequelize().DataTypes.GEOMETRY('POINT');
+      return _database().DataTypes.GEOMETRY('POINT');
     } else {
-      return _sequelize().DataTypes.JSON;
+      return _database().DataTypes.JSON;
     }
   }
 }

package/lib/server/fields/polygon.d.ts

@@ -1,5 +1,4 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
 declare class Polygon extends DataTypes.ABSTRACT {
     key: string;
 }

package/lib/server/fields/polygon.js

@@ -11,20 +11,13 @@ function _database() {
   };
   return data;
 }
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
-    return data;
-  };
-  return data;
-}
 var _helpers = require("../helpers");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-class Polygon extends _sequelize().DataTypes.ABSTRACT {
+class Polygon extends _database().DataTypes.ABSTRACT {
   constructor(...args) {
     super(...args);
     this.key = 'Polygon';
@@ -46,7 +39,7 @@ class PolygonField extends _database().Field {
       },
       set(value) {
         var _value;
-        if (!((_value = value) === null || _value === void 0 ? void 0 : _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
+        if (!((_value = value) !== null && _value !== void 0 && _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
           value = (0, _helpers.joinComma)(value.map(item => (0, _helpers.joinComma)(item)));
         } else if ((0, _helpers.isMysql)(context)) {
           value = {
@@ -62,9 +55,9 @@ class PolygonField extends _database().Field {
     if ((0, _helpers.isPg)(this.context)) {
       return Polygon;
     } else if ((0, _helpers.isMysql)(this.context)) {
-      return _sequelize().DataTypes.GEOMETRY('POLYGON');
+      return _database().DataTypes.GEOMETRY('POLYGON');
     } else {
-      return _sequelize().DataTypes.JSON;
+      return _database().DataTypes.JSON;
     }
   }
 }

package/package.json

@@ -2,30 +2,48 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Map",
   "displayName.zh-CN": "地图",
-  "version": "0.10.1-alpha.1",
+  "version": "0.11.0-alpha.1",
   "description": "Provide map fields and blocks",
   "description.zh-CN": "提供地图字段和区块",
   "license": "AGPL-3.0",
-  "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
-  "devDependencies": {
-    "@types/google.maps": "^3.53.4",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0"
-  },
+  "main": "./lib/server/index.js",
+  "files": [
+    "lib",
+    "src",
+    "README.md",
+    "README.zh-CN.md",
+    "CHANGELOG.md",
+    "server.js",
+    "server.d.ts",
+    "client.js",
+    "client.d.ts"
+  ],
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.10",
-    "@emotion/css": "^11.7.1",
-    "@formily/antd": "2.2.26",
+    "@googlemaps/js-api-loader": "^1.16.1",
+    "@types/google.maps": "^3.53.4",
+    "ahooks": "^3.7.2"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^5.1.4",
+    "@formily/antd-v5": "^1.1.0-beta.4",
+    "@formily/core": "2.2.26",
     "@formily/react": "2.2.26",
     "@formily/shared": "2.2.26",
-    "@googlemaps/js-api-loader": "^1.16.1",
-    "@nocobase/server": "0.10.1-alpha.1",
-    "@nocobase/test": "0.10.1-alpha.1",
-    "antd": "^4.24.8",
+    "@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",
+    "@types/react": "^17.0.0",
+    "@types/react-dom": "^17.0.0",
+    "antd": "^5.6.4",
     "react": "18.x",
-    "react-dom": "18.x"
+    "react-dom": "18.x",
+    "react-i18next": "^11.15.1",
+    "react-router-dom": "^6.11.2"
   },
-  "gitHead": "8f415f5e0ee2e72d681f9ab16af5911b52c374a9"
+  "gitHead": "7581b6d3a3a54f09f06a9effb7e3e65328281b2b"
 }

package/server.d.ts

@@ -1,4 +1,3 @@
-// @ts-nocheck
-export * from './lib/server';
-export { default } from './lib/server';
+export * from './src/server';
+export { default } from './src/server';
 

package/server.js

@@ -1,30 +1 @@
-"use strict";
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-var _index = _interopRequireWildcard(require("./lib/server"));
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _exportNames = {};
-Object.defineProperty(exports, "default", {
-  enumerable: true,
-  get: function get() {
-    return _index.default;
-  }
-});
-
-Object.keys(_index).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _index[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _index[key];
-    }
-  });
-});
+module.exports = require('./lib/server/index.js');

package/src/client/block/MapBlockDesigner.tsx

@@ -11,7 +11,7 @@ import {
   useDesignable,
   useSchemaTemplate,
 } from '@nocobase/client';
-import set from 'lodash/set';
+import { lodash } from '@nocobase/utils/client';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useMapTranslation } from '../locale';
@@ -100,7 +100,7 @@ export const MapBlockDesigner = () => {
           } as ISchema
         }
         onSubmit={({ zoom }) => {
-          set(fieldSchema, 'x-component-props.zoom', zoom);
+          lodash.set(fieldSchema, 'x-component-props.zoom', zoom);
           Object.assign(field.componentProps, fieldSchema['x-component-props']);
           dn.emit('patch', {
             schema: {

package/src/client/block/MapBlockInitializer.tsx

@@ -1,5 +1,5 @@
 import { TableOutlined } from '@ant-design/icons';
-import { FormDialog, FormLayout } from '@formily/antd';
+import { FormDialog, FormLayout } from '@formily/antd-v5';
 import { SchemaOptionsContext } from '@formily/react';
 import { DataBlockInitializer, SchemaComponent, SchemaComponentOptions, useCollectionManager } from '@nocobase/client';
 import React, { useContext } from 'react';

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

@@ -1,8 +1,8 @@
 import { CheckOutlined, EnvironmentOutlined, ExpandOutlined } from '@ant-design/icons';
-import { css } from '@emotion/css';
 import { RecursionField, Schema, useFieldSchema } from '@formily/react';
 import {
   ActionContextProvider,
+  css,
   RecordProvider,
   useCollection,
   useCompile,

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

@@ -1,13 +1,12 @@
 import AMapLoader from '@amap/amap-jsapi-loader';
 import '@amap/amap-jsapi-types';
 import { SyncOutlined } from '@ant-design/icons';
-import { css } from '@emotion/css';
 import { useFieldSchema } from '@formily/react';
-import { useCollection } from '@nocobase/client';
+import { css, useCollection } from '@nocobase/client';
 import { useMemoizedFn } from 'ahooks';
 import { Alert, Button, Modal, Spin } from 'antd';
 import React, { useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { useNavigate } from 'react-router';
+import { useNavigate } from 'react-router-dom';
 import { useMapConfiguration } from '../../hooks';
 import { useMapTranslation } from '../../locale';
 import { MapEditorType } from '../../types';

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

@@ -1,4 +1,4 @@
-import { css } from '@emotion/css';
+import { css } from '@nocobase/client';
 import { useDebounceFn } from 'ahooks';
 import { message, Select } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
@@ -85,7 +85,7 @@ export const Search = (props: SearchProps) => {
         onSearch={onSearch}
         onSelect={onSelect}
         options={options}
-        dropdownMatchSelectWidth={false}
+        popupMatchSelectWidth={false}
       ></Select>
     </div>
   );

package/src/client/components/Configuration.tsx

@@ -1,10 +1,10 @@
 import { useAPIClient, useCompile } from '@nocobase/client';
 import { useBoolean } from 'ahooks';
-import { Button, Card, Form, Input, message, Tabs } from 'antd';
+import { Button, Card, Form, Input, Tabs, message } from 'antd';
 import React, { useEffect, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
 import { MapTypes } from '../constants';
-import { getSSKey, MapConfigurationResourceKey, useMapConfiguration } from '../hooks';
+import { MapConfigurationResourceKey, getSSKey, useMapConfiguration } from '../hooks';
 import { useMapTranslation } from '../locale';
 
 interface BaseConfigurationProps {
@@ -46,7 +46,7 @@ const BaseConfiguration: React.FC<BaseConfigurationProps> = ({ type, children })
     <Form disabled={isDisabled} form={form} layout="vertical" onFinish={onSubmit}>
       {children}
       {isDisabled ? (
-        <Button disabled={false} onClick={disableAction.toggle} type="ghost">
+        <Button disabled={false} onClick={disableAction.toggle}>
           {t('Edit')}
         </Button>
       ) : (

package/src/client/components/Designer.tsx

@@ -10,7 +10,7 @@ import {
   useDesignable,
   useFormBlockContext,
 } from '@nocobase/client';
-import set from 'lodash/set';
+import { lodash } from '@nocobase/utils/client';
 import React from 'react';
 import { useMapTranslation } from '../locale';
 
@@ -117,7 +117,7 @@ const Designer = () => {
         }
         onSubmit={({ zoom }) => {
           if (zoom) {
-            set(fieldSchema, 'x-component-props.zoom', zoom);
+            lodash.set(fieldSchema, 'x-component-props.zoom', zoom);
             Object.assign(field.componentProps, fieldSchema['x-component-props']);
 
             dn.emit('patch', {

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

@@ -1,8 +1,8 @@
 import { CheckOutlined, EnvironmentOutlined, ExpandOutlined } from '@ant-design/icons';
-import { css } from '@emotion/css';
 import { RecursionField, Schema, useFieldSchema } from '@formily/react';
 import {
   ActionContextProvider,
+  css,
   RecordProvider,
   useCollection,
   useCompile,

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

@@ -1,12 +1,11 @@
 import { SyncOutlined } from '@ant-design/icons';
-import { css } from '@emotion/css';
 import { useFieldSchema } from '@formily/react';
 import { Loader } from '@googlemaps/js-api-loader';
-import { useAPIClient, useCollection } from '@nocobase/client';
+import { css, useAPIClient, useCollection } from '@nocobase/client';
 import { useMemoizedFn } from 'ahooks';
 import { Alert, Button, Modal, Spin } from 'antd';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
-import { useNavigate } from 'react-router';
+import { useNavigate } from 'react-router-dom';
 import { defaultImage } from '../../constants';
 import { useMapConfiguration } from '../../hooks';
 import { useMapTranslation } from '../../locale';

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

@@ -1,6 +1,6 @@
-import { css } from '@emotion/css';
+import { css } from '@nocobase/client';
 import { useDebounceFn } from 'ahooks';
-import { message, RefSelectProps, Select } from 'antd';
+import { message, Select } from 'antd';
 import React, { useEffect, useRef, useState } from 'react';
 import { useMapTranslation } from '../../locale';
 

package/src/client/components/Map.tsx

@@ -1,5 +1,5 @@
-import { css } from '@emotion/css';
 import { connect, mapReadPretty } from '@formily/react';
+import { css } from '@nocobase/client';
 import React from 'react';
 import { AMapComponentProps } from './AMap';
 import Designer from './Designer';

package/src/client/index.tsx

@@ -1,6 +1,7 @@
 import {
   CollectionManagerContext,
   CurrentAppInfoProvider,
+  Plugin,
   SchemaComponentOptions,
   SettingsCenterProvider,
 } from '@nocobase/client';
@@ -46,4 +47,10 @@ const MapProvider = React.memo((props) => {
 });
 MapProvider.displayName = 'MapProvider';
 
-export default MapProvider;
+export class MapPlugin extends Plugin {
+  async load() {
+    this.app.use(MapProvider);
+  }
+}
+
+export default MapPlugin;

package/src/server/fields/circle.ts

@@ -1,5 +1,4 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
 import { isPg, toValue } from '../helpers';
 
 class Circle extends DataTypes.ABSTRACT {

package/src/server/fields/lineString.ts

@@ -1,6 +1,5 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
-import { isMysql, isPg, isSqlite, joinComma, toValue } from '../helpers';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
+import { isMysql, isPg, joinComma, toValue } from '../helpers';
 
 class LineString extends DataTypes.ABSTRACT {
   key = 'Path';

package/src/server/fields/point.ts

@@ -1,5 +1,4 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
 import { isMysql, isPg, joinComma, toValue } from '../helpers';
 
 class Point extends DataTypes.ABSTRACT {

package/src/server/fields/polygon.ts

@@ -1,5 +1,4 @@
-import { BaseColumnFieldOptions, Field, FieldContext } from '@nocobase/database';
-import { DataTypes } from 'sequelize';
+import { BaseColumnFieldOptions, DataTypes, Field, FieldContext } from '@nocobase/database';
 import { isMysql, isPg, joinComma, toValue } from '../helpers';
 
 class Polygon extends DataTypes.ABSTRACT {

package/docs/en-US/changelog.md

@@ -1 +0,0 @@
-# Map Changelog

package/docs/en-US/index.md

@@ -1 +0,0 @@
-# Map overview

package/docs/en-US/installation.md

@@ -1 +0,0 @@
-# Map Installation

package/docs/en-US/tabs.json

@@ -1,18 +0,0 @@
-[
-  {
-    "title": "Introduction",
-    "path": "index"
-  },
-  {
-    "title": "Installation",
-    "path": "installation"
-  },
-  {
-    "title": "Usage",
-    "path": "usage"
-  },
-  {
-    "title": "Changelog",
-    "path": "changelog"
-  }
-]

package/docs/en-US/usage.md

@@ -1 +0,0 @@
-# Map Usage

package/docs/zh-CN/changelog.md

@@ -1 +0,0 @@
-# 地图更新日志

package/docs/zh-CN/index.md

@@ -1 +0,0 @@
-# 地图

package/docs/zh-CN/installation.md

@@ -1 +0,0 @@
-# 地图安装方法

package/docs/zh-CN/tabs.json

@@ -1,18 +0,0 @@
-[
-  {
-    "title": "介绍",
-    "path": "index"
-  },
-  {
-    "title": "安装",
-    "path": "installation"
-  },
-  {
-    "title": "用法",
-    "path": "usage"
-  },
-  {
-    "title": "日志",
-    "path": "changelog"
-  }
-]

package/docs/zh-CN/usage.md

@@ -1 +0,0 @@
-# 地图用法