@nocobase/plugin-map 0.9.2-alpha.2 → 0.9.2-alpha.3

package/lib/client/block/MapBlockInitializer.js

@@ -91,8 +91,8 @@ const MapBlockInitializer = props => {
                   '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);
+                    console.log('🚀 ~ file: MapBlockInitializer.tsx:45 ~ values ~ value:', value);
+                    console.log('🚀 ~ file: MapBlockInitializer.tsx:50 ~ values ~ mapFieldOptions:', mapFieldOptions);
                     if (!value) {
                       return;
                     }

package/lib/client/components/Designer.js

@@ -35,7 +35,7 @@ function _react2() {
 var _locale = require("../locale");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const Designer = () => {
-  var _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon;
+  var _collectionField$uiSc, _collectionField$uiSc2, _fieldSchema$xDecora;
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   const _useCollection = (0, _client().useCollection)(),
@@ -170,7 +170,7 @@ const Designer = () => {
       });
       refresh();
     }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['pattern-disable']) != true && _react2().default.createElement(_client().SchemaSettings.SelectItem, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && !(0, _client().isPatternDisabled)(fieldSchema) && _react2().default.createElement(_client().SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
     options: [{

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

@@ -1,9 +1,7 @@
 import React from 'react';
 import { AMapComponentProps } from './AMap';
 import Designer from './Designer';
-interface MapProps extends AMapComponentProps {
-}
-declare const Map: React.ForwardRefExoticComponent<Partial<MapProps> & React.RefAttributes<unknown>> & {
+declare const Map: React.ForwardRefExoticComponent<Partial<AMapComponentProps> & React.RefAttributes<unknown>> & {
     Designer: typeof Designer;
 };
 export default Map;

package/lib/client/locale/pt-BR.js

@@ -42,7 +42,7 @@ const locale = {
   'Delete field': 'Excluir campo',
   Required: 'Obrigatório',
   Pattern: 'Padrão',
-  "Operator": "Operador",
+  Operator: 'Operador',
   Editable: 'Editável',
   Readonly: 'Somente leitura',
   'Easy-reading': 'Apenas leitura (Modo de Leitura)',

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

@@ -42,7 +42,7 @@ const locale = {
   'Delete field': '删除字段',
   Required: '必填',
   Pattern: '模式',
-  "Operator": "运算符",
+  Operator: '运算符',
   Editable: '可编辑',
   Readonly: '只读（禁止编辑）',
   'Easy-reading': '只读（阅读模式）',

package/package.json

@@ -2,19 +2,19 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Map",
   "displayName.zh-CN": "地图",
-  "version": "0.9.2-alpha.2",
+  "version": "0.9.2-alpha.3",
   "description": "Provide map fields and blocks",
   "description.zh-CN": "提供地图字段和区块",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "devDependencies": {
-    "@nocobase/server": "0.9.2-alpha.2",
-    "@nocobase/test": "0.9.2-alpha.2"
+    "@nocobase/server": "0.9.2-alpha.3",
+    "@nocobase/test": "0.9.2-alpha.3"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.10"
   },
-  "gitHead": "1a0de6908b2b1854bdf434fcafa8909cb65bb8a3"
+  "gitHead": "b6b5f9372202d942c97d2d90a4197e060db05124"
 }

package/src/client/block/MapBlockInitializer.tsx

@@ -33,7 +33,7 @@ export const MapBlockInitializer = (props) => {
                         required: true,
                         'x-component': 'Select',
                         'x-decorator': 'FormItem',
-                        default: mapFieldOptions[0]?.value
+                        default: mapFieldOptions[0]?.value,
                       },
                       marker: {
                         title: t('Marker field'),
@@ -41,15 +41,18 @@ export const MapBlockInitializer = (props) => {
                         'x-component': 'Select',
                         '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)
+                          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) {
-                            return
+                            return;
                           }
-                          const item = mapFieldOptions.find((item) => item.value === value).type
-                          field.hidden = item !== 'point'
+                          const item = mapFieldOptions.find((item) => item.value === value).type;
+                          field.hidden = item !== 'point';
                         },
                       },
                     },

package/src/client/components/Designer.tsx

@@ -3,10 +3,11 @@ import { ISchema, useField, useFieldSchema } from '@formily/react';
 import {
   GeneralSchemaDesigner,
   SchemaSettings,
+  isPatternDisabled,
   useCollection,
   useCollectionManager,
   useDesignable,
-  useFormBlockContext
+  useFormBlockContext,
 } from '@nocobase/client';
 import set from 'lodash/set';
 import React from 'react';
@@ -155,7 +156,7 @@ const Designer = () => {
           }}
         />
       )}
-      {form && !form?.readPretty && fieldSchema?.['x-component-props']?.['pattern-disable'] != true && (
+      {form && !form?.readPretty && !isPatternDisabled(fieldSchema) && (
         <SchemaSettings.SelectItem
           key="pattern"
           title={t('Pattern')}

package/src/client/components/Map.tsx

@@ -5,7 +5,7 @@ import ReadPretty from './ReadPretty';
 import { css } from '@emotion/css';
 import Designer from './Designer';
 
-interface MapProps extends AMapComponentProps {}
+type MapProps = AMapComponentProps;
 
 const InternalMap = connect((props: MapProps) => {
   return (

package/src/client/constants.ts

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

package/src/client/fields/index.ts

@@ -1,16 +1,11 @@
-import { circle } from './circle'
-import { lineString } from './lineString'
-import { point } from './point'
-import { polygon } from './polygon'
+import { circle } from './circle';
+import { lineString } from './lineString';
+import { point } from './point';
+import { polygon } from './polygon';
 
-export const fields = [
-  point,
-  polygon,
-  lineString,
-  circle
-]
+export const fields = [point, polygon, lineString, circle];
 
 export const interfaces = fields.reduce((ins, field) => {
-  ins[field.name] = field
-  return ins
-}, {})
+  ins[field.name] = field;
+  return ins;
+}, {});

package/src/client/hooks/index.ts

@@ -1 +1 @@
-export * from './useMapConfiguration'
+export * from './useMapConfiguration';

package/src/client/locale/en-US.ts

@@ -1,5 +1,3 @@
-const locale = {
-
-}
+const locale = {};
 
 export default locale;

package/src/client/locale/pt-BR.ts

@@ -1,49 +1,51 @@
 const locale = {
-    'Map-based geometry': 'Geometria baseada em mapa',
-    'Map type': 'Tipo de mapa',
-    Point: 'Ponto',
-    Line: 'Linha',
-    Circle: 'Círculo',
-    Polygon: 'Polígono',
-    'Access key': 'Chave de acesso',
-    'securityJsCode or serviceHost': 'securityJsCode ou serviceHost',
-    AMap: 'AMap',
-    'Google Maps': 'Google Maps',
-    Clear: 'Limpar',
-    'Click to select the starting point and double-click to end the drawing': 'Clique para selecionar o ponto de partida e dê um duplo clique para terminar a criação',
-    'Clear the canvas': 'Limpar a tela',
-    'Are you sure to clear the canvas?': 'Tem certeza de que deseja limpar a tela?',
-    Confirm: 'Confirmar',
-    Cancel: 'Cancelar',
-    'Enter keywords to search': 'Digite palavras-chave para buscar',
-    'The AccessKey is incorrect, please check it': 'A chave de acesso está incorreta, por favor verifique',
-    'Please configure the AMap securityCode or serviceHost correctly': 'Por favor, configure o securityCode ou serviceHost do AMap corretamente',
-    'Map Manager': 'Gerenciador de Mapa',
-    Configuration: 'Configuração',
-    'Saved successfully': 'Salvo com sucesso',
-    'Saved failed': 'Falha ao salvar',
-    Edit: 'Editar',
-    Save: 'Salvar',
-    'Please configure the AccessKey and SecurityJsCode first': 'Por favor, configure a AccessKey e o SecurityJsCode primeiro',
-    'Go to the configuration page': 'Ir para a página de configuração',
-    Zoom: 'Zoom',
-    'Set default zoom level': 'Definir nível de zoom padrão',
-    'The default zoom level of the map': 'O nível de zoom padrão do mapa',
-    // Designer
-    'Edit field title': 'Editar título do campo',
-    'Field title': 'Título do campo',
-    'Edit tooltip': 'Editar dica de ferramenta',
-    'Delete field': 'Excluir campo',
-    Required: 'Obrigatório',
-    Pattern: 'Padrão',
-    "Operator": "Operador",
-    Editable: 'Editável',
-    Readonly: 'Somente leitura',
-    'Easy-reading': 'Apenas leitura (Modo de Leitura)',
-    'Edit description': 'Editar descrição',
-    'Map field': 'Campo de mapa',
-    'Marker field': 'Campo de marcador',
-  };
-  
-  export default locale;
-  
+  'Map-based geometry': 'Geometria baseada em mapa',
+  'Map type': 'Tipo de mapa',
+  Point: 'Ponto',
+  Line: 'Linha',
+  Circle: 'Círculo',
+  Polygon: 'Polígono',
+  'Access key': 'Chave de acesso',
+  'securityJsCode or serviceHost': 'securityJsCode ou serviceHost',
+  AMap: 'AMap',
+  'Google Maps': 'Google Maps',
+  Clear: 'Limpar',
+  'Click to select the starting point and double-click to end the drawing':
+    'Clique para selecionar o ponto de partida e dê um duplo clique para terminar a criação',
+  'Clear the canvas': 'Limpar a tela',
+  'Are you sure to clear the canvas?': 'Tem certeza de que deseja limpar a tela?',
+  Confirm: 'Confirmar',
+  Cancel: 'Cancelar',
+  'Enter keywords to search': 'Digite palavras-chave para buscar',
+  'The AccessKey is incorrect, please check it': 'A chave de acesso está incorreta, por favor verifique',
+  'Please configure the AMap securityCode or serviceHost correctly':
+    'Por favor, configure o securityCode ou serviceHost do AMap corretamente',
+  'Map Manager': 'Gerenciador de Mapa',
+  Configuration: 'Configuração',
+  'Saved successfully': 'Salvo com sucesso',
+  'Saved failed': 'Falha ao salvar',
+  Edit: 'Editar',
+  Save: 'Salvar',
+  'Please configure the AccessKey and SecurityJsCode first':
+    'Por favor, configure a AccessKey e o SecurityJsCode primeiro',
+  'Go to the configuration page': 'Ir para a página de configuração',
+  Zoom: 'Zoom',
+  'Set default zoom level': 'Definir nível de zoom padrão',
+  'The default zoom level of the map': 'O nível de zoom padrão do mapa',
+  // Designer
+  'Edit field title': 'Editar título do campo',
+  'Field title': 'Título do campo',
+  'Edit tooltip': 'Editar dica de ferramenta',
+  'Delete field': 'Excluir campo',
+  Required: 'Obrigatório',
+  Pattern: 'Padrão',
+  Operator: 'Operador',
+  Editable: 'Editável',
+  Readonly: 'Somente leitura',
+  'Easy-reading': 'Apenas leitura (Modo de Leitura)',
+  'Edit description': 'Editar descrição',
+  'Map field': 'Campo de mapa',
+  'Marker field': 'Campo de marcador',
+};
+
+export default locale;

package/src/client/locale/zh-CN.ts

@@ -36,7 +36,7 @@ const locale = {
   'Delete field': '删除字段',
   Required: '必填',
   Pattern: '模式',
-  "Operator": "运算符",
+  Operator: '运算符',
   Editable: '可编辑',
   Readonly: '只读（禁止编辑）',
   'Easy-reading': '只读（阅读模式）',

package/src/server/actions/index.ts

@@ -13,14 +13,12 @@ export const getConfiguration = async (ctx: Context, next) => {
     },
   });
 
-  ctx.body = record
+  ctx.body = record;
   return next();
 };
 
 export const setConfiguration = async (ctx: Context, next) => {
-  const {
-    params: values,
-  } = ctx.action;
+  const { params: values } = ctx.action;
   const repo = ctx.db.getRepository(MapConfigurationCollectionName);
   const record = await repo.findOne({
     filter: {
@@ -33,14 +31,14 @@ export const setConfiguration = async (ctx: Context, next) => {
       values,
       filter: {
         type: values.type,
-      }
+      },
     });
   } else {
     await repo.create({
       values,
-    })
+    });
   }
 
-  ctx.body = 'ok'
+  ctx.body = 'ok';
   return next();
 };

package/src/server/helpers/index.ts

@@ -1,12 +1,12 @@
 export const joinComma = (value: any[]) => {
-  if (!value) return null
-  return `(${value.join(',')})`
-}
+  if (!value) return null;
+  return `(${value.join(',')})`;
+};
 
 export const toValue = (value?: string) => {
-  if (!value) return null
-  return JSON.parse(value.replace(/\(/g, '[').replace(/\)/g, ']'))
-}
+  if (!value) return null;
+  return JSON.parse(value.replace(/\(/g, '[').replace(/\)/g, ']'));
+};
 
 export const getDialect = (ctx) => {
   return (ctx.db || ctx.database).sequelize.getDialect();