@nocobase/plugin-map 0.9.1-alpha.1 → 0.9.2-alpha.1

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

@@ -7,32 +7,32 @@ exports.default = void 0;
 const locale = {
   'Map-based geometry': '基于地图的几何图形',
   'Map type': '地图类型',
-  'Point': '点',
-  'Line': '线',
-  'Circle': '圆',
-  'Polygon': '多边形',
+  Point: '点',
+  Line: '线',
+  Circle: '圆',
+  Polygon: '多边形',
   'Access key': '访问密钥',
   'securityJsCode or serviceHost': 'securityJsCode 或 serviceHost',
-  'AMap': '高德地图',
+  AMap: '高德地图',
   'Google Maps': '谷歌地图',
-  'Clear': '清空',
+  Clear: '清空',
   'Click to select the starting point and double-click to end the drawing': '点击选择起点，双击结束绘制',
   'Clear the canvas': '清空画布',
   'Are you sure to clear the canvas?': '您确定要清空画布吗？',
-  'Confirm': '确定',
-  'Cancel': '取消',
+  Confirm: '确定',
+  Cancel: '取消',
   'Enter keywords to search': '输入地方名关键字搜索（必须包含省/市）',
   'The AccessKey is incorrect, please check it': '访问密钥不正确，请检查',
   'Please configure the AMap securityCode or serviceHost correctly': '请正确配置高德地图 securityCode 或 serviceHost',
   'Map Manager': '地图管理',
-  'Configuration': '配置',
+  Configuration: '配置',
   'Saved successfully': '保存成功',
   'Saved failed': '保存失败',
-  'Edit': '编辑',
-  'Save': '保存',
+  Edit: '编辑',
+  Save: '保存',
   'Please configure the AccessKey and SecurityJsCode first': '请先配置 AccessKey 和 SecurityJsCode',
   'Go to the configuration page': '前往配置页面',
-  'Zoom': '缩放',
+  Zoom: '缩放',
   'Set default zoom level': '设置默认缩放级别',
   'The default zoom level of the map': '地图默认缩放级别',
   // Designer
@@ -40,12 +40,15 @@ const locale = {
   'Field title': '字段标题',
   'Edit tooltip': '编辑提示信息',
   'Delete field': '删除字段',
-  "Required": "必填",
-  'Pattern': '模式',
-  "Editable": "可编辑",
-  "Readonly": "只读（禁止编辑）",
-  "Easy-reading": "只读（阅读模式）",
-  "Edit description": "编辑描述"
+  Required: '必填',
+  Pattern: '模式',
+  "Operator": "运算符",
+  Editable: '可编辑',
+  Readonly: '只读（禁止编辑）',
+  'Easy-reading': '只读（阅读模式）',
+  'Edit description': '编辑描述',
+  'Map field': '地图字段',
+  'Marker field': '标记字段'
 };
 var _default = locale;
 exports.default = _default;

package/lib/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _server = _interopRequireDefault(require("./server"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/server/actions/index.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.setConfiguration = exports.getConfiguration = void 0;
-
 var _constants = require("../constants");
-
 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); }); }; }
-
 const getConfiguration = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator(function* (ctx, next) {
     const type = ctx.action.params.type;
@@ -23,14 +19,11 @@ const getConfiguration = /*#__PURE__*/function () {
     ctx.body = record;
     return next();
   });
-
   return function getConfiguration(_x, _x2) {
     return _ref.apply(this, arguments);
   };
 }();
-
 exports.getConfiguration = getConfiguration;
-
 const setConfiguration = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator(function* (ctx, next) {
     const values = ctx.action.params;
@@ -40,7 +33,6 @@ const setConfiguration = /*#__PURE__*/function () {
         type: values.type
       }
     });
-
     if (record) {
       yield repo.update({
         values,
@@ -53,14 +45,11 @@ const setConfiguration = /*#__PURE__*/function () {
         values
       });
     }
-
     ctx.body = 'ok';
     return next();
   });
