@nocobase/client 0.7.0-alpha.78 → 0.7.0-alpha.81

package/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/es/collection-manager/Configuration/schemas/collections.js

@@ -20,8 +20,8 @@ var collection = {
     uiSchema: {
       title: '{{ t("Collection name") }}',
       type: 'string',
-      'x-component': 'Input' // description: '使用英文',
-
+      'x-component': 'Input',
+      description: '{{t("Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.")}}'
     }
   }, {
     type: 'hasMany',

package/es/collection-manager/interfaces/linkTo.js

@@ -99,7 +99,10 @@ export var linkTo = {
       'x-disabled': '{{ !createOnly }}',
       'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
       'x-decorator': 'FormItem',
-      'x-component': 'Select'
+      'x-component': 'Select',
+      'x-component-props': {
+        placeholder: '{{t("Leave it blank, unless you need a custom intermediate table")}}'
+      }
     },
     // 'reverseField.uiSchema.title': {
     //   type: 'string',

package/es/collection-manager/interfaces/properties/index.js

@@ -44,16 +44,16 @@ export var type = {
     label: 'Password',
     value: 'password'
   }, {
-    label: 'HasOne',
+    label: 'One to one',
     value: 'hasOne'
   }, {
-    label: 'HasMany',
+    label: 'One to many',
     value: 'hasMany'
   }, {
-    label: 'BelongsTo',
+    label: 'Many to one',
     value: 'belongsTo'
   }, {
-    label: 'BelongsToMany',
+    label: 'Many to many',
     value: 'belongsToMany'
   }]
 };

package/es/locale/en_US.d.ts

@@ -275,5 +275,8 @@ declare const _default: {
     'After successful update': string;
     'Save record': string;
     'After successful save': string;
+    'Button background color': string;
+    Highlight: string;
+    'Danger red': string;
 };
 export default _default;

package/es/locale/en_US.js

@@ -275,5 +275,8 @@ export default {
   'Manually close': 'Manually close',
   'After successful update': 'After successful update',
   'Save record': 'Save record',
-  'After successful save': 'After successful save'
+  'After successful save': 'After successful save',
+  'Button background color': 'Button background color',
+  'Highlight': 'Highlight',
+  'Danger red': 'Danger red'
 };

package/es/locale/index.d.ts

@@ -277,6 +277,9 @@ export declare const resources: {
             'After successful update': string;
             'Save record': string;
             'After successful save': string;
+            'Button background color': string;
+            Highlight: string;
+            'Danger red': string;
         };
     };
     'zh-CN': {
@@ -606,6 +609,7 @@ export declare const resources: {
             Accept: string;
             'Rich Text': string;
             'Junction collection': string;
+            'Leave it blank, unless you need a custom intermediate table': string;
             Fields: string;
             'Edit field title': string;
             'Field title': string;
@@ -740,6 +744,9 @@ export declare const resources: {
             'After successful save': string;
             'After clicking the custom button, the following field values will be assigned according to the following form.': string;
             'After clicking the custom button, the following fields of the current record will be saved according to the following form.': string;
+            'Button background color': string;
+            Highlight: string;
+            'Danger red': string;
         };
     };
 };

package/es/locale/zh_CN.d.ts

@@ -324,6 +324,7 @@ declare const _default: {
     Accept: string;
     'Rich Text': string;
     'Junction collection': string;
+    'Leave it blank, unless you need a custom intermediate table': string;
     Fields: string;
     'Edit field title': string;
     'Field title': string;
@@ -458,5 +459,8 @@ declare const _default: {
     'After successful save': string;
     'After clicking the custom button, the following field values will be assigned according to the following form.': string;
     'After clicking the custom button, the following fields of the current record will be saved according to the following form.': string;
+    'Button background color': string;
+    Highlight: string;
+    'Danger red': string;
 };
 export default _default;

package/es/locale/zh_CN.js

@@ -324,6 +324,7 @@ export default {
   'Accept': '文件格式',
   'Rich Text': '富文本',
   'Junction collection': '中间表',
+  'Leave it blank, unless you need a custom intermediate table': '默认留空，除非你需要一个自定义的中间表',
   'Fields': '字段',
   'Edit field title': '编辑字段标题',
   'Field title': '字段标题',
@@ -458,5 +459,8 @@ export default {
   'Updated successfully': '更新成功',
   'After successful save': '保存成功后',
   'After clicking the custom button, the following field values will be assigned according to the following form.': '点击当前自定义按钮时，以下字段值将按照以下表单赋值。',
-  'After clicking the custom button, the following fields of the current record will be saved according to the following form.': '点击当前自定义按钮时，当前数据以下字段将按照以下表单保存。'
+  'After clicking the custom button, the following fields of the current record will be saved according to the following form.': '点击当前自定义按钮时，当前数据以下字段将按照以下表单保存。',
+  'Button background color': '按钮颜色',
+  'Highlight': '高亮',
+  'Danger red': '红色'
 };

package/es/route-switch/antd/admin-layout/index.js

@@ -38,6 +38,10 @@ var filterByACL = function filterByACL(schema, options) {
         if (element['x-uid'] && !allowMenuItemIds.includes(element['x-uid'])) {
           delete s.properties[key];
         }
+
+        if (element['x-uid']) {
+          filterSchema(element);
+        }
       }
     }
   };

