@nocobase/client 0.7.4-alpha.7 → 0.7.6-alpha.1

package/es/schema-initializer/style.less

@@ -0,0 +1,4 @@
+.nb-menu-item-group {
+  max-height: 60vh;
+  overflow: auto;
+}

package/es/schema-templates/SchemaTemplateManagerProvider.js

@@ -75,11 +75,8 @@ export var useSchemaTemplate = function useSchemaTemplate() {
 
   var fieldSchema = useFieldSchema();
   var schemaId = fieldSchema['x-uid'];
-  var templateKey = fieldSchema['x-template-key'];
-  console.log('templateKey', {
-    schemaId: schemaId,
-    templateKey: templateKey
-  });
+  var templateKey = fieldSchema['x-template-key']; // console.log('templateKey', { schemaId, templateKey })
+
   return useMemo(function () {
     return getTemplateBySchema(fieldSchema);
   }, [schemaId, templateKey]);

package/es/system-settings/SystemSettingsShortcut.js

@@ -192,6 +192,13 @@ var schema = {
         'x-component': 'Checkbox',
         'x-decorator': 'FormItem'
       },
+      smsAuthEnabled: {
+        type: 'boolean',
+        default: false,
+        'x-content': '{{t("Enable SMS authentication")}}',
+        'x-component': 'Checkbox',
+        'x-decorator': 'FormItem'
+      },
       footer1: {
         type: 'void',
         'x-component': 'Action.Drawer.Footer',

package/es/user/SigninPage.d.ts

@@ -1,4 +1,13 @@
-export declare const useSignin: () => {
+import { ISchema } from '@formily/react';
+export declare const usePasswordSignIn: () => {
     run(): Promise<void>;
 };
-export declare const SigninPage: () => JSX.Element;
+export declare function usePhoneSignIn(): {
+    run(): Promise<void>;
+};
+export interface SigninPageProps {
+    schema?: ISchema;
+    components?: any;
+    scope?: any;
+}
+export declare const SigninPage: (props: SigninPageProps) => JSX.Element;

package/es/user/SigninPage.js

@@ -1,15 +1,23 @@
+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 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); }); }; }
 
 import { useForm } from '@formily/react';
-import { uid } from '@formily/shared';
-import React from 'react';
-import { useHistory, useLocation } from 'react-router-dom';
+import { Tabs } from 'antd';
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Link, useHistory, useLocation } from 'react-router-dom';
 import { SchemaComponent, useAPIClient, useCurrentDocumentTitle, useSystemSettings } from '..';
-var schema = {
+import VerificationCode from './VerificationCode';
+var passwordForm = {
   type: 'object',
-  name: uid(),
+  name: 'passwordForm',
   'x-component': 'FormV2',
   properties: {
     email: {
@@ -45,40 +53,33 @@ var schema = {
             htmlType: 'submit',
             block: true,
             type: 'primary',
-            useAction: '{{ useSignin }}',
+            useAction: '{{ usePasswordSignIn }}',
             style: {
               width: '100%'
             }
           }
         }
       }
-    },
-    link: {
-      type: 'void',
-      'x-component': 'div',
-      'x-visible': '{{allowSignUp}}',
-      properties: {
-        link: {
-          title: '{{t("Create an account")}}',
-          type: 'void',
-          'x-component': 'Link',
-          'x-content': '{{t("Create an account")}}',
-          'x-component-props': {
-            to: '/signup'
-          }
-        }
-      }
     }
   }
 };
