@jiangood/admin-spring-boot-starter 0.2.2 → 0.2.4

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.2",
+  "version": "0.2.4",
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

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

@@ -3,9 +3,10 @@ import React, {ReactNode} from "react";
 export interface LoginPageProps {
 
     /**
-     * 覆盖表单
+     * 表单渲染
+     * @param origForm 原始表单
      */
-    form?: ReactNode
+    formRender?: (originalForm: ReactNode) => ReactNode
 
 
 }

package/src/framework/pages/LoginPage.jsx

@@ -74,12 +74,10 @@ export class LoginPage extends React.Component {
     }
 
 
-    getForm(siteInfo) {
-        if(this.props.form){
-            return this.props.form;
-        }
+    getForm = siteInfo => {
+
 
-        return <Form
+        const form = <Form
             name="normal_login"
             className="login-form"
             initialValues={{remember: true}}
@@ -118,7 +116,12 @@ export class LoginPage extends React.Component {
                 </Button>
             </Form.Item>
         </Form>;
-    }
+
+        if(this.props.formRender){
+            return this.props.formRender(form);
+        }
+        return form;
+    };
 
     renderFormBottom() {
         let siteInfo = this.state.siteInfo;

package/src/layouts/index.jsx

@@ -112,16 +112,11 @@ class _Layouts extends React.Component {
                         triggerBg: ThemeUtils.getColor("primary-color-click"),
                         headerBg: 'white',
                         triggerHeight: 32
-                    },
-
-
+                    }
                 }
             }}>
-
-            {this.renderContent()}
-
             <MessageHolder />
-
+            {this.renderContent()}
         </ConfigProvider>
     }