@nocobase/plugin-map 2.1.0-alpha.4 → 2.1.0-alpha.40

package/dist/externalVersion.js

@@ -8,12 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.1.0-alpha.4",
+  "@nocobase/client": "2.1.0-alpha.40",
   "react": "18.2.0",
-  "@nocobase/server": "2.1.0-alpha.4",
-  "@nocobase/test": "2.1.0-alpha.4",
+  "@nocobase/flow-engine": "2.1.0-alpha.40",
+  "@nocobase/client-v2": "2.1.0-alpha.40",
+  "@nocobase/server": "2.1.0-alpha.40",
+  "@nocobase/test": "2.1.0-alpha.40",
   "@formily/react": "2.3.7",
-  "lodash": "4.17.21",
+  "lodash": "4.18.1",
   "react-i18next": "11.18.6",
   "@ant-design/icons": "5.6.1",
   "@formily/antd-v5": "1.2.3",
@@ -21,9 +23,7 @@ module.exports = {
   "antd": "5.24.2",
   "@formily/shared": "2.3.7",
   "@formily/core": "2.3.7",
-  "@nocobase/flow-engine": "2.1.0-alpha.4",
-  "@nocobase/plugin-action-bulk-update": "2.1.0-alpha.4",
-  "@nocobase/actions": "2.1.0-alpha.4",
-  "@nocobase/database": "2.1.0-alpha.4",
+  "@nocobase/actions": "2.1.0-alpha.40",
+  "@nocobase/database": "2.1.0-alpha.40",
   "ahooks": "3.7.8"
 };

package/dist/{client/models/MapActionGroupModel.d.ts → shared/configuration.d.ts}

@@ -6,6 +6,5 @@
  * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
-import { ActionGroupModel } from '@nocobase/client';
-export declare class MapActionGroupModel extends ActionGroupModel {
-}
+export declare const MapConfigurationResourceKey = "map-configuration";
+export declare const getSSKey: (type: string) => string;

package/dist/shared/configuration.js

@@ -0,0 +1,39 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var configuration_exports = {};
+__export(configuration_exports, {
+  MapConfigurationResourceKey: () => MapConfigurationResourceKey,
+  getSSKey: () => getSSKey
+});
+module.exports = __toCommonJS(configuration_exports);
+const MapConfigurationResourceKey = "map-configuration";
+const getSSKey = (type) => `NOCOBASE_PLUGIN_MAP_CONFIGURATION_${type}`;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  MapConfigurationResourceKey,
+  getSSKey
+});

package/dist/shared/constants.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const selectedImage: string;
+export declare const defaultImage: string;

package/dist/shared/constants.js

@@ -0,0 +1,43 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var constants_exports = {};
+__export(constants_exports, {
+  defaultImage: () => defaultImage,
+  selectedImage: () => selectedImage
+});
+module.exports = __toCommonJS(constants_exports);
+var import_theme = require("./theme");
+const markerSvg = (color) => `data:image/svg+xml;utf8,${encodeURIComponent(
+  `<svg xmlns="http://www.w3.org/2000/svg" width="38" height="63" viewBox="0 0 38 63"><path fill="${color}" d="M19 0C8.5 0 0 8.5 0 19c0 14.2 19 44 19 44s19-29.8 19-44C38 8.5 29.5 0 19 0Z"/><circle fill="white" cx="19" cy="19" r="8"/></svg>`
+)}`;
+const selectedImage = markerSvg(import_theme.mapSelectedColor);
+const defaultImage = markerSvg(import_theme.mapActiveColor);
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  defaultImage,
+  selectedImage
+});

package/dist/shared/theme.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const mapActiveColor = "#4e9bff";
+export declare const mapSelectedColor = "#F18b62";

package/dist/shared/theme.js

@@ -0,0 +1,39 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var theme_exports = {};
+__export(theme_exports, {
+  mapActiveColor: () => mapActiveColor,
+  mapSelectedColor: () => mapSelectedColor
+});
+module.exports = __toCommonJS(theme_exports);
+const mapActiveColor = "#4e9bff";
+const mapSelectedColor = "#F18b62";
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  mapActiveColor,
+  mapSelectedColor
+});

package/dist/shared/types.d.ts

@@ -0,0 +1,9 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export type MapEditorType = 'point' | 'polygon' | 'lineString' | 'circle';

package/dist/shared/types.js

@@ -0,0 +1,24 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var types_exports = {};
+module.exports = __toCommonJS(types_exports);

package/dist/shared/utils.d.ts

@@ -0,0 +1,13 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const getSource: (data: Record<string, any>, fields?: string[], type?: string) => any;
+export declare const runIdleTask: (callback: () => void) => void;
+export declare const normalizeErrorMessage: (error: unknown, fallbackMessage: string) => string;
+export declare const compileTemplate: (value: any, t?: (key: string, options?: any) => string) => any;
+export declare const getLabelFormatValue: (uiSchema: any, value: any) => any;

