@nocobase/plugin-map 0.8.1-alpha.4 → 0.9.0-alpha.2

package/lib/server/plugin.js

@@ -15,8 +15,6 @@ function _server() {
   return data;
 }
 
-var _fields = require("./fields");
-
 function _path() {
   const data = require("path");
 
@@ -29,6 +27,8 @@ function _path() {
 
 var _actions = require("./actions");
 
+var _fields = require("./fields");
+
 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); }); }; }
@@ -62,6 +62,13 @@ class MapPlugin extends _server().Plugin {
         },
         only: ['get', 'set']
       });
+
+      _this.app.acl.registerSnippet({
+        name: `pm.${_this.name}.configuration`,
+        actions: ['map-configuration:set']
+      });
+
+      _this.app.acl.allow('map-configuration', 'get', 'loggedIn');
     })();
   }
 

package/package.json

@@ -1,19 +1,17 @@
 {
   "name": "@nocobase/plugin-map",
-  "version": "0.8.1-alpha.4",
-  "main": "lib/server/index.js",
+  "version": "0.9.0-alpha.2",
+  "description": "",
+  "license": "AGPL-3.0",
+  "main": "./lib/index.js",
+  "types": "./lib/index.d.ts",
   "devDependencies": {
-    "@nocobase/server": "0.8.1-alpha.4",
-    "@nocobase/test": "0.8.1-alpha.4"
+    "@nocobase/server": "0.9.0-alpha.2",
+    "@nocobase/test": "0.9.0-alpha.2"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
-    "@amap/amap-jsapi-types": "^0.0.10",
-    "@emotion/css": "^11.7.1",
-    "@formily/react": "2.0.20",
-    "ahooks": "^3.7.2",
-    "antd": "~4.19.5",
-    "sequelize": "^6.26.0"
+    "@amap/amap-jsapi-types": "^0.0.10"
   },
-  "gitHead": "22ccdf7bd7fcbd16aeefd5250db237a4bd1ccff1"
+  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
 }

package/src/client/components/AMap.tsx

@@ -1,17 +1,16 @@
-import React from 'react';
-import { useEffect, useRef, useState } from 'react';
 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 } from '@emotion/css';
-import { Alert, Button, Modal } from 'antd';
-import { useMapTranslation } from '../locales';
-import Search from './Search';
 import { useMemoizedFn } from 'ahooks';
-import { useMapConfiguration } from '../hooks';
+import { Alert, Button, Modal } from 'antd';
+import React, { useEffect, useRef, useState } from 'react';
 import { useHistory } from 'react-router';