-export var useSignin = function useSignin() {
+
+function useRedirect() {
   var _location$query;
 
+  var next = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/admin';
   var location = useLocation();
   var history = useHistory();
+  var redirect = location === null || location === void 0 ? void 0 : (_location$query = location['query']) === null || _location$query === void 0 ? void 0 : _location$query.redirect;
+  return useCallback(function () {
+    history.push(redirect || '/admin');
+  }, [redirect]);
+}
+
+export var usePasswordSignIn = function usePasswordSignIn() {
   var form = useForm();
   var api = useAPIClient();
-  var redirect = location === null || location === void 0 ? void 0 : (_location$query = location['query']) === null || _location$query === void 0 ? void 0 : _location$query.redirect;
+  var redirect = useRedirect();
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
@@ -94,7 +95,7 @@ export var useSignin = function useSignin() {
                 return api.auth.signIn(form.values);
 
               case 4:
-                history.push(redirect || '/admin');
+                redirect();
 
               case 5:
               case "end":
@@ -106,17 +107,123 @@ export var useSignin = function useSignin() {
     }
   };
 };
-export var SigninPage = function SigninPage() {
-  var _ctx$data, _ctx$data$data;
+var phoneForm = {
+  type: 'object',
+  name: 'phoneForm',
+  'x-component': 'Form',
+  properties: {
+    phone: {
+      type: 'string',
+      required: true,
+      'x-component': 'Input',
+      'x-validator': 'phone',
+      'x-decorator': 'FormItem',
+      'x-component-props': {
+        placeholder: '{{t("Phone")}}',
+        style: {}
+      }
+    },
+    code: {
+      type: 'string',
+      required: true,
+      'x-component': 'VerificationCode',
+      'x-component-props': {
+        actionType: 'users:signin',
+        targetFieldName: 'phone'
+      },
+      'x-decorator': 'FormItem'
+    },
+    actions: {
+      title: '{{t("Sign in")}}',
+      type: 'void',
+      'x-component': 'Action',
+      'x-component-props': {
+        htmlType: 'submit',
+        block: true,
+        type: 'primary',
+        useAction: '{{ usePhoneSignIn }}',
+        style: {
+          width: '100%'
+        }
+      }
+    }
+  }
+};
+export function usePhoneSignIn() {
+  var form = useForm();
+  var api = useAPIClient();
+  var redirect = useRedirect();
+  return {
+    run: function run() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+        return regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                _context2.next = 2;
+                return form.submit();
+
+              case 2:
+                _context2.next = 4;
+                return api.auth.signIn(form.values, 'sms');
+
+              case 4:
+                redirect();
+
+              case 5:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      }))();
+    }
+  };
+}
+export var SigninPage = function SigninPage(props) {
+  var _ctx$data;
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
 
   useCurrentDocumentTitle('Signin');
   var ctx = useSystemSettings();
-  var allowSignUp = ctx === null || ctx === void 0 ? void 0 : (_ctx$data = ctx.data) === null || _ctx$data === void 0 ? void 0 : (_ctx$data$data = _ctx$data.data) === null || _ctx$data$data === void 0 ? void 0 : _ctx$data$data.allowSignUp;
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(SchemaComponent, {
+
+  var _ref = (ctx === null || ctx === void 0 ? void 0 : (_ctx$data = ctx.data) === null || _ctx$data === void 0 ? void 0 : _ctx$data.data) || {},
+      allowSignUp = _ref.allowSignUp,
+      smsAuthEnabled = _ref.smsAuthEnabled;
+
+  var schema = props.schema,
+      components = props.components,
+      scope = props.scope;
+  return /*#__PURE__*/React.createElement("div", null, smsAuthEnabled ? /*#__PURE__*/React.createElement(Tabs, {
+    defaultActiveKey: "password"
+  }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    tab: t('Sign in via account'),
+    key: "password"
+  }, /*#__PURE__*/React.createElement(SchemaComponent, {
     scope: {
-      useSignin: useSignin,
-      allowSignUp: allowSignUp
+      usePasswordSignIn: usePasswordSignIn
     },
-    schema: schema
-  }));
+    schema: schema || passwordForm
+  })), /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    tab: t('Sign in via phone'),
+    key: "phone"
+  }, /*#__PURE__*/React.createElement(SchemaComponent, {
+    schema: phoneForm,
+    scope: _objectSpread({
+      usePhoneSignIn: usePhoneSignIn
+    }, scope),
+    components: _objectSpread({
+      VerificationCode: VerificationCode
+    }, components)
+  }))) : /*#__PURE__*/React.createElement(SchemaComponent, {
+    components: _objectSpread({}, components),
+    scope: _objectSpread({
+      usePasswordSignIn: usePasswordSignIn
+    }, scope),
+    schema: schema || passwordForm
+  }), allowSignUp && /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Link, {
+    to: "/signup"
+  }, t('Create an account'))));
 };

package/es/user/SignupPage.d.ts

@@ -1,4 +1,15 @@
-export declare const useSignup: () => {
+import { ISchema } from '@formily/react';
+export interface UseSignupProps {
+    message?: {
+        success?: string;
+    };
+}
+export declare const useSignup: (props?: UseSignupProps) => {
     run(): Promise<void>;
 };
-export declare const SignupPage: () => JSX.Element;
+export interface SignupPageProps {
+    schema?: ISchema;
+    components?: any;
+    scope?: any;
+}
+export declare const SignupPage: (props: SignupPageProps) => JSX.Element;

package/es/user/SignupPage.js

@@ -1,3 +1,9 @@
+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 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); }); }; }
@@ -6,9 +12,11 @@ import { useForm } from '@formily/react';
 import { uid } from '@formily/shared';
 import { message } from 'antd';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Redirect, useHistory } from 'react-router-dom';
 import { SchemaComponent, useAPIClient, useCurrentDocumentTitle, useSystemSettings } from '..';