package/dist/shared/utils.js

@@ -0,0 +1,98 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var utils_exports = {};
+__export(utils_exports, {
+  compileTemplate: () => compileTemplate,
+  getLabelFormatValue: () => getLabelFormatValue,
+  getSource: () => getSource,
+  normalizeErrorMessage: () => normalizeErrorMessage,
+  runIdleTask: () => runIdleTask
+});
+module.exports = __toCommonJS(utils_exports);
+const getSource = (data, fields, type) => {
+  const res = fields == null ? void 0 : fields.reduce((obj, field, index) => {
+    if (index === fields.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 runIdleTask = (callback) => {
+  if (window.requestIdleCallback) {
+    window.requestIdleCallback(() => {
+      callback();
+    });
+    return;
+  }
+  window.setTimeout(callback, 1);
+};
+const normalizeErrorMessage = (error, fallbackMessage) => {
+  if (typeof error === "string") {
+    return error;
+  }
+  if (error instanceof Error && error.message) {
+    return error.message;
+  }
+  if (error && typeof error === "object" && "message" in error) {
+    const { message } = error;
+    if (typeof message === "string" && message) {
+      return message;
+    }
+  }
+  return fallbackMessage;
+};
+const compileTemplate = (value, t) => {
+  if (typeof value !== "string") {
+    return value;
+  }
+  return value.replace(/\{\{\s*t\(['"]([^'"]+)['"](?:,\s*([^}]+))?\)\s*\}\}/g, (_, key) => {
+    return t ? t(key) : key;
+  });
+};
+const getLabelFormatValue = (uiSchema, value) => {
+  var _a;
+  if (value == null) {
+    return value;
+  }
+  const enumOptions = (uiSchema == null ? void 0 : uiSchema.enum) || ((_a = uiSchema == null ? void 0 : uiSchema["x-component-props"]) == null ? void 0 : _a.options);
+  if (Array.isArray(enumOptions)) {
+    const matched = enumOptions.find((item) => (item == null ? void 0 : item.value) === value);
+    if (matched) {
+      return matched.label ?? matched.title ?? value;
+    }
+  }
+  return value;
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  compileTemplate,
+  getLabelFormatValue,
+  getSource,
+  normalizeErrorMessage,
+  runIdleTask
+});

package/package.json

@@ -3,11 +3,11 @@
   "displayName": "Block: Map",
   "displayName.ru-RU": "Блок: Карта",
   "displayName.zh-CN": "区块：地图",
-  "version": "2.1.0-alpha.4",
+  "version": "2.1.0-alpha.40",
   "description": "Map block, support Gaode map and Google map, you can also extend more map types.",
   "description.ru-RU": "Блок карты, поддерживает карты Gaode и Google, можно расширить поддержку других типов карт.",
   "description.zh-CN": "地图区块，支持高德地图和 Google 地图，你也可以扩展更多地图类型。",
-  "license": "AGPL-3.0",
+  "license": "Apache-2.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/block-map",
   "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/block-map",
@@ -34,12 +34,14 @@
   "peerDependencies": {
     "@nocobase/actions": "2.x",
     "@nocobase/client": "2.x",
+    "@nocobase/client-v2": "2.x",
     "@nocobase/database": "2.x",
+    "@nocobase/plugin-action-bulk-update": "2.x",
     "@nocobase/server": "2.x",
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "32c682485e5f1878b9165be2e9de18000d98f935",
+  "gitHead": "e73f99dd0abefe847f2e50ff0fea1f41a82fd048",
   "keywords": [
     "Blocks"
   ]

package/dist/client/models/components/Map.d.ts

@@ -1,13 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import React from 'react';
-import { AMapComponentProps } from './AMap';
-type MapProps = AMapComponentProps;
-declare const Map: (props: MapProps) => React.JSX.Element;
-export { Map };

package/dist/client/models/components/MapComponent.d.ts

@@ -1,10 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-import React from 'react';
-export declare const MapComponent: React.ForwardRefExoticComponent<Omit<any, "ref"> & React.RefAttributes<any>>;

package/dist/client/models/components/index.d.ts

@@ -1,13 +0,0 @@
-/**
- * This file is part of the NocoBase (R) project.
- * Copyright (c) 2020-2024 NocoBase Co., Ltd.
- * Authors: NocoBase Team.
- *
- * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
- * For more information, please refer to: https://www.nocobase.com/agreement.
- */
-export * from './AMap';
-export * from './Configuration';
-export * from './GoogleMaps';
-export * from './Map';
-export * from './MapComponent';