beer-assembly-biz 1.1.1-alpha.1 → 1.1.1-alpha.11

package/AppLayout.d.ts

@@ -3,7 +3,7 @@ import { MenuDataItem } from '@ant-design/pro-components';
 /**
  * 应用属性
  */
-declare type App = {
+export declare type App = {
     /**
      * Key
      */
@@ -36,7 +36,7 @@ declare type App = {
 /**
  * 用户信息实体.
  */
-declare type UserInfo = {
+export declare type UserInfo = {
     /**
      * 用户ID.
      */
@@ -57,7 +57,7 @@ declare type UserInfo = {
 /**
  * 布局属性
  */
-declare type LayoutProps = {
+export declare type LayoutProps = {
     /**
      * App
      */
@@ -69,7 +69,7 @@ declare type LayoutProps = {
     /**
      * 布局内容
      */
-    children: ReactNode;
+    children?: ReactNode;
     /**
      * 路径
      */
@@ -82,14 +82,14 @@ declare type LayoutProps = {
      * 左侧: Logo样式
      */
     logo?: {
-        /**
-         * 高度
-         */
-        height: number;
         /**
          * Logo 路径
          */
         path: string;
+        /**
+         * 高度
+         */
+        height?: number;
     };
     /**
      * 右侧: 用户下拉选菜单

package/AppLayout.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { css } from '@emotion/css';
-import { ProConfigProvider, ProLayout } from '@ant-design/pro-components';
+import { ProLayout } from '@ant-design/pro-components';
 import { Dropdown, message, Typography } from 'antd';
 import { Session } from 'beer-network/session';
 import dayjs from 'dayjs';
@@ -109,7 +109,7 @@ const Component = (props) => {
             sessionStorage.setItem('SESSION', JSON.stringify(userInfo));
         });
     }, [props?.requestUser]);
-    return React.createElement(ProConfigProvider, { hashed: false },
+    return React.createElement(React.Fragment, null,
         contextHolder,
         React.createElement(ProLayout, { className: css `
           .ant-pro-sider-logo {
@@ -259,7 +259,7 @@ const Component = (props) => {
           align-items: center;
 
           & > img {
-              height: ${props?.logo?.height || 22}px;
+              height: ${props?.logo?.height || 28}px;
               display: block;
               margin: 0 6px;
           }
@@ -299,14 +299,13 @@ const Component = (props) => {
                                 {
                                     type: 'divider'
                                 },
-                                ...(props?.userMenus || []),
-                                {
-                                    type: 'divider'
-                                },
+                                ...((props?.userMenus || [])?.length > 0 ? [...(props?.userMenus || []), {
+                                        type: 'divider'
+                                    }] : []),
                                 {
                                     key: 'EXIT',
                                     danger: true,
-                                    label: React.createElement("div", { onClick: onLogout }, "\u9000\u51FA\u767B\u5F55")
+                                    label: React.createElement("div", { style: { width: '100%' }, onClick: onLogout }, "\u9000\u51FA\u767B\u5F55")
                                 }
                             ]
                         } }, dom));

package/UserModals.js

@@ -11,7 +11,7 @@ export class UserModals {
                 return false;
             }
             if (callbackRef.current) {
-                if (await callbackRef.current?.(form.getFieldsValue())) {
+                if (await callbackRef.current?.(form.getFieldValue('password'))) {
                     setIsOpenModal(false);
                 }
             }
@@ -34,6 +34,6 @@ export class UserModals {
                                     required: true,
                                     message: '请输入密码'
                                 }] },
-                            React.createElement(Input.Password, { placeholder: "\u65B0\u5BC6\u7801" })))))];
+                            React.createElement(Input.Password, { placeholder: "\u65B0\u5BC6\u7801", autoComplete: "off" })))))];
     }
 }

package/auth/AuthPassword.d.ts

@@ -4,22 +4,22 @@ export declare type AuthPasswordProps = {
     /**
      * HTML 协议.
      */
-    protocol: string;
+    protocol?: string;
     /**
      * 请求滑块验证码.
      */
-    requestSlider: () => Promise<Slider>;
+    requestSlider?: () => Promise<Slider>;
     /**
      * 滑块验证码样式.
      */
-    sliderToken: SliderCodeToken;
+    sliderToken?: SliderCodeToken;
     /**
      * 登录请求
      * @param code 代码
      * @param slider 滑块
      * @param params 参数
      */
-    requestLogin?: (code: string, slider: Slider, params: {
+    requestLogin?: (code: string | undefined, slider: Slider | undefined, params: {
         username: string;
         password: string;
     }) => Promise<boolean>;

package/auth/AuthPassword.js

@@ -23,7 +23,25 @@ const App = (props) => {
             props?.onErrorMessage?.('请输入密码信息');
             return false;
         }
+        // 启动Loading
         setIsLoading(true);
+        // 如果不需要滑块验证; 直接登录
+        if (props?.requestSlider === undefined) {
+            await onConfirmLogin();
+        }
+        return true;
+    };
+    const onConfirmLogin = async (code, slider) => {
+        const params = form.getFieldsValue();
+        const func = props?.requestLogin;
+        if (func !== undefined) {
+            const result = await func(code, slider, params);
+            if (!result) {
+                return false;
+            }
+        }
+        // 如果处理成功, 关闭Loading
+        setIsLoading(false);
         return true;
     };
     return React.createElement(Form, { form: form },
@@ -37,22 +55,16 @@ const App = (props) => {
                 } },
                 React.createElement("span", { dangerouslySetInnerHTML: { __html: props?.protocol } }))),
         React.createElement(Form.Item, null,
-            React.createElement(Dropdown, { placement: "top", arrow: true, destroyPopupOnHide: true, dropdownRender: () => React.createElement(React.Fragment, null,
+            props?.requestSlider !== undefined ? React.createElement(Dropdown, { placement: "top", arrow: true, destroyPopupOnHide: true, dropdownRender: () => React.createElement(React.Fragment, null,
                     React.createElement("div", { style: {
                             width: '250px',
                             display: 'block',
                             marginLeft: '35px'
                         } },
-                        React.createElement(SliderCode, { request: props?.requestSlider, onReceipt: async (code, slider) => {
-                                const params = form.getFieldsValue();
-                                const result = (await props?.requestLogin?.(code, slider, params)) || true;
-                                // 如果处理成功, 关闭Loading
-                                if (result) {
-                                    setIsLoading(false);
-                                }
-                                return result;
-                            }, token: props?.sliderToken }))), trigger: ['click'], open: isLoading },
-                React.createElement("div", null)),
+                        React.createElement(SliderCode, { request: props?.requestSlider || (async () => {
+                                return {};
+                            }), onReceipt: onConfirmLogin, token: props?.sliderToken }))), trigger: ['click'], open: isLoading },
+                React.createElement("div", null)) : undefined,
             React.createElement(Button, { type: "primary", className: css `
           width: 100%;
           height: 38px;

package/auth/AuthStyle01.d.ts

@@ -8,7 +8,16 @@ declare type AuthStyleProps = {
     /**
      * Logo 图片.
      */
-    logo: string;
+    logo: {
+        /**
+         * 路径
+         */
+        path: string;
+        /**
+         * 高度
+         */
+        height?: number;
+    };
     /**
      * 侧边栏图片
      */
@@ -16,23 +25,23 @@ declare type AuthStyleProps = {
     /**
      * 描述.
      */
-    description: string;
+    description?: string;
     /**
      * HTML 协议.
      */
-    protocol: string;
+    protocol?: string;
     /**
      * HTML 关于.
      */
-    copyright: string;
+    copyright?: string;
     /**
      * 请求滑块验证码.
      */
-    requestSlider: () => Promise<Slider>;
+    requestSlider?: () => Promise<Slider>;
     /**
      * 滑块验证码样式.
      */
-    sliderToken: SliderCodeToken;
+    sliderToken?: SliderCodeToken;
     /**
      * 登录对象.
      * @param params 参数

package/auth/AuthStyle01.js

@@ -11,8 +11,8 @@ const App = (props) => {
         const result = await props?.systemLogin?.({
             account: params.username.trim(),
             password: params.password.trim(),
-            authCode: slider.authCode,
-            code
+            authCode: slider?.authCode || '',
+            code: code || ''
         });
         if (result === undefined) {
             setErrorMessage('登录失败，授权没有配置！');
@@ -66,10 +66,10 @@ const App = (props) => {
             padding: 30px 40px 0 40px;
         ` },
                 React.createElement("img", { className: css `
-              height: 42px;
+              height: ${props?.logo?.height || 42}px;
               margin: 0 auto 0 auto;
               display: block;
-          `, src: props?.logo, alt: "" }),
+          `, src: props?.logo?.path, alt: "" }),
                 React.createElement("p", { className: css `
               font-size: 13px;
               margin: 6px auto 10px auto;

package/auth/AuthStyle02.d.ts

@@ -8,27 +8,36 @@ declare type AuthStyleProps = {
     /**
      * Logo 图片.
      */
-    logo: string;
+    logo: {
+        /**
+         * 路径
+         */
+        path: string;
+        /**
+         * 高度
+         */
+        height?: number;
+    };
     /**
      * 描述.
      */
-    description: string;
+    description?: string;
     /**
      * HTML 协议.
      */
-    protocol: string;
+    protocol?: string;
     /**
      * HTML 关于.
      */
-    copyright: string;
+    copyright?: string;
     /**
      * 请求滑块验证码.
      */
-    requestSlider: () => Promise<Slider>;
+    requestSlider?: () => Promise<Slider>;
     /**
      * 滑块验证码样式.
      */
-    sliderToken: SliderCodeToken;
+    sliderToken?: SliderCodeToken;
     /**
      * 登录对象.
      * @param params 参数

package/auth/AuthStyle02.js

@@ -11,8 +11,8 @@ const App = (props) => {
         const result = await props?.systemLogin?.({
             account: params.username.trim(),
             password: params.password.trim(),
-            authCode: slider.authCode,
-            code
+            authCode: slider?.authCode || '',
+            code: code || ''
         });
         if (result === undefined) {
             setErrorMessage('登录失败，授权没有配置！');
@@ -59,10 +59,10 @@ const App = (props) => {
             padding: 30px 40px 0 40px;
         ` },
                 React.createElement("img", { className: css `
-              height: 42px;
+              height: ${props?.logo?.height || 42}px;
               margin: 0 auto 0 auto;
               display: block;
-          `, src: props.logo, alt: "" }),
+          `, src: props?.logo?.path, alt: "" }),
                 React.createElement("p", { className: css `
               font-size: 13px;
               margin: 6px auto 10px auto;