@nocobase/client 0.7.6-alpha.2 → 0.8.0-alpha.10

package/lib/collection-manager/CollectionManagerProvider.js

@@ -15,7 +15,7 @@ var _apiClient = require("../api-client");
 
 var _CollectionManagerSchemaComponentProvider = require("./CollectionManagerSchemaComponentProvider");
 
-var _context3 = require("./context");
+var _context2 = require("./context");
 
 var defaultInterfaces = _interopRequireWildcard(require("./interfaces"));
 
@@ -23,6 +23,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+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); }); }; }
+
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -35,10 +39,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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); }); }; }
-
 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; }
@@ -50,40 +50,13 @@ var CollectionManagerProvider = function CollectionManagerProvider(props) {
       interfaces = props.interfaces,
       _props$collections = props.collections,
       collections = _props$collections === void 0 ? [] : _props$collections,
-      _refreshCM = props.refreshCM;
-  return /*#__PURE__*/_react.default.createElement(_context3.CollectionManagerContext.Provider, {
+      refreshCM = props.refreshCM;
+  return /*#__PURE__*/_react.default.createElement(_context2.CollectionManagerContext.Provider, {
     value: {
       service: service,
       interfaces: _objectSpread(_objectSpread({}, defaultInterfaces), interfaces),
       collections: collections,
-      refreshCM: function () {
-        var _refreshCM2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-          return regeneratorRuntime.wrap(function _callee$(_context) {
-            while (1) {
-              switch (_context.prev = _context.next) {
-                case 0:
-                  if (!_refreshCM) {
-                    _context.next = 3;
-                    break;
-                  }
-
-                  _context.next = 3;
-                  return _refreshCM();
-
-                case 3:
-                case "end":
-                  return _context.stop();
-              }
-            }
-          }, _callee);
-        }));
-
-        function refreshCM() {
-          return _refreshCM2.apply(this, arguments);
-        }
-
-        return refreshCM;
-      }()
+      refreshCM: refreshCM
     }
   }, /*#__PURE__*/_react.default.createElement(_CollectionManagerSchemaComponentProvider.CollectionManagerSchemaComponentProvider, null, props.children));
 };
@@ -124,33 +97,41 @@ var RemoteCollectionManagerProvider = function RemoteCollectionManagerProvider(p
     }),
     collections: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data,
     refreshCM: function () {
-      var _refreshCM3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+      var _refreshCM = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(opts) {
         var _yield$api$request, data;
 
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+        return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context.prev = _context.next) {
               case 0:
-                setContentLoading(true);
-                _context2.next = 3;
+                if (opts === null || opts === void 0 ? void 0 : opts.reload) {
+                  setContentLoading(true);
+                }
+
+                _context.next = 3;
                 return api.request(options);
 
               case 3:
-                _yield$api$request = _context2.sent;
+                _yield$api$request = _context.sent;
                 data = _yield$api$request.data;
                 service.mutate(data);
-                setContentLoading(false);
 
-              case 7:
+                if (opts === null || opts === void 0 ? void 0 : opts.reload) {
+                  setContentLoading(false);
+                }
+
+                return _context.abrupt("return", (data === null || data === void 0 ? void 0 : data.data) || []);
+
+              case 8:
               case "end":
-                return _context2.stop();
+                return _context.stop();
             }
           }
-        }, _callee2);
+        }, _callee);
       }));
 
-      function refreshCM() {
-        return _refreshCM3.apply(this, arguments);
+      function refreshCM(_x) {
+        return _refreshCM.apply(this, arguments);
       }
 
       return refreshCM;

package/lib/collection-manager/CollectionManagerShortcut.d.ts

@@ -1 +1,3 @@
+export declare const CollectionManagerPane: () => JSX.Element;
 export declare const CollectionManagerShortcut: () => JSX.Element;
+export declare const CollectionManagerShortcut2: () => JSX.Element;

package/lib/collection-manager/CollectionManagerShortcut.js

@@ -5,16 +5,20 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CollectionManagerShortcut = void 0;
+exports.CollectionManagerShortcut2 = exports.CollectionManagerShortcut = exports.CollectionManagerPane = void 0;
 
 var _icons = require("@ant-design/icons");
 
 var _shared = require("@formily/shared");
 
+var _antd = require("antd");
+
 var _react = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
 
+var _reactRouterDom = require("react-router-dom");
+
 var _pluginManager = require("../plugin-manager");
 
 var _schemaComponent = require("../schema-component");
@@ -52,15 +56,54 @@ var schema = {
     }
   })
 };
