component-sanzhizhou 1.2.1 → 1.2.3

package/dist/auth-main/account.d.ts

@@ -6,6 +6,7 @@ interface Props {
     disabledFormItemLabel?: boolean;
     accountRegDisabled?: boolean;
     onSuccess: () => void;
+    showSubAccount?: boolean;
 }
 /** 账户登录 / 注册；找回密码通过抽屉弹出。 */
 declare const Account: React.FC<Props>;

package/dist/auth-main/account.js

@@ -14,7 +14,8 @@ var Account = function Account(_ref) {
     roleType = _ref.roleType,
     disabledFormItemLabel = _ref.disabledFormItemLabel,
     accountRegDisabled = _ref.accountRegDisabled,
-    onSuccess = _ref.onSuccess;
+    onSuccess = _ref.onSuccess,
+    showSubAccount = _ref.showSubAccount;
   var _useState = useState('login'),
     _useState2 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
@@ -42,6 +43,7 @@ var Account = function Account(_ref) {
     apiUrl: apiUrl,
     roleType: roleType,
     disabledFormItemLabel: disabledFormItemLabel,
+    showSubAccount: showSubAccount,
     onSuccess: onSuccess,
     onForgotPassword: function onForgotPassword() {
       return setForgotOpen(true);
@@ -63,6 +65,7 @@ var Account = function Account(_ref) {
     env: env,
     apiUrl: apiUrl,
     disabledFormItemLabel: disabledFormItemLabel,
+    showSubAccount: showSubAccount,
     onDone: function onDone() {
       return setForgotOpen(false);
     }

package/dist/auth-main/forgot-password.d.ts

@@ -3,6 +3,7 @@ interface Props {
     env?: Global.Env;
     apiUrl?: string;
     disabledFormItemLabel?: boolean;
+    showSubAccount?: boolean;
     /** 重置成功后回调（切回登录）。 */
     onDone: () => void;
 }

package/dist/auth-main/forgot-password.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React from 'react';
+import React, { useState } from 'react';
 import { LockOutlined, UserOutlined, EyeTwoTone, EyeInvisibleOutlined } from '@ant-design/icons';
-import { Input, Button, Form } from 'antd';
+import { Input, Button, Form, Segmented } from 'antd';
 import { useRequest } from '@umijs/hooks';
 import Tool from "../lib/Tool";
 import * as AuthController from "../service/api/AuthController";
@@ -14,10 +14,15 @@ var ForgotPassword = function ForgotPassword(_ref) {
   var env = _ref.env,
     apiUrl = _ref.apiUrl,
     disabledFormItemLabel = _ref.disabledFormItemLabel,
+    showSubAccount = _ref.showSubAccount,
     onDone = _ref.onDone;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var _useState = useState('main'),
+    _useState2 = _slicedToArray(_useState, 2),
+    accountType = _useState2[0],
+    setAccountType = _useState2[1];
   var _useRequest = useRequest(function (data) {
       return AuthController.forgotPassword({
         accountName: data.accountName,
@@ -48,7 +53,23 @@ var ForgotPassword = function ForgotPassword(_ref) {
     labelCol: {
       span: FormSpan
     }
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+  }, showSubAccount && /*#__PURE__*/React.createElement(Form.Item, {
+    wrapperCol: {
+      offset: FormSpan
+    }
+  }, /*#__PURE__*/React.createElement(Segmented, {
+    value: accountType,
+    options: [{
+      label: formatMessage('主账户'),
+      value: 'main'
+    }, {
+      label: formatMessage('子账户'),
+      value: 'sub'
+    }],
+    onChange: function onChange(e) {
+      return setAccountType(e);
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     label: disabledFormItemLabel ? undefined : formatMessage('手机号码'),
     name: "accountName",
     rules: [{

package/dist/auth-main/index.d.ts

@@ -12,11 +12,12 @@ interface Props {
         [name: string]: any;
     };
     onLoginSuccess: () => void;
+    showSubAccount?: boolean;
 }
 /**
  * 登录 / 注册（重构版）。
  * - 微信扫码：逻辑与旧 Auth 保持一致（WechatQr）。
  * - 账户：登录 / 短信注册 / 找回密码（Account）。
  */
-declare const Auth: React.FC<Props>;
-export default Auth;
+declare const AuthMain: React.FC<Props>;
+export default AuthMain;

package/dist/auth-main/index.js

@@ -14,7 +14,7 @@ import styles from "./index.module.less";
  * - 微信扫码：逻辑与旧 Auth 保持一致（WechatQr）。
  * - 账户：登录 / 短信注册 / 找回密码（Account）。
  */
-var Auth = function Auth(_ref) {
+var AuthMain = function AuthMain(_ref) {
   var productType = _ref.productType,
     apiUrl = _ref.apiUrl,
     clientUniqueKeyList = _ref.clientUniqueKeyList,
@@ -27,7 +27,8 @@ var Auth = function Auth(_ref) {
     _ref$domain = _ref.domain,
     domain = _ref$domain === void 0 ? document.location.hostname : _ref$domain,
     _ref$onLoginSuccess = _ref.onLoginSuccess,
-    onLoginSuccess = _ref$onLoginSuccess === void 0 ? function () {} : _ref$onLoginSuccess;
+    onLoginSuccess = _ref$onLoginSuccess === void 0 ? function () {} : _ref$onLoginSuccess,
+    showSubAccount = _ref.showSubAccount;
   var _useState = useState(_toConsumableArray(loginTypeList)),
     _useState2 = _slicedToArray(_useState, 2),
     currentLoginTypeList = _useState2[0],
@@ -81,6 +82,7 @@ var Auth = function Auth(_ref) {
     roleType: roleType,
     disabledFormItemLabel: disabledFormItemLabel,
     accountRegDisabled: accountRegDisabled,
+    showSubAccount: showSubAccount,
     onSuccess: function onSuccess() {
       return onLoginSuccess();
     }
@@ -92,4 +94,4 @@ var Auth = function Auth(_ref) {
     onClick: onCallAccount
   }));
 };
-export default Auth;
+export default AuthMain;

package/dist/auth-main/login.d.ts

@@ -3,6 +3,7 @@ import type { AccountFormProps } from './types';
 interface Props extends AccountFormProps {
     roleType?: UserAuth.RoleType;
     disabledFormItemLabel?: boolean;
+    showSubAccount?: boolean;
     onForgotPassword?: () => void;
 }
 /** 账户密码登录。 */

package/dist/auth-main/login.js

@@ -1,7 +1,8 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import React from 'react';
+import React, { useState } from 'react';
 import { LockOutlined, UserOutlined, EyeTwoTone, EyeInvisibleOutlined } from '@ant-design/icons';
-import { Input, Button, Form } from 'antd';
+import { Input, Button, Form, Segmented } from 'antd';
 import { useRequest } from '@umijs/hooks';
 import * as AuthController from "../service/api/AuthController";
 import formatMessage from "../lib/formatMessage";
@@ -13,11 +14,16 @@ var Login = function Login(_ref) {
     apiUrl = _ref.apiUrl,
     roleType = _ref.roleType,
     disabledFormItemLabel = _ref.disabledFormItemLabel,
+    showSubAccount = _ref.showSubAccount,
     _onSuccess = _ref.onSuccess,
     onForgotPassword = _ref.onForgotPassword;
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var _useState = useState('main'),
+    _useState2 = _slicedToArray(_useState, 2),
+    accountType = _useState2[0],
+    setAccountType = _useState2[1];
   var _useRequest = useRequest(function (data) {
       return AuthController.accountLogin(data, {
         env: env,
@@ -34,18 +40,37 @@ var Login = function Login(_ref) {
     run = _useRequest.run;
   var onFinish = function onFinish(values) {
     values.accountName = (values.accountName || '').replace(/\s+/g, '');
-    run(values);
+    run(_objectSpread(_objectSpread({}, values), {}, {
+      accountType: accountType
+    }));
   };
+  var formSpan = 8;
   return /*#__PURE__*/React.createElement("section", null, /*#__PURE__*/React.createElement(Form, {
+    labelCol: {
+      span: formSpan
+    },
     form: form,
     onFinish: onFinish,
-    disabled: loading,
-    autoComplete: "off"
-  }, /*#__PURE__*/React.createElement(Form.Item, {
+    disabled: loading
+    // autoComplete="off"
+  }, showSubAccount && /*#__PURE__*/React.createElement(Form.Item, {
+    wrapperCol: {
+      offset: formSpan
+    }
+  }, /*#__PURE__*/React.createElement(Segmented, {
+    value: accountType,
+    options: [{
+      label: formatMessage('主账户'),
+      value: 'main'
+    }, {
+      label: formatMessage('子账户'),
+      value: 'sub'
+    }],
+    onChange: function onChange(e) {
+      return setAccountType(e);
+    }
+  })), /*#__PURE__*/React.createElement(Form.Item, {
     label: disabledFormItemLabel ? undefined : formatMessage('手机号码'),
-    labelCol: {
-      span: 8
-    },
     name: "accountName",
     rules: [{
       required: true,
@@ -61,9 +86,6 @@ var Login = function Login(_ref) {
     })
   })), /*#__PURE__*/React.createElement(Form.Item, {
     label: disabledFormItemLabel ? undefined : formatMessage('密码'),
-    labelCol: {
-      span: 8
-    },
     name: "password",
     rules: [{
       required: true,
@@ -96,7 +118,7 @@ var Login = function Login(_ref) {
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
     wrapperCol: {
-      offset: 8
+      offset: formSpan
     }
   }, /*#__PURE__*/React.createElement(Button, {
     type: "primary",

package/dist/auth-main/types.d.ts

@@ -8,6 +8,8 @@ export interface AccountAuthData {
     nickname: string;
     avatarUrl: string;
     gender: number;
+    isSubAccount: boolean;
+    powerKindList: string[];
 }
 /** PoW 挑战。 */
 export interface PowChallengeData {

package/dist/lib/Tool.d.ts

@@ -162,7 +162,7 @@ declare const Tool: {
     getTitleByPath(path: string): string;
     getDirByPath(path: string): string;
     h5Pay(query: Pay.H5PayQuery): void;
-    notification(type: "info" | "error" | "warning" | "success", message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
+    notification(type: "success" | "info" | "warning" | "error", message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationSuccess(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationError(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;
     notificationWarning(message: string, description?: import("react").ReactNode, options?: import("./notification").NotificationOption): void;

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

@@ -29,6 +29,8 @@ export interface AccountAuthResult {
     nickname: string;
     avatarUrl: string;
     gender: number;
+    isSubAccount: boolean;
+    powerKindList: string[];
 }
 export interface PowChallengeResult {
     challenge: string;
@@ -48,6 +50,7 @@ export declare function sendSmsCode(body: {
 export declare function accountLogin(body: {
     accountName: string;
     password: string;
+    accountType?: string;
 }, options?: ServicesApi.RequestOptions): Promise<AccountAuthResult>;
 export declare function accountReg(body: {
     accountName: string;

package/dist/types/AuthMain.d.ts

@@ -0,0 +1,3 @@
+declare namespace AuthMain {
+    type AccountType = 'main' | 'sub';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "component-sanzhizhou",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",