@jiangood/open-admin 3.0.2 → 3.0.4

package/package.json

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

package/src/framework/biz/OrgTree.tsx

@@ -22,7 +22,7 @@ export class OrgTree extends React.Component<OrgTreeProps, OrgTreeState> {
     }
 
     componentDidMount() {
-        HttpUtils.get('admin/sysOrg/dept-tree').then(tree => {
+        HttpUtils.get('admin/sysOrg/tree').then(tree => {
             this.setState({treeData: tree, treeDataLoading: false})
         })
     }

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

@@ -49,6 +49,8 @@ export interface ProTableProps<T = any> {
     searchFormRender?: () => React.ReactNode;
     scrollY?: number | string;
     bordered?: boolean;
+    /** 树形数据模式，关闭分页且不传 page/size 参数 */
+    treeMode?: boolean;
 }
 
 interface ProTableState<T = any> {
@@ -131,10 +133,12 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
     }
 
     loadData = () => {
-        const {request} = this.props
+        const {request, treeMode} = this.props
         const params = {...this.state.params}
-        params.size = this.state.pageSize
-        params.page = this.state.current
+        if (!treeMode) {
+            params.size = this.state.pageSize
+            params.page = this.state.current
+        }
 
         const {sorter} = this.state
 
@@ -200,7 +204,7 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
                     size={this.state.tableSize}
                     rowSelection={this.getRowSelectionProps(rowSelection)}
                     scroll={{x: 'max-content', y: this.state.scrollY}}
-                    pagination={{
+                    pagination={this.props.treeMode ? false : {
                         showSizeChanger: true,
                         total: this.state.total,
                         pageSize: this.state.pageSize,
@@ -210,11 +214,15 @@ export class ProTable<T = any> extends React.Component<ProTableProps<T>, ProTabl
                     }}
 
                     onChange={(pagination, filters, sorter, extra) => {
-                        this.setState({
-                            current: pagination.current,
-                            pageSize: pagination.pageSize,
-                            sorter
-                        }, this.loadData)
+                        if (this.props.treeMode) {
+                            this.setState({sorter}, this.loadData)
+                        } else {
+                            this.setState({
+                                current: pagination.current,
+                                pageSize: pagination.pageSize,
+                                sorter
+                            }, this.loadData)
+                        }
                     }}
 
                     footer={this.state.extData.summary ? () => this.state.extData.summary : null}

package/src/framework/fields/FieldSysOrgTreeSelect/index.tsx

@@ -1,6 +1,3 @@
-/**
- * 组织机构树选择器
- */
 import React from "react";
 import {FieldRemoteTreeSelect} from "../FieldRemoteTreeSelect";
 import type {FieldProps} from '../types';
@@ -17,11 +14,13 @@ export class FieldSysOrgTreeSelect extends React.Component<FieldSysOrgTreeSelect
 
     render() {
         const {type, ...rest} = this.props;
-        const url = type === 'dept'?
-            '/admin/sysOrg/dept-tree':
-            '/admin/sysOrg/unit-tree';
+        let url = '/admin/sysOrg/dept-tree';
+        if (type === 'unit') {
+            url = '/admin/sysOrg/unit-tree';
+        } else if (type === 'shop') {
+            url = '/admin/sysOrg/tree?type=3';
+        }
 
         return <FieldRemoteTreeSelect url={url} {...rest}/>;
     }
-
-}
+}

package/src/layouts/admin/index.jsx

@@ -153,6 +153,12 @@ export default class extends React.Component {
         PageUtils.open(path, menu.name);
     }
 
+    getActiveTopMenu() {
+        const {topMenus, activeTopMenuKey} = this.state;
+        if (!activeTopMenuKey || !topMenus) return null;
+        return topMenus.find(t => t.key === activeTopMenuKey) || null;
+    }
+
     renderTopMenu = () => {
         if (this.state.menuLoading) return null;
         const {topMenus, activeTopMenuKey} = this.state;
@@ -198,6 +204,10 @@ return <Layout className='main-layout'>
                         <div key={a.code} className='item' style={{cursor: 'pointer', padding: '0 12px', whiteSpace: 'nowrap'}}
                              onClick={() => PageUtils.open('/article/' + a.code, a.title)}>{a.title}</div>
                     ))}
+                    {this.props.headerExtra?.({
+                        activeTopMenu: this.getActiveTopMenu(),
+                        loginInfo: this.props.loginInfo,
+                    })}
                     <HeaderRight/>
                 </Header>
 

package/src/layouts/index.tsx

@@ -22,7 +22,16 @@ const configProps = {
     theme: getThemeConfig(),
 };
 
-export class Layouts extends React.Component {
+export interface HeaderExtraContext {
+    activeTopMenu: { key: string; label: string } | null;
+    loginInfo: { id: string; name: string; account: string };
+}
+
+interface LayoutsProps {
+    headerExtra?: (context: HeaderExtraContext) => React.ReactNode;
+}
+
+export class Layouts extends React.Component<LayoutsProps> {
     state = {
         location: history.location,
         siteInfoLoaded: false,
@@ -119,7 +128,7 @@ export class Layouts extends React.Component {
         return (
             <ErrorBoundary minimal>
                 <ConfigProvider {...configProps}>
-                    {showPageFrame ? <PageFrame url={pathname + search}/> : ready ? <AdminLayout/> : (
+                    {showPageFrame ? <PageFrame url={pathname + search}/> : ready ? <AdminLayout headerExtra={this.props.headerExtra} loginInfo={GlobalData.getLoginInfo()}/> : (
                         <PageLoading messages={[
                             !siteInfoLoaded && '加载站点信息...',
                             !loginChecked && '检查登录中...',

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

@@ -3,7 +3,7 @@ import {Button, Card, Checkbox, Descriptions, Form, Input, InputNumber, Popconfi
 import React from 'react';
 import {
     FieldBoolean,
-    FieldDictSelect,
+    FieldRemoteSelect,
     FieldRemoteTreeSelect,
     FieldUserSelect,
     FormModal, Gap,
@@ -185,7 +185,7 @@ export default class extends React.Component {
                     <InputNumber/>
                 </Form.Item>
                 <Form.Item label='类型' name='type' rules={[{required: true}]}>
-                    <FieldDictSelect typeCode='orgType'/>
+                    <FieldRemoteSelect url='admin/sysOrg/type-options' placeholder='请选择类型'/>
                 </Form.Item>
                 <Form.Item label='部门领导' name={['leader', 'id']}>
                     <FieldUserSelect/>

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

@@ -57,7 +57,7 @@ export default class extends React.Component {
     }
 
     handleEdit = record => {
-        this.modalRef.current.open({...record, deptId: record.deptId || record.unitId})
+        this.modalRef.current.open({...record, orgId: record.orgId || record.unitId})
     }
 
     columns = [
@@ -66,8 +66,8 @@ export default class extends React.Component {
             dataIndex: 'unitLabel',
         },
         {
-            title: '部门',
-            dataIndex: 'deptLabel',
+            title: '机构',
+            dataIndex: 'orgLabel',
         },
         {
             title: '姓名',
@@ -205,7 +205,7 @@ export default class extends React.Component {
 
             <FormModal ref={this.modalRef} title='系统用户' onFinish={this.onFinish}>
 
-                <Form.Item label='所属机构' name='deptId' rules={[{required: true}]}>
+                <Form.Item label='所属机构' name='orgId' rules={[{required: true}]}>
                     <FieldSysOrgTreeSelect/>
                 </Form.Item>