@nocobase/client 0.9.2-alpha.4 → 0.9.3-alpha.1

package/lib/collection-manager/Configuration/CollectionFields.js

@@ -174,9 +174,8 @@ var CurrentFields = function CurrentFields(props) {
       type: 'checkbox',
       onChange: function onChange(selectedRowKeys) {
         setState(function (state) {
-          var result = [].concat(_toConsumableArray(state.selectedRowKeys || []), _toConsumableArray(selectedRowKeys));
           return _objectSpread(_objectSpread({}, state), {}, {
-            selectedRowKeys: result
+            selectedRowKeys: selectedRowKeys
           });
         });
       }

package/lib/collection-manager/Configuration/EditFieldAction.js

@@ -62,7 +62,6 @@ var getSchema = function getSchema(schema, record, compile, getContainer) {
         }
       }
     };
-    properties['defaultValue']['x-disabled'] = record.overriding;
   }
   return {
     type: 'object',

package/lib/collection-manager/Configuration/OverridingCollectionField.js

@@ -47,7 +47,6 @@ var getSchema = function getSchema(schema, record, compile, getContainer) {
     properties['defaultValue'] = (0, _cloneDeep.default)(schema.default.uiSchema);
     properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
     properties['defaultValue']['x-decorator'] = 'FormItem';
-    properties['defaultValue']['x-disabled'] = true;
   }
   return {
     type: 'object',

package/lib/collection-manager/action-hooks.d.ts

@@ -50,7 +50,7 @@ export declare const useDestroyAction: () => {
     run(): Promise<void>;
 };
 export declare const useBulkDestroyAction: () => {
-    run(): Promise<void>;
+    run(): Promise<any>;
 };
 export declare const useValuesFromRA: (options: any) => any;
 export declare const useCreateActionAndRefreshCM: () => {

package/lib/collection-manager/action-hooks.js

@@ -9,6 +9,7 @@ var _react = require("@formily/react");
 var _antd = require("antd");
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _react2 = require("react");
+var _reactI18next = require("react-i18next");
 var _ = require(".");
 var _2 = require("..");
 var _apiClient = require("../api-client");
@@ -233,9 +234,10 @@ var useCollectionFilterOptions = function useCollectionFilterOptions(collectionN
   var options = getOptions(fields, 1);
   var compile = (0, _2.useCompile)();
   var _useCollectionManager4 = (0, _.useCollectionManager)(),
-    getChildrenCollections = _useCollectionManager4.getChildrenCollections;
-  var collection = (0, _.useCollection)();
-  var childrenCollections = getChildrenCollections(collection.name);
+    getChildrenCollections = _useCollectionManager4.getChildrenCollections,
+    getCollection = _useCollectionManager4.getCollection;
+  var collection = getCollection(collectionName);
+  var childrenCollections = getChildrenCollections(collectionName);
   if (childrenCollections.length > 0 && !options.find(function (v) {
     return v.name == 'tableoid';
   })) {
@@ -246,7 +248,7 @@ var useCollectionFilterOptions = function useCollectionFilterOptions(collectionN
       schema: {
         'x-component': 'Select',
         enum: [{
-          value: collection.name,
+          value: collectionName,
           label: compile(collection.title)
         }].concat(childrenCollections.map(function (v) {
           return {
@@ -604,22 +606,31 @@ var useBulkDestroyAction = function useBulkDestroyAction() {
     refresh = _useResourceActionCon7.refresh;
   var _useResourceContext7 = (0, _ResourceActionProvider.useResourceContext)(),
     resource = _useResourceContext7.resource;
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+    t = _useTranslation.t;
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        var _state$selectedRowKey;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context11.next = 2;
+              if (state === null || state === void 0 ? void 0 : (_state$selectedRowKey = state.selectedRowKeys) === null || _state$selectedRowKey === void 0 ? void 0 : _state$selectedRowKey.length) {
+                _context11.next = 2;
+                break;
+              }
+              return _context11.abrupt("return", _antd.message.error(t('Please select the records you want to delete')));
+            case 2:
+              _context11.next = 4;
               return resource.destroy({
                 filterByTk: (state === null || state === void 0 ? void 0 : state.selectedRowKeys) || []
               });
-            case 2:
+            case 4:
               setState === null || setState === void 0 ? void 0 : setState({
                 selectedRowKeys: []
               });
               refresh();
-            case 4:
+            case 6:
             case "end":
               return _context11.stop();
           }

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

@@ -27,7 +27,7 @@ var createdBy = {
     uiSchema: {
       type: 'object',
       title: '{{t("Created by")}}',
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         fieldNames: {
           value: 'id',

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.linkTo = void 0;
 var _shared = require("@formily/shared");
-var _lodash = require("lodash");
 var _properties = require("./properties");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -26,7 +25,7 @@ var linkTo = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -42,7 +41,7 @@ var linkTo = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -65,41 +64,6 @@ var linkTo = {
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer),
-          selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-        };
-      }
-      return schema;
-    } else {
-      if (readPretty) {
-        schema['properties'] = {
-          viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
-        };
-      } else {
-        schema['properties'] = {
-          selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-        };
-      }
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.m2m = void 0;
 var _shared = require("@formily/shared");
-var _lodash = require("lodash");
 var _properties = require("./properties");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -26,7 +25,7 @@ var m2m = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -42,7 +41,7 @@ var m2m = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -59,46 +58,13 @@ var m2m = {
     var readPretty = _ref.readPretty,
       block = _ref.block,
       targetCollection = _ref.targetCollection;
+    schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer),
-          selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

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

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.m2o = void 0;
-var _lodash = require("lodash");
 var _properties = require("./properties");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -25,7 +24,7 @@ var m2o = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -41,7 +40,7 @@ var m2o = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -58,46 +57,13 @@ var m2o = {
     var block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
+    schema['type'] = 'object';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer),
-          selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties.recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: (0, _lodash.cloneDeep)(_properties.recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

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

@@ -4,8 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.o2m = void 0;
-var _lodash = require("lodash");
-var _properties2 = require("./properties");
+var _properties = require("./properties");
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -25,7 +24,7 @@ var o2m = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -41,7 +40,7 @@ var o2m = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -59,76 +58,13 @@ var o2m = {
       block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
+    schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'TableField') {
-        var association = "".concat(field.collectionName, ".").concat(field.name);
-        schema['type'] = 'void';
-        schema['properties'] = {
-          block: {
-            type: 'void',
-            'x-decorator': 'TableFieldProvider',
-            'x-acl-action': "".concat(association, ":list"),
-            'x-decorator-props': {
-              collection: field.target,
-              association: association,
-              resource: association,
-              action: 'list',
-              params: {
-                paginate: false
-              },
-              showIndex: true,
-              dragSort: false,
-              fieldName: field.name
-            },
-            properties: _defineProperty({
-              actions: {
-                type: 'void',
-                'x-initializer': 'SubTableActionInitializers',
-                'x-component': 'TableField.ActionBar',
-                'x-component-props': {}
-              }
-            }, field.name, {
-              type: 'array',
-              'x-initializer': 'TableColumnInitializers',
-              'x-component': 'TableV2',
-              'x-component-props': {
-                rowSelection: {
-                  type: 'checkbox'
-                },
-                useProps: '{{ useTableFieldProps }}'
-              }
-            })
-          }
-        };
-      } else if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer),
-          selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: (0, _lodash.cloneDeep)(_properties2.recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: (0, _lodash.cloneDeep)(_properties2.recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -153,7 +89,7 @@ var o2m = {
       'x-component': 'Input',
       description: "{{t('Randomly generated and can be modified. Support letters, numbers and underscores, must start with an letter.')}}"
     },
-    type: _properties2.relationshipType,
+    type: _properties.relationshipType,
     grid: {
       type: 'void',
       'x-component': 'Grid',
@@ -257,7 +193,7 @@ var o2m = {
         }
       }
     }
-  }, _properties2.constraintsProps), _properties2.reverseFieldProperties),
+  }, _properties.constraintsProps), _properties.reverseFieldProperties),
   filterable: {
     nested: true,
     children: [