-var schema = {
+import VerificationCode from './VerificationCode';
+var signupPageSchema = {
   type: 'object',
   name: uid(),
   'x-component': 'FormV2',
@@ -24,6 +32,29 @@ var schema = {
         style: {}
       }
     },
+    phone: {
+      type: 'string',
+      required: true,
+      'x-component': 'Input',
+      'x-validator': 'phone',
+      'x-decorator': 'FormItem',
+      'x-component-props': {
+        placeholder: '{{t("Phone")}}',
+        style: {}
+      },
+      'x-visible': '{{smsAuthEnabled}}'
+    },
+    code: {
+      type: 'string',
+      required: true,
+      'x-component': 'VerificationCode',
+      'x-component-props': {
+        actionType: 'users:signup',
+        targetFieldName: 'phone'
+      },
+      'x-decorator': 'FormItem',
+      'x-visible': '{{smsAuthEnabled}}'
+    },
     password: {
       type: 'string',
       required: true,
@@ -50,7 +81,6 @@ var schema = {
       'x-decorator': 'FormItem',
       'x-component-props': {
         placeholder: '{{t("Confirm password")}}',
-        checkStrength: true,
         style: {}
       },
       'x-reactions': [{
@@ -98,13 +128,19 @@ var schema = {
     }
   }
 };
-export var useSignup = function useSignup() {
+export var useSignup = function useSignup(props) {
   var history = useHistory();
   var form = useForm();
   var api = useAPIClient();
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var _props$message;
+
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
@@ -119,7 +155,7 @@ export var useSignup = function useSignup() {
                 });
 
               case 4:
-                message.success('注册成功，即将跳转登录页');
+                message.success((props === null || props === void 0 ? void 0 : (_props$message = props.message) === null || _props$message === void 0 ? void 0 : _props$message.success) || t('Sign up successfully, and automatically jump to the sign in page'));
                 setTimeout(function () {
                   history.push('/signin');
                 }, 2000);
@@ -134,12 +170,15 @@ export var useSignup = function useSignup() {
     }
   };
 };
-export var SignupPage = function SignupPage() {
-  var _ctx$data, _ctx$data$data;
+export var SignupPage = function SignupPage(props) {
+  var _ctx$data;
 
   useCurrentDocumentTitle('Signup');
   var ctx = useSystemSettings();
-  var allowSignUp = ctx === null || ctx === void 0 ? void 0 : (_ctx$data = ctx.data) === null || _ctx$data === void 0 ? void 0 : (_ctx$data$data = _ctx$data.data) === null || _ctx$data$data === void 0 ? void 0 : _ctx$data$data.allowSignUp;
+
+  var _ref = (ctx === null || ctx === void 0 ? void 0 : (_ctx$data = ctx.data) === null || _ctx$data === void 0 ? void 0 : _ctx$data.data) || {},
+      allowSignUp = _ref.allowSignUp,
+      smsAuthEnabled = _ref.smsAuthEnabled;
 
   if (!allowSignUp) {
     return /*#__PURE__*/React.createElement(Redirect, {
@@ -147,10 +186,17 @@ export var SignupPage = function SignupPage() {
     });
   }
 
+  var schema = props.schema,
+      components = props.components,
+      scope = props.scope;
   return /*#__PURE__*/React.createElement(SchemaComponent, {
-    schema: schema,
-    scope: {
-      useSignup: useSignup
-    }
+    schema: schema || signupPageSchema,
+    components: _objectSpread({
+      VerificationCode: VerificationCode
+    }, components),
+    scope: _objectSpread({
+      useSignup: useSignup,
+      smsAuthEnabled: smsAuthEnabled
+    }, scope)
   });
 };

package/es/user/VerificationCode.d.ts

@@ -0,0 +1,7 @@
+/// <reference types="react" />
+export default function VerificationCode({ targetFieldName, actionType, value, onChange }: {
+    targetFieldName?: string;
+    actionType: any;
+    value: any;
+    onChange: any;
+}): JSX.Element;

package/es/user/VerificationCode.js

@@ -0,0 +1,129 @@
+var _templateObject;
+
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
+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."); }
+
+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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { useTranslation } from "react-i18next";
+import { css } from '@emotion/css';
+import { useAPIClient } from "../api-client";
+import { useForm } from "@formily/react";
+import { useEffect, useRef, useState } from "react";
+import { Button, Input, message } from "antd";
+import React from "react";
+export default function VerificationCode(_ref) {
+  var _ref$targetFieldName = _ref.targetFieldName,
+      targetFieldName = _ref$targetFieldName === void 0 ? 'phone' : _ref$targetFieldName,
+      actionType = _ref.actionType,
+      value = _ref.value,
+      onChange = _ref.onChange;
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  var api = useAPIClient();
+  var form = useForm();
+
+  var _useState = useState(0),
+      _useState2 = _slicedToArray(_useState, 2),
+      count = _useState2[0],
+      setCountdown = _useState2[1];
+
+  var timer = useRef(null);
+  useEffect(function () {
+    if (count <= 0 && timer.current) {
+      clearInterval(timer.current);
+    }
+  }, [count]);
+
+  function onGetCode() {
+    return _onGetCode.apply(this, arguments);
+  }
+
+  function _onGetCode() {
+    _onGetCode = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      var _yield$api$resource$c, data, expiresIn;
+
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!(count > 0)) {
+                _context.next = 2;
+                break;
+              }
+
+              return _context.abrupt("return");
+
+            case 2:
+              _context.prev = 2;
+              _context.next = 5;
+              return api.resource('verifications').create({
+                values: {
+                  type: actionType,
+                  phone: form.values[targetFieldName]
+                }
+              });
+
+            case 5:
+              _yield$api$resource$c = _context.sent;
+              data = _yield$api$resource$c.data.data;
+              message.success(t('Operation succeeded'));
+
+              if (value) {
+                onChange('');
+              }
+
+              expiresIn = data.expiresAt ? Math.ceil((Date.parse(data.expiresAt) - Date.now()) / 1000) : 60;
+              setCountdown(expiresIn);
+              timer.current = setInterval(function () {
+                setCountdown(function (count) {
+                  return count - 1;
+                });
+              }, 1000);
+              _context.next = 17;
+              break;
+
+            case 14:
+              _context.prev = 14;
+              _context.t0 = _context["catch"](2);
+              console.error(_context.t0);
+
+            case 17:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[2, 14]]);
+    }));
+    return _onGetCode.apply(this, arguments);
+  }
+
+  ;
+  return /*#__PURE__*/React.createElement("fieldset", {
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      display: flex;\n      gap: .5em;\n    "])))
+  }, /*#__PURE__*/React.createElement(Input, {
+    value: value,
+    onChange: onChange,
+    placeholder: t('Verification code')
+  }), /*#__PURE__*/React.createElement(Button, {
+    onClick: onGetCode,
+    disabled: count > 0
+  }, count > 0 ? t('Retry after {{count}} seconds', {
+    count: count
+  }) : t('Send code')));
+}

