@nocobase/plugin-map 0.9.0-alpha.2 → 0.9.1-alpha.1

package/README.md

@@ -0,0 +1,13 @@
+# map
+
+English | [中文](./README.zh-CN.md)
+
+地图插件。
+
+## 安装激活
+
+```bash
+yarn pm enable map
+```
+
+## 使用方法

package/README.zh-CN.md

@@ -0,0 +1,13 @@
+# map
+
+[English](./README.md) | 中文
+
+地图插件。
+
+## 安装激活
+
+```bash
+yarn pm enable map
+```
+
+## 使用方法

package/lib/client/components/ReadPretty.js

@@ -63,15 +63,15 @@ const ReadPretty = props => {
   const mapType = props.mapType || (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema['x-component-props']) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.mapType);
   const field = (0, _react().useField)();
   (0, _react2().useEffect)(() => {
-    if (!field.title) {
+    var _collectionField$uiSc2;
+
+    if (!field.title && (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2.title)) {
       field.title = collectionField.uiSchema.title;
     }
-  }, collectionField.title);
-  if (!readOnly) return _react2().default.createElement("div", {
-    style: {
-      whiteSpace: 'pre-wrap'
-    }
-  }, value === null || value === void 0 ? void 0 : value.map(item => Array.isArray(item) ? `(${item.join(',')})` : item).join(','));
+  }, collectionField === null || collectionField === void 0 ? void 0 : collectionField.title);
+  if (!readOnly) return _react2().default.createElement("div", null, _react2().default.createElement(_client().EllipsisWithTooltip, {
+    ellipsis: true
+  }, value === null || value === void 0 ? void 0 : value.map(item => Array.isArray(item) ? `(${item.join(',')})` : item).join(',')));
   return mapType === 'amap' ? _react2().default.createElement(_AMap.default, _objectSpread({
     mapType: mapType
   }, props)) : null;

package/lib/client/fields/schema.d.ts

@@ -35,62 +35,6 @@ export declare const commonSchema: {
             'x-validator': string;
             description: string;
         };