package/es/schema-component/antd/action/Action.Designer.js

@@ -54,7 +54,7 @@ var MenuGroup = function MenuGroup(props) {
 };
 
 export var ActionDesigner = function ActionDesigner(props) {
-  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7;
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7;
 
   var modalTip = props.modalTip,
       restProps = _objectWithoutProperties(props, _excluded);
@@ -115,12 +115,29 @@ export var ActionDesigner = function ActionDesigner(props) {
           default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.icon,
           'x-component-props': {} // description: `原字段标题：${collectionField?.uiSchema?.title}`,
 
+        },
+        type: {
+          'x-decorator': 'FormItem',
+          'x-component': 'Radio.Group',
+          title: t('Button background color'),
+          default: (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.danger) ? 'danger' : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.type) === 'primary' ? 'primary' : 'default',
+          enum: [{
+            value: 'default',
+            label: '{{t("Default")}}'
+          }, {
+            value: 'primary',
+            label: '{{t("Highlight")}}'
+          }, {
+            value: 'danger',
+            label: '{{t("Danger red")}}'
+          }]
         }
       }
     },
     onSubmit: function onSubmit(_ref) {
       var title = _ref.title,
-          icon = _ref.icon;
+          icon = _ref.icon,
+          type = _ref.type;
 
       if (title) {
         var _schema;
@@ -128,8 +145,12 @@ export var ActionDesigner = function ActionDesigner(props) {
         fieldSchema.title = title;
         field.title = title;
         field.componentProps.icon = icon;
+        field.componentProps.danger = type === 'danger';
+        field.componentProps.type = type;
         fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
         fieldSchema['x-component-props'].icon = icon;
+        fieldSchema['x-component-props'].danger = type === 'danger';
+        fieldSchema['x-component-props'].type = type;
         dn.emit('patch', {
           schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, "title", title), _defineProperty(_schema, 'x-component-props', _objectSpread({}, fieldSchema['x-component-props'])), _schema)
         });
@@ -145,7 +166,7 @@ export var ActionDesigner = function ActionDesigner(props) {
       label: t('Dialog'),
       value: 'modal'
     }],
-    value: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['openMode'],
+    value: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['openMode'],
     onChange: function onChange(value) {
       field.componentProps.openMode = value;
       fieldSchema['x-component-props']['openMode'] = value;

package/es/schema-component/hooks/useDesignable.js

@@ -37,6 +37,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { Schema, SchemaOptionsContext, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import { message } from 'antd';
+import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import set from 'lodash/set';
 import React, { useContext } from 'react';
@@ -529,6 +530,8 @@ export var Designable = /*#__PURE__*/function () {
             breakRemoveOn: breakRemoveOn
           });
         }
+      } else if (schema) {
+        schema = cloneDeep(schema);
       }
 
       var properties = {};
@@ -609,6 +612,8 @@ export var Designable = /*#__PURE__*/function () {
             breakRemoveOn: breakRemoveOn
           });
         }
+      } else if (schema) {
+        schema = cloneDeep(schema);
       }
 
       var properties = {};
@@ -677,6 +682,8 @@ export var Designable = /*#__PURE__*/function () {
             breakRemoveOn: breakRemoveOn
           });
         }
+      } else if (schema) {
+        schema = cloneDeep(schema);
       }
 
       this.prepareProperty(schema);
@@ -736,6 +743,8 @@ export var Designable = /*#__PURE__*/function () {
         }
 
         schema.parent = null;
+      } else if (schema) {
+        schema = cloneDeep(schema);
       }
 
       var order = 0;

package/es/schema-settings/SchemaSettings.js

