@tachybase/client 1.6.22 → 1.6.23

package/es/application/utils/globalDeps.mjs

@@ -11,9 +11,9 @@ import * as __WEBPACK_EXTERNAL_MODULE_antd__ from "antd";
 import * as __WEBPACK_EXTERNAL_MODULE_ahooks__ from "ahooks";
 import * as __WEBPACK_EXTERNAL_MODULE__tachybase_schema_532e17e1__ from "@tachybase/schema";
 import * as __WEBPACK_EXTERNAL_MODULE_react_router_dom_5358f3fe__ from "react-router-dom";
+import * as __WEBPACK_EXTERNAL_MODULE_antd_style_1dcbd21e__ from "antd-style";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_icons_a8184985__ from "@ant-design/icons";
 import * as __WEBPACK_EXTERNAL_MODULE__emotion_css_bfcd1b5d__ from "@emotion/css";
-import * as __WEBPACK_EXTERNAL_MODULE_antd_style_1dcbd21e__ from "antd-style";
 import * as __WEBPACK_EXTERNAL_MODULE_i18next__ from "i18next";
 import * as __WEBPACK_EXTERNAL_MODULE__ant_design_cssinjs_c619260f__ from "@ant-design/cssinjs";
 import * as __WEBPACK_EXTERNAL_MODULE__dnd_kit_accessibility_682092eb__ from "@dnd-kit/accessibility";

package/es/built-in/locale/LocalePlugin.d.ts

@@ -1,4 +1,6 @@
+import type { Application } from '../../application/Application';
 import { Plugin } from '../../application/Plugin';
