component-shipinlv 1.0.28 → 1.0.30

package/dist/Auth/index.d.ts

@@ -4,6 +4,7 @@ interface Props {
     clientUniqueKey: string;
     loginTypeList: Global.AuthClientLoginType[];
     domain?: string;
+    env?: Global.Env;
     onLoginSuccess: () => void;
 }
 declare const Auth: React.FC<Props>;

package/dist/Auth/index.js

@@ -28,6 +28,7 @@ var Auth = function Auth(_ref) {
   var productType = _ref.productType,
     clientUniqueKey = _ref.clientUniqueKey,
     loginTypeList = _ref.loginTypeList,
+    env = _ref.env,
     _ref$domain = _ref.domain,
     domain = _ref$domain === void 0 ? document.location.hostname : _ref$domain,
     _ref$onLoginSuccess = _ref.onLoginSuccess,
@@ -315,6 +316,7 @@ var Auth = function Auth(_ref) {
           }),
           disabled: !loginTypeList.includes('account-login'),
           children: /*#__PURE__*/_jsx(AuthLoginReg, {
+            env: env,
             productType: productType,
             clientUniqueKey: clientUniqueKey,
             accountRegDisabled: !loginTypeList.includes('account-reg'),

package/dist/AuthClient/login-reg.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 interface Props {
+    env?: Global.Env;
     productType: string;
     clientUniqueKey: string;
     activeKeyDefault?: 'login' | 'reg' | string;

package/dist/AuthClient/login-reg.js

@@ -8,7 +8,8 @@ import AuthLogin from "./login";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var AuthLoginReg = function AuthLoginReg(_ref) {
-  var productType = _ref.productType,
+  var env = _ref.env,
+    productType = _ref.productType,
     clientUniqueKey = _ref.clientUniqueKey,
     _ref$activeKeyDefault = _ref.activeKeyDefault,
     activeKeyDefault = _ref$activeKeyDefault === void 0 ? 'reg' : _ref$activeKeyDefault,
@@ -45,6 +46,7 @@ var AuthLoginReg = function AuthLoginReg(_ref) {
       children: [/*#__PURE__*/_jsx(Tabs.TabPane, {
         tab: "\u767B\u5F55",
         children: /*#__PURE__*/_jsx(AuthLogin, {
+          env: env,
           productType: productType,
           clientUniqueKey: clientUniqueKey,
           onSuccess: function onSuccess() {
@@ -54,6 +56,7 @@ var AuthLoginReg = function AuthLoginReg(_ref) {
       }, "login"), /*#__PURE__*/_jsx(Tabs.TabPane, {
         tab: "\u6CE8\u518C",
         children: /*#__PURE__*/_jsx(Reg, {
+          env: env,
           productType: productType,
           clientUniqueKey: clientUniqueKey,
           onSuccess: function onSuccess() {

package/dist/AuthClient/login.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 interface Props {
+    env?: Global.Env;
     productType: string;
     clientUniqueKey: string;
     onSuccess: () => void;

package/dist/AuthClient/login.js

@@ -10,6 +10,7 @@ import { useRequest } from '@umijs/hooks';
 
 // import styles from "./reg.scss" ;
 import * as AuthController from "../service/api/AuthController";
+import AuthUserOffline from "./user-offline";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var formItemLayout = {
@@ -43,7 +44,8 @@ var tailFormItemLayout = {
   }
 };
 var AuthReg = function AuthReg(_ref) {
-  var productType = _ref.productType,
+  var env = _ref.env,
+    productType = _ref.productType,
     clientUniqueKey = _ref.clientUniqueKey,
     _ref$onSuccess = _ref.onSuccess,
     onSuccess = _ref$onSuccess === void 0 ? function () {} : _ref$onSuccess;
@@ -55,17 +57,39 @@ var AuthReg = function AuthReg(_ref) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _useRequest = useRequest(function (data) {
+      var unbind = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       return AuthController.login(_objectSpread(_objectSpread({
         productType: productType,
         clientUniqueKey: clientUniqueKey,
         from: "web"
       }, data), {}, {
+        unbind: unbind,
         inviteUserId: Tool.getInviteUserId()
-      }));
+      }), {
+        env: env
+      });
     }, {
       manual: true,
       onSuccess: function onSuccess(result) {
         loginSuccess(result);
+      },
+      onError: function onError(err) {
+        if (err.name === 'user-offline') {
+          var dialog = Tool.pageDialog({
+            title: '此账号已经在其他电脑登录',
+            content: /*#__PURE__*/_jsx(AuthUserOffline, {
+              message: err.message,
+              onConfirm: function onConfirm() {
+                run(form.getFieldsValue(), true);
+                dialog.destroy();
+              },
+              onCancel: function onCancel() {
+                dialog.destroy();
+              }
+            }),
+            width: 520
+          });
+        }
       }
     }),
     loading = _useRequest.loading,

package/dist/AuthClient/reg.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 interface Props {
+    env?: Global.Env;
     productType: string;
     clientUniqueKey: string;
     onSuccess: () => void;

package/dist/AuthClient/reg.js

@@ -41,7 +41,8 @@ var tailFormItemLayout = {
   }
 };
 var Reg = function Reg(_ref) {
-  var productType = _ref.productType,
+  var env = _ref.env,
+    productType = _ref.productType,
     clientUniqueKey = _ref.clientUniqueKey,
     _ref$onSuccess = _ref.onSuccess,
     onSuccess = _ref$onSuccess === void 0 ? function () {} : _ref$onSuccess;
@@ -54,7 +55,9 @@ var Reg = function Reg(_ref) {
         clientUniqueKey: clientUniqueKey
       }, data), {}, {
         inviteUserId: Tool.getInviteUserId()
-      }));
+      }), {
+        env: env
+      });
     }, {
       manual: true,
       onSuccess: function onSuccess(result) {

package/dist/AuthClient/user-offline.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+interface Props {
+    message: string;
+    onConfirm: () => void;
+    onCancel: () => void;
+}
+declare const AuthUserOffline: React.FC<Props>;
+export default AuthUserOffline;

package/dist/AuthClient/user-offline.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import { Button, Form, Space } from 'antd';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var AuthUserOffline = function AuthUserOffline(_ref) {
+  var message = _ref.message,
+    _ref$onConfirm = _ref.onConfirm,
+    onConfirm = _ref$onConfirm === void 0 ? function () {} : _ref$onConfirm,
+    _ref$onCancel = _ref.onCancel,
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
+  return /*#__PURE__*/_jsx("section", {
+    className: "authClientLogin",
+    children: /*#__PURE__*/_jsxs(Form, {
+      children: [/*#__PURE__*/_jsx(Form.Item, {
+        children: message
+      }), /*#__PURE__*/_jsx(Form.Item, {
+        children: /*#__PURE__*/_jsxs(Space, {
+          children: [/*#__PURE__*/_jsx(Button, {
+            type: "primary",
+            onClick: function onClick() {
+              return onConfirm();
+            },
+            children: "\u7EE7\u7EED\u767B\u5F55"
+          }), /*#__PURE__*/_jsx(Button, {
+            type: "link",
+            danger: true,
+            ghost: true,
+            onClick: function onClick() {
+              return onCancel();
+            },
+            children: "\u53D6\u6D88"
+          })]
+        })
+      })]
+    })
+  });
+};
+export default AuthUserOffline;

package/dist/service/api/AuthController.d.ts

@@ -4,7 +4,7 @@ export declare function login(body: {
     password: string;
     from: "web";
     inviteUserId: number;
-}): Promise<UserAuth.LoginSuccessData>;
+}, options?: ServicesApi.RequestOptions): Promise<UserAuth.LoginSuccessData>;
 export declare function weMiniLoginQr(body: {
     loginId: string;
     loginType: 'client';
@@ -12,10 +12,10 @@ export declare function weMiniLoginQr(body: {
     inviteUserId: number;
     domain: string;
     env: Global.Env;
-}): Promise<UserAuth.WeQrResult>;
+}, options?: ServicesApi.RequestOptions): Promise<UserAuth.WeQrResult>;
 export declare function reg(body: {
     productType: string;
     accountName: string;
     password: string;
     inviteUserId: number;
-}): Promise<UserAuth.LoginSuccessData>;
+}, options?: ServicesApi.RequestOptions): Promise<UserAuth.LoginSuccessData>;

package/dist/service/api/AuthController.js

@@ -2,24 +2,24 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import request from "../../lib/request";
-export function login(_x) {
+export function login(_x, _x2) {
   return _login.apply(this, arguments);
 }
 function _login() {
-  _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body) {
+  _login = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(body, options) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           // 兼容
           // @ts-ignore
           body.account = body.accountName;
-          return _context.abrupt("return", request("auth/loginAccount", {
+          return _context.abrupt("return", request("auth/loginAccount", _objectSpread({
             method: 'POST',
             headers: {
               'Content-Type': 'application/json'
             },
             data: _objectSpread({}, body)
-          }));
+          }, options || {})));
         case 2:
         case "end":
           return _context.stop();
@@ -28,23 +28,22 @@ function _login() {
   }));
   return _login.apply(this, arguments);
 }
-export function weMiniLoginQr(_x2) {
+export function weMiniLoginQr(_x3, _x4) {
   return _weMiniLoginQr.apply(this, arguments);
 }
 function _weMiniLoginQr() {
-  _weMiniLoginQr = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(body) {
+  _weMiniLoginQr = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(body, options) {
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", request('auth/wechatLoginQr',
-          //`client/auth/weMiniLoginQr`,
-          {
+          return _context2.abrupt("return", request('auth/wechatLoginQr', //`client/auth/weMiniLoginQr`,
+          _objectSpread({
             method: 'POST',
             headers: {
               'Content-Type': 'application/json'
             },
             data: _objectSpread({}, body)
-          }));
+          }, options || {})));
         case 1:
         case "end":
           return _context2.stop();
@@ -53,21 +52,21 @@ function _weMiniLoginQr() {
   }));
   return _weMiniLoginQr.apply(this, arguments);
 }
-export function reg(_x3) {
+export function reg(_x5, _x6) {
   return _reg.apply(this, arguments);
 }
 function _reg() {
-  _reg = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(body) {
+  _reg = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(body, options) {
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", request("auth/reg", {
+          return _context3.abrupt("return", request("auth/reg", _objectSpread({
             method: 'POST',
             headers: {
               'Content-Type': 'application/json'
             },
             data: _objectSpread({}, body)
-          }));
+          }, options || {})));
         case 1:
         case "end":
           return _context3.stop();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-shipinlv",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",