-
   return function setConfiguration(_x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 }();
-
 exports.setConfiguration = setConfiguration;

package/lib/server/collections/mapConfiguration.d.ts

@@ -1,3 +1,3 @@
-import { CollectionOptions } from "@nocobase/client";
+import { CollectionOptions } from '@nocobase/client';
 declare const _default: CollectionOptions;
 export default _default;

package/lib/server/collections/mapConfiguration.js

@@ -4,11 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _constants = require("../constants");
-
 var _default = {
-  namespace: 'map',
+  namespace: 'map.mapConfiguration',
   duplicator: 'optional',
   name: _constants.MapConfigurationCollectionName,
   title: '{{t("Map Manager")}}',

package/lib/server/fields/circle.js

@@ -4,73 +4,56 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CircleField = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 {
   constructor(...args) {
     super(...args);
     this.key = 'Circle';
   }
-
 }
-
 class CircleField extends _database().Field {
   constructor(options, context) {
     const name = options.name;
     super(_objectSpread({
       get() {
         const value = this.getDataValue(name);
-
         if ((0, _helpers.isPg)(context)) {
           if (typeof value === 'string') {
             return (0, _helpers.toValue)(`(${value})`);
           }
-
           return value ? [value.x, value.y, value.radius] : null;
         } else {
           return value;
         }
       },
-
       set(value) {
         var _value;
-
         if (!((_value = value) === null || _value === void 0 ? void 0 : _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
           value = value.join(',');
         }
         this.setDataValue(name, value);
       }
-
     }, options), context);
   }
-
   get dataType() {
     if ((0, _helpers.isPg)(this.context)) {
       return Circle;
@@ -78,7 +61,5 @@ class CircleField extends _database().Field {
       return _sequelize().DataTypes.JSON;
     }
   }
-
 }
-
 exports.CircleField = CircleField;

package/lib/server/fields/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _point = require("./point");
-
 Object.keys(_point).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _point[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_point).forEach(function (key) {
     }
   });
 });
-
 var _lineString = require("./lineString");
-
 Object.keys(_lineString).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _lineString[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_lineString).forEach(function (key) {
     }
   });
 });
-
 var _polygon = require("./polygon");
-
 Object.keys(_polygon).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _polygon[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_polygon).forEach(function (key) {
     }
   });
 });
-
 var _circle = require("./circle");
-
 Object.keys(_circle).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _circle[key]) return;

package/lib/server/fields/lineString.js

@@ -4,50 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LineStringField = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 {
   constructor(...args) {
     super(...args);
     this.key = 'Path';
   }
-
 }
