@antv/dumi-theme-antv 0.8.0-beta.4 → 0.8.0-beta.5

package/dist/components/Login/Captcha/index.js

@@ -6,6 +6,8 @@ import cls from 'classnames';
 import { useIntl } from 'dumi';
 import "./index.less";
 
+// 添加 window.noCaptcha 的类型声明
+
 // 图形验证码资源文件
 var NC_CSS_SOURCE = 'https://g.alicdn.com/sd/ncpc/nc.css?t=1514534550478';
 var NC_SCRIPT_SOURCE = 'https://g.alicdn.com/sd/ncpc/nc.js?t=1514534550478';
@@ -16,12 +18,12 @@ var Captcha = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _ref$scene = _ref.scene,
     scene = _ref$scene === void 0 ? NC_SCENE.login : _ref$scene,
     form = _ref.form,
-    en = _ref.en,
     _ref$onCallback = _ref.onCallback,
     onCallback = _ref$onCallback === void 0 ? function () {} : _ref$onCallback,
     className = _ref.className;
   var _useIntl = useIntl(),
-    formatMessage = _useIntl.formatMessage;
+    formatMessage = _useIntl.formatMessage,
+    locale = _useIntl.locale;
   var ncInstance = useRef(null);
   function reset() {
     var _ncInstance$current;
@@ -64,7 +66,7 @@ var Captcha = /*#__PURE__*/forwardRef(function (_ref, ref) {
       appkey: nc_appkey,
       scene: nc_scene,
       token: nc_token,
-      language: en ? 'en' : 'cn',
+      language: locale ? 'en' : 'cn',
       customWidth: nc_customWidth,
       callback: function callback(data) {
         // 校验成功回调
@@ -81,41 +83,27 @@ var Captcha = /*#__PURE__*/forwardRef(function (_ref, ref) {
     };
     (_ncInstance$current2 = ncInstance.current) === null || _ncInstance$current2 === void 0 || _ncInstance$current2.init(nc_option);
     var lang = {
-      _startTEXT: en ? formatMessage({
-        id: 'login.captcha.drag.en'
-      }) : formatMessage({
+      _startTEXT: formatMessage({
         id: 'login.captcha.drag'
       }),
-      _yesTEXT: en ? formatMessage({
-        id: 'login.captcha.success.en'
-      }) : formatMessage({
+      _yesTEXT: formatMessage({
         id: 'login.captcha.success'
       }),
-      _Loading: en ? formatMessage({
-        id: 'login.captcha.loading.en'
-      }) : formatMessage({
+      _Loading: formatMessage({
         id: 'login.captcha.loading'
       }),
-      _error300: en ? formatMessage({
-        id: 'login.captcha.error.wrong.en'
-      }) + ' <a href="javascript:__nc.reset()">' + formatMessage({
-        id: 'login.captcha.error.refresh.en'
-      }) + '</a>' : formatMessage({
+      _error300: formatMessage({
         id: 'login.captcha.error.wrong'
       }) + ' <a href="javascript:__nc.reset()">' + formatMessage({
         id: 'login.captcha.error.refresh'
       }) + '</a>',
-      _errorNetwork: en ? formatMessage({
-        id: 'login.captcha.error.network.en'
-      }) + ' <a href="javascript:__nc.reset()">' + formatMessage({
-        id: 'login.captcha.error.refresh.en'
-      }) + '</a>' : formatMessage({
+      _errorNetwork: formatMessage({
         id: 'login.captcha.error.network'
       }) + ' <a href="javascript:__nc.reset()">' + formatMessage({
         id: 'login.captcha.error.refresh'
       }) + '</a>'
     };
-    if (en) {
+    if (locale) {
       var _ncInstance$current3;
       (_ncInstance$current3 = ncInstance.current) === null || _ncInstance$current3 === void 0 || _ncInstance$current3.upLang('en', lang);
     } else {
@@ -185,9 +173,7 @@ var Captcha = /*#__PURE__*/forwardRef(function (_ref, ref) {
     name: "captcha",
     rules: [{
       required: true,
-      message: en ? formatMessage({
-        id: 'login.captcha.required.en'
-      }) : formatMessage({
+      message: formatMessage({
         id: 'login.captcha.required'
       })
     }],

package/dist/components/Login/CheckCode/index.js

@@ -46,10 +46,8 @@ function CheckCode(_ref) {
   var captchaRef = useRef(null);
   var inputRef = useRef(null);
   var countDownRef = useRef(null);
-  var countDownSendText = !en ? formatMessage({
+  var countDownSendText = formatMessage({
     id: 'login.checkcode.get'
-  }) : formatMessage({
-    id: 'login.checkcode.get.en'
   });
   function handleResetCountDown() {
     var _countDownRef$current;
@@ -89,10 +87,8 @@ function CheckCode(_ref) {
               captcha: captchaValues.captcha ? 1 : 0
             }));
           case 8:
-            message.success(!en ? formatMessage({
+            message.success(formatMessage({
               id: 'login.checkcode.send.success'
-            }) : formatMessage({
-              id: 'login.checkcode.send.success.en'
             }));
             _context.next = 15;
             break;
@@ -130,17 +126,13 @@ function CheckCode(_ref) {
               break;
             }
             handleResetCountDown();
-            message.error(!en ? formatMessage({
+            message.error(formatMessage({
               id: 'login.checkcode.error.incomplete'
-            }) : formatMessage({
-              id: 'login.checkcode.error.incomplete.en'
             }));
             form.setFields([{
               name: 'captcha',
-              errors: [!en ? formatMessage({
+              errors: [formatMessage({
                 id: 'login.checkcode.error.incomplete'
-              }) : formatMessage({
-                id: 'login.checkcode.error.incomplete.en'
               })]
             }]);
             // 尝试解决滑块显示完成，但提示没有完成的问题
@@ -195,10 +187,8 @@ function CheckCode(_ref) {
     if (sending) {
       return /*#__PURE__*/React.createElement("div", {
         className: "mobile-code-hint"
-      }, /*#__PURE__*/React.createElement("span", null, !en ? formatMessage({
+      }, /*#__PURE__*/React.createElement("span", null, formatMessage({
         id: 'login.checkcode.sent'
-      }) : formatMessage({
-        id: 'login.checkcode.sent.en'
       })));
     }
   }
@@ -222,27 +212,21 @@ function CheckCode(_ref) {
     validateTrigger: ['onSubmit', 'onBlur'],
     rules: [{
       required: true,
-      message: !en ? formatMessage({
+      message: formatMessage({
         id: 'login.checkcode.required'
-      }) : formatMessage({
-        id: 'login.checkcode.required.en'
       })
     }, {
       pattern: /^\d{6}$/,
-      message: !en ? formatMessage({
+      message: formatMessage({
         id: 'login.checkcode.invalid'
-      }) : formatMessage({
-        id: 'login.checkcode.invalid.en'
       })
     }]
   }, /*#__PURE__*/React.createElement(Input, {
     type: "text",
     autoComplete: "off",
     ref: inputRef,
-    placeholder: !en ? formatMessage({
+    placeholder: formatMessage({
       id: 'login.checkcode.placeholder'
-    }) : formatMessage({
-      id: 'login.checkcode.placeholder.en'
     }),
     maxLength: 6
   }))), /*#__PURE__*/React.createElement("div", {

package/dist/components/Login/CountDownButton/index.js

@@ -76,20 +76,14 @@ var CountDownButton = /*#__PURE__*/forwardRef(function (_ref, ref) {
     if (counting) {
       return /*#__PURE__*/React.createElement("span", {
         className: "code-count-text"
-      }, en ? formatMessage({
-        id: 'login.countdown.resend.en'
-      }, {
-        time: countingTime
-      }) : formatMessage({
+      }, formatMessage({
         id: 'login.countdown.resend'
       }, {
         time: countingTime
       }));
     }
     if (hasSend) {
-      return en ? formatMessage({
-        id: 'login.countdown.resend.simple.en'
-      }) : formatMessage({
+      return formatMessage({
         id: 'login.countdown.resend.simple'
       });
     }

package/dist/components/Login/index.js

@@ -2,12 +2,16 @@ import React from 'react';
 import LoginForm from "./LoginForm";
 import { Modal } from 'antd';
 import { useSnapshot } from 'valtio';
+import { useIntl } from 'dumi';
 import { authStore, hideLoginModal } from "../../model/auth";
 export function LoginModal() {
   var authSnap = useSnapshot(authStore);
+  var intl = useIntl();
   return /*#__PURE__*/React.createElement(Modal, {
     width: 400,
-    title: "\u9A8C\u8BC1\u7801\u767B\u5F55",
+    title: intl.formatMessage({
+      id: 'login.modal.title'
+    }),
     open: authSnap.isModalOpen,
     onCancel: function onCancel() {
       return hideLoginModal();

package/dist/locales/en.json

@@ -279,45 +279,24 @@
   "login.error.invalid.phone": "Please enter a valid mobile number",
   "login.error.invalid.phone.or.email": "Please enter a valid mobile number or email",
   "login.button.login.or.register": "Sign In / Sign Up",
-  "login.button.login.or.register.en": "Sign In / Sign Up",
-  "login.button.github": "Login With GitHub",
-  "login.button.github.en": "Login With GitHub",
-  "login.button.google": "Login With Google",
-  "login.button.google.en": "Login With Google",
   "login.protocol.read.agree": "I have read and agree to AntV ",
   "login.protocol.link": "User Agreement",
   "login.link.home": "Return to Home Page",
-  "login.link.home.en": "Return to Home Page",
   "login.checkcode.get": "Get Code",
-  "login.checkcode.get.en": "Get Code",
   "login.checkcode.send.success": "Verification code sent successfully",
-  "login.checkcode.send.success.en": "Verification code sent successfully",
   "login.checkcode.error.incomplete": "Please complete the captcha verification first",
-  "login.checkcode.error.incomplete.en": "Please complete the captcha verification first",
   "login.checkcode.sent": "The Verification code has been sent",
-  "login.checkcode.sent.en": "The Verification code has been sent",
   "login.checkcode.required": "Verification code is required",
-  "login.checkcode.required.en": "Verification code is required",
   "login.checkcode.invalid": "Please enter a valid 6-digit verification code",
-  "login.checkcode.invalid.en": "Verification code not valid",
   "login.checkcode.placeholder": "Verification code",
-  "login.checkcode.placeholder.en": "Verification code",
   "login.countdown.resend": "Resend({time})",
-  "login.countdown.resend.en": "Resend({time})",
   "login.countdown.resend.simple": "Resend",
-  "login.countdown.resend.simple.en": "Resend",
   "login.captcha.drag": "Hold and drag the slider right",
-  "login.captcha.drag.en": "Hold and drag the slider right",
   "login.captcha.success": "Verification successful",
-  "login.captcha.success.en": "Verification successful",
   "login.captcha.loading": "Loading...",
-  "login.captcha.loading.en": "Loading...",
   "login.captcha.error.wrong": "Oops! Something went wrong. Click",
-  "login.captcha.error.wrong.en": "Oops! Something went wrong. Click",
   "login.captcha.error.network": "Poor connection. Click",
-  "login.captcha.error.network.en": "Poor connection. Click",
   "login.captcha.error.refresh": "Refresh",
-  "login.captcha.error.refresh.en": "Refresh",
   "login.captcha.required": "Please drag the slider to verify",
-  "login.captcha.required.en": "Please drag the slider to verify"
+  "login.modal.title": "Verification Code Login"
 }

package/dist/locales/zh.json

@@ -278,45 +278,24 @@
   "login.error.invalid.phone": "请输入正确的手机号",
   "login.error.invalid.phone.or.email": "请输入正确的手机号或邮箱",
   "login.button.login.or.register": "登录 / 注册",
-  "login.button.login.or.register.en": "Sign In / Sign Up",
-  "login.button.github": "GitHub 登录",
-  "login.button.github.en": "Login With GitHub",
-  "login.button.google": "Google 登录",
-  "login.button.google.en": "Login With Google",
   "login.protocol.read.agree": "我已阅读并同意 AntV ",
   "login.protocol.link": "用户协议 ",
   "login.link.home": "返回首页",
-  "login.link.home.en": "Return to Home Page",
   "login.checkcode.get": "获取验证码",
-  "login.checkcode.get.en": "Get Code",
   "login.checkcode.send.success": "验证码发送成功",
-  "login.checkcode.send.success.en": "Verification code sent successfully",
   "login.checkcode.error.incomplete": "先完成滑块验证",
-  "login.checkcode.error.incomplete.en": "Please complete the captcha verification first",
   "login.checkcode.sent": "已发送验证码",
-  "login.checkcode.sent.en": "The Verification code has been sent",
   "login.checkcode.required": "验证码不能为空",
-  "login.checkcode.required.en": "Verification code is required",
   "login.checkcode.invalid": "请输入有效的 6 位数字验证码",
-  "login.checkcode.invalid.en": "Verification code not valid",
   "login.checkcode.placeholder": "6 位验证码",
-  "login.checkcode.placeholder.en": "Verification code",
   "login.countdown.resend": "重新获取({time})",
-  "login.countdown.resend.en": "Resend({time})",
   "login.countdown.resend.simple": "重新获取",
-  "login.countdown.resend.simple.en": "Resend",
   "login.captcha.drag": "按住滑块，拖动到最右边",
-  "login.captcha.drag.en": "Hold and drag the slider right",
   "login.captcha.success": "验证通过",
-  "login.captcha.success.en": "Verification successful",
   "login.captcha.loading": "加载中",
-  "login.captcha.loading.en": "Loading...",
   "login.captcha.error.wrong": "哎呀，出错了，单击",
-  "login.captcha.error.wrong.en": "Oops！something went wrong. Click",
   "login.captcha.error.network": "网络不给力，单击",
-  "login.captcha.error.network.en": "Poor connection. Click",
   "login.captcha.error.refresh": "刷新",
-  "login.captcha.error.refresh.en": "Refresh",
   "login.captcha.required": "拖动滑块验证",
-  "login.captcha.required.en": "Please drag the slider to verify"
+  "login.modal.title": "验证码登录"
 }

package/dist/model/auth.js

@@ -24,7 +24,7 @@ function hasSkipLoginParam() {
 // 1. 定义 State (只包含数据)
 export var authStore = proxy({
   isModalOpen: false,
-  isAuthenticated: false,
+  isAuthenticated: true,
   token: localStorage.getItem('authToken')
 });
 
@@ -82,8 +82,34 @@ export var logout = function logout() {
 export function sendValidationCode(data) {
   return request.post('/api/modules/user/api/validation_code/send', data);
 }
-export var initializeAuth = function initializeAuth() {
-  if (authStore.token || hasSkipLoginParam()) {
-    authStore.isAuthenticated = true;
-  }
-};
+export var initializeAuth = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          if (hasSkipLoginParam()) {
+            _context2.next = 4;
+            break;
+          }
+          _context2.next = 4;
+          return request.get('/api/modules/user/api/accounts/get_company_info');
+        case 4:
+          authStore.isAuthenticated = true;
+          _context2.next = 11;
+          break;
+        case 7:
+          _context2.prev = 7;
+          _context2.t0 = _context2["catch"](0);
+          console.error('Initialize auth failed in store:', _context2.t0);
+          authStore.isAuthenticated = false;
+        case 11:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 7]]);
+  }));
+  return function initializeAuth() {
+    return _ref2.apply(this, arguments);
+  };
+}();

package/dist/utils/request.js

@@ -5,9 +5,9 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import axios from 'axios';
-import { message, Modal } from 'antd';
+import { message } from 'antd';
 import { getBaseURL } from "./env";
-import { getToken, removeToken } from "./auth";
+import { getToken } from "./auth";
 var req = axios.create({
   baseURL: getBaseURL(),
   timeout: 60000
@@ -28,55 +28,9 @@ req.interceptors.request.use(function (config) {
 req.interceptors.response.use(
 // @ts-ignore - Temporarily ignore type mismatch if it occurs with custom ApiResponse
 function (response) {
-  var res = response.data;
-
-  // 业务码非成功状态的统一处理
-  if (res.code !== 0 && res.code !== 200) {
-    message.error(res.message || 'Error');
-    if (res.code === 401) {
-      Modal.confirm({
-        title: '登录提醒',
-        content: '您的登录已过期，请重新登录。',
-        okText: '重新登录',
-        cancelText: '取消',
-        onOk: function onOk() {
-          removeToken();
-          window.location.href = '/login';
-        }
-      });
-    }
-    return Promise.reject(new Error(res.message || 'Error'));
-  } else {
-    // 成功则直接返回核心业务数据
-    return res.data;
-  }
+  return response.data;
 }, function (error) {
   var errorMessage = error.message;
-  if (error.response) {
-    switch (error.response.status) {
-      case 400:
-        errorMessage = '请求参数错误 (400)';
-        break;
-      case 401:
-        errorMessage = '未授权，请重新登录 (401)';
-        break;
-      case 403:
-        errorMessage = '拒绝访问 (403)';
-        break;
-      case 404:
-        errorMessage = '请求地址不存在 (404)';
-        break;
-      case 500:
-        errorMessage = '服务器内部错误 (500)';
-        break;
-      default:
-        errorMessage = "\u8FDE\u63A5\u9519\u8BEF (".concat(error.response.status, ")!");
-    }
-  } else if (errorMessage.includes('timeout')) {
-    errorMessage = '请求超时，请检查网络连接！';
-  } else {
-    errorMessage = '网络连接异常！';
-  }
   message.error(errorMessage);
   return Promise.reject(error);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/dumi-theme-antv",
-  "version": "0.8.0-beta.4",
+  "version": "0.8.0-beta.5",
   "description": "AntV website theme based on dumi2.",
   "keywords": [
     "dumi",