-import { SyncOutlined } from '@ant-design/icons';
+import { useMapConfiguration } from '../hooks';
+import { useMapTranslation } from '../locale';
+import Search from './Search';
 
 interface AMapComponentProps {
   accessKey: string;

package/src/client/components/Configuration.tsx

@@ -1,10 +1,10 @@
-import { useAPIClient, useCompile, useRequest } from '@nocobase/client';
+import { useAPIClient, useCompile } from '@nocobase/client';
 import { useBoolean } from 'ahooks';
-import { Form, Input, Tabs, Button, Card, message } from 'antd';
-import React, { useMemo, useEffect } from 'react';
+import { Button, Card, Form, Input, message, Tabs } from 'antd';
+import React, { useEffect, useMemo } from 'react';
 import { MapTypes } from '../constants';
 import { MapConfigurationResourceKey, useMapConfiguration } from '../hooks';
-import { useMapTranslation } from '../locales';
+import { useMapTranslation } from '../locale';
 
 const AMapConfiguration = ({ type }) => {
   const { t } = useMapTranslation();

package/src/client/components/Designer.tsx

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

package/src/client/components/Search.tsx

@@ -1,8 +1,8 @@
-import { message, Select } from 'antd';
 import { css } from '@emotion/css';
-import React, { useEffect, useRef, useState } from 'react';
 import { useDebounceFn } from 'ahooks';
-import { useMapTranslation } from '../locales';
+import { message, Select } from 'antd';
+import React, { useEffect, useRef, useState } from 'react';
+import { useMapTranslation } from '../locale';
 
 interface SearchProps {
   aMap: any;

package/src/client/constants.ts

@@ -1,4 +1,4 @@
-import { generateNTemplate } from "./locales";
+import { generateNTemplate } from "./locale";
 
 export const MapTypes = [
   { label: generateNTemplate('AMap'), value: 'amap' },

package/src/client/fields/circle.ts

@@ -1,5 +1,5 @@
 import { IField } from '@nocobase/client';
-import { generateNTemplate } from '../locales';
+import { generateNTemplate } from '../locale';
 import { commonSchema } from './schema';
 
 export const circle: IField = {

package/src/client/fields/lineString.ts

@@ -1,5 +1,5 @@
 import { IField } from '@nocobase/client';
-import { generateNTemplate } from '../locales';
+import { generateNTemplate } from '../locale';
 import { commonSchema } from './schema';
 
 export const lineString: IField = {

package/src/client/fields/point.ts

@@ -1,6 +1,5 @@
-import { ISchema } from '@formily/react';
 import { IField } from '@nocobase/client';
-import { generateNTemplate } from '../locales';
+import { generateNTemplate } from '../locale';
 import { commonSchema } from './schema';
 
 export const point: IField = {

package/src/client/fields/polygon.ts

@@ -1,5 +1,5 @@
 import { IField } from '@nocobase/client';
-import { generateNTemplate } from '../locales';
+import { generateNTemplate } from '../locale';
 import { commonSchema } from './schema';
 
 export const polygon: IField = {

package/src/client/fields/schema.ts

@@ -1,7 +1,7 @@
 import { ISchema } from '@formily/react';
 import { interfacesProperties } from '@nocobase/client';
 import { MapTypes } from '../constants';
-import { generateNTemplate } from '../locales';
+import { generateNTemplate } from '../locale';
 
 const { defaultProps } = interfacesProperties;
 

package/src/client/index.tsx

@@ -2,14 +2,14 @@ import {
   CollectionManagerContext,
   CurrentAppInfoProvider,
   SchemaComponentOptions,
-  SettingsCenterProvider,
+  SettingsCenterProvider
 } from '@nocobase/client';
 import React, { useContext } from 'react';
 import Configuration from './components/Configuration';
 import Map from './components/Map';
 import { interfaces } from './fields';
 import { Initialize } from './initialize';
-import { useMapTranslation } from './locales';
+import { useMapTranslation } from './locale';
 
 export default React.memo((props) => {
   const ctx = useContext(CollectionManagerContext);
@@ -19,7 +19,7 @@ export default React.memo((props) => {
       <Initialize>
         <SettingsCenterProvider
           settings={{
-            'map-configuration': {
+            map: {
               title: t('Map Manager'),
               icon: 'EnvironmentOutlined',
               tabs: {

package/src/client/initialize.tsx

@@ -1,9 +1,8 @@
-import React from 'react';
 import { registerField, registerGroup, useCurrentAppInfo } from '@nocobase/client';
-import { generateNTemplate } from './locales';
-import './locales';
+import React, { useEffect } from 'react';
 import { fields } from './fields';
-import { useEffect } from 'react';
+import './locale';
+import { generateNTemplate } from './locale';
 
 export const useRegisterInterface = () => {
   const { data } = useCurrentAppInfo() || {};

package/src/client/{locales → locale}/index.ts

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

package/src/server/__tests__/fields.test.ts

@@ -94,8 +94,14 @@ describe('fields', () => {
       [3, 4],
       [5, 6],
     ]);
-    model.set('lineString', [[5, 6], [7, 8]]);
-    expect(model.get('lineString')).toMatchObject([[5, 6], [7, 8]]);
+    model.set('lineString', [
+      [5, 6],
+      [7, 8],
+    ]);
+    expect(model.get('lineString')).toMatchObject([
+      [5, 6],
+      [7, 8],
+    ]);
     model.set('circle', [1, 2, 0.5]);
     expect(model.get('circle')).toMatchObject([1, 2, 0.5]);
   });

package/src/server/fields/circle.ts

@@ -6,29 +6,28 @@ class Circle extends DataTypes.ABSTRACT {
   key = 'Circle';
 }
 
-
 export class CircleField extends Field {
   constructor(options?: any, context?: FieldContext) {
-    const { name } = options
+    const { name } = options;
     super(
       {
         get() {
           const value = this.getDataValue(name);
           if (isPg(context)) {
             if (typeof value === 'string') {
-              return toValue(`(${value})`)
+              return toValue(`(${value})`);
             }
-            return value ? [value.x, value.y, value.radius] : null
+            return value ? [value.x, value.y, value.radius] : null;
           } else {
-            return value
+            return value;
           }
         },
         set(value) {
-          if (!value?.length) value = null
+          if (!value?.length) value = null;
           else if (isPg(context)) {
-            value = value.join(',')
+            value = value.join(',');
           }
-          this.setDataValue(name, value)
+          this.setDataValue(name, value);
         },
         ...options,
       },
@@ -40,7 +39,7 @@ export class CircleField extends Field {
     if (isPg(this.context)) {
       return Circle;
     } else {
-      return DataTypes.JSON
+      return DataTypes.JSON;
     }
   }
 }

package/src/server/fields/index.ts

@@ -1,4 +1,4 @@
-export * from './point'
-export * from './lineString'
-export * from './polygon'
-export * from './circle'
+export * from './point';
+export * from './lineString';
+export * from './polygon';
+export * from './circle';

package/src/server/fields/lineString.ts

@@ -8,30 +8,30 @@ class LineString extends DataTypes.ABSTRACT {
 
 export class LineStringField extends Field {
   constructor(options?: any, context?: FieldContext) {
-    const { name } = options
+    const { name } = options;
     super(
       {
         get() {
           const value = this.getDataValue(name);
           if (isPg(context)) {
-            return toValue(value)
+            return toValue(value);
           } else if (isMysql(context)) {
-            return value?.coordinates || null
+            return value?.coordinates || null;
           } else {
-            return value
+            return value;
           }
         },
         set(value) {
-          if (!value?.length) value = null
+          if (!value?.length) value = null;
           else if (isPg(context)) {
-            value = joinComma(value.map(joinComma))
+            value = joinComma(value.map(joinComma));
           } else if (isMysql(context)) {
             value = {
               type: 'LineString',
-              coordinates: value
-            }
+              coordinates: value,
+            };
           }
-          this.setDataValue(name, value)
+          this.setDataValue(name, value);
         },
         ...options,
       },
@@ -41,14 +41,14 @@ export class LineStringField extends Field {
 
   get dataType() {
     if (isPg(this.context)) {
-      return LineString
-    } if (isMysql(this.context)) {
+      return LineString;
+    }
+    if (isMysql(this.context)) {
       return DataTypes.GEOMETRY('LINESTRING');
     } else {
       return DataTypes.JSON;
     }
   }
-
 }
 
 export interface LineStringOptions extends BaseColumnFieldOptions {

package/src/server/fields/point.ts

@@ -8,33 +8,33 @@ class Point extends DataTypes.ABSTRACT {
 
 export class PointField extends Field {
   constructor(options?: any, context?: FieldContext) {
-    const { name } = options
+    const { name } = options;
     super(
       {
         get() {
           const value = this.getDataValue(name);
           if (isPg(context)) {
             if (typeof value === 'string') {
-              return toValue(value)
+              return toValue(value);
             }
-            return value ? [value.x, value.y] : null
+            return value ? [value.x, value.y] : null;
           } else if (isMysql(context)) {
-            return value?.coordinates || null
+            return value?.coordinates || null;
           } else {
-            return value
+            return value;
           }
         },
         set(value) {
-          if (!value?.length) value = null
+          if (!value?.length) value = null;
           else if (isPg(context)) {
-            value = joinComma(value)
+            value = joinComma(value);
           } else if (isMysql(context)) {
             value = {
               type: 'Point',
-              coordinates: value
-            }
+              coordinates: value,
+            };
           }
-          this.setDataValue(name, value)
+          this.setDataValue(name, value);
         },
         ...options,
       },
@@ -45,13 +45,13 @@ export class PointField extends Field {
   get dataType() {
     if (isPg(this.context)) {
       return Point;
-    } if (isMysql(this.context)) {
+    }
+    if (isMysql(this.context)) {
       return DataTypes.GEOMETRY('POINT');
     } else {
       return DataTypes.JSON;
     }
   }
-
 }
 
 export interface PointFieldOptions extends BaseColumnFieldOptions {

package/src/server/fields/polygon.ts

@@ -3,35 +3,35 @@ import { DataTypes } from 'sequelize';
 import { isMysql, isPg, joinComma, toValue } from '../helpers';
 
 class Polygon extends DataTypes.ABSTRACT {
-  key = 'Polygon'
+  key = 'Polygon';
 }
 
 export class PolygonField extends Field {
   constructor(options?: any, context?: FieldContext) {
-    const { name } = options
+    const { name } = options;
     super(
       {
         get() {
-          const value = this.getDataValue(name)
+          const value = this.getDataValue(name);
           if (isPg(context)) {
-            return toValue(value)
+            return toValue(value);
           } else if (isMysql(context)) {
-            return value?.coordinates[0].slice(0, -1) || null
+            return value?.coordinates[0].slice(0, -1) || null;
           } else {
-            return value
+            return value;
           }
         },
         set(value) {
-          if (!value?.length) value = null
+          if (!value?.length) value = null;
           else if (isPg(context)) {
-            value = joinComma(value.map((item: any) => joinComma(item)))
+            value = joinComma(value.map((item: any) => joinComma(item)));
           } else if (isMysql(context)) {
             value = {
               type: 'Polygon',
-              coordinates: [value.concat([value[0]])]
-            }
+              coordinates: [value.concat([value[0]])],
+            };
           }
-          this.setDataValue(name, value)
+          this.setDataValue(name, value);
         },
         ...options,
       },
@@ -48,7 +48,6 @@ export class PolygonField extends Field {
       return DataTypes.JSON;
     }
   }
-
 }
 
 export interface PolygonFieldOptions extends BaseColumnFieldOptions {

package/src/server/plugin.ts

@@ -1,46 +1,51 @@
 import { InstallOptions, Plugin } from '@nocobase/server';
-import { CircleField, LineStringField, PointField, PolygonField } from './fields';
 import { resolve } from 'path';
 import { getConfiguration, setConfiguration } from './actions';
+import { CircleField, LineStringField, PointField, PolygonField } from './fields';
 
 export class MapPlugin extends Plugin {
-  afterAdd() { }
+  afterAdd() {}
 
   beforeLoad() {
     const fields = {
       point: PointField,
       polygon: PolygonField,
       lineString: LineStringField,
-      circle: CircleField
+      circle: CircleField,
     };
 
     this.db.registerFieldTypes(fields);
   }
 
-
   async load() {
     await this.db.import({
       directory: resolve(__dirname, 'collections'),
     });
 
-    this.app.resource(({
+    this.app.resource({
       name: 'map-configuration',
       actions: {
         get: getConfiguration,
-        set: setConfiguration
+        set: setConfiguration,
       },
-      only: ['get', 'set']
-    }))
+      only: ['get', 'set'],
+    });
+
+    this.app.acl.registerSnippet({
+      name: `pm.${this.name}.configuration`,
+      actions: ['map-configuration:set'],
+    });
 
+    this.app.acl.allow('map-configuration', 'get', 'loggedIn');
   }
 
-  async install(options?: InstallOptions) { }
+  async install(options?: InstallOptions) {}
 
-  async afterEnable() { }
+  async afterEnable() {}
 
-  async afterDisable() { }
+  async afterDisable() {}
 
-  async remove() { }
+  async remove() {}
 }
 
 export default MapPlugin;