+var schema2 = {
+  type: 'object',
+  properties: _defineProperty({}, (0, _shared.uid)(), {
+    'x-component': 'ConfigurationTable'
+  })
+};
+
+var CollectionManagerPane = function CollectionManagerPane() {
+  return /*#__PURE__*/_react.default.createElement(_antd.Card, {
+    bordered: false
+  }, /*#__PURE__*/_react.default.createElement(_schemaComponent.SchemaComponent, {
+    schema: schema2,
+    components: {
+      ConfigurationTable: _Configuration.ConfigurationTable,
+      AddFieldAction: _Configuration.AddFieldAction,
+      AddCollectionField: _Configuration.AddCollectionField,
+      EditFieldAction: _Configuration.EditFieldAction,
+      EditCollectionField: _Configuration.EditCollectionField
+    }
+  }));
+};
+
+exports.CollectionManagerPane = CollectionManagerPane;
 
 var CollectionManagerShortcut = function CollectionManagerShortcut() {
+  var _useTranslation = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation.t;
+
+  var history = (0, _reactRouterDom.useHistory)();
+  return /*#__PURE__*/_react.default.createElement(_pluginManager.PluginManager.Toolbar.Item, {
+    icon: /*#__PURE__*/_react.default.createElement(_icons.DatabaseOutlined, null),
+    title: t('Collections & Fields'),
+    onClick: function onClick() {
+      history.push('/admin/settings/collection-manager/collections');
+    }
+  });
+};
+
+exports.CollectionManagerShortcut = CollectionManagerShortcut;
+
+var CollectionManagerShortcut2 = function CollectionManagerShortcut2() {
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
 
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-      t = _useTranslation.t;
+  var _useTranslation2 = (0, _reactI18next.useTranslation)(),
+      t = _useTranslation2.t;
 
   return /*#__PURE__*/_react.default.createElement(_schemaComponent.ActionContext.Provider, {
     value: {
@@ -83,4 +126,4 @@ var CollectionManagerShortcut = function CollectionManagerShortcut() {
   }));
 };
 
-exports.CollectionManagerShortcut = CollectionManagerShortcut;
+exports.CollectionManagerShortcut2 = CollectionManagerShortcut2;

package/lib/collection-manager/Configuration/AddFieldAction.d.ts

@@ -1 +1,5 @@
-export declare const AddFieldAction: () => JSX.Element;
+export declare const useCollectionFieldFormValues: () => {
+    getValues(): any;
+};
+export declare const AddCollectionField: (props: any) => JSX.Element;
+export declare const AddFieldAction: (props: any) => JSX.Element;

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

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AddFieldAction = void 0;
+exports.useCollectionFieldFormValues = exports.AddFieldAction = exports.AddCollectionField = void 0;
 
 var _icons = require("@ant-design/icons");
 
@@ -94,6 +94,9 @@ var getSchema = function getSchema(schema, record, compile) {
     properties: _defineProperty({}, (0, _shared.uid)(), {
       type: 'void',
       'x-component': 'Action.Drawer',
+      'x-component-props': {
+        getContainer: '{{ getContainer }}'
+      },
       'x-decorator': 'Form',
       'x-decorator-props': {
         useValues: function useValues(options) {
@@ -122,7 +125,7 @@ var getSchema = function getSchema(schema, record, compile) {
               title: '{{ t("Cancel") }}',
               'x-component': 'Action',
               'x-component-props': {
-                useAction: '{{ cm.useCancelAction }}'
+                useAction: '{{ useCancelAction }}'
               }
             },
             action2: {
@@ -140,6 +143,24 @@ var getSchema = function getSchema(schema, record, compile) {
   };
 };
 
+var useCollectionFieldFormValues = function useCollectionFieldFormValues() {
+  var form = (0, _react.useForm)();
+  return {
+    getValues: function getValues() {
+      var values = (0, _lodash.cloneDeep)(form.values);
+
+      if (values.autoCreateReverseField) {} else {
+        delete values.reverseField;
+      }
+
+      delete values.autoCreateReverseField;
+      return values;
+    }
+  };
+};
+
+exports.useCollectionFieldFormValues = useCollectionFieldFormValues;
+
 var useCreateCollectionField = function useCreateCollectionField() {
   var form = (0, _react.useForm)();
 
@@ -149,9 +170,6 @@ var useCreateCollectionField = function useCreateCollectionField() {
   var _useCollectionManager = (0, _hooks.useCollectionManager)(),
       refreshCM = _useCollectionManager.refreshCM;
 
-  var _useRecord = (0, _recordProvider.useRecord)(),
-      title = _useRecord.title;
-
   var ctx = (0, _schemaComponent.useActionContext)();
 
   var _useResourceActionCon = (0, _ResourceActionProvider.useResourceActionContext)(),
@@ -205,7 +223,23 @@ var useCreateCollectionField = function useCreateCollectionField() {
   };
 };
 
-var AddFieldAction = function AddFieldAction() {
+var AddCollectionField = function AddCollectionField(props) {
+  var record = (0, _recordProvider.useRecord)();
+  return /*#__PURE__*/_react2.default.createElement(AddFieldAction, _objectSpread({
+    item: record
+  }, props));
+};
+
+exports.AddCollectionField = AddCollectionField;
+
+var AddFieldAction = function AddFieldAction(props) {
+  var scope = props.scope,
+      getContainer = props.getContainer,
+      record = props.item,
+      children = props.children,
+      trigger = props.trigger,
+      align = props.align;
+
   var _useCollectionManager2 = (0, _hooks.useCollectionManager)(),
       getInterface = _useCollectionManager2.getInterface;
 
@@ -224,13 +258,17 @@ var AddFieldAction = function AddFieldAction() {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
 
-  var record = (0, _recordProvider.useRecord)();
-  return /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContext.Provider, {
+  return /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+    record: record
+  }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContext.Provider, {
     value: {
       visible: visible,
       setVisible: setVisible
     }
   }, /*#__PURE__*/_react2.default.createElement(_antd2.Dropdown, {
+    getPopupContainer: getContainer,
+    trigger: trigger,
+    align: align,
     overlay: /*#__PURE__*/_react2.default.createElement(_antd2.Menu, {
       style: {
         maxHeight: '60vh',
@@ -253,7 +291,7 @@ var AddFieldAction = function AddFieldAction() {
         }, compile(child.title));
       }));
     }))
-  }, /*#__PURE__*/_react2.default.createElement(_antd2.Button, {
+  }, children || /*#__PURE__*/_react2.default.createElement(_antd2.Button, {
     icon: /*#__PURE__*/_react2.default.createElement(_icons.PlusOutlined, null),
     type: 'primary'
   }, t('Add field'))), /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
@@ -261,13 +299,15 @@ var AddFieldAction = function AddFieldAction() {
     components: _objectSpread(_objectSpread({}, components), {}, {
       ArrayTable: _antd.ArrayTable
     }),
-    scope: {
+    scope: _objectSpread({
+      getContainer: getContainer,
+      useCancelAction: _actionHooks.useCancelAction,
       createOnly: true,
       useCreateCollectionField: useCreateCollectionField,
       record: record,
       showReverseFieldConfig: true
-    }
-  }));
+    }, scope)
+  })));
 };
 
 exports.AddFieldAction = AddFieldAction;

