@nocobase/plugin-map 0.12.0-alpha.2 → 0.12.0-alpha.4

package/dist/client/block/utils.d.ts

@@ -55,3 +55,4 @@ export declare const createMapBlockSchema: (options: any) => import("@formily/re
     "x-read-pretty"?: boolean;
     "x-compile-omitted"?: string[];
 }>;
+export declare const findNestedOption: (value: string[] | string, options?: any[]) => any;

package/dist/client/index.js

@@ -1,6 +1,6 @@
 (function(global2, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("@nocobase/client"), require("react-i18next"), require("@ant-design/icons"), require("@formily/react"), require("ahooks"), require("antd"), require("react-router-dom"), require("lodash"), require("@formily/antd-v5"), require("@formily/shared")) : typeof define === "function" && define.amd ? define(["exports", "react", "@nocobase/client", "react-i18next", "@ant-design/icons", "@formily/react", "ahooks", "antd", "react-router-dom", "lodash", "@formily/antd-v5", "@formily/shared"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2["@nocobase/plugin-map"] = {}, global2.react, global2["@nocobase/client"], global2["react-i18next"], global2["@ant-design/icons"], global2["@formily/react"], global2.ahooks, global2.antd, global2["react-router-dom"], global2.lodash, global2["@formily/antd-v5"], global2["@formily/shared"]));
-})(this, function(exports2, React, client, reactI18next, icons, react, ahooks, antd, reactRouterDom, lodash, antdV5, shared) {
+  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("react"), require("@nocobase/client"), require("react-i18next"), require("@ant-design/icons"), require("@formily/react"), require("ahooks"), require("antd"), require("react-router-dom"), require("lodash"), require("@formily/shared"), require("@formily/antd-v5")) : typeof define === "function" && define.amd ? define(["exports", "react", "@nocobase/client", "react-i18next", "@ant-design/icons", "@formily/react", "ahooks", "antd", "react-router-dom", "lodash", "@formily/shared", "@formily/antd-v5"], factory) : (global2 = typeof globalThis !== "undefined" ? globalThis : global2 || self, factory(global2["@nocobase/plugin-map"] = {}, global2.react, global2["@nocobase/client"], global2["react-i18next"], global2["@ant-design/icons"], global2["@formily/react"], global2.ahooks, global2.antd, global2["react-router-dom"], global2.lodash, global2["@formily/shared"], global2["@formily/antd-v5"]));
+})(this, function(exports2, React, client, reactI18next, icons, react, ahooks, antd, reactRouterDom, lodash, shared, antdV5) {
   "use strict";
   var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
   function getDefaultExportFromCjs(x) {
@@ -39,10 +39,12 @@
   var jsxRuntimeExports = jsxRuntime.exports;
   const NAMESPACE = "map";
   function generateNTemplate(key) {
-    return `{{t('${key}', { ns: '${NAMESPACE}' })}}`;
+    return `{{t('${key}', { ns: '${NAMESPACE}', nsMode: 'fallback' })}}`;
   }
   function useMapTranslation() {
-    return reactI18next.useTranslation(NAMESPACE);
+    return reactI18next.useTranslation(NAMESPACE, {
+      nsMode: "fallback"
+    });
   }
   const MapActionInitializers = {
     title: "{{t('Configure actions')}}",
@@ -603,6 +605,7 @@
         content: t("Are you sure to clear the canvas?"),
         okText: t("Confirm"),
         cancelText: t("Cancel"),
+        getContainer: () => document.getElementById(id.current),
         onOk() {
           ok();
         }
@@ -842,11 +845,21 @@
       }
     );
   });
+  const getSource = (data, fields2, type) => {
+    const res = fields2 == null ? void 0 : fields2.reduce((obj, field, index) => {
+      if (index === fields2.length - 1 && (type === "o2m" || type === "m2m")) {
+        return obj == null ? void 0 : obj.map((item) => item[field]).filter((v) => v !== null && v !== void 0);
+      }
+      return obj == null ? void 0 : obj[field];
+    }, data);
+    return type === "o2m" || type === "m2m" ? res : [res];
+  };
   const AMapBlock = (props) => {
-    var _a, _b, _c;
-    const { fieldNames, dataSource = [], fixedBlock, zoom, setSelectedRecordKeys } = client.useProps(props);
-    const { getField, getPrimaryKey } = client.useCollection();
-    const field = getField(fieldNames == null ? void 0 : fieldNames.field);
+    var _a, _b, _c, _d;
+    const { collectionField, fieldNames, dataSource, fixedBlock, zoom, setSelectedRecordKeys } = client.useProps(props);
+    const { name: name2, getPrimaryKey } = client.useCollection();
+    const { getCollectionJoinField } = client.useCollectionManager();
+    const primaryKey = getPrimaryKey();
     const [isMapInitialization, setIsMapInitialization] = React.useState(false);
     const mapRef = React.useRef();
     const geometryUtils = (_b = (_a = mapRef.current) == null ? void 0 : _a.aMap) == null ? void 0 : _b.GeometryUtil;
@@ -876,21 +889,23 @@
       });
     };
     const removeSelection = () => {
+      var _a2, _b2, _c2;
       if (!mapRef.current)
         return;
-      mapRef.current.mouseTool().close(true);
-      mapRef.current.editor().setTarget(null);
-      mapRef.current.editor().close();
+      (_a2 = mapRef.current) == null ? void 0 : _a2.mouseTool().close(true);
+      (_b2 = mapRef.current) == null ? void 0 : _b2.editor().setTarget(null);
+      (_c2 = mapRef.current) == null ? void 0 : _c2.editor().close();
     };
     React.useEffect(() => {
+      var _a2, _b2, _c2, _d2;
       if (selectingMode !== "selection") {
         return;
       }
-      if (!mapRef.current.editor()) {
-        mapRef.current.createEditor("polygon");
-        mapRef.current.createMouseTool("polygon");
+      if (!((_a2 = mapRef.current) == null ? void 0 : _a2.editor())) {
+        (_b2 = mapRef.current) == null ? void 0 : _b2.createEditor("polygon");
+        (_c2 = mapRef.current) == null ? void 0 : _c2.createMouseTool("polygon");
       } else {
-        mapRef.current.executeMouseTool("polygon");
+        (_d2 = mapRef.current) == null ? void 0 : _d2.executeMouseTool("polygon");
       }
       return () => {
         removeSelection();
@@ -899,8 +914,9 @@
     React.useEffect(() => {
       if (selectingMode) {
         return () => {
+          var _a2;
           if (!selectingModeRef.current) {
-            mapRef.current.map.getAllOverlays().forEach((o) => {
+            (_a2 = mapRef.current) == null ? void 0 : _a2.map.getAllOverlays().forEach((o) => {
               setOverlayOptions(o, false);
             });
           }
@@ -908,48 +924,54 @@
       }
     }, [selectingMode]);
     const onSelectingComplete = ahooks.useMemoizedFn(() => {
-      const selectingOverlay = mapRef.current.editor().getTarget();
-      const overlays = mapRef.current.map.getAllOverlays();
-      const selectedOverlays = overlays.filter((o) => {
+      var _a2, _b2, _c2;
+      const selectingOverlay = (_a2 = mapRef.current) == null ? void 0 : _a2.editor().getTarget();
+      const overlays = (_b2 = mapRef.current) == null ? void 0 : _b2.map.getAllOverlays();
+      const selectedOverlays = overlays == null ? void 0 : overlays.filter((o) => {
         if (o === selectingOverlay || o.getExtData().id === void 0)
           return;
         if ("getPosition" in o) {
-          return geometryUtils.isPointInRing(o.getPosition(), selectingOverlay.getPath());
+          return geometryUtils.isPointInRing(o.getPosition(), selectingOverlay == null ? void 0 : selectingOverlay.getPath());
         }
-        return geometryUtils.doesRingRingIntersect(o.getPath(), selectingOverlay.getPath());
+        return geometryUtils.doesRingRingIntersect(o.getPath(), selectingOverlay == null ? void 0 : selectingOverlay.getPath());
       });
-      const ids = selectedOverlays.map((o) => {
+      const ids = selectedOverlays == null ? void 0 : selectedOverlays.map((o) => {
         setOverlayOptions(o, true);
         return o.getExtData().id;
       });
-      setSelectedRecordKeys((lastIds) => ids.concat(lastIds));
-      selectingOverlay.remove();
-      mapRef.current.editor().close();
+      setSelectedRecordKeys((lastIds) => ids == null ? void 0 : ids.concat(lastIds));
+      selectingOverlay == null ? void 0 : selectingOverlay.remove();
+      (_c2 = mapRef.current) == null ? void 0 : _c2.editor().close();
     });
     React.useEffect(() => {
-      var _a2;
-      if (!field || !mapRef.current)
+      var _a2, _b2;
+      if (!collectionField || !mapRef.current || !dataSource)
         return;
+      const fieldPaths = Array.isArray(fieldNames == null ? void 0 : fieldNames.field) && (fieldNames == null ? void 0 : fieldNames.field.length) > 1 ? fieldNames == null ? void 0 : fieldNames.field.slice(0, -1) : fieldNames == null ? void 0 : fieldNames.field;
+      const cf = getCollectionJoinField([name2, ...fieldPaths].flat().join("."));
       const overlays = dataSource.map((item) => {
-        const data = item[fieldNames == null ? void 0 : fieldNames.field];
-        if (!data)
-          return;
-        const overlay = mapRef.current.setOverlay(field.type, data, {
-          strokeColor: "#4e9bff",
-          fillColor: "#4e9bff",
-          cursor: "pointer",
-          label: {
-            direction: "bottom",
-            offset: [0, 5],
-            content: (fieldNames == null ? void 0 : fieldNames.marker) ? compile(item[fieldNames.marker]) : void 0
-          },
-          extData: {
-            id: item[getPrimaryKey()]
-          }
+        const data = getSource(item, fieldNames == null ? void 0 : fieldNames.field, cf == null ? void 0 : cf.interface);
+        if (!(data == null ? void 0 : data.length))
+          return [];
+        return data == null ? void 0 : data.filter(Boolean).map((mapItem) => {
+          var _a3;
+          const overlay = (_a3 = mapRef.current) == null ? void 0 : _a3.setOverlay(collectionField.type, mapItem, {
+            strokeColor: "#4e9bff",
+            fillColor: "#4e9bff",
+            cursor: "pointer",
+            label: {
+              direction: "bottom",
+              offset: [0, 5],
+              content: (fieldNames == null ? void 0 : fieldNames.marker) ? compile(item[fieldNames.marker]) : void 0
+            },
+            extData: {
+              id: item[primaryKey]
+            }
+          });
+          return overlay;
         });
-        return overlay;
-      }).filter(Boolean);
-      (_a2 = mapRef.current.map) == null ? void 0 : _a2.setFitView(overlays);
+      }).flat().filter(Boolean);
+      (_b2 = (_a2 = mapRef.current) == null ? void 0 : _a2.map) == null ? void 0 : _b2.setFitView(overlays);
       const events = overlays.map((o) => {
         const onClick = (e) => {
           const overlay = e.target;
@@ -965,8 +987,8 @@
             }
             return;
           }
-          const data = dataSource == null ? void 0 : dataSource.find((item) => {
-            return extData.id === item[getPrimaryKey()];
+          const data = dataSource.find((item) => {
+            return extData.id === item[primaryKey];
           });
           if (isConnected) {
             setPrevSelected((prev) => {
@@ -977,7 +999,7 @@
                 return null;
               } else {
                 selectMarker$1(o);
-                doFilter(data[getPrimaryKey()], (target) => target.field || getPrimaryKey(), "$eq");
+                doFilter(data[primaryKey], (target) => target.field || primaryKey, "$eq");
               }
               return o;
             });
@@ -996,7 +1018,7 @@
         });
         events.forEach((e) => e());
       };
-    }, [dataSource, isMapInitialization, fieldNames, field.type, isConnected]);
+    }, [dataSource, isMapInitialization, fieldNames, name2, primaryKey, collectionField.type, isConnected]);
     React.useEffect(() => {
       setTimeout(() => {
         setSelectedRecordKeys([]);
@@ -1023,7 +1045,7 @@
           top: 10px;
           z-index: 999;
         `,
-              children: isMapInitialization && !mapRef.current.errMessage ? /* @__PURE__ */ jsxRuntimeExports.jsxs(antd.Space, { direction: "vertical", children: [
+              children: isMapInitialization && !((_c = mapRef.current) == null ? void 0 : _c.errMessage) ? /* @__PURE__ */ jsxRuntimeExports.jsxs(antd.Space, { direction: "vertical", children: [
                 /* @__PURE__ */ jsxRuntimeExports.jsx(
                   antd.Button,
                   {
@@ -1068,7 +1090,7 @@
           /* @__PURE__ */ jsxRuntimeExports.jsx(
             AMapComponent,
             {
-              ...(_c = field == null ? void 0 : field.uiSchema) == null ? void 0 : _c["x-component-props"],
+              ...(_d = collectionField == null ? void 0 : collectionField.uiSchema) == null ? void 0 : _d["x-component-props"],
               ref: mapRefCallback,
               style: { height: fixedBlock ? "100%" : null },
               zoom,
@@ -1401,9 +1423,9 @@
         });
       });
     }
-    importLibrary(name) {
+    importLibrary(name2) {
       this.execute();
-      return google.maps.importLibrary(name);
+      return google.maps.importLibrary(name2);
     }
     /**
      * Load the Google Maps JavaScript API script with a callback.
@@ -1927,6 +1949,7 @@
           content: t("Are you sure to clear the canvas?"),
           okText: t("Confirm"),
           cancelText: t("Cancel"),
+          getContainer: () => mapContainerRef.current,
           onOk() {
             ok();
           }
@@ -2056,13 +2079,10 @@
   border: 1px solid #0000f5;
 `;
   const GoogleMapsBlock = (props) => {
-    const { fieldNames, dataSource = [], fixedBlock, zoom, setSelectedRecordKeys } = client.useProps(props);
-    const { getField, getPrimaryKey } = client.useCollection();
-    const { marker: markerName, field: fieldName } = fieldNames || {
-      marker: "id",
-      field: "id"
-    };
-    const field = getField(fieldName);
+    const { collectionField, fieldNames, dataSource, fixedBlock, zoom, setSelectedRecordKeys } = client.useProps(props);
+    const { getPrimaryKey } = client.useCollection();
+    const primaryKey = getPrimaryKey();
+    const { marker: markerName = "id" } = fieldNames;
     const [isMapInitialization, setIsMapInitialization] = React.useState(false);
     const mapRef = React.useRef();
     const [record, setRecord] = React.useState();
@@ -2072,9 +2092,10 @@
     const { isConnected, doFilter } = client.useFilterAPI();
     const [, setPrevSelected] = React.useState(null);
     const selectingModeRef = React.useRef(selectingMode);
-    const selectionOverlayRef = React.useRef();
+    const selectionOverlayRef = React.useRef(null);
     const overlaysRef = React.useRef([]);
     selectingModeRef.current = selectingMode;
+    const { getCollectionJoinField } = client.useCollectionManager();
     const setOverlayOptions = (overlay, state) => {
       const selected = typeof state !== "undefined" ? !state : overlay.get(OVERLAY_SELECtED);
       overlay.set(OVERLAY_SELECtED, !selected);
@@ -2091,20 +2112,22 @@
       });
     };
     React.useEffect(() => {
+      var _a, _b, _c, _d;
       if (selectingMode !== "selection") {
         return;
       }
-      if (!mapRef.current.drawingManager) {
-        mapRef.current.drawingManager = mapRef.current.createDraw(true, {
+      if (mapRef.current && !((_a = mapRef.current) == null ? void 0 : _a.drawingManager)) {
+        mapRef.current.drawingManager = (_b = mapRef.current) == null ? void 0 : _b.createDraw(true, {
           editable: true,
           draggable: true
         });
       }
       const listenerSet = /* @__PURE__ */ new Set();
-      mapRef.current.drawingManager.setDrawingMode(google.maps.drawing.OverlayType.POLYGON);
-      mapRef.current.drawingManager.addListener("overlaycomplete", (event) => {
+      (_c = mapRef.current) == null ? void 0 : _c.drawingManager.setDrawingMode(google.maps.drawing.OverlayType.POLYGON);
+      (_d = mapRef.current) == null ? void 0 : _d.drawingManager.addListener("overlaycomplete", (event) => {
+        var _a2;
         const polygon2 = event.overlay;
-        mapRef.current.drawingManager.setDrawingMode(null);
+        (_a2 = mapRef.current) == null ? void 0 : _a2.drawingManager.setDrawingMode(null);
         selectionOverlayRef.current = polygon2;
         const path = polygon2.getPath();
         ["insert_at", "remove_at", "set_at"].forEach((key) => {
@@ -2113,17 +2136,17 @@
         });
       });
       return () => {
-        var _a, _b;
+        var _a2, _b2, _c2, _d2;
         listenerSet.forEach((i) => {
           i();
         });
         if (!mapRef.current)
           return;
-        (_a = selectionOverlayRef.current) == null ? void 0 : _a.unbindAll();
-        (_b = selectionOverlayRef.current) == null ? void 0 : _b.setMap(null);
+        (_a2 = selectionOverlayRef.current) == null ? void 0 : _a2.unbindAll();
+        (_b2 = selectionOverlayRef.current) == null ? void 0 : _b2.setMap(null);
         selectionOverlayRef.current = null;
-        mapRef.current.drawingManager.setDrawingMode(null);
-        mapRef.current.drawingManager.unbindAll();
+        (_c2 = mapRef.current) == null ? void 0 : _c2.drawingManager.setDrawingMode(null);
+        (_d2 = mapRef.current) == null ? void 0 : _d2.drawingManager.unbindAll();
       };
     }, [selectingMode]);
     React.useEffect(() => {
@@ -2138,6 +2161,7 @@
       }
     }, [selectingMode]);
     const onSelectingComplete = ahooks.useMemoizedFn(() => {
+      var _a;
       const overlay = selectionOverlayRef.current;
       const overlays = overlaysRef.current;
       const poly = google.maps.geometry.poly;
@@ -2159,35 +2183,42 @@
         return o.get(OVERLAY_KEY);
       });
       setSelectedRecordKeys((lastIds) => ids.concat(lastIds));
-      overlay.unbindAll();
-      overlay.setMap(null);
-      mapRef.current.drawingManager.setDrawingMode(google.maps.drawing.OverlayType.POLYGON);
+      overlay == null ? void 0 : overlay.unbindAll();
+      overlay == null ? void 0 : overlay.setMap(null);
+      (_a = mapRef.current) == null ? void 0 : _a.drawingManager.setDrawingMode(google.maps.drawing.OverlayType.POLYGON);
     });
     React.useEffect(() => {
-      var _a;
-      if (!field || !((_a = mapRef.current) == null ? void 0 : _a.map))
+      var _a, _b;
+      if (!collectionField || !(dataSource == null ? void 0 : dataSource.length) || !((_a = mapRef.current) == null ? void 0 : _a.map))
         return;
+      const fieldPaths = Array.isArray(fieldNames == null ? void 0 : fieldNames.field) && (fieldNames == null ? void 0 : fieldNames.field.length) > 1 ? fieldNames == null ? void 0 : fieldNames.field.slice(0, -1) : fieldNames == null ? void 0 : fieldNames.field;
+      const cf = getCollectionJoinField([name, ...fieldPaths].flat().join("."));
       const overlays = dataSource.map((item) => {
-        const data = item[fieldNames == null ? void 0 : fieldNames.field];
-        if (!data)
-          return;
-        const overlay = mapRef.current.setOverlay(field.type, data, {
-          strokeColor: "#4e9bff",
-          fillColor: "#4e9bff",
-          cursor: "pointer",
-          label: {
-            className: labelClass,
-            fontFamily: "inherit",
-            fontSize: "13px",
-            color: "#333",
-            text: (fieldNames == null ? void 0 : fieldNames.marker) ? compile(item[markerName]) : void 0
-          }
+        const data = getSource(item, fieldNames == null ? void 0 : fieldNames.field, cf == null ? void 0 : cf.interface);
+        if (!(data == null ? void 0 : data.length))
+          return [];
+        return data == null ? void 0 : data.filter(Boolean).map((mapItem) => {
+          var _a2;
+          if (!data)
+            return;
+          const overlay = (_a2 = mapRef.current) == null ? void 0 : _a2.setOverlay(collectionField.type, mapItem, {
+            strokeColor: "#4e9bff",
+            fillColor: "#4e9bff",
+            cursor: "pointer",
+            label: {
+              className: labelClass,
+              fontFamily: "inherit",
+              fontSize: "13px",
+              color: "#333",
+              text: (fieldNames == null ? void 0 : fieldNames.marker) ? compile(item[markerName]) : void 0
+            }
+          });
+          overlay == null ? void 0 : overlay.set(OVERLAY_KEY, item[primaryKey]);
+          return overlay;
         });
-        overlay.set(OVERLAY_KEY, item[getPrimaryKey()]);
-        return overlay;
-      }).filter(Boolean);
+      }).flat().filter(Boolean);
       overlaysRef.current = overlays;
-      mapRef.current.setFitView(overlays);
+      (_b = mapRef.current) == null ? void 0 : _b.setFitView(overlays);
       const events = overlays.map((o) => {
         const onClick = (event) => {
           const overlay = o;
@@ -2195,7 +2226,7 @@
           if (!id)
             return;
           const data = dataSource == null ? void 0 : dataSource.find((item) => {
-            return id === item[getPrimaryKey()];
+            return id === item[primaryKey];
           });
           if (isConnected) {
             setPrevSelected((prev) => {
@@ -2206,7 +2237,7 @@
                 return null;
               } else {
                 selectMarker(overlay);
-                doFilter(data[getPrimaryKey()], (target) => target.field || getPrimaryKey(), "$eq");
+                doFilter(data[primaryKey], (target) => target.field || primaryKey, "$eq");
               }
               return overlay;
             });
@@ -2226,7 +2257,7 @@
         });
         events.forEach((e) => e());
       };
-    }, [dataSource, isMapInitialization, markerName, field.type, isConnected]);
+    }, [dataSource, isMapInitialization, markerName, collectionField.type, isConnected]);
     React.useEffect(() => {
       setTimeout(() => {
         setSelectedRecordKeys([]);
@@ -2539,10 +2570,13 @@
   const MapBlock = (props) => {
     var _a;
     const { fieldNames } = client.useProps(props);
-    const { getField } = client.useCollection();
-    const field = getField(fieldNames == null ? void 0 : fieldNames.field);
-    const fieldComponentProps = (_a = field == null ? void 0 : field.uiSchema) == null ? void 0 : _a["x-component-props"];
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(MapBlockComponent, { ...fieldComponentProps, ...props });
+    const { getCollectionJoinField } = client.useCollectionManager();
+    const { name: name2 } = client.useCollection();
+    const collectionField = React.useMemo(() => {
+      return getCollectionJoinField([name2, fieldNames == null ? void 0 : fieldNames.field].flat().join("."));
+    }, [name2, fieldNames == null ? void 0 : fieldNames.field]);
+    const fieldComponentProps = (_a = collectionField == null ? void 0 : collectionField.uiSchema) == null ? void 0 : _a["x-component-props"];
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(MapBlockComponent, { ...fieldComponentProps, ...props, collectionField });
   };
   const MapBlockContext = React.createContext({});
   const InternalMapBlockProvider = (props) => {
@@ -2569,7 +2603,13 @@
     ) }) });
   };
   const MapBlockProvider = (props) => {
-    return /* @__PURE__ */ jsxRuntimeExports.jsx(client.BlockProvider, { ...props, params: { ...props.params, paginate: false }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(InternalMapBlockProvider, { ...props }) });
+    const { params, fieldNames } = props;
+    const appends = params.appends || [];
+    const { field } = fieldNames || {};
+    if (Array.isArray(field) && field.length > 1) {
+      appends.push(field[0]);
+    }
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(client.BlockProvider, { ...props, params: { ...params, appends, paginate: false }, children: /* @__PURE__ */ jsxRuntimeExports.jsx(InternalMapBlockProvider, { ...props }) });
   };
   const useMapBlockContext = () => {
     return React.useContext(MapBlockContext);
@@ -2583,15 +2623,101 @@
       zoom: ((_d = (_c = ctx == null ? void 0 : ctx.field) == null ? void 0 : _c.componentProps) == null ? void 0 : _d.zoom) || 13
     };
   };
+  const createMapBlockSchema = (options) => {
+    const { collection, resource, fieldNames, ...others } = options;
+    const schema = {
+      type: "void",
+      "x-acl-action": `${resource || collection}:list`,
+      "x-decorator": "MapBlockProvider",
+      "x-decorator-props": {
+        collection,
+        resource: resource || collection,
+        action: "list",
+        fieldNames,
+        params: {
+          paginate: false
+        },
+        ...others
+      },
+      "x-designer": "MapBlockDesigner",
+      "x-component": "CardItem",
+      // 保存当前筛选区块所能过滤的数据区块
+      "x-filter-targets": [],
+      properties: {
+        actions: {
+          type: "void",
+          "x-initializer": "MapActionInitializers",
+          "x-component": "ActionBar",
+          "x-component-props": {
+            style: {
+              marginBottom: 16
+            }
+          },
+          properties: {}
+        },
+        [shared.uid()]: {
+          type: "void",
+          "x-component": "MapBlock",
+          "x-component-props": {
+            useProps: "{{ useMapBlockProps }}"
+          },
+          properties: {
+            drawer: {
+              type: "void",
+              "x-component": "Action.Drawer",
+              "x-component-props": {
+                className: "nb-action-popup"
+              },
+              title: '{{ t("View record") }}',
+              properties: {
+                tabs: {
+                  type: "void",
+                  "x-component": "Tabs",
+                  "x-component-props": {},
+                  "x-initializer": "TabPaneInitializers",
+                  properties: {
+                    tab1: {
+                      type: "void",
+                      title: '{{t("Details")}}',
+                      "x-component": "Tabs.TabPane",
+                      "x-designer": "Tabs.Designer",
+                      "x-component-props": {},
+                      properties: {
+                        grid: {
+                          type: "void",
+                          "x-component": "Grid",
+                          "x-initializer": "RecordBlockInitializers",
+                          properties: {}
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    };
+    return schema;
+  };
+  const findNestedOption = (value, options = []) => {
+    if (typeof value === "string") {
+      value = [value];
+    }
+    return value == null ? void 0 : value.reduce((cur, v, index) => {
+      const matched = cur == null ? void 0 : cur.find((item) => item.value === v);
+      return index === value.length - 1 ? matched : matched == null ? void 0 : matched.children;
+    }, options);
+  };
   const MapBlockDesigner = () => {
-    var _a, _b, _c, _d, _e;
-    const { name, title } = client.useCollection();
+    var _a, _b, _c, _d, _e, _f;
+    const { name: name2, title } = client.useCollection();
     const field = react.useField();
     const fieldSchema = react.useFieldSchema();
-    const dataSource = client.useCollectionFilterOptions(name);
+    const dataSource = client.useCollectionFilterOptions(name2);
     const { service } = useMapBlockContext();
-    const { t: mapT } = useMapTranslation();
-    const { t } = reactI18next.useTranslation();
+    const { t } = useMapTranslation();
     const { dn } = client.useDesignable();
     const { getCollectionFieldsOptions } = client.useCollectionManager();
     const collection = client.useCollection();
@@ -2600,17 +2726,21 @@
     const fieldNames = ((_d = fieldSchema == null ? void 0 : fieldSchema["x-decorator-props"]) == null ? void 0 : _d["fieldNames"]) || {};
     const defaultZoom = ((_e = fieldSchema == null ? void 0 : fieldSchema["x-component-props"]) == null ? void 0 : _e["zoom"]) || 13;
     const template = client.useSchemaTemplate();
-    const mapFieldOptions = getCollectionFieldsOptions(collection == null ? void 0 : collection.name, ["point", "lineString", "polygon"]);
+    const mapFieldOptions = getCollectionFieldsOptions(collection == null ? void 0 : collection.name, ["point", "lineString", "polygon"], {
+      association: ["o2o", "obo", "oho", "o2m", "m2o", "m2m"]
+    });
     const markerFieldOptions = getCollectionFieldsOptions(collection == null ? void 0 : collection.name, "string");
-    return /* @__PURE__ */ jsxRuntimeExports.jsxs(client.GeneralSchemaDesigner, { template, title: title || name, children: [
+    const isPointField = ((_f = findNestedOption(fieldNames.field, mapFieldOptions)) == null ? void 0 : _f.type) === "point";
+    return /* @__PURE__ */ jsxRuntimeExports.jsxs(client.GeneralSchemaDesigner, { template, title: title || name2, children: [
       /* @__PURE__ */ jsxRuntimeExports.jsx(client.SchemaSettings.BlockTitleItem, {}),
       /* @__PURE__ */ jsxRuntimeExports.jsx(client.FixedBlockDesignerItem, {}),
       /* @__PURE__ */ jsxRuntimeExports.jsx(
-        client.SchemaSettings.SelectItem,
+        client.SchemaSettings.CascaderItem,
         {
-          title: mapT("Map field"),
+          title: t("Map field"),
           value: fieldNames.field,
           options: mapFieldOptions,
+          allowClear: false,
           onChange: (v) => {
             const fieldNames2 = field.decoratorProps.fieldNames || {};
             fieldNames2["field"] = v;
@@ -2627,10 +2757,10 @@
           }
         }
       ),
-      /* @__PURE__ */ jsxRuntimeExports.jsx(
+      isPointField ? /* @__PURE__ */ jsxRuntimeExports.jsx(
         client.SchemaSettings.SelectItem,
         {
-          title: mapT("Marker field"),
+          title: t("Marker field"),
           value: fieldNames.marker,
           options: markerFieldOptions,
           onChange: (v) => {
@@ -2648,17 +2778,17 @@
             dn.refresh();
           }
         }
-      ),
+      ) : null,
       /* @__PURE__ */ jsxRuntimeExports.jsx(
         client.SchemaSettings.ModalItem,
         {
-          title: mapT("The default zoom level of the map"),
+          title: t("The default zoom level of the map"),
           schema: {
             type: "object",
-            title: mapT("Set default zoom level"),
+            title: t("Set default zoom level"),
             properties: {
               zoom: {
-                title: mapT("Zoom"),
+                title: t("Zoom"),
                 default: defaultZoom,
                 "x-component": "InputNumber",
                 "x-decorator": "FormItem",
@@ -2720,7 +2850,7 @@
       ),
       /* @__PURE__ */ jsxRuntimeExports.jsx(client.SchemaSettings.ConnectDataBlocks, { type: client.FilterBlockType.TABLE, emptyDescription: t("No blocks to connect") }),
       /* @__PURE__ */ jsxRuntimeExports.jsx(client.SchemaSettings.Divider, {}),
-      /* @__PURE__ */ jsxRuntimeExports.jsx(client.SchemaSettings.Template, { componentName: "Map", collectionName: name, resourceName: defaultResource }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(client.SchemaSettings.Template, { componentName: "Map", collectionName: name2, resourceName: defaultResource }),
       /* @__PURE__ */ jsxRuntimeExports.jsx(client.SchemaSettings.Divider, {}),
       /* @__PURE__ */ jsxRuntimeExports.jsx(
         client.SchemaSettings.Remove,
@@ -2733,84 +2863,6 @@
       )
     ] });
   };
-  const createMapBlockSchema = (options) => {
-    const { collection, resource, fieldNames, ...others } = options;
-    const schema = {
-      type: "void",
-      "x-acl-action": `${resource || collection}:list`,
-      "x-decorator": "MapBlockProvider",
-      "x-decorator-props": {
-        collection,
-        resource: resource || collection,
-        action: "list",
-        fieldNames,
-        params: {
-          paginate: false
-        },
-        ...others
-      },
-      "x-designer": "MapBlockDesigner",
-      "x-component": "CardItem",
-      // 保存当前筛选区块所能过滤的数据区块
-      "x-filter-targets": [],
-      properties: {
-        actions: {
-          type: "void",
-          "x-initializer": "MapActionInitializers",
-          "x-component": "ActionBar",
-          "x-component-props": {
-            style: {
-              marginBottom: 16
-            }
-          },
-          properties: {}
-        },
-        [shared.uid()]: {
-          type: "void",
-          "x-component": "MapBlock",
-          "x-component-props": {
-            useProps: "{{ useMapBlockProps }}"
-          },
-          properties: {
-            drawer: {
-              type: "void",
-              "x-component": "Action.Drawer",
-              "x-component-props": {
-                className: "nb-action-popup"
-              },
-              title: '{{ t("View record") }}',
-              properties: {
-                tabs: {
-                  type: "void",
-                  "x-component": "Tabs",
-                  "x-component-props": {},
-                  "x-initializer": "TabPaneInitializers",
-                  properties: {
-                    tab1: {
-                      type: "void",
-                      title: '{{t("Details")}}',
-                      "x-component": "Tabs.TabPane",
-                      "x-designer": "Tabs.Designer",
-                      "x-component-props": {},
-                      properties: {
-                        grid: {
-                          type: "void",
-                          "x-component": "Grid",
-                          "x-initializer": "RecordBlockInitializers",
-                          properties: {}
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    };
-    return schema;
-  };
   const MapBlockInitializer = (props) => {
     const { insert } = props;
     const options = React.useContext(react.SchemaOptionsContext);
@@ -2824,7 +2876,9 @@
         componentType: "Map",
         icon: /* @__PURE__ */ jsxRuntimeExports.jsx(icons.TableOutlined, {}),
         onCreateBlockSchema: async ({ item }) => {
-          const mapFieldOptions = getCollectionFieldsOptions(item.name, ["point", "lineString", "polygon"]);
+          const mapFieldOptions = getCollectionFieldsOptions(item.name, ["point", "lineString", "polygon"], {
+            association: ["o2o", "obo", "oho", "o2m", "m2o", "m2m"]
+          });
           const markerFieldOptions = getCollectionFieldsOptions(item.name, "string");
           const values = await client.FormDialog(
             t("Create map block"),
@@ -2839,9 +2893,11 @@
                         title: t("Map field"),
                         enum: mapFieldOptions,
                         required: true,
-                        "x-component": "Select",
+                        "x-component": "Cascader",
                         "x-decorator": "FormItem",
-                        default: (_a = mapFieldOptions[0]) == null ? void 0 : _a.value
+                        default: mapFieldOptions.length ? [mapFieldOptions[0].value, (_a = mapFieldOptions[0].children) == null ? void 0 : _a[0].value].filter(
+                          (v) => v !== void 0 && v !== null
+                        ) : []
                       },
                       marker: {
                         title: t("Marker field"),
@@ -2850,16 +2906,13 @@
                         "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) {
+                          if (!(value == null ? void 0 : value.length)) {
                             return;
                           }
-                          const item2 = mapFieldOptions.find((item3) => item3.value === value).type;
-                          field.hidden = item2 !== "point";
+                          const item2 = findNestedOption(value, mapFieldOptions);
+                          if (item2) {
+                            field.hidden = item2.type !== "point";
+                          }
                         }
                       }
                     }

package/dist/client/utils.d.ts

@@ -0,0 +1 @@
+export declare const getSource: (data: Record<string, any>, fields?: string[], type?: string) => any;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Map",
   "displayName.zh-CN": "地图",
-  "version": "0.12.0-alpha.2",
+  "version": "0.12.0-alpha.4",
   "description": "Provide map fields and blocks",
   "description.zh-CN": "提供地图字段和区块",
   "license": "AGPL-3.0",
@@ -34,5 +34,5 @@
     "@nocobase/test": "0.x",
     "@nocobase/utils": "0.x"
   },
-  "gitHead": "a95e9e2666f0318c955113a4735bc005a2c9a767"
+  "gitHead": "215dc3b2437c501ca903b56cc378ab5e81c8a11c"
 }