-
 class LineStringField extends _database().Field {
   constructor(options, context) {
     const name = options.name;
     super(_objectSpread({
       get() {
         const value = this.getDataValue(name);
-
         if ((0, _helpers.isPg)(context)) {
           return (0, _helpers.toValue)(value);
         } else if ((0, _helpers.isMysql)(context)) {
@@ -56,10 +44,8 @@ class LineStringField extends _database().Field {
           return value;
         }
       },
-
       set(value) {
         var _value;
-
         if (!((_value = value) === null || _value === void 0 ? 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)) {
@@ -70,22 +56,17 @@ class LineStringField extends _database().Field {
         }
         this.setDataValue(name, value);
       }
-
     }, options), context);
   }
-
   get dataType() {
     if ((0, _helpers.isPg)(this.context)) {
       return LineString;
     }
-
     if ((0, _helpers.isMysql)(this.context)) {
       return _sequelize().DataTypes.GEOMETRY('LINESTRING');
     } else {
       return _sequelize().DataTypes.JSON;
     }
   }
-
 }
-
 exports.LineStringField = LineStringField;

package/lib/server/fields/point.js

@@ -4,55 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PointField = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 {
   constructor(...args) {
     super(...args);
     this.key = 'Point';
   }
-
 }
-
 class PointField extends _database().Field {
   constructor(options, context) {
     const name = options.name;
     super(_objectSpread({
       get() {
         const value = this.getDataValue(name);
-
         if ((0, _helpers.isPg)(context)) {
           if (typeof value === 'string') {
             return (0, _helpers.toValue)(value);
           }
-
           return value ? [value.x, value.y] : null;
         } else if ((0, _helpers.isMysql)(context)) {
           return (value === null || value === void 0 ? void 0 : value.coordinates) || null;
@@ -60,10 +47,8 @@ class PointField extends _database().Field {
           return value;
         }
       },
-
       set(value) {
         var _value;
-
         if (!((_value = value) === null || _value === void 0 ? void 0 : _value.length)) value = null;else if ((0, _helpers.isPg)(context)) {
           value = (0, _helpers.joinComma)(value);
         } else if ((0, _helpers.isMysql)(context)) {
@@ -74,22 +59,17 @@ class PointField extends _database().Field {
         }
         this.setDataValue(name, value);
       }
-
     }, options), context);
   }
-
   get dataType() {
     if ((0, _helpers.isPg)(this.context)) {
       return Point;
     }
-
     if ((0, _helpers.isMysql)(this.context)) {
       return _sequelize().DataTypes.GEOMETRY('POINT');
     } else {
       return _sequelize().DataTypes.JSON;
     }
   }
-
 }
-
 exports.PointField = PointField;

package/lib/server/fields/polygon.js

@@ -4,50 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PolygonField = void 0;
-
 function _database() {
   const data = require("@nocobase/database");
-
   _database = function _database() {
     return data;
   };
-
   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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 {
   constructor(...args) {
     super(...args);
     this.key = 'Polygon';
   }
-
 }
-
 class PolygonField extends _database().Field {
   constructor(options, context) {
     const name = options.name;
     super(_objectSpread({
       get() {
         const value = this.getDataValue(name);
-
         if ((0, _helpers.isPg)(context)) {
           return (0, _helpers.toValue)(value);
         } else if ((0, _helpers.isMysql)(context)) {
@@ -56,10 +44,8 @@ class PolygonField extends _database().Field {
           return value;
         }
       },
-
       set(value) {
         var _value;
-
         if (!((_value = value) === null || _value === void 0 ? 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)) {
@@ -70,10 +56,8 @@ class PolygonField extends _database().Field {
         }
         this.setDataValue(name, value);
       }
-
     }, options), context);
   }
-
   get dataType() {
     if ((0, _helpers.isPg)(this.context)) {
       return Polygon;
@@ -83,7 +67,5 @@ class PolygonField extends _database().Field {
       return _sequelize().DataTypes.JSON;
     }
   }
-
 }
-
 exports.PolygonField = PolygonField;

package/lib/server/helpers/index.js

@@ -4,41 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.toValue = exports.joinComma = exports.isSqlite = exports.isPg = exports.isMysql = exports.getDialect = void 0;
-
 const joinComma = value => {
   if (!value) return null;
   return `(${value.join(',')})`;
 };
-
 exports.joinComma = joinComma;
-
 const toValue = value => {
   if (!value) return null;
   return JSON.parse(value.replace(/\(/g, '[').replace(/\)/g, ']'));
 };
-
 exports.toValue = toValue;
-
 const getDialect = ctx => {
   return (ctx.db || ctx.database).sequelize.getDialect();
 };
-
 exports.getDialect = getDialect;
-
 const isPg = ctx => {
   return getDialect(ctx) === 'postgres';
 };
-
 exports.isPg = isPg;
-
 const isSqlite = ctx => {
   return getDialect(ctx) === 'sqlite';
 };
-
 exports.isSqlite = isSqlite;
-
 const isMysql = ctx => {
   return getDialect(ctx) === 'mysql';
 };
-
 exports.isMysql = isMysql;

package/lib/server/index.js

@@ -9,7 +9,5 @@ Object.defineProperty(exports, "default", {
     return _plugin.default;
   }
 });
-
 var _plugin = _interopRequireDefault(require("./plugin"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }