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

package/lib/application/Application.js

@@ -1,11 +1,15 @@
 "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.getCurrentTimezone = exports.Application = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
+
+var _react = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
 
@@ -27,6 +31,8 @@ var _i18n = require("../i18n");
 
 var _pluginManager = require("../plugin-manager");
 
+var _pm = _interopRequireWildcard(require("../pm"));
+
 var _routeSwitch = require("../route-switch");
 
 var _schemaComponent = require("../schema-component");
@@ -41,15 +47,15 @@ var _user = require("../user");
 
 var _compose = require("./compose");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+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 _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 _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+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 _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(); }
 
@@ -59,12 +65,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; }
@@ -77,6 +77,18 @@ 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; }
 
+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; }
+
 var getCurrentTimezone = function getCurrentTimezone() {
   var timezoneOffset = new Date().getTimezoneOffset() / -60;
   var timezone = String(timezoneOffset).padStart(2, '0') + ':00';
@@ -85,6 +97,17 @@ var getCurrentTimezone = function getCurrentTimezone() {
 
 exports.getCurrentTimezone = getCurrentTimezone;
 
+var App = /*#__PURE__*/_react.default.memo(function (props) {
+  var C = _compose.compose.apply(void 0, _toConsumableArray(props.providers))(function () {
+    var routes = (0, _routeSwitch.useRoutes)();
+    return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_routeSwitch.RouteSwitch, {
+      routes: routes
+    }));
+  });
+
+  return /*#__PURE__*/_react.default.createElement(C, null);
+});
+
 var Application = /*#__PURE__*/function () {
   function Application(options) {
     var _window, _window$location;
@@ -96,6 +119,8 @@ 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.APIClient(_objectSpread({
       baseURL: process.env.API_BASE_URL,
       headers: {
@@ -131,7 +156,9 @@ var Application = /*#__PURE__*/function () {
         DesignableSwitch: _schemaComponent.DesignableSwitch,
         CollectionManagerShortcut: _collectionManager.CollectionManagerShortcut,
         SystemSettingsShortcut: _systemSettings.SystemSettingsShortcut,
-        SchemaTemplateShortcut: _schemaTemplates.SchemaTemplateShortcut
+        SchemaTemplateShortcut: _schemaTemplates.SchemaTemplateShortcut,
+        PluginManagerLink: _pm.PluginManagerLink,
+        SettingsCenterDropdown: _pm.SettingsCenterDropdown
       }
     });
     this.use(_schemaComponent.SchemaComponentProvider, {
@@ -149,26 +176,7 @@ var Application = /*#__PURE__*/function () {
     this.use(_schemaComponent.AntdSchemaComponentProvider);
     this.use(_acl.ACLProvider);
     this.use(_documentTitle.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(_pm.default);
   }
 
   _createClass(Application, [{
@@ -193,12 +201,104 @@ var Application = /*#__PURE__*/function () {
   }, {
     key: "render",
     value: function render() {
-      return _compose.compose.apply(void 0, _toConsumableArray(this.providers))(this.mainComponent || function () {
-        var routes = (0, _routeSwitch.useRoutes)();
-        return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_routeSwitch.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 = (0, _react.useState)(false),
+            _useState2 = _slicedToArray(_useState, 2),
+            loading = _useState2[0],
+            setLoading = _useState2[1];
+
+        (0, _react.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.default.createElement(_antd.Spin, null);
+        }
+
+        return /*#__PURE__*/_react.default.createElement(App, {
+          providers: _this.providers
+        });
+      };
     }
   }]);
 

package/lib/block-provider/BlockProvider.js

@@ -125,6 +125,8 @@ var useResourceAction = function useResourceAction(props) {
     return field.name;
   });
   var params = useActionParams(props);
+  var api = (0, _.useAPIClient)();
+  var fieldSchema = (0, _react.useFieldSchema)();
 
   if (!Object.keys(params).includes('appends') && (appends === null || appends === void 0 ? void 0 : appends.length)) {
     params['appends'] = appends;
@@ -145,6 +147,15 @@ 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/lib/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/lib/block-provider/CalendarBlockProvider.js

@@ -29,7 +29,8 @@ var CalendarBlockContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.CalendarBlockContext = CalendarBlockContext;
 
 var InternalCalendarBlockProvider = function InternalCalendarBlockProvider(props) {
-  var fieldNames = props.fieldNames;
+  var fieldNames = props.fieldNames,
+      showLunar = props.showLunar;
   var field = (0, _react.useField)();
 
   var _useBlockRequestConte = (0, _BlockProvider.useBlockRequestContext)(),
@@ -45,7 +46,8 @@ var InternalCalendarBlockProvider = function InternalCalendarBlockProvider(props
       field: field,
       service: service,
       resource: resource,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      showLunar: showLunar
     }
   }, props.children);
 };
@@ -81,7 +83,8 @@ 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/lib/block-provider/TableSelectorProvider.js

@@ -38,7 +38,8 @@ exports.TableSelectorContext = TableSelectorContext;
 
 var InternalTableSelectorProvider = function InternalTableSelectorProvider(props) {
   var params = props.params,
-      rowKey = props.rowKey;
+      rowKey = props.rowKey,
+      extraFilter = props.extraFilter;
   var field = (0, _react.useField)();
 
   var _useBlockRequestConte = (0, _BlockProvider.useBlockRequestContext)(),
@@ -54,6 +55,7 @@ var InternalTableSelectorProvider = function InternalTableSelectorProvider(props
       service: service,
       resource: resource,
       params: params,
+      extraFilter: extraFilter,
       rowKey: rowKey
     }
   }, props.children);
@@ -103,10 +105,12 @@ 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, {
@@ -114,7 +118,7 @@ var TableSelectorProvider = function TableSelectorProvider(props) {
           })]
         };
       } else {
-        params['filter'] = _defineProperty({}, collectionField.foreignKey, {
+        extraFilter = _defineProperty({}, collectionField.foreignKey, {
           $is: null
         });
       }
@@ -128,7 +132,7 @@ 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), {
@@ -136,7 +140,7 @@ 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
           });
         }
@@ -144,10 +148,21 @@ 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__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
   }), /*#__PURE__*/_react2.default.createElement(InternalTableSelectorProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: params
+    params: params,
+    extraFilter: extraFilter
   })));
 };
 

package/lib/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>;
 };