@nocobase/plugin-map 0.9.2-alpha.4 → 0.9.4-alpha.1

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;
+  var _collectionField$uiSc;
   const _useCollectionManager = (0, _client().useCollectionManager)(),
     getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   const _useCollection = (0, _client().useCollection)(),
@@ -64,113 +64,7 @@ const Designer = () => {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
-  return _react2().default.createElement(_client().GeneralSchemaDesigner, null, _react2().default.createElement(_client().SchemaSettings.ModalItem, {
-    key: "edit-field-title",
-    title: t('Edit field title'),
-    schema: {
-      type: 'object',
-      title: t('Edit field title'),
-      properties: {
-        title: {
-          title: t('Field title'),
-          default: field === null || field === void 0 ? void 0 : field.title,
-          description: `${t('Original field title: ')}${collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2.title}`,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: ({
-      title
-    }) => {
-      if (title) {
-        field.title = title;
-        fieldSchema.title = title;
-        dn.emit('patch', {
-          schema: {
-            'x-uid': fieldSchema['x-uid'],
-            title: fieldSchema.title
-          }
-        });
-      }
-      dn.refresh();
-    }
-  }), !field.readPretty && _react2().default.createElement(_client().SchemaSettings.ModalItem, {
-    key: "edit-description",
-    title: t('Edit description'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        description: {
-          // title: t('Description'),
-          default: field === null || field === void 0 ? void 0 : field.description,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: ({
-      description
-    }) => {
-      field.description = description;
-      fieldSchema.description = description;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          description: fieldSchema.description
-        }
-      });
-      dn.refresh();
-    }
-  }), field.readPretty && _react2().default.createElement(_client().SchemaSettings.ModalItem, {
-    key: "edit-tooltip",
-    title: t('Edit tooltip'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        tooltip: {
-          default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.tooltip,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: ({
-      tooltip
-    }) => {
-      field.decoratorProps.tooltip = tooltip;
-      fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
-      fieldSchema['x-decorator-props']['tooltip'] = tooltip;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          'x-decorator-props': fieldSchema['x-decorator-props']
-        }
-      });
-      dn.refresh();
-    }
-  }), !field.readPretty && _react2().default.createElement(_client().SchemaSettings.SwitchItem, {
-    key: "required",
-    title: t('Required'),
-    checked: fieldSchema.required,
-    onChange: required => {
-      const schema = {
-        ['x-uid']: fieldSchema['x-uid']
-      };
-      field.required = required;
-      fieldSchema['required'] = required;
-      schema['required'] = required;
-      dn.emit('patch', {
-        schema
-      });
-      refresh();
-    }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && !(0, _client().isPatternDisabled)(fieldSchema) && _react2().default.createElement(_client().SchemaSettings.SelectItem, {
+  return _react2().default.createElement(_client().GeneralSchemaDesigner, null, _react2().default.createElement(_client().GeneralSchemaItems, null), 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/ReadPretty.js

@@ -47,7 +47,7 @@ const ReadPretty = props => {
   (0, _react2().useEffect)(() => {
     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;
+      field.title = collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema.title;
     }
   }, collectionField === null || collectionField === void 0 ? void 0 : collectionField.title);
   if (!form.readPretty) {

package/package.json

@@ -2,19 +2,19 @@
   "name": "@nocobase/plugin-map",
   "displayName": "Map",
   "displayName.zh-CN": "地图",
-  "version": "0.9.2-alpha.4",
+  "version": "0.9.4-alpha.1",
   "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.4",
-    "@nocobase/test": "0.9.2-alpha.4"
+    "@nocobase/server": "0.9.4-alpha.1",
+    "@nocobase/test": "0.9.4-alpha.1"
   },
   "dependencies": {
     "@amap/amap-jsapi-loader": "^1.0.1",
     "@amap/amap-jsapi-types": "^0.0.10"
   },
-  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
+  "gitHead": "0b4936be557be918dbdf8196dadcbc7eb395906d"
 }

package/src/client/components/Designer.tsx

@@ -2,6 +2,7 @@ import { Field } from '@formily/core';
 import { ISchema, useField, useFieldSchema } from '@formily/react';
 import {
   GeneralSchemaDesigner,
+  GeneralSchemaItems,
   SchemaSettings,
   isPatternDisabled,
   useCollection,
@@ -40,122 +41,7 @@ const Designer = () => {
 
   return (
     <GeneralSchemaDesigner>
-      <SchemaSettings.ModalItem
-        key="edit-field-title"
-        title={t('Edit field title')}
-        schema={
-          {
-            type: 'object',
-            title: t('Edit field title'),
-            properties: {
-              title: {
-                title: t('Field title'),
-                default: field?.title,
-                description: `${t('Original field title: ')}${collectionField?.uiSchema?.title}`,
-                'x-decorator': 'FormItem',
-                'x-component': 'Input',
-                'x-component-props': {},
-              },
-            },
-          } as ISchema
-        }
-        onSubmit={({ title }) => {
-          if (title) {
-            field.title = title;
-            fieldSchema.title = title;
-            dn.emit('patch', {
-              schema: {
-                'x-uid': fieldSchema['x-uid'],
-                title: fieldSchema.title,
-              },
-            });
-          }
-          dn.refresh();
-        }}
-      />
-      {!field.readPretty && (
-        <SchemaSettings.ModalItem
-          key="edit-description"
-          title={t('Edit description')}
-          schema={
-            {
-              type: 'object',
-              title: t('Edit description'),
-              properties: {
-                description: {
-                  // title: t('Description'),
-                  default: field?.description,
-                  'x-decorator': 'FormItem',
-                  'x-component': 'Input.TextArea',
-                  'x-component-props': {},
-                },
-              },
-            } as ISchema
-          }
-          onSubmit={({ description }) => {
-            field.description = description;
-            fieldSchema.description = description;
-            dn.emit('patch', {
-              schema: {
-                'x-uid': fieldSchema['x-uid'],
-                description: fieldSchema.description,
-              },
-            });
-            dn.refresh();
-          }}
-        />
-      )}
-      {field.readPretty && (
-        <SchemaSettings.ModalItem
-          key="edit-tooltip"
-          title={t('Edit tooltip')}
-          schema={
-            {
-              type: 'object',
-              title: t('Edit description'),
-              properties: {
-                tooltip: {
-                  default: fieldSchema?.['x-decorator-props']?.tooltip,
-                  'x-decorator': 'FormItem',
-                  'x-component': 'Input.TextArea',
-                  'x-component-props': {},
-                },
-              },
-            } as ISchema
-          }
-          onSubmit={({ tooltip }) => {
-            field.decoratorProps.tooltip = tooltip;
-            fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
-            fieldSchema['x-decorator-props']['tooltip'] = tooltip;
-            dn.emit('patch', {
-              schema: {
-                'x-uid': fieldSchema['x-uid'],
-                'x-decorator-props': fieldSchema['x-decorator-props'],
-              },
-            });
-            dn.refresh();
-          }}
-        />
-      )}
-      {!field.readPretty && (
-        <SchemaSettings.SwitchItem
-          key="required"
-          title={t('Required')}
-          checked={fieldSchema.required as boolean}
-          onChange={(required) => {
-            const schema = {
-              ['x-uid']: fieldSchema['x-uid'],
-            };
-            field.required = required;
-            fieldSchema['required'] = required;
-            schema['required'] = required;
-            dn.emit('patch', {
-              schema,
-            });
-            refresh();
-          }}
-        />
-      )}
+      <GeneralSchemaItems />
       {form && !form?.readPretty && !isPatternDisabled(fieldSchema) && (
         <SchemaSettings.SelectItem
           key="pattern"

package/src/client/components/ReadPretty.tsx

@@ -13,7 +13,7 @@ const ReadPretty = (props) => {
   const form = useForm();
   useEffect(() => {
     if (!field.title && collectionField?.uiSchema?.title) {
-      field.title = collectionField.uiSchema.title;
+      field.title = collectionField?.uiSchema.title;
     }
   }, collectionField?.title);