@nocobase/client 0.7.0-alpha.80 → 0.7.0-alpha.83

package/es/acl/ACLProvider.js

@@ -1,9 +1,3 @@
-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; }
-
 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."); }
@@ -16,12 +10,17 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+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; }
+
 import { useFieldSchema } from '@formily/react';
-import { useCookieState } from 'ahooks';
 import { Spin } from 'antd';
 import React, { createContext, useContext } from 'react';
 import { Redirect } from 'react-router-dom';
-import { useRequest } from '../api-client';
+import { useAPIClient, useRequest } from '../api-client';
 import { useCollection } from '../collection-manager';
 import { useRecordIsOwn } from '../record-provider';
 import { SchemaComponentOptions, useDesignable } from '../schema-component';
@@ -40,11 +39,7 @@ export var ACLRolesCheckProvider = function ACLRolesCheckProvider(props) {
   var _useDesignable = useDesignable(),
       setDesignable = _useDesignable.setDesignable;
 
-  var _useCookieState = useCookieState('currentRoleName'),
-      _useCookieState2 = _slicedToArray(_useCookieState, 2),
-      roleName = _useCookieState2[0],
-      setRoleName = _useCookieState2[1];
-
+  var api = useAPIClient();
   var result = useRequest({
     url: 'roles:check'
   }, {
@@ -55,10 +50,10 @@ export var ACLRolesCheckProvider = function ACLRolesCheckProvider(props) {
         setDesignable(false);
       }
 
-      if ((data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.role) !== roleName) {
+      if ((data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.role) !== api.auth.role) {
         var _data$data4;
 
-        setRoleName(data === null || data === void 0 ? void 0 : (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : _data$data4.role);
+        api.auth.setRole(data === null || data === void 0 ? void 0 : (_data$data4 = data.data) === null || _data$data4 === void 0 ? void 0 : _data$data4.role);
       }
     }
   });

package/es/antd-config-provider/index.js

@@ -15,11 +15,13 @@ import enUS from 'antd/lib/locale/en_US';
 import zhCN from 'antd/lib/locale/zh_CN';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useRequest } from '../api-client';
+import { useAPIClient, useRequest } from '../api-client';
 export function AntdConfigProvider(props) {
   var remoteLocale = props.remoteLocale,
       others = _objectWithoutProperties(props, _excluded);
 
+  var api = useAPIClient();
+
   var _useTranslation = useTranslation(),
       i18n = _useTranslation.i18n;
 
@@ -29,12 +31,13 @@ export function AntdConfigProvider(props) {
     onSuccess: function onSuccess(data) {
       var _data$data;
 
-      var locale = localStorage.getItem('NOCOBASE_LANG');
+      var locale = api.auth.locale;
 
       if ((data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.lang) && !locale) {
-        var _data$data2;
+        var _data$data2, _data$data3;
 
-        i18n.changeLanguage(data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.lang);
+        api.auth.setLocale(data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.lang);
+        i18n.changeLanguage(data === null || data === void 0 ? void 0 : (_data$data3 = data.data) === null || _data$data3 === void 0 ? void 0 : _data$data3.lang);
       }
     },
     manual: !remoteLocale

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

@@ -1,33 +1,5 @@
+import { APIClient as APIClientSDK } from '@nocobase/sdk';
 import { Result } from 'ahooks/lib/useRequest/src/types';
-import { AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-export interface ActionParams {
-    filterByTk?: any;
-    [key: string]: any;
-}
-declare type ResourceActionOptions<P = any> = {
-    resource?: string;
-    resourceOf?: any;
-    action?: string;
-    params?: P;
-};
-export interface IResource {
-    list?: (params?: ActionParams) => Promise<any>;
-    get?: (params?: ActionParams) => Promise<any>;
-    create?: (params?: ActionParams) => Promise<any>;
-    update?: (params?: ActionParams) => Promise<any>;
-    destroy?: (params?: ActionParams) => Promise<any>;
-    [key: string]: (params?: ActionParams) => Promise<any>;
-}
-export declare class APIClient {
-    axios: AxiosInstance;
+export declare class APIClient extends APIClientSDK {
     services: Record<string, Result<any, any>>;
-    tokenKey: string;
-    constructor(instance?: AxiosInstance | AxiosRequestConfig);
-    qsMiddleware(): void;
-    authMiddleware(): void;
-    setBearerToken(token: any): void;
-    service(uid: string): Result<any, any>;
-    request<T = any, R = AxiosResponse<T>, D = any>(config: AxiosRequestConfig<D> | ResourceActionOptions): Promise<R>;
-    resource(name: string, of?: any): IResource;
 }
-export {};

package/es/api-client/APIClient.js

@@ -1,172 +1,44 @@
-var _excluded = ["values", "filter"];
+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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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 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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-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 _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-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 _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
-import { observable } from '@formily/reactive';
-import axios from 'axios';
-import Cookies from 'js-cookie';
-import qs from 'qs';
-export var APIClient = /*#__PURE__*/function () {
-  function APIClient(instance) {
-    _classCallCheck(this, APIClient);
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-    this.axios = void 0;
-    this.services = void 0;
-    this.tokenKey = 'NOCOBASE_TOKEN';
-    this.services = observable({});
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-    if (typeof instance === 'function') {
-      this.axios = instance;
-    } else {
-      this.axios = axios.create(instance);
-    }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-    this.qsMiddleware();
-    this.authMiddleware();
-  }
+import { APIClient as APIClientSDK } from '@nocobase/sdk';
+export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
+  _inherits(APIClient, _APIClientSDK);
 
-  _createClass(APIClient, [{
-    key: "qsMiddleware",
-    value: function qsMiddleware() {
-      this.axios.interceptors.request.use(function (config) {
-        config.paramsSerializer = function (params) {
-          return qs.stringify(params, {
-            strictNullHandling: true,
-            arrayFormat: 'brackets'
-          });
-        };
-
-        return config;
-      });
-    } // TODO
-
-  }, {
-    key: "authMiddleware",
-    value: function authMiddleware() {
-      var _this = this;
-
-      this.axios.interceptors.request.use(function (config) {
-        var token = localStorage.getItem(_this.tokenKey);
-        config.headers['X-Locale'] = localStorage.getItem('NOCOBASE_LANG');
-        config.headers['X-Hostname'] = window.location.hostname;
-
-        if (token) {
-          config.headers['Authorization'] = "Bearer ".concat(token);
-        }
-
-        var currentRoleName = Cookies.get('currentRoleName');
-
-        if (currentRoleName) {
-          config.headers['X-Role'] = currentRoleName;
-        }
-
-        return config;
-      });
-    } // TODO
-
-  }, {
-    key: "setBearerToken",
-    value: function setBearerToken(token) {
-      localStorage.setItem(this.tokenKey, token || '');
-      Cookies.remove('currentRoleName');
-    }
-  }, {
-    key: "service",
-    value: function service(uid) {
-      return this.services[uid];
-    }
-  }, {
-    key: "request",
-    value: function request(config) {
-      var resource = config.resource,
-          resourceOf = config.resourceOf,
-          action = config.action,
-          params = config.params;
-
-      if (resource) {
-        return this.resource(resource, resourceOf)[action](params);
-      }
-
-      return this.axios.request(config);
-    }
-  }, {
-    key: "resource",
-    value: function resource(name, of) {
-      var _this2 = this;
-
-      var target = {};
-      var handler = {
-        get: function get(_, actionName) {
-          var url = name.split('.').join("/".concat(of || '_', "/"));
-          url += ":".concat(actionName);
-          var config = {
-            url: url
-          };
-
-          if (['get', 'list'].includes(actionName)) {
-            config['method'] = 'get';
-          } else {
-            config['method'] = 'post';
-          }
-
-          return /*#__PURE__*/function () {
-            var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(params) {
-              var _ref2, values, filter, others;
-
-              return regeneratorRuntime.wrap(function _callee$(_context) {
-                while (1) {
-                  switch (_context.prev = _context.next) {
-                    case 0:
-                      _ref2 = params || {}, values = _ref2.values, filter = _ref2.filter, others = _objectWithoutProperties(_ref2, _excluded);
-                      config['params'] = others;
-
-                      if (filter) {
-                        if (typeof filter === 'string') {
-                          config['params']['filter'] = filter;
-                        } else {
-                          config['params']['filter'] = JSON.stringify(filter);
-                        }
-                      }
-
-                      if (config.method !== 'get') {
-                        config['data'] = values || {};
-                      }
-
-                      _context.next = 6;
-                      return _this2.request(config);
-
-                    case 6:
-                      return _context.abrupt("return", _context.sent);
-
-                    case 7:
-                    case "end":
-                      return _context.stop();
-                  }
-                }
-              }, _callee);
-            }));
-
-            return function (_x) {
-              return _ref.apply(this, arguments);
-            };
-          }();
-        }
-      };
-      return new Proxy(target, handler);
+  var _super = _createSuper(APIClient);
+
+  function APIClient() {
+    var _this;
+
+    _classCallCheck(this, APIClient);
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
-  }]);
 
-  return APIClient;
-}();
+    _this = _super.call.apply(_super, [this].concat(args));
+    _this.services = void 0;
+    return _this;
+  }
+
+  return _createClass(APIClient);
+}(APIClientSDK);

package/es/api-client/hooks/useResource.d.ts

@@ -1 +1 @@
-export declare function useResource(name: string, of?: string | number): import("..").IResource;
+export declare function useResource(name: string, of?: string | number): import("@nocobase/sdk").IResource;

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

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