-        type: import("@formily/react").Stringify<{
-            [key: symbol]: any;
-            [key: `x-${string}`]: any;
-            [key: `x-${number}`]: any;
-            version?: string;
-            name?: import("@formily/react").SchemaKey;
-            title?: any;
-            description?: any;
-            default?: any;
-            readOnly?: boolean;
-            writeOnly?: boolean;
-            type?: import("@formily/react").SchemaTypes;
-            enum?: import("@formily/react").SchemaEnum<any>;
-            const?: any;
-            multipleOf?: number;
-            maximum?: number;
-            exclusiveMaximum?: number;
-            minimum?: number;
-            exclusiveMinimum?: number;
-            maxLength?: number;
-            minLength?: number;
-            pattern?: string | RegExp;
-            maxItems?: number;
-            minItems?: number;
-            uniqueItems?: boolean;
-            maxProperties?: number;
-            minProperties?: number;
-            required?: string | boolean | string[];
-            format?: string;
-            $ref?: string;
-            $namespace?: string;
-            definitions?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-            properties?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-            items?: import("@formily/react").SchemaItems<any, any, any, any, any, any, any, any>;
-            additionalItems?: import("@formily/react").Stringify<any>;
-            patternProperties?: import("@formily/react").SchemaProperties<any, any, any, any, any, any, any, any>;
-            additionalProperties?: import("@formily/react").Stringify<any>;
-            "x-value"?: any;
-            "x-index"?: number;
-            "x-pattern"?: any;
-            "x-display"?: any;
-            "x-validator"?: any;
-            "x-decorator"?: any;
-            "x-decorator-props"?: any;
-            "x-component"?: any;
-            "x-component-props"?: any;
-            "x-reactions"?: import("@formily/react").SchemaReactions<any>;
-            "x-content"?: any;
-            "x-data"?: any;
-            "x-visible"?: boolean;
-            "x-hidden"?: boolean;
-            "x-disabled"?: boolean;
-            "x-editable"?: boolean;
-            "x-read-only"?: boolean;
-            "x-read-pretty"?: boolean;
-        }>;
     };
     schemaInitialize(schema: ISchema, { readPretty, block }: {
         readPretty: any;

package/lib/client/fields/schema.js

@@ -27,8 +27,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const defaultProps = _client().interfacesProperties.defaultProps;
 
-if (Array.isArray(defaultProps.type.enum)) {
-  defaultProps.type.enum.push({
+if (Array.isArray(_client().interfacesProperties.type.enum)) {
+  _client().interfacesProperties.type.enum.push({
     label: 'Point',
     value: 'point'
   }, {

package/lib/server/collections/mapConfiguration.js

@@ -8,6 +8,8 @@ exports.default = void 0;
 var _constants = require("../constants");
 
 var _default = {
+  namespace: 'map',
+  duplicator: 'optional',
   name: _constants.MapConfigurationCollectionName,
   title: '{{t("Map Manager")}}',
   fields: [{

package/lib/server/plugin.js

@@ -29,6 +29,8 @@ var _actions = require("./actions");
 
 var _fields = require("./fields");
 
+var _valueParsers = require("./value-parsers");
+
 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); }); }; }
@@ -44,6 +46,12 @@ class MapPlugin extends _server().Plugin {
       circle: _fields.CircleField
     };
     this.db.registerFieldTypes(fields);
+    this.db.registerFieldValueParsers({
+      point: _valueParsers.PointValueParser,
+      polygon: _valueParsers.PolygonValueParser,
+      lineString: _valueParsers.LineStringValueParser,
+      circle: _valueParsers.CircleValueParser
+    });
   }
 
   load() {

package/lib/server/value-parsers/index.d.ts

@@ -0,0 +1,13 @@
+import { BaseValueParser } from '@nocobase/database';
+export declare class PointValueParser extends BaseValueParser {
+    setValue(value: any): Promise<void>;
+}
+export declare class PolygonValueParser extends BaseValueParser {
+    setValue(value: any): Promise<void>;
+}
+export declare class LineStringValueParser extends BaseValueParser {
+    setValue(value: any): Promise<void>;
+}
+export declare class CircleValueParser extends BaseValueParser {
+    setValue(value: any): Promise<void>;
+}

package/lib/server/value-parsers/index.js

@@ -0,0 +1,96 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PolygonValueParser = exports.PointValueParser = exports.LineStringValueParser = exports.CircleValueParser = void 0;
+
+function _database() {
+  const data = require("@nocobase/database");
+
+  _database = function _database() {
+    return data;
+  };
+
+  return data;
+}
+
+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); }); }; }
+
+class PointValueParser extends _database().BaseValueParser {
+  setValue(value) {
+    var _this = this;
+
+    return _asyncToGenerator(function* () {
+      if (Array.isArray(value)) {
+        _this.value = value;
+      } else if (typeof value === 'string') {
+        _this.value = value.split(',');
+      } else {
+        _this.errors.push('Value invalid');
+      }
+    })();
+  }
+
+}
+
+exports.PointValueParser = PointValueParser;
+
+class PolygonValueParser extends _database().BaseValueParser {
+  setValue(value) {
+    var _this2 = this;
+
+    return _asyncToGenerator(function* () {
+      if (Array.isArray(value)) {
+        _this2.value = value;
+      } else if (typeof value === 'string') {
+        _this2.value = value.substring(1, value.length - 1).split('),(').map(v => v.split(','));
+      } else {
+        _this2.errors.push('Value invalid');
+      }
+    })();
+  }
+
+}
+
+exports.PolygonValueParser = PolygonValueParser;
+
+class LineStringValueParser extends _database().BaseValueParser {
+  setValue(value) {
+    var _this3 = this;
+
+    return _asyncToGenerator(function* () {
+      if (Array.isArray(value)) {
+        _this3.value = value;
+      } else if (typeof value === 'string') {
+        _this3.value = value.substring(1, value.length - 1).split('),(').map(v => v.split(','));
+      } else {
+        _this3.errors.push('Value invalid');
+      }
+    })();
+  }
+
+}
+
+exports.LineStringValueParser = LineStringValueParser;
+
+class CircleValueParser extends _database().BaseValueParser {
+  setValue(value) {
+    var _this4 = this;
+
+    return _asyncToGenerator(function* () {
+      if (Array.isArray(value)) {
+        _this4.value = value;
+      } else if (typeof value === 'string') {
+        _this4.value = value.split(',');
+      } else {
+        _this4.errors.push('Value invalid');
+      }
+    })();
+  }
+
+}
+
+exports.CircleValueParser = CircleValueParser;

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@nocobase/plugin-map",
-  "version": "0.9.0-alpha.2",
+  "version": "0.9.1-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "devDependencies": {
-    "@nocobase/server": "0.9.0-alpha.2",
-    "@nocobase/test": "0.9.0-alpha.2"
+    "@nocobase/server": "0.9.1-alpha.1",
+    "@nocobase/test": "0.9.1-alpha.1"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.10"
   },