@@ -728,12 +728,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/React.memo(function (props) {
     };
   }();
 
-  return /*#__PURE__*/React.createElement("div", {
-    onClick: function onClick(e) {
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  }, /*#__PURE__*/React.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
     onClick: openAssignedFieldValueHandler
   }), props.children || props.title), /*#__PURE__*/React.createElement(Modal, _objectSpread(_objectSpread({
     width: '50%',

package/lib/collection-manager/Configuration/schemas/collections.js

@@ -28,8 +28,8 @@ var collection = {
     uiSchema: {
       title: '{{ t("Collection name") }}',
       type: 'string',
-      'x-component': 'Input' // description: '使用英文',
-
+      'x-component': 'Input',
+      description: '{{t("Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.")}}'
     }
   }, {
     type: 'hasMany',

package/lib/collection-manager/interfaces/linkTo.js

@@ -109,7 +109,10 @@ var linkTo = {
       'x-disabled': '{{ !createOnly }}',
       'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
       'x-decorator': 'FormItem',
-      'x-component': 'Select'
+      'x-component': 'Select',
+      'x-component-props': {
+        placeholder: '{{t("Leave it blank, unless you need a custom intermediate table")}}'
+      }
     },
     // 'reverseField.uiSchema.title': {
     //   type: 'string',

package/lib/collection-manager/interfaces/properties/index.js

@@ -59,16 +59,16 @@ var type = {
     label: 'Password',
     value: 'password'
   }, {
-    label: 'HasOne',
+    label: 'One to one',
     value: 'hasOne'
   }, {
-    label: 'HasMany',
+    label: 'One to many',
     value: 'hasMany'
   }, {
-    label: 'BelongsTo',
+    label: 'Many to one',
     value: 'belongsTo'
   }, {
-    label: 'BelongsToMany',
+    label: 'Many to many',
     value: 'belongsToMany'
   }]
 };

package/lib/locale/en_US.d.ts

@@ -275,5 +275,8 @@ declare const _default: {
     'After successful update': string;
     'Save record': string;
     'After successful save': string;
+    'Button background color': string;
+    Highlight: string;
+    'Danger red': string;
 };
 export default _default;

package/lib/locale/en_US.js

@@ -281,6 +281,9 @@ var _default = {
   'Manually close': 'Manually close',
   'After successful update': 'After successful update',
   'Save record': 'Save record',
-  'After successful save': 'After successful save'
+  'After successful save': 'After successful save',
+  'Button background color': 'Button background color',
+  'Highlight': 'Highlight',
+  'Danger red': 'Danger red'
 };
 exports.default = _default;

package/lib/locale/index.d.ts

@@ -277,6 +277,9 @@ export declare const resources: {
             'After successful update': string;
             'Save record': string;
             'After successful save': string;
+            'Button background color': string;
+            Highlight: string;
+            'Danger red': string;
         };
     };
     'zh-CN': {
@@ -606,6 +609,7 @@ export declare const resources: {
             Accept: string;
             'Rich Text': string;
             'Junction collection': string;
+            'Leave it blank, unless you need a custom intermediate table': string;
             Fields: string;
             'Edit field title': string;
             'Field title': string;
@@ -740,6 +744,9 @@ export declare const resources: {
             'After successful save': string;
             'After clicking the custom button, the following field values will be assigned according to the following form.': string;
             'After clicking the custom button, the following fields of the current record will be saved according to the following form.': string;
+            'Button background color': string;
+            Highlight: string;
+            'Danger red': string;
         };
     };
 };

package/lib/locale/zh_CN.d.ts

@@ -324,6 +324,7 @@ declare const _default: {
     Accept: string;
     'Rich Text': string;
     'Junction collection': string;
+    'Leave it blank, unless you need a custom intermediate table': string;
     Fields: string;
     'Edit field title': string;
     'Field title': string;
@@ -458,5 +459,8 @@ declare const _default: {
     'After successful save': string;
     'After clicking the custom button, the following field values will be assigned according to the following form.': string;
     'After clicking the custom button, the following fields of the current record will be saved according to the following form.': string;
+    'Button background color': string;
+    Highlight: string;
+    'Danger red': string;
 };
 export default _default;

package/lib/locale/zh_CN.js

@@ -330,6 +330,7 @@ var _default = {
   'Accept': '文件格式',
   'Rich Text': '富文本',
   'Junction collection': '中间表',
+  'Leave it blank, unless you need a custom intermediate table': '默认留空，除非你需要一个自定义的中间表',
   'Fields': '字段',
   'Edit field title': '编辑字段标题',
   'Field title': '字段标题',
@@ -464,6 +465,9 @@ var _default = {
   'Updated successfully': '更新成功',
   'After successful save': '保存成功后',
   'After clicking the custom button, the following field values will be assigned according to the following form.': '点击当前自定义按钮时，以下字段值将按照以下表单赋值。',
-  'After clicking the custom button, the following fields of the current record will be saved according to the following form.': '点击当前自定义按钮时，当前数据以下字段将按照以下表单保存。'
+  'After clicking the custom button, the following fields of the current record will be saved according to the following form.': '点击当前自定义按钮时，当前数据以下字段将按照以下表单保存。',
+  'Button background color': '按钮颜色',
+  'Highlight': '高亮',
+  'Danger red': '红色'
 };
 exports.default = _default;

package/lib/route-switch/antd/admin-layout/index.js

@@ -57,6 +57,10 @@ var filterByACL = function filterByACL(schema, options) {
         if (element['x-uid'] && !allowMenuItemIds.includes(element['x-uid'])) {
           delete s.properties[key];
         }
+
+        if (element['x-uid']) {
+          filterSchema(element);
+        }
       }
     }
   };

package/lib/schema-component/antd/action/Action.Designer.js

@@ -74,7 +74,7 @@ var MenuGroup = function MenuGroup(props) {
 };
 
 var ActionDesigner = function ActionDesigner(props) {
-  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7;
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xAction, _fieldSchema$xAction2, _fieldSchema$xAction3, _fieldSchema$xAction4, _fieldSchema$xAction5, _fieldSchema$xAction6, _fieldSchema$xAction7;
 
   var modalTip = props.modalTip,
       restProps = _objectWithoutProperties(props, _excluded);
@@ -135,12 +135,29 @@ var ActionDesigner = function ActionDesigner(props) {
           default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.icon,
           'x-component-props': {} // description: `原字段标题：${collectionField?.uiSchema?.title}`,
 
+        },
+        type: {
+          'x-decorator': 'FormItem',
+          'x-component': 'Radio.Group',
+          title: t('Button background color'),
+          default: (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.danger) ? 'danger' : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.type) === 'primary' ? 'primary' : 'default',
+          enum: [{
+            value: 'default',
+            label: '{{t("Default")}}'
+          }, {
+            value: 'primary',
+            label: '{{t("Highlight")}}'
+          }, {
+            value: 'danger',
+            label: '{{t("Danger red")}}'
+          }]
         }
       }
     },
     onSubmit: function onSubmit(_ref) {
       var title = _ref.title,
-          icon = _ref.icon;
+          icon = _ref.icon,
+          type = _ref.type;
 
       if (title) {
         var _schema;
@@ -148,8 +165,12 @@ var ActionDesigner = function ActionDesigner(props) {
         fieldSchema.title = title;
         field.title = title;
         field.componentProps.icon = icon;
+        field.componentProps.danger = type === 'danger';
+        field.componentProps.type = type;
         fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
         fieldSchema['x-component-props'].icon = icon;
+        fieldSchema['x-component-props'].danger = type === 'danger';
+        fieldSchema['x-component-props'].type = type;
         dn.emit('patch', {
           schema: (_schema = {}, _defineProperty(_schema, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema, "title", title), _defineProperty(_schema, 'x-component-props', _objectSpread({}, fieldSchema['x-component-props'])), _schema)
         });
@@ -165,7 +186,7 @@ var ActionDesigner = function ActionDesigner(props) {
       label: t('Dialog'),
       value: 'modal'
     }],
-    value: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['openMode'],
+    value: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['openMode'],
     onChange: function onChange(value) {
       field.componentProps.openMode = value;
       fieldSchema['x-component-props']['openMode'] = value;

package/lib/schema-component/hooks/useDesignable.js

@@ -16,6 +16,8 @@ var _shared = require("@formily/shared");
 
 var _antd = require("antd");
 
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+
 var _get = _interopRequireDefault(require("lodash/get"));
 
 var _set = _interopRequireDefault(require("lodash/set"));
@@ -559,6 +561,8 @@ var Designable = /*#__PURE__*/function () {
             breakRemoveOn: breakRemoveOn
           });
         }
+      } else if (schema) {
+        schema = (0, _cloneDeep.default)(schema);
       }
 
       var properties = {};
@@ -639,6 +643,8 @@ var Designable = /*#__PURE__*/function () {
             breakRemoveOn: breakRemoveOn
           });
         }
+      } else if (schema) {
+        schema = (0, _cloneDeep.default)(schema);
       }
 
       var properties = {};
@@ -707,6 +713,8 @@ var Designable = /*#__PURE__*/function () {
             breakRemoveOn: breakRemoveOn
           });
         }
+      } else if (schema) {
+        schema = (0, _cloneDeep.default)(schema);
       }
 
       this.prepareProperty(schema);
@@ -766,6 +774,8 @@ var Designable = /*#__PURE__*/function () {
         }
 
         schema.parent = null;
+      } else if (schema) {
+        schema = (0, _cloneDeep.default)(schema);
       }
 
       var order = 0;

package/lib/schema-settings/SchemaSettings.js

@@ -765,12 +765,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     };
   }();
 
-  return /*#__PURE__*/_react2.default.createElement("div", {
-    onClick: function onClick(e) {
-      e.preventDefault();
-      e.stopPropagation();
-    }
-  }, /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
+  return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
     onClick: openAssignedFieldValueHandler
   }), props.children || props.title), /*#__PURE__*/_react2.default.createElement(_antd2.Modal, _objectSpread(_objectSpread({
     width: '50%',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.0-alpha.78",
+  "version": "0.7.0-alpha.81",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -18,7 +18,7 @@
     "@formily/antd": "2.0.20",
     "@formily/core": "2.0.20",
     "@formily/react": "2.0.20",
-    "@nocobase/utils": "0.7.0-alpha.78",
+    "@nocobase/utils": "0.7.0-alpha.81",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.26.1",
@@ -51,5 +51,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "a00b45a2686695c5f4824d074ac5e1aff210793a"
+  "gitHead": "c84bcc9188a9f8d086a6e29b6b00921da030a296"
 }

package/src/collection-manager/Configuration/schemas/collections.ts

@@ -26,7 +26,7 @@ const collection: CollectionOptions = {
         title: '{{ t("Collection name") }}',
         type: 'string',
         'x-component': 'Input',
-        // description: '使用英文',
+        description: '{{t("Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.")}}',
       },
     },
     {

package/src/collection-manager/interfaces/linkTo.ts

@@ -92,6 +92,9 @@ export const linkTo: IField = {
       'x-reactions': ['{{useAsyncDataSource(loadCollections)}}'],
       'x-decorator': 'FormItem',
       'x-component': 'Select',
+      'x-component-props': {
+        placeholder: '{{t("Leave it blank, unless you need a custom intermediate table")}}',
+      },
     },
     // 'reverseField.uiSchema.title': {
     //   type: 'string',

package/src/collection-manager/interfaces/properties/index.ts

@@ -22,10 +22,10 @@ export const type: ISchema = {
     { label: 'Virtual', value: 'virtual' },
     { label: 'JSON', value: 'json' },
     { label: 'Password', value: 'password' },
-    { label: 'HasOne', value: 'hasOne' },
-    { label: 'HasMany', value: 'hasMany' },
-    { label: 'BelongsTo', value: 'belongsTo' },
-    { label: 'BelongsToMany', value: 'belongsToMany' },
+    { label: 'One to one', value: 'hasOne' },
+    { label: 'One to many', value: 'hasMany' },
+    { label: 'Many to one', value: 'belongsTo' },
+    { label: 'Many to many', value: 'belongsToMany' },
   ],
 };
 

package/src/locale/en_US.ts

@@ -299,4 +299,7 @@ export default {
   'After successful update': 'After successful update',
   'Save record': 'Save record',
   'After successful save': 'After successful save',
+  'Button background color': 'Button background color',
+  'Highlight': 'Highlight',
+  'Danger red': 'Danger red'
 }

package/src/locale/zh_CN.ts

@@ -346,6 +346,7 @@ export default {
   'Accept': '文件格式',
   'Rich Text': '富文本',
   'Junction collection': '中间表',
+  'Leave it blank, unless you need a custom intermediate table': '默认留空，除非你需要一个自定义的中间表',
   'Fields': '字段',
   'Edit field title': '编辑字段标题',
   'Field title': '字段标题',
@@ -505,4 +506,7 @@ export default {
   'After successful save': '保存成功后',
   'After clicking the custom button, the following field values will be assigned according to the following form.': '点击当前自定义按钮时，以下字段值将按照以下表单赋值。',
   'After clicking the custom button, the following fields of the current record will be saved according to the following form.': '点击当前自定义按钮时，当前数据以下字段将按照以下表单保存。',
+  'Button background color': '按钮颜色',
+  'Highlight': '高亮',
+  'Danger red': '红色'
 }

package/src/route-switch/antd/admin-layout/index.tsx

@@ -37,6 +37,9 @@ const filterByACL = (schema, options) => {
         if (element['x-uid'] && !allowMenuItemIds.includes(element['x-uid'])) {
           delete s.properties[key];
         }
+        if (element['x-uid']) {
+          filterSchema(element);
+        }
       }
     }
   };

package/src/schema-component/antd/action/Action.Designer.tsx

@@ -79,16 +79,35 @@ export const ActionDesigner = (props) => {
                   'x-component-props': {},
                   // description: `原字段标题：${collectionField?.uiSchema?.title}`,
                 },
+                type: {
+                  'x-decorator': 'FormItem',
+                  'x-component': 'Radio.Group',
+                  title: t('Button background color'),
+                  default: fieldSchema?.['x-component-props']?.danger
+                    ? 'danger'
+                    : fieldSchema?.['x-component-props']?.type === 'primary'
+                    ? 'primary'
+                    : 'default',
+                  enum: [
+                    { value: 'default', label: '{{t("Default")}}' },
+                    { value: 'primary', label: '{{t("Highlight")}}' },
+                    { value: 'danger', label: '{{t("Danger red")}}' },
+                  ],
+                },
               },
             } as ISchema
           }
-          onSubmit={({ title, icon }) => {
+          onSubmit={({ title, icon, type }) => {
             if (title) {
               fieldSchema.title = title;
               field.title = title;
               field.componentProps.icon = icon;
+              field.componentProps.danger = type === 'danger';
+              field.componentProps.type = type;
               fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
               fieldSchema['x-component-props'].icon = icon;
+              fieldSchema['x-component-props'].danger = type === 'danger';
+              fieldSchema['x-component-props'].type = type;
               dn.emit('patch', {
                 schema: {
                   ['x-uid']: fieldSchema['x-uid'],

package/src/schema-component/hooks/useDesignable.tsx

@@ -1,6 +1,7 @@
 import { ISchema, Schema, SchemaOptionsContext, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import { message } from 'antd';
+import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import set from 'lodash/set';
 import React, { useContext } from 'react';
@@ -325,6 +326,8 @@ export class Designable {
       if (removeParentsIfNoChildren) {
         opts['removed'] = this.recursiveRemoveIfNoChildren(schema.parent, { breakRemoveOn });
       }
+    } else if (schema) {
+      schema = cloneDeep(schema);
     }
     const properties = {};
     let start = false;
@@ -382,6 +385,8 @@ export class Designable {
       if (removeParentsIfNoChildren) {
         opts['removed'] = this.recursiveRemoveIfNoChildren(schema.parent, { breakRemoveOn });
       }
+    } else if (schema) {
+      schema = cloneDeep(schema);
     }
     const properties = {};
     let order = 1;
@@ -430,6 +435,8 @@ export class Designable {
       if (removeParentsIfNoChildren) {
         opts['removed'] = this.recursiveRemoveIfNoChildren(schema.parent, { breakRemoveOn });
       }
+    } else if (schema) {
+      schema = cloneDeep(schema);
     }
     this.prepareProperty(schema);
     const wrapped = wrap(schema);
@@ -466,6 +473,8 @@ export class Designable {
         opts['removed'] = this.recursiveRemoveIfNoChildren(schema.parent, { breakRemoveOn });
       }
       schema.parent = null;
+    } else if (schema) {
+      schema = cloneDeep(schema);
     }
 
     let order = 0;

package/src/schema-settings/SchemaSettings.tsx

@@ -486,6 +486,7 @@ SchemaSettings.ActionModalItem = React.memo((props: any) => {
   const cancelHandler = () => {
     setVisible(false);
   };
+
   const submitHandler = () => {
     onSubmit?.(cloneDeep(form.values));
     setVisible(false);
@@ -504,12 +505,7 @@ SchemaSettings.ActionModalItem = React.memo((props: any) => {
   };
 
   return (
-    <div
-      onClick={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
-      }}
-    >
+    <>
       <SchemaSettings.Item {...others} onClick={openAssignedFieldValueHandler}>
         {props.children || props.title}
       </SchemaSettings.Item>
@@ -538,7 +534,7 @@ SchemaSettings.ActionModalItem = React.memo((props: any) => {
           </FormLayout>
         </FormProvider>
       </Modal>
-    </div>
+    </>
   );
 });