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

package/es/acl/ACLShortcut.d.ts

@@ -1 +1,3 @@
+export declare const ACLPane: () => JSX.Element;
 export declare const ACLShortcut: () => JSX.Element;
+export declare const ACLShortcut2: () => JSX.Element;

package/es/acl/ACLShortcut.js

@@ -14,8 +14,10 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { LockOutlined } from '@ant-design/icons';
 import { uid } from '@formily/shared';
+import { Card } from 'antd';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { useHistory } from 'react-router-dom';
 import { PluginManager } from '../plugin-manager';
 import { ActionContext, SchemaComponent } from '../schema-component';
 import * as components from './Configuration';
@@ -33,14 +35,41 @@ var schema = {
     }
   })
 };
+var schema2 = {
+  type: 'object',
+  properties: _defineProperty({}, uid(), {
+    'x-component': 'RoleTable'
+  })
+};
+export var ACLPane = function ACLPane() {
+  return /*#__PURE__*/React.createElement(Card, {
+    bordered: false
+  }, /*#__PURE__*/React.createElement(SchemaComponent, {
+    components: components,
+    schema: schema2
+  }));
+};
 export var ACLShortcut = function ACLShortcut() {
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  var history = useHistory();
+  return /*#__PURE__*/React.createElement(PluginManager.Toolbar.Item, {
+    icon: /*#__PURE__*/React.createElement(LockOutlined, null),
+    title: t('Roles & Permissions'),
+    onClick: function onClick() {
+      history.push('/admin/settings/acl/roles');
+    }
+  });
+};
+export var ACLShortcut2 = function ACLShortcut2() {
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       visible = _useState2[0],
       setVisible = _useState2[1];
 
-  var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
+  var _useTranslation2 = useTranslation(),
+      t = _useTranslation2.t;
 
   return /*#__PURE__*/React.createElement(ActionContext.Provider, {
     value: {

package/es/api-client/APIClient.d.ts

@@ -2,6 +2,7 @@ import { APIClient as APIClientSDK } from '@nocobase/sdk';
 import { Result } from 'ahooks/lib/useRequest/src/types';
 export declare class APIClient extends APIClientSDK {
     services: Record<string, Result<any, any>>;
+    service(uid: string): Result<any, any>;
     interceptors(): void;
     notification(): void;
 }

package/es/api-client/APIClient.js

@@ -42,11 +42,16 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
     }
 
     _this = _super.call.apply(_super, [this].concat(args));
-    _this.services = void 0;
+    _this.services = {};
     return _this;
   }
 
   _createClass(APIClient, [{
+    key: "service",
+    value: function service(uid) {
+      return this.services[uid];
+    }
+  }, {
     key: "interceptors",
     value: function interceptors() {
       _get(_getPrototypeOf(APIClient.prototype), "interceptors", this).call(this);

package/es/application/Application.d.ts

@@ -4,6 +4,7 @@ export interface ApplicationOptions {
     apiClient?: any;
     i18n?: any;
     plugins?: any[];
+    dynamicImport?: any;
 }
 export declare const getCurrentTimezone: () => string;
 export declare type PluginCallback = () => Promise<any>;
@@ -13,6 +14,7 @@ export declare class Application {
     apiClient: APIClient;
     i18n: i18next;
     plugins: PluginCallback[];
+    options: ApplicationOptions;
     constructor(options: ApplicationOptions);
     use(component: any, props?: any): void;
     main(mainComponent: any): void;
@@ -20,5 +22,5 @@ export declare class Application {
      * TODO
      */
     plugin(plugin: PluginCallback): void;
-    render(): (props?: any) => JSX.Element;
+    render(): (props: any) => JSX.Element;
 }

package/es/application/Application.js

@@ -1,10 +1,8 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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(); }
 
@@ -14,12 +12,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
 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; }
@@ -32,7 +24,20 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-import React from 'react';
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+import { Spin } from 'antd';
+import React, { useEffect, useState } from 'react';
 import { I18nextProvider } from 'react-i18next';
 import { Link, NavLink } from 'react-router-dom';
 import { ACLProvider, ACLShortcut } from '../acl';
@@ -43,6 +48,7 @@ import { CollectionManagerShortcut } from '../collection-manager';
 import { RemoteDocumentTitleProvider } from '../document-title';
 import { i18n } from '../i18n';
 import { PluginManagerProvider } from '../plugin-manager';
+import PMProvider, { PluginManagerLink, SettingsCenterDropdown } from '../pm';
 import { AdminLayout, AuthLayout, RemoteRouteSwitchProvider, RouteSchemaComponent, RouteSwitch, useRoutes } from '../route-switch';
 import { AntdSchemaComponentProvider, DesignableSwitch, MenuItemInitializers, SchemaComponentProvider } from '../schema-component';
 import { SchemaInitializerProvider } from '../schema-initializer';
@@ -55,6 +61,15 @@ export var getCurrentTimezone = function getCurrentTimezone() {
   var timezone = String(timezoneOffset).padStart(2, '0') + ':00';
   return (timezoneOffset > 0 ? '+' : '-') + timezone;
 };
+var App = /*#__PURE__*/React.memo(function (props) {
+  var C = compose.apply(void 0, _toConsumableArray(props.providers))(function () {
+    var routes = useRoutes();
+    return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(RouteSwitch, {
+      routes: routes
+    }));
+  });
+  return /*#__PURE__*/React.createElement(C, null);
+});
 export var Application = /*#__PURE__*/function () {
   function Application(options) {
     var _window, _window$location;
@@ -66,6 +81,8 @@ export var Application = /*#__PURE__*/function () {
     this.apiClient = void 0;
     this.i18n = void 0;
     this.plugins = [];
+    this.options = void 0;
+    this.options = options;
     this.apiClient = new APIClient(_objectSpread({
       baseURL: process.env.API_BASE_URL,
       headers: {
@@ -101,7 +118,9 @@ export var Application = /*#__PURE__*/function () {
         DesignableSwitch: DesignableSwitch,
         CollectionManagerShortcut: CollectionManagerShortcut,
         SystemSettingsShortcut: SystemSettingsShortcut,
-        SchemaTemplateShortcut: SchemaTemplateShortcut
+        SchemaTemplateShortcut: SchemaTemplateShortcut,
+        PluginManagerLink: PluginManagerLink,
+        SettingsCenterDropdown: SettingsCenterDropdown
       }
     });
     this.use(SchemaComponentProvider, {
@@ -119,26 +138,7 @@ export var Application = /*#__PURE__*/function () {
     this.use(AntdSchemaComponentProvider);
     this.use(ACLProvider);
     this.use(RemoteDocumentTitleProvider);
-
-    var _iterator = _createForOfIteratorHelper(options.plugins),
-        _step;
-
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var plugin = _step.value;
-
-        var _ref = Array.isArray(plugin) ? plugin : [plugin],
-            _ref2 = _slicedToArray(_ref, 2),
-            component = _ref2[0],
-            props = _ref2[1];
-
-        this.use(component, props);
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
+    this.use(PMProvider);
   }
 
   _createClass(Application, [{
@@ -163,12 +163,104 @@ export var Application = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      return compose.apply(void 0, _toConsumableArray(this.providers))(this.mainComponent || function () {
-        var routes = useRoutes();
-        return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(RouteSwitch, {
-          routes: routes
-        }));
-      });
+      var _this = this;
+
+      return function (props) {
+        var _this$options = _this.options,
+            _this$options$plugins = _this$options.plugins,
+            plugins = _this$options$plugins === void 0 ? [] : _this$options$plugins,
+            dynamicImport = _this$options.dynamicImport;
+
+        var _useState = useState(false),
+            _useState2 = _slicedToArray(_useState, 2),
+            loading = _useState2[0],
+            setLoading = _useState2[1];
+
+        useEffect(function () {
+          setLoading(true);
+
+          _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+            var _res$data;
+
+            var res, _iterator, _step, plugin, pluginModule;
+
+            return regeneratorRuntime.wrap(function _callee$(_context) {
+              while (1) {
+                switch (_context.prev = _context.next) {
+                  case 0:
+                    _context.next = 2;
+                    return _this.apiClient.request({
+                      url: 'app:getPlugins'
+                    });
+
+                  case 2:
+                    res = _context.sent;
+
+                    if (Array.isArray((_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.data)) {
+                      plugins.push.apply(plugins, _toConsumableArray(res.data.data));
+                    }
+
+                    _iterator = _createForOfIteratorHelper(plugins);
+                    _context.prev = 5;
+
+                    _iterator.s();
+
+                  case 7:
+                    if ((_step = _iterator.n()).done) {
+                      _context.next = 15;
+                      break;
+                    }
+
+                    plugin = _step.value;
+                    _context.next = 11;
+                    return dynamicImport(plugin);
+
+                  case 11:
+                    pluginModule = _context.sent;
+
+                    _this.use(pluginModule.default);
+
+                  case 13:
+                    _context.next = 7;
+                    break;
+
+                  case 15:
+                    _context.next = 20;
+                    break;
+
+                  case 17:
+                    _context.prev = 17;
+                    _context.t0 = _context["catch"](5);
+
+                    _iterator.e(_context.t0);
+
+                  case 20:
+                    _context.prev = 20;
+
+                    _iterator.f();
+
+                    return _context.finish(20);
+
+                  case 23:
+                    setLoading(false);
+
+                  case 24:
+                  case "end":
+                    return _context.stop();
+                }
+              }
+            }, _callee, null, [[5, 17, 20, 23]]);
+          }))();
+        }, []);
+
+        if (loading) {
+          return /*#__PURE__*/React.createElement(Spin, null);
+        }
+
+        return /*#__PURE__*/React.createElement(App, {
+          providers: _this.providers
+        });
+      };
     }
   }]);
 

package/es/block-provider/BlockProvider.js

@@ -10,7 +10,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
-import { useField } from '@formily/react';
+import { useField, useFieldSchema } from '@formily/react';
 import { useRequest } from 'ahooks';
 import template from 'lodash/template';
 import React, { createContext, useContext } from 'react';
@@ -97,6 +97,8 @@ export var useResourceAction = function useResourceAction(props) {
     return field.name;
   });
   var params = useActionParams(props);
+  var api = useAPIClient();
+  var fieldSchema = useFieldSchema();
 
   if (!Object.keys(params).includes('appends') && (appends === null || appends === void 0 ? void 0 : appends.length)) {
     params['appends'] = appends;
@@ -117,6 +119,15 @@ export var useResourceAction = function useResourceAction(props) {
       return res.data;
     });
   }, _objectSpread(_objectSpread({}, opts), {}, {
+    onSuccess: function onSuccess(data, params) {
+      var _opts$onSuccess;
+
+      opts === null || opts === void 0 ? void 0 : (_opts$onSuccess = opts['onSuccess']) === null || _opts$onSuccess === void 0 ? void 0 : _opts$onSuccess.call(opts, data, params);
+
+      if (fieldSchema['x-uid']) {
+        api.services[fieldSchema['x-uid']] = result;
+      }
+    },
     defaultParams: [params],
     refreshDeps: [JSON.stringify(params.appends)]
   }));

package/es/block-provider/CalendarBlockProvider.d.ts

@@ -4,4 +4,5 @@ export declare const CalendarBlockProvider: (props: any) => JSX.Element;
 export declare const useCalendarBlockContext: () => any;
 export declare const useCalendarBlockProps: () => {
     fieldNames: any;
+    showLunar: any;
 };

package/es/block-provider/CalendarBlockProvider.js

@@ -11,7 +11,8 @@ import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 export var CalendarBlockContext = /*#__PURE__*/createContext({});
 
 var InternalCalendarBlockProvider = function InternalCalendarBlockProvider(props) {
-  var fieldNames = props.fieldNames;
+  var fieldNames = props.fieldNames,
+      showLunar = props.showLunar;
   var field = useField();
 
   var _useBlockRequestConte = useBlockRequestContext(),
@@ -27,7 +28,8 @@ var InternalCalendarBlockProvider = function InternalCalendarBlockProvider(props
       field: field,
       service: service,
       resource: resource,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      showLunar: showLunar
     }
   }, props.children);
 };
@@ -57,6 +59,7 @@ export var useCalendarBlockProps = function useCalendarBlockProps() {
     }
   }, [ctx === null || ctx === void 0 ? void 0 : (_ctx$service3 = ctx.service) === null || _ctx$service3 === void 0 ? void 0 : _ctx$service3.loading]);
   return {
-    fieldNames: ctx.fieldNames
+    fieldNames: ctx.fieldNames,
+    showLunar: ctx.showLunar
   };
 };

package/es/block-provider/TableSelectorProvider.js

@@ -18,7 +18,8 @@ export var TableSelectorContext = /*#__PURE__*/createContext({});
 
 var InternalTableSelectorProvider = function InternalTableSelectorProvider(props) {
   var params = props.params,
-      rowKey = props.rowKey;
+      rowKey = props.rowKey,
+      extraFilter = props.extraFilter;
   var field = useField();
 
   var _useBlockRequestConte = useBlockRequestContext(),
@@ -34,6 +35,7 @@ var InternalTableSelectorProvider = function InternalTableSelectorProvider(props
       service: service,
       resource: resource,
       params: params,
+      extraFilter: extraFilter,
       rowKey: rowKey
     }
   }, props.children);
@@ -83,10 +85,12 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
     params['appends'] = appends;
   }
 
+  var extraFilter;
+
   if (collectionField) {
     if (['oho', 'o2m'].includes(collectionField.interface)) {
       if (record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]) {
-        params['filter'] = {
+        extraFilter = {
           $or: [_defineProperty({}, collectionField.foreignKey, {
             $is: null
           }), _defineProperty({}, collectionField.foreignKey, {
@@ -94,7 +98,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
           })]
         };
       } else {
-        params['filter'] = _defineProperty({}, collectionField.foreignKey, {
+        extraFilter = _defineProperty({}, collectionField.foreignKey, {
           $is: null
         });
       }
@@ -108,7 +112,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
 
       if (targetField) {
         if (record === null || record === void 0 ? void 0 : record[collectionField.foreignKey]) {
-          params['filter'] = {
+          extraFilter = {
             $or: [_defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
               $is: null
             }), _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
@@ -116,7 +120,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
             })]
           };
         } else {
-          params['filter'] = _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
+          extraFilter = _defineProperty({}, "".concat(targetField.name, ".").concat(targetField.foreignKey), {
             $is: null
           });
         }
@@ -124,10 +128,21 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
     }
   }
 
+  if (extraFilter) {
+    if (params === null || params === void 0 ? void 0 : params.filter) {
+      params['filter'] = {
+        $and: [extraFilter, params['filter']]
+      };
+    } else {
+      params['filter'] = extraFilter;
+    }
+  }
+
   return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
   }), /*#__PURE__*/React.createElement(InternalTableSelectorProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: params
+    params: params,
+    extraFilter: extraFilter
   })));
 };
 export var useTableSelectorContext = function useTableSelectorContext() {

package/es/block-provider/hooks/index.d.ts

@@ -7,6 +7,12 @@ export declare const useCreateActionProps: () => {
 export declare const useCustomizeUpdateActionProps: () => {
     onClick(): Promise<void>;
 };
+export declare const useCustomizeBulkUpdateActionProps: () => {
+    onClick(): Promise<void>;
+};
+export declare const useCustomizeBulkEditActionProps: () => {
+    onClick(): Promise<void>;
+};
 export declare const useCustomizeRequestActionProps: () => {
     onClick(): Promise<void>;
 };