@jiangood/open-admin 1.3.4 → 2.0.1

package/src/.umi-production/core/route.tsx

@@ -19,27 +19,25 @@ if (process.env.NODE_ENV === 'development') {
 import React from 'react';
 
 export async function getRoutes() {
-  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"userCenter/ChangePassword":{"path":"userCenter/ChangePassword","id":"userCenter/ChangePassword","parentId":"@@/global-layout"},"system/sysManual/index":{"path":"system/sysManual","id":"system/sysManual/index","parentId":"@@/global-layout"},"system/user/UserPerm":{"path":"system/user/UserPerm","id":"system/user/UserPerm","parentId":"@@/global-layout"},"userCenter/message":{"path":"userCenter/message","id":"userCenter/message","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"userCenter/manual":{"path":"userCenter/manual","id":"userCenter/manual","parentId":"@@/global-layout"},"system/api/index":{"path":"system/api","id":"system/api/index","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"system/role/perm":{"path":"system/role/perm","id":"system/role/perm","parentId":"@@/global-layout"},"userCenter/index":{"path":"userCenter","id":"userCenter/index","parentId":"@@/global-layout"},"test/views":{"path":"test/views","id":"test/views","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
+  const routes = {"404":{"path":"*","id":"404","parentId":"@@/global-layout"},"userCenter/ChangePassword":{"path":"userCenter/ChangePassword","id":"userCenter/ChangePassword","parentId":"@@/global-layout"},"system/user/UserPerm":{"path":"system/user/UserPerm","id":"system/user/UserPerm","parentId":"@@/global-layout"},"system/manual/index":{"path":"system/manual","id":"system/manual/index","parentId":"@@/global-layout"},"userCenter/message":{"path":"userCenter/message","id":"userCenter/message","parentId":"@@/global-layout"},"system/dict/index":{"path":"system/dict","id":"system/dict/index","parentId":"@@/global-layout"},"system/file/index":{"path":"system/file","id":"system/file/index","parentId":"@@/global-layout"},"system/role/index":{"path":"system/role","id":"system/role/index","parentId":"@@/global-layout"},"system/user/index":{"path":"system/user","id":"system/user/index","parentId":"@@/global-layout"},"userCenter/manual":{"path":"userCenter/manual","id":"userCenter/manual","parentId":"@@/global-layout"},"system/job/index":{"path":"system/job","id":"system/job/index","parentId":"@@/global-layout"},"system/log/index":{"path":"system/log","id":"system/log/index","parentId":"@@/global-layout"},"system/org/index":{"path":"system/org","id":"system/org/index","parentId":"@@/global-layout"},"system/role/perm":{"path":"system/role/perm","id":"system/role/perm","parentId":"@@/global-layout"},"userCenter/index":{"path":"userCenter","id":"userCenter/index","parentId":"@@/global-layout"},"about":{"path":"about","id":"about","parentId":"@@/global-layout"},"index":{"path":"/","id":"index","parentId":"@@/global-layout"},"login":{"path":"login","id":"login","parentId":"@@/global-layout"},"@@/global-layout":{"id":"@@/global-layout","path":"/","isLayout":true}} as const;
   return {
     routes,
     routeComponents: {
 '404': React.lazy(() => import(/* webpackChunkName: "src__pages__404" */'../../../src/pages/404.jsx')),
 'userCenter/ChangePassword': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__ChangePassword" */'../../../src/pages/userCenter/ChangePassword.jsx')),
-'system/sysManual/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__sysManual__index" */'../../../src/pages/system/sysManual/index.jsx')),
 'system/user/UserPerm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__user__UserPerm" */'../../../src/pages/system/user/UserPerm.jsx')),
+'system/manual/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__manual__index" */'../../../src/pages/system/manual/index.jsx')),
 'userCenter/message': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__message" */'../../../src/pages/userCenter/message.jsx')),
 'system/dict/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__dict__index" */'../../../src/pages/system/dict/index.jsx')),
 'system/file/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__file__index" */'../../../src/pages/system/file/index.jsx')),
 'system/role/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__index" */'../../../src/pages/system/role/index.jsx')),
 'system/user/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__user__index" */'../../../src/pages/system/user/index.jsx')),
 'userCenter/manual': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__manual" */'../../../src/pages/userCenter/manual.jsx')),
-'system/api/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__api__index" */'../../../src/pages/system/api/index.jsx')),
 'system/job/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__job__index" */'../../../src/pages/system/job/index.jsx')),
 'system/log/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__log__index" */'../../../src/pages/system/log/index.jsx')),
 'system/org/index': React.lazy(() => import(/* webpackChunkName: "src__pages__system__org__index" */'../../../src/pages/system/org/index.jsx')),
 'system/role/perm': React.lazy(() => import(/* webpackChunkName: "src__pages__system__role__perm" */'../../../src/pages/system/role/perm.jsx')),
 'userCenter/index': React.lazy(() => import(/* webpackChunkName: "src__pages__userCenter__index" */'../../../src/pages/userCenter/index.jsx')),
-'test/views': React.lazy(() => import(/* webpackChunkName: "src__pages__test__views" */'../../../src/pages/test/views.jsx')),
 'about': React.lazy(() => import(/* webpackChunkName: "src__pages__about" */'../../../src/pages/about.jsx')),
 'index': React.lazy(() => import(/* webpackChunkName: "src__pages__index" */'../../../src/pages/index.jsx')),
 'login': React.lazy(() => import(/* webpackChunkName: "src__pages__login" */'../../../src/pages/login.jsx')),

package/src/.umi-production/exports.ts

@@ -7,10 +7,10 @@ export type { RuntimeConfig } from './core/defineApp'
 // plugins
 // plugins types.d.ts
 // @umijs/renderer-*
-export { createBrowserHistory, createHashHistory, createMemoryHistory, Helmet, HelmetProvider, createSearchParams, generatePath, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, useAppData, useClientLoaderData, useLoaderData, useRouteProps, useSelectedRoutes, useServerLoaderData, renderClient, __getRoot, Link, useRouteData, __useFetcher, withRouter } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.51_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
-export type { History, ClientLoader } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.51_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react'
+export { createBrowserHistory, createHashHistory, createMemoryHistory, Helmet, HelmetProvider, createSearchParams, generatePath, matchPath, matchRoutes, Navigate, NavLink, Outlet, resolvePath, useLocation, useMatch, useNavigate, useOutlet, useOutletContext, useParams, useResolvedPath, useRoutes, useSearchParams, useAppData, useClientLoaderData, useLoaderData, useRouteProps, useSelectedRoutes, useServerLoaderData, renderClient, __getRoot, Link, useRouteData, __useFetcher, withRouter } from '/home/runner/work/open-admin/open-admin/web/node_modules/@umijs/renderer-react';
+export type { History, ClientLoader } from '/home/runner/work/open-admin/open-admin/web/node_modules/@umijs/renderer-react'
 // umi/client/client/plugin
-export { ApplyPluginsType, PluginManager } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/umi@4.6.51_@babel+core@7.29.0_@types+node@25.6.0_@types+react@19.2.14_eslint@8.57.1_lig_f1c7f91a64c199a5f22b4d6a795e45de/node_modules/umi/client/client/plugin.js';
+export { ApplyPluginsType, PluginManager } from '/home/runner/work/open-admin/open-admin/web/node_modules/umi/client/client/plugin.js';
 export { history, createHistory } from './core/history';
 export { terminal } from './core/terminal';
 // react ssr

package/src/.umi-production/testBrowser.tsx

@@ -3,7 +3,7 @@
 // DO NOT CHANGE IT MANUALLY!
 import React, { useEffect, useState } from 'react';
 import { ApplyPluginsType } from 'umi';
-import { renderClient, RenderClientOpts } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.51_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
+import { renderClient, RenderClientOpts } from '/home/runner/work/open-admin/open-admin/web/node_modules/@umijs/renderer-react';
 import { createHistory } from './core/history';
 import { createPluginManager } from './core/plugin';
 import { getRoutes } from './core/route';

package/src/.umi-production/tsconfig.json

@@ -26,7 +26,7 @@
         "../../src/.umi/*"
       ],
       "umi": [
-        "../../node_modules/.pnpm/umi@4.6.51_@babel+core@7.29.0_@types+node@25.6.0_@types+react@19.2.14_eslint@8.57.1_lig_f1c7f91a64c199a5f22b4d6a795e45de/node_modules/umi"
+        "../../node_modules/umi"
       ],
       "umi/typings": [
         "../../src/.umi/typings"

package/src/.umi-production/umi.ts

@@ -3,7 +3,7 @@
 // DO NOT CHANGE IT MANUALLY!
 import './core/polyfill';
 
-import { renderClient } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/@umijs+renderer-react@4.6.51_react-dom@18.3.1_react@18.3.1__react@18.3.1/node_modules/@umijs/renderer-react';
+import { renderClient } from '/home/runner/work/open-admin/open-admin/web/node_modules/@umijs/renderer-react';
 import { getRoutes } from './core/route';
 import { createPluginManager } from './core/plugin';
 import { createHistory } from './core/history';
@@ -78,6 +78,6 @@ render();
 
     if (typeof window !== 'undefined') {
       window.g_umi = {
-        version: '4.6.51',
+        version: '4.6.55',
       };
     }

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

@@ -0,0 +1,86 @@
+import React from 'react';
+import {Button, Collapse, Result} from 'antd';
+import {ThemeUtils} from '../../utils';
+
+interface Props {
+    children: React.ReactNode;
+    /** 自定义降级 UI */
+    fallback?: React.ReactNode;
+    /** 错误回调，可用于上报 */
+    onError?: (error: Error, errorInfo: React.ErrorInfo) => void;
+}
+
+interface State {
+    hasError: boolean;
+    error: Error | null;
+    errorInfo: React.ErrorInfo | null;
+}
+
+export default class ErrorBoundary extends React.Component<Props, State> {
+
+    state: State = {
+        hasError: false,
+        error: null,
+        errorInfo: null,
+    };
+
+    static getDerivedStateFromError(error: Error) {
+        return {hasError: true, error};
+    }
+
+    componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
+        this.setState({errorInfo});
+        this.props.onError?.(error, errorInfo);
+    }
+
+    handleRetry = () => {
+        this.setState({hasError: false, error: null, errorInfo: null});
+    };
+
+    render() {
+        if (!this.state.hasError) {
+            return this.props.children;
+        }
+
+        if (this.props.fallback) {
+            return this.props.fallback;
+        }
+
+        const detailStyle: React.CSSProperties = {
+            maxHeight: 300, overflow: 'auto',
+            fontSize: 12, fontFamily: 'monospace',
+            whiteSpace: 'pre-wrap', wordBreak: 'break-all',
+            background: '#f5f5f5', padding: 12, borderRadius: 4,
+            color: ThemeUtils.getColor('error-color') || '#ff4d4f',
+        };
+
+        return (
+            <Result
+                status="error"
+                title="页面渲染异常"
+                subTitle="组件渲染时发生错误，请尝试刷新页面。"
+                extra={[
+                    <Button key="retry" type="primary" onClick={this.handleRetry}>
+                        重试
+                    </Button>,
+                    <Button key="refresh" onClick={() => window.location.reload()}>
+                        刷新页面
+                    </Button>,
+                ]}
+            >
+                <Collapse
+                    size="small"
+                    items={[{
+                        key: 'detail',
+                        label: '错误详情',
+                        children: (
+                            <div style={detailStyle}>
+                                {this.state.error?.stack || String(this.state.error)}
+                            </div>
+                        ),
+                    }]}
+                />
+            </Result>
+        );
+    }
+}

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

@@ -0,0 +1,42 @@
+import React from "react";
+
+const SizeMap = {
+  xs: 4,
+  sm: 8,
+  md: 16,
+  lg: 24,
+  xl: 32,
+  xxl: 40,
+};
+
+type GapProps = {
+  size?: keyof typeof SizeMap;
+  direction?: "horizontal" | "vertical";
+} & React.HTMLAttributes<HTMLDivElement>;
+
+/**
+ * 上下间隔
+ */
+export const Gap: React.FC<GapProps> = ({
+  size = "md",
+  direction = "vertical",
+  ...rest
+}) => {
+  if (size && !Object.hasOwn(SizeMap, size)) {
+    throw new Error(
+      `Gap: size 属性必须为 [${Object.keys(SizeMap).join(", ")}] 之一，当前传入：${size}`
+    );
+  }
+
+  const sizePx = SizeMap[size];
+  const isHorizontal = direction === "horizontal";
+
+  const style: React.CSSProperties = {
+    display: isHorizontal ? "inline-block" : "block",
+    width: isHorizontal ? sizePx : 0,
+    height: isHorizontal ? 0 : sizePx,
+    ...rest.style,
+  };
+
+  return <div style={style} {...rest} />;
+};

package/src/framework/components/NamedIcon/index.d.ts

@@ -1,5 +1,7 @@
-declare type NamedIconProps = {
-    name: string
-};
+import React from 'react';
 
-export function NamedIcon(props:NamedIconProps);
+type NamedIconProps = {
+    name: string;
+} & React.ComponentProps<typeof import('@ant-design/icons').WarningOutlined>;
+
+export function NamedIcon(props: NamedIconProps): React.ReactElement;

package/src/framework/components/NamedIcon/index.jsx

@@ -1,11 +1,14 @@
 import * as Icons from '@ant-design/icons';
+import { WarningOutlined } from '@ant-design/icons';
 
-export function NamedIcon(props){
-    let {name, ...rest} = props;
-    const IconType = Icons[name]
+export function NamedIcon(props) {
+    const {name, ...rest} = props;
+    const IconType = Icons[name];
 
-    if(IconType){
-        return <IconType {...rest}></IconType>
+    if (IconType) {
+        return <IconType {...rest}></IconType>;
     }
 
-}
+    console.warn(`NamedIcon: icon "${name}" not found, using fallback`);
+    return <WarningOutlined {...rest} />;
+}

package/src/framework/components/OrgTree/{index.jsx → index.tsx}

@@ -3,39 +3,33 @@ import React from 'react';
 import * as Icons from '@ant-design/icons';
 import {HttpUtils} from "../../utils";
 
-
-export  class OrgTree  extends React.Component {
+export class OrgTree extends React.Component<any, any> {
 
     state = {
         treeDataLoading: true,
         treeData: [],
-
         currentOrgId: null
     }
 
-
     componentDidMount() {
-        HttpUtils.get('admin/sysOrg/deptTree').then(tree => {
-            this.setState({treeData: tree,treeDataLoading: false})
+        HttpUtils.get('admin/sysOrg/dept-tree').then(tree => {
+            this.setState({treeData: tree, treeDataLoading: false})
         })
     }
 
-
     onSelectOrg = orgIds => {
-        let orgId = orgIds[0] || null;
+        const orgId = orgIds[0] || null;
         this.props.onChange(orgId)
     }
 
-
     render() {
-        let {treeData, treeDataLoading} = this.state
+        const {treeData, treeDataLoading} = this.state
         if (treeDataLoading) {
             return <Skeleton title='加载中...'/>
         }
 
         if (treeData.length === 0) {
-            return <Alert type={"warning"} message={'组织机构数据为空'}>
-            </Alert>
+            return <Alert type={"warning"} message={'组织机构数据为空'}/>
         }
 
         return <Tree
@@ -44,15 +38,12 @@ export  class OrgTree  extends React.Component {
             onSelect={this.onSelectOrg}
             showIcon
             blockNode
-            icon={item=>{
-                const icon =  Icons[item.iconName]
-                if(icon){
+            icon={item => {
+                const icon = Icons[item.iconName]
+                if (icon) {
                     return React.createElement(icon)
                 }
             }}
-        >
-        </Tree>
+        />
     }
-
-
 }

package/src/framework/components/PageLoading/{index.jsx → index.tsx}

@@ -2,8 +2,7 @@ import React from "react";
 import {Alert, Spin} from "antd";
 import {ThemeUtils} from "../../utils";
 
-
-export function PageLoading(props) {
+export function PageLoading(props: { message?: string }) {
     const msg = props.message || '页面加载中...';
 
     return <div style={{
@@ -18,8 +17,6 @@ export function PageLoading(props) {
             <div style={{marginTop: '1rem'}}>
                 <Alert title={msg}></Alert>
             </div>
-
-
         </div>
-    </div>
+    </div>;
 }

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

@@ -52,7 +52,7 @@ export class ProModal extends React.Component<ProModalProps, any> {
     return (
       <Modal
         maskClosable={false}
-        destroyOnHidden
+        destroyOnClose
         title={this.props.title}
         open={this.state.visible}
         onCancel={this.hide}

package/src/framework/components/ProTable/components/ToolBar/{index.jsx → index.tsx}

@@ -7,7 +7,7 @@ import React from 'react';
 import './index.less';
 import {DateUtils, PageUtils, StorageUtils} from "../../../../utils";
 
-export default class Toolbar extends React.Component {
+export class Toolbar extends React.Component {
 
     state = {
         // 查询历史的模态框
@@ -55,7 +55,7 @@ export default class Toolbar extends React.Component {
                       open={this.state.historyOpen}
                       onCancel={() => this.setState({historyOpen: false})}
                       footer={null}
-                      destroyOnHidden
+                      destroyOnClose
         >
 
             <Table
@@ -104,7 +104,7 @@ export default class Toolbar extends React.Component {
             return
         }
         const list = StorageUtils.get(this.getParamKey()) || []
-        let data = {time: DateUtils.now(), params};
+        const data = {time: DateUtils.now(), params};
         list.unshift(data)
         if (list.length > 5) {
             list.pop()

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

@@ -6,7 +6,7 @@
 
     .form-item-double-width {
       .ant-form-item-control {
-        flex: 0 0 480px !important;
+        flex: 0 0 480px;
       }
     }
   }

package/src/framework/components/ProTable/{index.jsx → index.tsx}

@@ -1,10 +1,12 @@
-import {Button, Form, Table} from 'antd';
-import Toolbar from './components/ToolBar';
 import React from "react";
-import './index.less'
+import {Button, Form, Table} from 'antd';
 import {SearchOutlined} from "@ant-design/icons";
+
+import { Toolbar } from './components/ToolBar';
 import {StringUtils} from "../../utils";
 
+import './index.less'
+
 
 export class ProTable extends React.Component {
 
@@ -58,7 +60,7 @@ export class ProTable extends React.Component {
             }
         }
 
-        let scrollY = this.props.scrollY;
+        const scrollY = this.props.scrollY;
         if (scrollY) {
             this.setState({scrollY: scrollY})
         }
@@ -101,7 +103,7 @@ export class ProTable extends React.Component {
         const {selectedRows} = this.state
         for (let i = 0; i < selectedRows.length; i++) {
             for (let newItem of list) {
-                let oldItem = selectedRows[i];
+                const oldItem = selectedRows[i];
                 if (oldItem[rowKey] === newItem[rowKey]) {
                     selectedRows[i] = newItem;
                     break
@@ -210,7 +212,7 @@ export class ProTable extends React.Component {
         if (!toolBarRender) {
             return
         }
-        let {selectedRows, selectedRowKeys, params} = this.state;
+        const {selectedRows, selectedRowKeys, params} = this.state;
         return toolBarRender(params, {
             selectedRows: selectedRows,
             selectedRowKeys: selectedRowKeys,
@@ -224,7 +226,7 @@ export class ProTable extends React.Component {
         if (rowSelection === true) {
             rowSelection = {}
         }
-        let {type, onChange: inputOnChange} = rowSelection
+        const {type, onChange: inputOnChange} = rowSelection
 
 
         return {

package/src/framework/components/ProTable/utils/index.ts

@@ -0,0 +1,62 @@
+import type { MutableRefObject } from 'react';
+
+interface PageInfo {
+    current: number;
+    pageSize: number;
+    total: number;
+}
+
+interface ActionType {
+    pageInfo: PageInfo;
+    reload: () => void;
+    reset: () => void;
+    setPageInfo: (info: Partial<PageInfo>) => void;
+}
+
+interface ActionProps {
+    onCleanSelected: () => void;
+    resetAll: () => void;
+}
+
+interface UserAction {
+    pageInfo: PageInfo;
+    reload: (resetPageIndex?: boolean) => Promise<void>;
+    reloadAndRest: () => Promise<void>;
+    reset: () => Promise<void>;
+    clearSelected: () => void;
+    setPageInfo: (rest: Partial<PageInfo>) => void;
+}
+
+/**
+ * 获取用户的 action 信息
+ */
+export function useActionType(
+    ref: MutableRefObject<UserAction | undefined>,
+    action: ActionType,
+    props: ActionProps,
+): void {
+    /** 这里生成action的映射，保证 action 总是使用的最新 只需要渲染一次即可 */
+    const userAction: UserAction = {
+        pageInfo: action.pageInfo,
+        reload: async (resetPageIndex) => {
+            if (resetPageIndex) {
+                await action.setPageInfo({ current: 1 });
+            }
+            action?.reload();
+        },
+        reloadAndRest: async () => {
+            props.onCleanSelected();
+            await action.setPageInfo({ current: 1 });
+            await action?.reload();
+        },
+        reset: async () => {
+            await props.resetAll();
+            await action?.reset?.();
+            await action?.reload();
+        },
+        clearSelected: () => props.onCleanSelected(),
+        setPageInfo: (rest) => action.setPageInfo(rest),
+    };
+    // eslint-disable-next-line no-param-reassign
+    ref.current = userAction;
+}

package/src/framework/components/RoleTree/{index.jsx → index.tsx}

@@ -3,48 +3,38 @@ import React from 'react';
 import {SolutionOutlined} from '@ant-design/icons';
 import {HttpUtils} from "../../utils";
 
-
-export  class RoleTree  extends React.Component {
+export class RoleTree extends React.Component<any, any> {
 
     state = {
         treeDataLoading: true,
         treeData: [],
-
         currentOrgId: null
     }
 
-
     componentDidMount() {
-        HttpUtils.get('admin/sysRole/bizTree').then(tree => {
-            this.setState({treeData: tree,treeDataLoading: false})
+        HttpUtils.get('admin/sysRole/biz-tree').then(tree => {
+            this.setState({treeData: tree, treeDataLoading: false})
         })
     }
 
     onSelect = keys => {
-        let orgId = keys[0] || null;
+        const orgId = keys[0] || null;
         this.props.onSelect(orgId)
     }
 
-
     render() {
-        let {treeData, treeDataLoading} = this.state
+        const {treeData, treeDataLoading} = this.state
         if (treeDataLoading) {
             return <Skeleton title='加载中...'/>
         }
 
-
         return <Tree
             treeData={treeData}
             defaultExpandAll
             onSelect={this.onSelect}
             showIcon
             blockNode
-            icon={item=>{
-               return <SolutionOutlined />
-            }}
-        >
-        </Tree>
+            icon={item => <SolutionOutlined/>}
+        />
     }
-
-
 }

package/src/framework/components/ValueType/{index.jsx → index.tsx}

@@ -1,6 +1,7 @@
 import React from "react";
-import {fieldRegistry, viewRegistry} from "./registry";
 import {Input} from "antd";
+
+import {fieldRegistry, viewRegistry} from "./registry";
 import {ViewText} from "../../views";
 
 function getComponent(registry, type) {

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

@@ -0,0 +1,15 @@
+import React from "react";
+
+interface ViewRangeProps {
+  min?: string;
+  max?: string;
+}
+
+export const ViewRange: React.FC<ViewRangeProps> = ({ min, max }) => {
+  if ((min == null || min === "") && (max == null || max === "")) {
+    return null;
+  }
+  const showMin = min ?? '未知';
+  const showMax = max ?? '未知';
+  return <>{showMin} - {showMax}</>;
+};

package/src/framework/components/index.ts

@@ -10,4 +10,5 @@ export * from './Page'
 export * from './ValueType'
 export * from './OrgTree'
 export * from './RoleTree'
-export * from './ViewRange'
+export * from './ViewRange'
+export { default as ErrorBoundary } from './ErrorBoundary'

package/src/framework/components/system/ButtonList.tsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import { Space } from 'antd';
+import { PermUtils } from '../../utils';
+
+/**
+ * 带权限的按钮列表
+ * @param maxNum: 显示子节点的个数， 超过的为收缩起来
+ */
+export function ButtonList(props) {
+  const { children } = props;
+
+  const checkPerm = (element) => {
+    const _props = element?.props;
+    return !_props?.perm || PermUtils.hasPermission(_props.perm);
+  };
+
+  const nodes = React.Children.toArray(children).filter(
+    (child) => child != null && checkPerm(child)
+  );
+
+  return <Space>{nodes}</Space>;
+}

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

@@ -12,18 +12,18 @@ export function FieldUserSelectMultiple(props) {
 }
 
 export function FieldUnitTreeSelect(props) {
-    return <FieldRemoteTreeSelect url="admin/sysOrg/unitTree" {...props} />;
+    return <FieldRemoteTreeSelect url="admin/sysOrg/unit-tree" {...props} />;
 }
 
 export function FieldDeptTreeSelect(props) {
-    return <FieldRemoteTreeSelect url="admin/sysOrg/deptTree" {...props} />;
+    return <FieldRemoteTreeSelect url="admin/sysOrg/dept-tree" {...props} />;
 }
 
 export function FieldOrgTreeSelect(props) {
-    return <FieldRemoteTreeSelect url="admin/sysOrg/deptTree" {...props} />;
+    return <FieldRemoteTreeSelect url="admin/sysOrg/dept-tree" {...props} />;
 }
 
 export function FieldOrgTreeMultipleSelect(props) {
-    return <FieldRemoteSelectMultiple url="/sysOrg/deptTree" {...props} />;
+    return <FieldRemoteSelectMultiple url="/sysOrg/dept-tree" {...props} />;
 }