@jiangood/admin-spring-boot-starter 0.2.3 → 0.2.5

package/package.json

@@ -7,7 +7,7 @@
     "typescript": "^5.0.0"
   },
   "peerDependencies": {
-    "@ant-design/icons": "^5.4.0",
+    "@ant-design/icons": "^6.0.0",
     "@bpmn-io/properties-panel": "^3.34.0",
     "@tinymce/tinymce-react": "^6.0.0",
     "@umijs/types": "^3.5.43",
@@ -33,7 +33,7 @@
     "!src/.umi"
   ],
   "main": "src/index.ts",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

package/src/framework/pages/LoginPageUtils.ts

@@ -8,6 +8,7 @@ export class LoginPageUtils {
 
     static postLogin(values) {
         return new Promise((resolve, reject) => {
+            console.log('开始登录')
             HttpUtils.postForm('/admin/auth/login', values).then(rs => {
                 console.log('登录结果', rs)
                 EventBusUtils.emit('loginSuccess')

package/src/framework/utils/MessageUtils.tsx

@@ -57,22 +57,24 @@ export class MessageUtils {
         const isNumber = typeof initialValue === 'number';
         return new Promise((resolve) => {
             const ref = React.createRef()
+            let element:any = isNumber ? <InputNumber placeholder={placeholder}/> : <Input placeholder={placeholder}/>;
+            const content:any = <div>
+                <div style={{marginBottom: 4}}>{message}</div>
+                <Form ref={ref}>
+                    <Form.Item name='inputValue' initialValue={initialValue}>
+                        {element}
+                    </Form.Item>
+                </Form>
+            </div>;
             this.modalApi.confirm({
                 icon: null,
                 title: '提示',
-                content: <div>
-                    <div style={{marginBottom: 4}}>{message}</div>
-                    <Form ref={ref}>
-                        <Form.Item name='inputValue' initialValue={initialValue}>
-                            {isNumber ? <InputNumber placeholder={placeholder}/> : <Input  placeholder={placeholder}/>}
-                        </Form.Item>
-                    </Form>
-                </div>,
+                content:content,
                 okText: '确定',
                 cancelText: '取消',
                 onOk: () => {
                     const form = ref.current;
-                   const values= form.getFieldsValue()
+                    const values = form.getFieldsValue()
                     resolve(values.inputValue)
                 },
                 onCancel: () => {
@@ -89,6 +91,10 @@ export class MessageUtils {
      * 成功消息
      */
     static success(content: String, duration: number = 3) {
+        if(!this.messageApi){
+            alert(content)
+            return
+        }
         this.messageApi.success(content, duration);
     }
 
@@ -96,6 +102,11 @@ export class MessageUtils {
      * 错误消息
      */
     static error(content: String, duration: number = 3) {
+        console.error('调用 MessageUtils.error',content)
+        if(!this.messageApi){
+            alert(content)
+            return
+        }
         this.messageApi.error(content, duration);
     }
 
@@ -103,6 +114,10 @@ export class MessageUtils {
      * 警告消息
      */
     static warning(content: String, duration: number = 3) {
+        if(!this.messageApi){
+            alert(content)
+            return
+        }
         this.messageApi.warning(content, duration);
     }
 
@@ -110,6 +125,10 @@ export class MessageUtils {
      * 通用消息
      */
     static info(content: React.ReactNode, duration: number = 3) {
+        if(!this.messageApi){
+            alert(content)
+            return
+        }
         this.messageApi.info(content, duration);
     }
 
@@ -135,10 +154,15 @@ export class MessageUtils {
  * antd6 推荐使用这个hooks，这里统一设置， 供公共layout使用
  * @constructor
  */
-export function MessageHolder(){
+export function MessageHolder(props){
     const [modalApi, modalContextHolder] = Modal.useModal();
     const [messageApi, messageContextHolder] = message.useMessage();
-    MessageUtils.config(messageApi,modalApi);
+
+    React.useEffect(()=>{
+        console.log('MessageHolder Rendered')
+        MessageUtils.config(messageApi,modalApi);
+        props.onFinish()
+    },[])
     return <>
         {modalContextHolder} {messageContextHolder}
     </>

package/src/layouts/index.jsx

@@ -5,7 +5,15 @@ import {ConfigProvider} from "antd";
 
 import {Outlet, withRouter} from "umi";
 import zhCN from 'antd/locale/zh_CN';
-import {ArrUtils, HttpUtils, MessageHolder, PageLoading, PageUtils, SysUtils, ThemeUtils,} from "../framework";
+import {
+    ArrUtils,
+    HttpUtils,
+    MessageHolder,
+    PageLoading,
+    PageUtils,
+    SysUtils,
+    ThemeUtils,
+} from "../framework";
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 
@@ -21,24 +29,28 @@ class _Layouts extends React.Component {
 
 
     state = {
+        messageHolderInit:false,
         siteInfoLoading: true,
         loginInfoFinish: false
     }
 
+    onMessageHolderFinish = () => {
+        this.loadSiteInfo()
+        this.setState({messageHolderInit:true});
+    }
+
 
-    componentDidMount() {
+    loadSiteInfo = () => {
         HttpUtils.get("/admin/public/site-info").then(rs => {
             SysUtils.setSiteInfo(rs)
             this.setState({siteInfoLoading: false})
-
             this.loadLoginInfo()
         })
-    }
+    };
 
     componentDidUpdate(prevProps, prevState, snapshot) {
         const pre = prevProps.location.pathname
         const cur = this.props.location.pathname
-
         if (pre !== cur) {
             this.loadLoginInfo()
         }
@@ -46,7 +58,10 @@ class _Layouts extends React.Component {
 
     isSimplePage() {
         let {pathname} = this.props.location;
-        return ArrUtils.contains(SIMPLE_URLS, pathname)
+        let isSimplePage = ArrUtils.contains(SIMPLE_URLS, pathname);
+        console.log('简单页面列表定义', SIMPLE_URLS)
+        console.log('当前页面是否简单页面',pathname,isSimplePage)
+        return isSimplePage
     }
 
     loadLoginInfo = () => {
@@ -74,11 +89,6 @@ class _Layouts extends React.Component {
             })
     }
 
-
-
-
-
-
     render() {
         return <ConfigProvider
             input={{autoComplete: 'off'}}
@@ -112,23 +122,25 @@ class _Layouts extends React.Component {
                         triggerBg: ThemeUtils.getColor("primary-color-click"),
                         headerBg: 'white',
                         triggerHeight: 32
-                    },
-
-
+                    }
                 }
             }}>
 
             {this.renderContent()}
-
-            <MessageHolder />
-
         </ConfigProvider>
     }
 
+
     renderContent = () => {
+        if(!this.state.messageHolderInit) {
+            console.log('先加载message holder')
+            return <MessageHolder onFinish={this.onMessageHolderFinish} />
+        }
+
         if (this.state.siteInfoLoading) {
             return <PageLoading message='加载站点信息...'/>
         }
+        
         let {params = {}} = this.props.location;
         console.log('layout: params', params)
         let simple = this.isSimplePage();
@@ -140,14 +152,11 @@ class _Layouts extends React.Component {
             return <PageLoading message='加载登录信息...'/>
         }
 
-
         return <AdminLayout path={this.state.path} logo={this.props.logo}/>
     };
-
-
-
 }
 
+
 export const Layouts = withRouter(_Layouts);
 export default Layouts
 export * from './PageRender'