@jiangood/springboot-admin-starter 0.0.4 → 0.0.5

package/package.json

@@ -31,7 +31,7 @@
     "config/dist/*"
   ],
   "main": "src/index.ts",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "dependencies": {
     "preact": "^10.27.2",
     "preact-hooks": "0.0.0-0.0.0"

package/src/framework/field-components/FieldTable.d.ts

@@ -4,7 +4,8 @@ import {ColumnsType} from "antd/es/table";
 declare type FieldTableProps = {
     columns:  ColumnsType,
     value?: any[]
-    onChange?: (list:any[])=>{}
+    onChange?: (list:any[])=>{},
+    style?: React.CSSProperties
 };
 
 /***

package/src/framework/field-components/FieldTable.jsx

@@ -61,7 +61,7 @@ export class FieldTable extends React.Component {
         let row = dataSource[index]
 
         let v = e;
-        if (e != null &&e.hasOwnProperty('target')) {
+        if (e != null && e.hasOwnProperty('target')) {
             v = e.target.value;
         }
 
@@ -89,17 +89,14 @@ export class FieldTable extends React.Component {
     }
 
     render() {
-        return <div className='edit-table'>
-
+        return <div className='edit-table' style={this.props.style}>
             <Table columns={this.columns}
                    dataSource={this.state.dataSource}
                    size='small'
-
-
-                   footer={() => <Button type='dashed' icon={<PlusOutlined/>}
+                   footer={() => <Button type='dashed'
+                                         icon={<PlusOutlined/>}
                                          onClick={this.add}>增加一行
                    </Button>}
-
                    pagination={false}
             >
 

package/src/framework/index.ts

@@ -2,3 +2,4 @@ export * from './components'
 export * from './utils'
 export * from './field-components'
 export * from './view-components'
+export * from './pages'

package/src/framework/pages/LoginPage.d.ts

@@ -0,0 +1,11 @@
+import React from "react";
+
+export interface LoginPageProps {
+
+
+
+}
+
+export class LoginPage extends React.Component<LoginPageProps, any> {
+}
+

package/src/framework/pages/LoginPage.jsx

@@ -0,0 +1,136 @@
+import React from 'react';
+import {Button, Form, Input, message, Space} from 'antd';
+import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
+import "./LoginPage.less"
+import {history} from 'umi';
+import {HttpUtils, MessageUtils, PageUtils, SysUtils} from "../utils";
+import {JSEncrypt} from "jsencrypt";
+
+
+export class LoginPage extends React.Component {
+
+
+    state = {
+        logging: false,
+
+        siteInfo: {},
+        random: Math.random()
+    }
+    redirect = '/';
+
+    async componentDidMount() {
+        console.log('渲染登录页面')
+        const redirect = PageUtils.currentParams()['redirect']
+        if (redirect) {
+            console.log('重定向参数', redirect)
+            this.redirect = decodeURIComponent(redirect)
+        }
+
+        if (localStorage.length === 0) {
+            MessageUtils.alert('站点数据缺失，刷新当前页面...')
+            window.location.reload()
+            return
+        }
+
+        const siteInfo = SysUtils.getSiteInfo()
+        this.setState({siteInfo})
+    }
+
+
+    submit = values => {
+        this.setState({logging: true})
+
+        const pubkey = this.state.siteInfo.rsaPublicKey;
+        if (!pubkey) {
+            message.error("未获取密钥，请刷新浏览器再试")
+            return
+        }
+        // 对密码加密
+        const crypt = new JSEncrypt();
+        crypt.setPublicKey(pubkey);
+        values.password = crypt.encrypt(values.password)
+
+
+        HttpUtils.postForm('/admin/auth/login', values).then(rs => {
+            console.log('登录结果', rs)
+            history.push(this.redirect)
+        }).catch(e => {
+            console.log('登录错误', e)
+        })
+        .finally(() => {
+            this.setState({logging: false})
+        })
+    }
+
+
+    render() {
+        const {siteInfo} = this.state
+
+        const pageStyle = {}
+        if (siteInfo.loginBackground) {
+            let url = 'admin/sysFile/preview/' + siteInfo.loginBackground;
+            pageStyle.backgroundImage = 'url("' + url + '")'
+        }
+
+        return (
+            <section className='login-page' style={pageStyle}>
+                <div className="login-content">
+                    <h1>{siteInfo.title}</h1>
+                    <Form
+                        name="normal_login"
+                        className="login-form"
+                        initialValues={{remember: true}}
+                        onFinish={this.submit}
+                        requiredMark={false}
+                        colon={false}
+                    >
+
+                        <Form.Item name="username" rules={[{required: true, message: '请输入用户名!'}]}>
+                            <Input size='large' prefix={<UserOutlined/>} placeholder="用户名" autoComplete="off"/>
+                        </Form.Item>
+                        <Form.Item name="password" rules={[{required: true, message: '请输入密码!'}]}>
+                            <Input autoComplete="off" prefix={<LockOutlined/>} type="password" placeholder="密码"
+                                   size='large'
+                            />
+                        </Form.Item>
+
+
+                        {siteInfo.captcha && <Form.Item name='captchaCode' rules={[{required: true}]}>
+                            <Space style={{alignItems: 'center'}}>
+                                <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>
+                                <img height={36}
+                                     width={100}
+                                     src={"/admin/auth/captchaImage?_random=" + this.state.random}
+                                     onClick={() => {
+                                         this.setState({random: Math.random()})
+                                     }}></img>
+                            </Space>
+                        </Form.Item>}
+
+
+                        <Form.Item style={{marginTop: 10}}>
+                            <Button loading={this.state.logging} type="primary" htmlType="submit"
+                                    block size='large'>
+                                登录
+                            </Button>
+                        </Form.Item>
+                    </Form>
+
+                    {this.renderFormBottom()}
+
+                </div>
+            </section>
+        );
+    }
+
+
+    renderFormBottom() {
+        let siteInfo = this.state.siteInfo;
+        if (siteInfo.loginBoxBottomTip) {
+            return <div style={{color: 'white', marginTop: 50, fontSize: '14px', textAlign: 'center'}}>
+                <WarningOutlined/> {siteInfo.loginBoxBottomTip}
+            </div>
+        }
+    }
+
+}

package/src/{pages/login.less → framework/pages/LoginPage.less}

@@ -1,6 +1,6 @@
 .login-page {
   background-size: cover;
-  background-image: url("../asserts/login_bg.jpg");
+  background-image: url("/admin/public/login_bg.jpg");
   background-repeat: no-repeat;
   background-position: bottom;
 

package/src/framework/pages/index.ts

@@ -0,0 +1 @@
+export * from './LoginPage'

package/src/layouts/admin/index.jsx

@@ -99,7 +99,7 @@ export default class extends React.Component {
             <Header className='header'>
                 <div className='header-left'>
                     {siteInfo.logoUrl &&
-                        <img className='logo-img' src={siteInfo.logoUrl} onClick={() => history.push('/')} alt='logo'/>}
+                        <img className='logo-img' src='/admin/public/logo.jpg' onClick={() => history.push('/')} alt='logo'/>}
                     <h3 className='hide-on-mobile'>
                         <Link to="/" style={{color: ThemeUtils.getColor("primary-color")}}>{siteInfo.title} </Link>
                     </h3>

package/src/pages/login.jsx

@@ -1,144 +1,19 @@
 import React from 'react';
-import {Button, Form, Input, message, Space} from 'antd';
-import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
-import "./login.less"
-import {history} from 'umi';
-import {HttpUtils, MessageUtils, PageUtils, SysUtils} from "../framework";
-import {JSEncrypt} from "jsencrypt";
 
+import {LoginPage} from "../framework/pages/LoginPage";
 
-export default class login extends React.Component {
 
+export default class  extends React.Component {
 
-    state = {
-        logging: false,
 
-        siteInfo: {},
-        random:Math.random()
-    }
-    redirect ='/';
-
-    async componentDidMount() {
-        console.log('渲染登录页面')
-        const redirect = PageUtils.currentParams()['redirect']
-        if(redirect){
-            console.log('重定向参数',redirect)
-           this.redirect = decodeURIComponent(redirect)
-        }
-
-
-        {
-            // 内部系统登录
-            let token = PageUtils.currentParams().token
-            if (token) {
-                token = window.location.search
-                this.submit({token})
-            }
-        }
-
-        if (localStorage.length === 0) {
-            MessageUtils.alert('站点数据缺失，刷新当前页面...')
-            window.location.reload()
-            return
-        }
-
-        const siteInfo = SysUtils.getSiteInfo()
-        this.setState({siteInfo})
-    }
-
-
-    submit = values => {
-        this.setState({logging: true})
-
-        const pubkey = this.state.siteInfo.rsaPublicKey;
-        if(!pubkey){
-            message.error("未获取密钥，请刷新浏览器再试")
-            return
-        }
-        // 对密码加密
-        const crypt = new JSEncrypt();
-        crypt.setPublicKey(pubkey);
-        values.password = crypt.encrypt(values.password)
-
-
-        HttpUtils.postForm('/admin/auth/login', values).then(rs => {
-            console.log('登录结果', rs)
-            history.push(this.redirect)
-        }).catch(e=>{
-            console.log('登录错误', e)
-        })
-            .finally(() => {
-            this.setState({logging: false})
-        })
-    }
 
 
     render() {
-        const {siteInfo} = this.state
-
-        const pageStyle = {}
-        if(siteInfo.loginBackground){
-            let url = 'admin/sysFile/preview/' + siteInfo.loginBackground;
-            pageStyle.backgroundImage = 'url("'+url+'")'
-        }
-
-        return (
-            <section className='login-page' style={pageStyle}>
-                <div className="login-content">
-                    <h1>{siteInfo.title}</h1>
-                    <Form
-                        name="normal_login"
-                        className="login-form"
-                        initialValues={{remember: true}}
-                        onFinish={this.submit}
-                        requiredMark={false}
-                        colon={false}
-                    >
-
-                        <Form.Item name="username" rules={[{required: true, message: '请输入用户名!'}]}>
-                            <Input size='large' prefix={<UserOutlined/>} placeholder="用户名" autoComplete="off"/>
-                        </Form.Item>
-                        <Form.Item name="password" rules={[{required: true, message: '请输入密码!'}]}>
-                            <Input autoComplete="off" prefix={<LockOutlined/>} type="password" placeholder="密码"
-                                   size='large'
-                            />
-                        </Form.Item>
-
-
-                        {siteInfo.captcha && <Form.Item name='captchaCode' rules={[{required: true}]}>
-                            <Space style={{alignItems: 'center'}}>
-                                <Input size='large' placeholder='验证码' prefix={<SafetyCertificateOutlined/>}/>
-                                <img height={36} width={100}
-                                     src={"/admin/auth/captchaImage?_random=" + this.state.random} onClick={() => {
-                                    this.setState({random: Math.random()})
-                                }}></img>
-                            </Space>
-                        </Form.Item>}
 
-
-                        <Form.Item style={{marginTop: 10}}>
-                            <Button loading={this.state.logging} type="primary" htmlType="submit"
-                                    block size='large'>
-                                登录
-                            </Button>
-                        </Form.Item>
-                    </Form>
-
-                    {this.renderFormBottom()}
-
-                </div>
-            </section>
-        );
+      return <LoginPage />
     }
 
 
-    renderFormBottom() {
-        let siteInfo = this.state.siteInfo;
-        if (siteInfo.loginBoxBottomTip) {
-            return <div style={{color: 'white', marginTop: 50, fontSize: '14px', textAlign: 'center'}}>
-                <WarningOutlined/> {siteInfo.loginBoxBottomTip}
-            </div>
-        }
-    }
+
 
 }