beer-assembly-biz 1.1.1-alpha.7 → 1.1.1-alpha.9

package/auth/AuthPassword.d.ts

@@ -8,18 +8,18 @@ export declare type AuthPasswordProps = {
     /**
      * 请求滑块验证码.
      */
-    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,9 +23,23 @@ 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 result = (await props?.requestLogin?.(code, slider, params)) || true;
+        // 如果处理成功, 关闭Loading
+        if (result) {
+            setIsLoading(false);
+        }
+        return result;
+    };
     return React.createElement(Form, { form: form },
         React.createElement(Form.Item, { name: "username", style: { marginBottom: 12 } },
             React.createElement(Input, { className: "input", maxLength: 32, placeholder: "\u8BF7\u8F93\u5165\u8D26\u53F7", style: { height: 36 } })),
@@ -37,22 +51,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;
+    };
     /**
      * 侧边栏图片
      */
@@ -28,11 +37,11 @@ declare type AuthStyleProps = {
     /**
      * 请求滑块验证码.
      */
-    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,7 +8,16 @@ declare type AuthStyleProps = {
     /**
      * Logo 图片.
      */
-    logo: string;
+    logo: {
+        /**
+         * 路径
+         */
+        path: string;
+        /**
+         * 高度
+         */
+        height: number;
+    };
     /**
      * 描述.
      */
@@ -24,11 +33,11 @@ declare type AuthStyleProps = {
     /**
      * 请求滑块验证码.
      */
-    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;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "beer-assembly-biz",
   "private": false,
-  "version": "1.1.1-alpha.7",
+  "version": "1.1.1-alpha.9",
   "scripts": {
     "pub-w": "tsc && copy package.json .\\dist\\package.json && npm publish ./dist",
     "pub-m": "tsc && cp -a src/icon ./dist && cp -a src/fonts ./dist && cp -a src/images ./dist && cp package.json ./dist/package.json && npm publish ./dist"