-  "gitHead": "b8f76ad38e60e677c5bb4aab0a4cdb28d98a0f49"
+  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
 }

package/src/client/components/ReadPretty.tsx

@@ -1,5 +1,5 @@
 import { useField, useFieldSchema } from '@formily/react';
-import { useCollection } from '@nocobase/client';
+import { EllipsisWithTooltip, useCollection } from '@nocobase/client';
 import React, { useEffect } from 'react';
 import AMapComponent from './AMap';
 
@@ -12,19 +12,17 @@ const ReadPretty = (props) => {
   const field = useField();
 
   useEffect(() => {
-    if (!field.title) {
+    if (!field.title && collectionField?.uiSchema?.title) {
       field.title = collectionField.uiSchema.title;
     }
-  }, collectionField.title);
+  }, collectionField?.title);
 
   if (!readOnly)
     return (
-      <div
-        style={{
-          whiteSpace: 'pre-wrap',
-        }}
-      >
-        {value?.map((item) => (Array.isArray(item) ? `(${item.join(',')})` : item)).join(',')}
+      <div>
+        <EllipsisWithTooltip ellipsis={true}>
+          {value?.map((item) => (Array.isArray(item) ? `(${item.join(',')})` : item)).join(',')}
+        </EllipsisWithTooltip>
       </div>
     );
 

package/src/client/fields/schema.ts

@@ -5,8 +5,8 @@ import { generateNTemplate } from '../locale';
 
 const { defaultProps } = interfacesProperties;
 
-if (Array.isArray(defaultProps.type.enum)) {
-  defaultProps.type.enum.push(
+if (Array.isArray(interfacesProperties.type.enum)) {
+  interfacesProperties.type.enum.push(
     {
       label: 'Point',
       value: 'point',

package/src/server/collections/mapConfiguration.ts

@@ -2,6 +2,8 @@ import { CollectionOptions } from "@nocobase/client";
 import { MapConfigurationCollectionName } from "../constants";
 
 export default {
+  namespace: 'map',
+  duplicator: 'optional',
   name: MapConfigurationCollectionName,
   title: '{{t("Map Manager")}}',
   fields: [

package/src/server/plugin.ts

@@ -2,6 +2,7 @@ import { InstallOptions, Plugin } from '@nocobase/server';
 import { resolve } from 'path';
 import { getConfiguration, setConfiguration } from './actions';
 import { CircleField, LineStringField, PointField, PolygonField } from './fields';
+import { CircleValueParser, LineStringValueParser, PointValueParser, PolygonValueParser } from './value-parsers';
 
 export class MapPlugin extends Plugin {
   afterAdd() {}
@@ -13,8 +14,13 @@ export class MapPlugin extends Plugin {
       lineString: LineStringField,
       circle: CircleField,
     };
-
     this.db.registerFieldTypes(fields);
+    this.db.registerFieldValueParsers({
+      point: PointValueParser,
+      polygon: PolygonValueParser,
+      lineString: LineStringValueParser,
+      circle: CircleValueParser,
+    });
   }
 
   async load() {

package/src/server/value-parsers/index.ts

@@ -0,0 +1,55 @@
+import { BaseValueParser } from '@nocobase/database';
+
+export class PointValueParser extends BaseValueParser {
+  async setValue(value) {
+    if (Array.isArray(value)) {
+      this.value = value;
+    } else if (typeof value === 'string') {
+      this.value = value.split(',');
+    } else {
+      this.errors.push('Value invalid');
+    }
+  }
+}
+
+export class PolygonValueParser extends BaseValueParser {
+  async setValue(value) {
+    if (Array.isArray(value)) {
+      this.value = value;
+    } else if (typeof value === 'string') {
+      this.value = value
+        .substring(1, value.length - 1)
+        .split('),(')
+        .map((v) => v.split(','));
+    } else {
+      this.errors.push('Value invalid');
+    }
+  }
+}
+
+export class LineStringValueParser extends BaseValueParser {
+  async setValue(value) {
+    if (Array.isArray(value)) {
+      this.value = value;
+    } else if (typeof value === 'string') {
+      this.value = value
+        .substring(1, value.length - 1)
+        .split('),(')
+        .map((v) => v.split(','));
+    } else {
+      this.errors.push('Value invalid');
+    }
+  }
+}
+
+export class CircleValueParser extends BaseValueParser {
+  async setValue(value) {
+    if (Array.isArray(value)) {
+      this.value = value;
+    } else if (typeof value === 'string') {
+      this.value = value.split(',');
+    } else {
+      this.errors.push('Value invalid');
+    }
+  }
+}