package/lib/collection-manager/Configuration/CollectionFieldsTable.d.ts

@@ -0,0 +1,15 @@
+import { Options, Result } from 'ahooks/lib/useRequest/src/types';
+import React from 'react';
+import { TableProps } from 'antd';
+declare type TableVoidProps = TableProps<any> & {
+    request?: any;
+    useSelectedRowKeys?: any;
+    useDataSource?: (options?: Options<any, any> & {
+        uid?: string;
+    }, props?: any) => Result<any, any> & {
+        state?: any;
+        setState?: any;
+    };
+};
+export declare const CollectionFieldsTable: React.FC<TableVoidProps>;
+export {};

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

@@ -0,0 +1,92 @@
+"use strict";
+
+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); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.CollectionFieldsTable = void 0;
+
+var _core = require("@formily/core");
+
+var _react = require("@formily/react");
+
+var _react2 = _interopRequireWildcard(require("react"));
+
+var _ = require("../..");
+
+var _useAttach = require("@formily/react/lib/hooks/useAttach");
+
+var _CollectionFieldsTableArray = require("./CollectionFieldsTableArray");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+var useDefSelectedRowKeys = function useDefSelectedRowKeys() {
+  var _result$state;
+
+  var result = (0, _.useAsyncData)();
+  return [result === null || result === void 0 ? void 0 : (_result$state = result.state) === null || _result$state === void 0 ? void 0 : _result$state.selectedRowKeys, function (selectedRowKeys) {
+    var _result$setState;
+
+    return result === null || result === void 0 ? void 0 : (_result$setState = result.setState) === null || _result$setState === void 0 ? void 0 : _result$setState.call(result, {
+      selectedRowKeys: selectedRowKeys
+    });
+  }];
+};
+
+var useDef = function useDef(options, props) {
+  var request = props.request,
+      dataSource = props.dataSource;
+
+  if (request) {
+    return (0, _.useRequest)(request(props), options);
+  } else {
+    return Promise.resolve({
+      data: dataSource
+    });
+  }
+};
+
+var CollectionFieldsTable = (0, _react.observer)(function (props) {
+  var _props$rowKey = props.rowKey,
+      rowKey = _props$rowKey === void 0 ? 'id' : _props$rowKey,
+      _props$useDataSource = props.useDataSource,
+      useDataSource = _props$useDataSource === void 0 ? useDef : _props$useDataSource,
+      _props$useSelectedRow = props.useSelectedRowKeys,
+      useSelectedRowKeys = _props$useSelectedRow === void 0 ? useDefSelectedRowKeys : _props$useSelectedRow;
+  var field = (0, _react.useField)();
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var form = (0, _react2.useMemo)(function () {
+    return (0, _core.createForm)();
+  }, []);
+  var f = (0, _useAttach.useAttach)(form.createArrayField(_objectSpread(_objectSpread({}, field.props), {}, {
+    basePath: ''
+  })));
+  var result = useDataSource({
+    uid: fieldSchema['x-uid'],
+    onSuccess: function onSuccess(data) {
+      form.setValues(_defineProperty({}, fieldSchema.name, data === null || data === void 0 ? void 0 : data.data));
+    }
+  }, props);
+  return /*#__PURE__*/_react2.default.createElement(_.AsyncDataProvider, {
+    value: result
+  }, /*#__PURE__*/_react2.default.createElement(_react.FormContext.Provider, {
+    value: form
+  }, /*#__PURE__*/_react2.default.createElement(_react.FieldContext.Provider, {
+    value: f
+  }, /*#__PURE__*/_react2.default.createElement(_CollectionFieldsTableArray.CollectionFieldsTableArray, _objectSpread(_objectSpread({}, props), {}, {
+    rowKey: rowKey,
+    loading: result === null || result === void 0 ? void 0 : result['loading'],
+    useSelectedRowKeys: useSelectedRowKeys,
+    pagination: false
+  })))));
+});
+exports.CollectionFieldsTable = CollectionFieldsTable;

package/lib/collection-manager/Configuration/CollectionFieldsTableArray.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export declare const components: {
+    body: {
+        row: (props: any) => JSX.Element;
+        cell: (props: any) => JSX.Element;
+    };
+};
+export declare const CollectionFieldsTableArray: React.FC<any>;