@jiangood/open-admin 3.0.0 → 3.0.2

package/package.json

@@ -48,5 +48,5 @@
     "test:e2e": "playwright test",
     "test:e2e:ui": "playwright test --ui"
   },
-  "version": "3.0.0"
+  "version": "3.0.2"
 }

package/src/framework/components/DownloadModal/index.tsx

@@ -9,7 +9,7 @@ import axios from "axios";
 import qs from 'qs';
 
 const axiosInstance = axios.create({
-  baseURL: import.meta.env.VITE_SERVLET_CONTEXT || '',
+  baseURL: import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH,
   withCredentials: true,
   headers: {'Content-Type': 'application/json'},
   paramsSerializer: (params) => qs.stringify(params, {indices: false})

package/src/framework/router/PageFrame.tsx

@@ -6,9 +6,28 @@ import ErrorBoundary from '../components/ErrorBoundary';
 
 interface PageFrameProps {
     url: string;
+    show?: boolean;
 }
 
 export class PageFrame extends React.Component<PageFrameProps> {
+    componentRef = React.createRef<any>();
+
+    componentDidMount() {
+        this.callOnShowIfActive();
+    }
+
+    componentDidUpdate(prevProps: PageFrameProps) {
+        if (!prevProps.show && this.props.show) {
+            this.callOnShowIfActive();
+        }
+    }
+
+    callOnShowIfActive() {
+        if (this.props.show && this.componentRef.current?.onShow) {
+            this.componentRef.current.onShow();
+        }
+    }
+
     render() {
         const {url} = this.props;
         const qIndex = url.indexOf('?');
@@ -21,7 +40,7 @@ export class PageFrame extends React.Component<PageFrameProps> {
         if (matched) {
             const {component: Comp, params} = matched;
             const location = {pathname, search, query: UrlUtils.getParams(url)};
-            content = <Comp params={params} location={location}/>;
+            content = <Comp ref={this.componentRef} params={params} location={location}/>;
         } else {
             content = <Result status={404} title='页面不存在！' subTitle={<div>路由地址：{pathname}</div>}/>;
         }

package/src/framework/utils/UrlUtils.ts

@@ -65,7 +65,7 @@ export class UrlUtils {
      * 为路径添加 SERVLET_CONTEXT 前缀
      */
     static contextPath(path: string): string {
-        const base = import.meta.env.VITE_SERVLET_CONTEXT || '';
+        const base = import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH;
         return base + path;
     }
 }

package/src/framework/utils/system/HttpUtils.ts

@@ -10,7 +10,7 @@ interface RequestOptions extends AxiosRequestConfig {
 }
 
 const axiosInstance = axios.create({
-    baseURL: import.meta.env.VITE_SERVLET_CONTEXT || '',
+    baseURL: import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH,
     withCredentials: true,
     headers: { 'Content-Type': 'application/json' },
     paramsSerializer: (params: Record<string, unknown>) => qs.stringify(params, {indices: false})

package/src/layouts/admin/TabLayout.jsx

@@ -113,7 +113,7 @@ export class TabLayout extends React.Component {
                 <div style={{flex: 1, overflow: 'hidden'}}>
                     {tabs.map(t => (
                         <div key={t.key} style={{display: t.key === activeKey ? 'block' : 'none', height: '100%'}}>
-                            <PageFrame key={t.refreshKey} url={t.key}/>
+                            <PageFrame key={t.refreshKey} url={t.key} show={t.key === activeKey}/>
                         </div>
                     ))}
                 </div>

package/src/pages/system/role/index.jsx

@@ -8,6 +8,7 @@ export default class extends React.Component {
 
     state = {
         usersModalOpen: false,
+        usersModalLoading: false,
         selectedRecord: null,
 
         userList: [],
@@ -132,12 +133,15 @@ export default class extends React.Component {
     ]
 
     handleSaveUsers = () => {
+        this.setState({usersModalLoading: true})
         const params = {
             id: this.state.selectedRecord.id,
             userIdList: this.state.targetKeys
         }
         HttpUtils.post('admin/sysRole/grant-users', params).then(rs => {
-            this.setState({usersModalOpen: false})
+            this.setState({usersModalOpen: false, usersModalLoading: false})
+        }).catch(() => {
+            this.setState({usersModalLoading: false})
         })
     }
 
@@ -213,6 +217,7 @@ export default class extends React.Component {
 
             <Modal title={'角色用户' + "【" + this.state.selectedRecord?.name + '】'}
                    open={this.state.usersModalOpen}
+                   confirmLoading={this.state.usersModalLoading}
                    destroyOnHidden
                    mask={{ closable: false }}
                    width={800}