+export declare function handleUnauthorizedLocaleLoad(app: Application): string;
 export declare class LocalePlugin extends Plugin {
     locales: any;
     afterAdd(): Promise<void>;

package/es/built-in/locale/LocalePlugin.mjs

@@ -14,6 +14,16 @@ function _define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
+function handleUnauthorizedLocaleLoad(app) {
+    var _auth_setRole, _auth_setAuthenticator;
+    const auth = app.apiClient.auth;
+    auth.setToken(null);
+    null == (_auth_setRole = auth.setRole) || _auth_setRole.call(auth, null);
+    null == (_auth_setAuthenticator = auth.setAuthenticator) || _auth_setAuthenticator.call(auth, null);
+    const signInPath = app.getHref('signin');
+    if (window.location.pathname.toLowerCase() === signInPath.toLowerCase()) return signInPath;
+    return "".concat(signInPath, "?redirect=").concat(window.location.pathname).concat(window.location.search);
+}
 class LocalePlugin extends Plugin {
     async afterAdd() {
         const api = this.app.apiClient;
@@ -25,6 +35,7 @@ class LocalePlugin extends Plugin {
                 params: {
                     locale
                 },
+                skipNotify: true,
                 headers: {
                     'X-Role': 'anonymous'
                 }
@@ -59,9 +70,7 @@ class LocalePlugin extends Plugin {
             window['cronLocale'] = null == data ? void 0 : null == (_data_data4 = data.data) ? void 0 : _data_data4.cron;
         } catch (error) {
             var _error_response;
-            if ((null == error ? void 0 : null == (_error_response = error.response) ? void 0 : _error_response.status) === 401) setTimeout(()=>{
-                window.location.href = '/signIn';
-            }, 1000);
+            if ((null == error ? void 0 : null == (_error_response = error.response) ? void 0 : _error_response.status) === 401) window.location.href = handleUnauthorizedLocaleLoad(this.app);
             throw error;
         }
     }
@@ -69,4 +78,4 @@ class LocalePlugin extends Plugin {
         super(...args), _define_property(this, "locales", {});
     }
 }
-export { LocalePlugin };
+export { LocalePlugin, handleUnauthorizedLocaleLoad };

package/es/schema-component/antd/grid/Grid.mjs

@@ -2,13 +2,14 @@ import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import react, { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
 import { RecursionField, Schema, observer, uid, useField, useFieldSchema } from "@tachybase/schema";
 import { TinyColor } from "@ctrl/tinycolor";
-import { DndContext, useDndContext, useDndMonitor, useDraggable, useDroppable } from "@dnd-kit/core";
+import { useDndContext, useDndMonitor, useDraggable, useDroppable } from "@dnd-kit/core";
 import classnames from "classnames";
 import lodash from "lodash";
 import { useToken } from "../__builtins__/index.mjs";
 import { useSchemaInitializerRender } from "../../../application/schema-initializer/hooks/index.mjs";
 import { useFormBlockContext } from "../../../block-provider/FormBlockContext.mjs";
 import { useFormBlockType } from "../../../block-provider/FormBlockProvider.mjs";
+import { DndContext } from "../../common/dnd-context/index.mjs";
 import { SchemaComponent } from "../../core/SchemaComponent.mjs";
 import { useDesignable } from "../../hooks/useDesignable.mjs";
 import Grid_style from "./Grid.style.mjs";

package/lib/built-in/locale/LocalePlugin.js

@@ -33,7 +33,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    LocalePlugin: ()=>LocalePlugin
+    LocalePlugin: ()=>LocalePlugin,
+    handleUnauthorizedLocaleLoad: ()=>handleUnauthorizedLocaleLoad
 });
 const schema_namespaceObject = require("@tachybase/schema");
 const external_antd_namespaceObject = require("antd");
@@ -52,6 +53,16 @@ function _define_property(obj, key, value) {
     else obj[key] = value;
     return obj;
 }
+function handleUnauthorizedLocaleLoad(app) {
+    var _auth_setRole, _auth_setAuthenticator;
+    const auth = app.apiClient.auth;
+    auth.setToken(null);
+    null == (_auth_setRole = auth.setRole) || _auth_setRole.call(auth, null);
+    null == (_auth_setAuthenticator = auth.setAuthenticator) || _auth_setAuthenticator.call(auth, null);
+    const signInPath = app.getHref('signin');
+    if (window.location.pathname.toLowerCase() === signInPath.toLowerCase()) return signInPath;
+    return "".concat(signInPath, "?redirect=").concat(window.location.pathname).concat(window.location.search);
+}
 class LocalePlugin extends Plugin_js_namespaceObject.Plugin {
     async afterAdd() {
         const api = this.app.apiClient;
@@ -63,6 +74,7 @@ class LocalePlugin extends Plugin_js_namespaceObject.Plugin {
                 params: {
                     locale
                 },
+                skipNotify: true,
                 headers: {
                     'X-Role': 'anonymous'
                 }
@@ -97,9 +109,7 @@ class LocalePlugin extends Plugin_js_namespaceObject.Plugin {
             window['cronLocale'] = null == data ? void 0 : null == (_data_data4 = data.data) ? void 0 : _data_data4.cron;
         } catch (error) {
             var _error_response;
-            if ((null == error ? void 0 : null == (_error_response = error.response) ? void 0 : _error_response.status) === 401) setTimeout(()=>{
-                window.location.href = '/signIn';
-            }, 1000);
+            if ((null == error ? void 0 : null == (_error_response = error.response) ? void 0 : _error_response.status) === 401) window.location.href = handleUnauthorizedLocaleLoad(this.app);
             throw error;
         }
     }
@@ -108,8 +118,10 @@ class LocalePlugin extends Plugin_js_namespaceObject.Plugin {
     }
 }
 exports.LocalePlugin = __webpack_exports__.LocalePlugin;
+exports.handleUnauthorizedLocaleLoad = __webpack_exports__.handleUnauthorizedLocaleLoad;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [
-    "LocalePlugin"
+    "LocalePlugin",
+    "handleUnauthorizedLocaleLoad"
 ].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true

package/lib/schema-component/antd/grid/Grid.js

@@ -52,6 +52,7 @@ const index_js_namespaceObject = require("../__builtins__/index.js");
 const hooks_index_js_namespaceObject = require("../../../application/schema-initializer/hooks/index.js");
 const FormBlockContext_js_namespaceObject = require("../../../block-provider/FormBlockContext.js");
 const FormBlockProvider_js_namespaceObject = require("../../../block-provider/FormBlockProvider.js");
+const dnd_context_index_js_namespaceObject = require("../../common/dnd-context/index.js");
 const SchemaComponent_js_namespaceObject = require("../../core/SchemaComponent.js");
 const useDesignable_js_namespaceObject = require("../../hooks/useDesignable.js");
 const external_Grid_style_js_namespaceObject = require("./Grid.style.js");
@@ -287,7 +288,7 @@ const DndWrapper = (props)=>{
     if (false === props.dndContext) return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(jsx_runtime_namespaceObject.Fragment, {
         children: props.children
     });
-    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(core_namespaceObject.DndContext, {
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(dnd_context_index_js_namespaceObject.DndContext, {
         ...props.dndContext,
         children: props.children
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.6.22",
+  "version": "1.6.23",
   "homepage": "https://github.com/tegojs/tego-standard#readme",
   "bugs": {
     "url": "https://github.com/tegojs/tego-standard/issues"
@@ -30,9 +30,9 @@
     "@floating-ui/react": "0.26.28",
     "@js-preview/excel": "^1.7.14",
     "@lottiefiles/dotlottie-react": "^0.9.3",
-    "@tachybase/schema": "1.6.13",
-    "@tachybase/utils": "1.6.13",
-    "@tego/client": "1.6.13",
+    "@tachybase/schema": "1.6.16",
+    "@tachybase/utils": "1.6.16",
+    "@tego/client": "1.6.16",
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "antd-style": "3.7.1",