@jiangood/open-admin 1.2.2 → 1.2.4

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

@@ -10,7 +10,7 @@ export type { RuntimeConfig } from './core/defineApp'
 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.33_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.33_react-dom@18.3.1_react@18.3.1__react@18.3.1/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.33_@babel+core@7.29.0_@types+node@25.5.0_@types+react@19.2.14_eslint@8.57.1_lig_f543cb11e6d746f2acaaf8cf866d6b1b/node_modules/umi/client/client/plugin.js';
+export { ApplyPluginsType, PluginManager } from '/home/runner/work/open-admin/open-admin/web/node_modules/.pnpm/umi@4.6.33_@babel+core@7.29.0_@types+node@25.5.0_@types+react@19.2.14_eslint@8.57.1_lig_3d6241fcee791bc19d42955a9bb8309c/node_modules/umi/client/client/plugin.js';
 export { history, createHistory } from './core/history';
 export { terminal } from './core/terminal';
 // react ssr

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

@@ -27,7 +27,7 @@
         "src/.umi/*"
       ],
       "umi": [
-        "../../node_modules/.pnpm/umi@4.6.33_@babel+core@7.29.0_@types+node@25.5.0_@types+react@19.2.14_eslint@8.57.1_lig_f543cb11e6d746f2acaaf8cf866d6b1b/node_modules/umi"
+        "../../node_modules/.pnpm/umi@4.6.33_@babel+core@7.29.0_@types+node@25.5.0_@types+react@19.2.14_eslint@8.57.1_lig_3d6241fcee791bc19d42955a9bb8309c/node_modules/umi"
       ],
       "umi/typings": [
         "src/.umi/typings"

package/src/framework/components/ProTable/components/ToolBar/index.jsx

@@ -27,8 +27,8 @@ export default class Toolbar extends React.Component {
             <div className='pro-table-toolbar-left'>
                 {showSearch && <Input.Search placeholder='搜索...'
                                              allowClear
-                                             onChange={(e) => {
-                                                 this.props.onSearch({searchText: e.target.value})
+                                             onSearch={e=>{
+                                                 this.props.onSearch({searchText: e})
                                              }}
                 />}
             </div>

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

@@ -80,9 +80,10 @@ export class ProTable extends React.Component {
 
         this.setState({loading: true})
         request(params).then(rs => {
-            const {content, totalElements, extData} = rs;
+            const {content, totalElements, size,extData} = rs;
 
-            this.setState({dataSource: content, total: parseInt(totalElements)})
+
+            this.setState({dataSource: content, total: parseInt(totalElements),pageSize:size})
             if (extData) {
                 this.setState({extData})
             }

package/src/framework/fields/FieldDictSelect/index.jsx

@@ -2,16 +2,16 @@ import React from "react";
 import {Select} from "antd";
 import {DictUtils} from "../../utils";
 
-export function FieldDictSelect(props) {
-    const {value, onChange, typeCode, ...rest} = props;
-    const options = DictUtils.dictOptions(typeCode);
+export class FieldDictSelect extends React.Component {
+    render() {
+        const {value,  typeCode} = this.props;
+        const options = DictUtils.dictOptions(typeCode);
+        const strValue = value == null ? null : String(value);
 
-
-    return <Select value={String(value)}
-                   onChange={onChange}
-                   style={{width: '100%', minWidth: 200}}
-                   options={options}
-                   {...rest}>
-
-    </Select>;
+        return <Select value={strValue}
+                       onChange={this.props.onChange}
+                       style={{width: '100%', minWidth: 200}}
+                       options={options}
+                   />
+    }
 }

package/src/framework/fields/FieldRemoteSelect/index.jsx

@@ -3,123 +3,64 @@ import { Select, Spin, message } from 'antd';
 import { debounce } from 'lodash';
 import { HttpUtils } from "../../utils";
 
-export const FieldRemoteSelect = ({
-    url,
-    debounceTime = 500,
-    paramsProcessor,
-    dataProcessor,
-    cacheSize = 10,
-    initialLoad = true,
-    clearOnSearch = false,
-    onError,
-    onLoad,
-    value,
-    ...rest
-}) => {
-    const [options, setOptions] = useState([]);
-    const [loading, setLoading] = useState(false);
-    const [cache, setCache] = useState(new Map());
-    const fetchIdRef = useRef(0);
-    const searchHistoryRef = useRef([]);
+export class FieldRemoteSelect extends React.Component {
 
-    const loadData = useCallback(async (searchText = '') => {
-        const fetchId = ++fetchIdRef.current;
-        const cacheKey = searchText || '_initial_';
+    static defaultProps = {
+        placeholder: '请搜索选择'
+    }
 
-        // 检查缓存
-        if (cache.has(cacheKey)) {
-            const cachedData = cache.get(cacheKey);
-            setOptions(cachedData || []);
-            onLoad?.(cachedData);
-            return;
-        }
+    state = {
+        dataLoading:true,
+        data: {}
+    }
 
-        setLoading(true);
+    componentDidMount() {
+        this.loadData(null);
+    }
 
-        try {
-            let params = { searchText, selected: value };
-            if (paramsProcessor) {
-                params = paramsProcessor(params);
-            }
+    loadData = (searchText) => {
+        this.setState({dataLoading:true})
+        const {url} = this.props;
+        const params = {
+            searchText,
+            selected: this.props.value
+        };
 
-            const data = await HttpUtils.get(url, params);
-            const processedData = dataProcessor ? dataProcessor(data) : data;
+        HttpUtils.get(url,params).then(data => {
+            this.setState({data})
+        }).finally(() => {
+            this.setState({dataLoading: false})
+        })
+    };
+    handleSearch = searchText => {
+        this.loadData(searchText)
+    };
 
-            if (fetchId === fetchIdRef.current) {
-                setOptions(processedData || []);
-                
-                // 更新缓存
-                setCache(prevCache => {
-                    const newCache = new Map(prevCache);
-                    newCache.set(cacheKey, processedData || []);
-                    
-                    // 限制缓存大小
-                    if (newCache.size > cacheSize) {
-                        const firstKey = newCache.keys().next().value;
-                        newCache.delete(firstKey);
-                    }
-                    
-                    return newCache;
-                });
+    render() {
+        let {
+            value,
+            placeholder,
+            ...rest
+        } = this.props;
 
-                onLoad?.(processedData);
-            }
-        } catch (error) {
-            console.error('远程搜索失败:', error);
-            message.error('搜索失败，请重试');
-            setOptions([]);
-            onError?.(error);
-        } finally {
-            if (fetchId === fetchIdRef.current) {
-                setLoading(false);
-            }
-        }
-    }, [url, value, paramsProcessor, dataProcessor, cache, cacheSize, onError, onLoad]);
+        return (
+            <Select
+                showSearch={{
+                    filterOption: false,
+                    onSearch: this.handleSearch,
+                }}
+                options={this.state.data}
+                notFoundContent={this.state.dataLoading ? <Spin size="small"/> : '数据为空'}
+                style={{width: '100%', minWidth: 200}}
+                allowClear
+                loading={this.state.dataLoading}
+                value={value}
+                {...rest}
+            />
+        );
+    }
+}
 
-    // 使用 useMemo 缓存 debounce 函数
-    const debouncedLoadData = useCallback(
-        debounce((value) => loadData(value), debounceTime),
-        [loadData, debounceTime]
-    );
 
-    useEffect(() => {
-        if (initialLoad) {
-            loadData();
-        }
-    }, [initialLoad, loadData]);
 
-    const handleSearch = useCallback((searchValue) => {
-        const trimmedValue = searchValue.trim();
-        
-        // 记录搜索历史
-        if (trimmedValue && !searchHistoryRef.current.includes(trimmedValue)) {
-            searchHistoryRef.current = [trimmedValue, ...searchHistoryRef.current].slice(0, 5);
-        }
-        
-        if (trimmedValue === '') {
-            setOptions([]);
-            return;
-        }
-        
-        debouncedLoadData(trimmedValue);
-    }, [debouncedLoadData]);
 
-    return (
-        <Select
-            showSearch={{
-                filterOption: false,
-                onSearch: handleSearch,
-            }}
-            options={options}
-            notFoundContent={loading ? <Spin size="small" /> : '数据为空'}
-            style={{ width: '100%', minWidth: 200 }}
-            allowClear
-            loading={loading}
-            {...rest}
-        />
-    );
-};
-
-FieldRemoteSelect.defaultProps = {
-    placeholder: '请搜索选择'
-};

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

@@ -7,7 +7,7 @@ import React from 'react';
 import {StringUtils} from "../StringUtils";
 
 export interface DictItem {
-    value: string | number;
+    code: string | number;
     label: string;
     color?: string;
 }
@@ -31,14 +31,14 @@ export class DictUtils {
      * @returns 对应的字典项列表，未找到返回空数组
      */
     public static dictList(code: string): DictItem[] {
-        const map = SysUtils.getDictInfo();
-        if (!map) {
+        const info = SysUtils.getDictInfo();
+        if (!info) {
             return [];
         }
 
-        code = StringUtils.toUnderlineCase(code).toUpperCase();
+        let list = info.filter(e=>e.typeCode === code);
 
-        return map[code] || [];
+        return list
     }
 
     /**
@@ -50,7 +50,7 @@ export class DictUtils {
         const list: DictItem[] = DictUtils.dictList(typeCode);
         return list.map(i => {
             return {
-                value: i.value,
+                value: i.code,
                 label: i.label,
             }
         });

package/src/layouts/index.jsx

@@ -85,8 +85,8 @@ class _Layouts extends React.Component {
 
         HttpUtils.get('/admin/public/checkLogin')
             .then(rs => {
-                const {needUpdatePwd, dictMap, loginInfo} = rs
-                SysUtils.setDictInfo(dictMap)
+                const {needUpdatePwd, dictInfo, loginInfo} = rs
+                SysUtils.setDictInfo(dictInfo)
                 SysUtils.setLoginInfo(loginInfo)
                 if (!needUpdatePwd) {
                     this.setState({loginInfoFinish: true});

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

@@ -2,21 +2,17 @@ import React from "react";
 import {Button, Form, Input, InputNumber, Modal, Popconfirm, Splitter, Tag, Tree, Typography} from "antd";
 import {
     ButtonList,
-    FieldBoolean, FieldDictSelect,
+    FieldBoolean, FieldDictSelect, FieldRemoteSelect,
     HttpUtils,
     Page,
-    PageLoading,
     ProTable,
-    ViewBooleanEnableDisable
+    ViewBooleanEnableDisable, ViewText
 } from "../../../framework";
 import {PlusOutlined} from "@ant-design/icons";
 
 export default class extends React.Component {
 
     state = {
-        treeData: [],
-        treeLoading: true,
-        typeCode: null,
         formValues: {},
         formOpen: false
     }
@@ -24,17 +20,9 @@ export default class extends React.Component {
     formRef = React.createRef()
     tableRef = React.createRef()
 
-    async componentDidMount() {
-        const treeData = await HttpUtils.get('admin/dict/tree');
-        this.setState({treeData, treeLoading: false});
-    }
 
-    onSelect = (selectedKeys) => {
-        const key = selectedKeys.length === 1 ? selectedKeys[0] : null;
-        this.setState({typeCode: key}, () => {
-            this.tableRef.current.reload()
-        })
-    }
+
+
     handleAdd = () => {
         this.setState({formOpen: true, formValues: {}})
     }
@@ -44,7 +32,6 @@ export default class extends React.Component {
     }
 
     onFinish = values => {
-        values.sysDict = {id: this.props.sysDictId}
         HttpUtils.post('admin/dict/save', values).then(rs => {
             this.setState({formOpen: false})
             this.tableRef.current.reload()
@@ -59,8 +46,16 @@ export default class extends React.Component {
 
     columns = [
         {
-            title: '文本',
-            dataIndex: 'name',
+            title: '类型标签',
+            dataIndex: 'typeLabel',
+        },
+        {
+            title: '类型编码',
+            dataIndex: 'typeCode',
+        },
+        {
+            title: '标签',
+            dataIndex: 'label',
         },
         {
             title: '编码',
@@ -94,6 +89,9 @@ export default class extends React.Component {
             title: '操作',
             dataIndex: 'option',
             render: (_, record) => {
+                if(!record.id){ // 非数据库定义的不让修改
+                    return
+                }
 
                 return (
                     <ButtonList>
@@ -110,45 +108,25 @@ export default class extends React.Component {
     ]
 
     render() {
-        if (this.state.treeLoading) {
-            return <PageLoading/>
-        }
-
-        return <Page>
-            <Splitter>
-                <Splitter.Panel defaultSize={600} style={{paddingRight: 16}}>
-                    <Tree
-                        treeData={this.state.treeData}
-                        onSelect={this.onSelect}
-
-                        showIcon
-                        blockNode
-                        showLine
-                        defaultExpandAll
-                    >
-                    </Tree>
-                </Splitter.Panel>
-                <Splitter.Panel style={{paddingLeft: 16}}>
-                    {this.renderTypeInfo()}
-                    <ProTable
-                        rowKey='code'
-                        actionRef={this.tableRef}
-                        toolBarRender={() => {
-                            return <ButtonList>
-                                <Button perm='sysDict:save' type='primary' onClick={this.handleAdd} disabled={!this.state.typeCode}>
-                                    <PlusOutlined/> 新增
-                                </Button>
-                            </ButtonList>
-                        }}
-                        request={(params) => {
-                            params.typeCode = this.state.typeCode
-                            return HttpUtils.get('admin/dict/page', params);
-                        }}
-                        columns={this.columns}
-                        search={false}
-                    />
-                </Splitter.Panel>
-            </Splitter>
+        return <Page padding>
+            <ProTable
+                rowKey='uid'
+                actionRef={this.tableRef}
+                toolBarRender={() => {
+                    return <ButtonList>
+                        <Button perm='sysDict:save' type='primary' onClick={this.handleAdd} >
+                            <PlusOutlined/> 新增
+                        </Button>
+                    </ButtonList>
+                }}
+                request={(params) => {
+                    params.typeCode = this.state.typeCode
+                    return HttpUtils.get('admin/dict/page', params);
+                }}
+                columns={this.columns}
+                showToolbarSearch={true}
+                scrollY={500}
+            />
             <Modal
                 title='编辑数据字典项'
                 open={this.state.formOpen}
@@ -161,13 +139,16 @@ export default class extends React.Component {
                       initialValues={this.state.formValues}
                       onFinish={this.onFinish}>
                     <Form.Item name='id' noStyle></Form.Item>
-                    <Form.Item label='类型编码' name='typeCode' rules={[{required: true}]} initialValue={this.state.typeCode}>
-                        <Input/>
+                    <Form.Item label='类型' name='color' rules={[{required: true}]} >
+                       <ViewText />
+                    </Form.Item>
+                    <Form.Item label='类型' name='typeCode' rules={[{required: true}]} >
+                        <FieldRemoteSelect url='/admin/dict/typeOptions' />
                     </Form.Item>
                     <Form.Item label='编码' name='code' rules={[{required: true}]}>
                         <Input/>
                     </Form.Item>
-                    <Form.Item label='文本' name='name' rules={[{required: true}]} >
+                    <Form.Item label='标签' name='label' rules={[{required: true}]} help='显示文本'>
                         <Input/>
                     </Form.Item>
                     <Form.Item label='颜色' name='color' rules={[{required: true}]}>
@@ -188,14 +169,5 @@ export default class extends React.Component {
 
     }
 
-    renderTypeInfo() {
-        if(this.state.typeCode){
-            return <>
-                <Typography.Text italic> 类型：</Typography.Text>
-                <Typography.Text copyable>
-                    {this.state.typeCode}
-                </Typography.Text>
-            </>;
-        }
-    }
+
 }