package/lib/application/Application.js

@@ -23,8 +23,6 @@ var _collectionManager = require("../collection-manager");
 
 var _documentTitle = require("../document-title");
 
-var _fileManager = require("../file-manager");
-
 var _i18n = require("../i18n");
 
 var _pluginManager = require("../plugin-manager");
@@ -133,8 +131,7 @@ var Application = /*#__PURE__*/function () {
         DesignableSwitch: _schemaComponent.DesignableSwitch,
         CollectionManagerShortcut: _collectionManager.CollectionManagerShortcut,
         SystemSettingsShortcut: _systemSettings.SystemSettingsShortcut,
-        SchemaTemplateShortcut: _schemaTemplates.SchemaTemplateShortcut,
-        FileStorageShortcut: _fileManager.FileStorageShortcut
+        SchemaTemplateShortcut: _schemaTemplates.SchemaTemplateShortcut
       }
     });
     this.use(_schemaComponent.SchemaComponentProvider, {

package/lib/block-provider/TableBlockProvider.js

@@ -259,12 +259,12 @@ var useTableBlockProps = function useTableBlockProps() {
       }))();
     },
     onChange: function onChange(_ref2, filters, sorter) {
-      var _ctx$service$params;
+      var _ctx$service$params, _ctx$service$params$, _ctx$service$params2;
 
       var current = _ref2.current,
           pageSize = _ref2.pageSize;
-      var sort = sorter.order ? sorter.order === "ascend" ? [sorter.field] : ["-".concat(sorter.field)] : globalSort || null;
-      ctx.service.run(_objectSpread(_objectSpread({}, (_ctx$service$params = ctx.service.params) === null || _ctx$service$params === void 0 ? void 0 : _ctx$service$params[0]), {}, {
+      var sort = sorter.order ? sorter.order === "ascend" ? [sorter.field] : ["-".concat(sorter.field)] : globalSort || ((_ctx$service$params = ctx.service.params) === null || _ctx$service$params === void 0 ? void 0 : (_ctx$service$params$ = _ctx$service$params[0]) === null || _ctx$service$params$ === void 0 ? void 0 : _ctx$service$params$.sort);
+      ctx.service.run(_objectSpread(_objectSpread({}, (_ctx$service$params2 = ctx.service.params) === null || _ctx$service$params2 === void 0 ? void 0 : _ctx$service$params2[0]), {}, {
         page: current,
         pageSize: pageSize,
         sort: sort