From 4f4f06f689f9f92108ddc524ecdd6abf92794e24 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 15 二月 2024 13:39:34 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/role/index.jsx |  124 +++++++++++++++++++++++++++++-----------
 1 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index 91ad35a..00837be 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -2,7 +2,10 @@
 import React, { useState, useRef, useEffect } from 'react';
 import { useIntl, FormattedMessage } from '@umijs/max';
 import { Button, message, Modal } from 'antd';
-import { FooterToolbar, PageContainer, ProTable } from '@ant-design/pro-components';
+import {
+    FooterToolbar, PageContainer, ProTable, LightFilter,
+    ProFormDatePicker,
+} from '@ant-design/pro-components';
 import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
 import Http from '@/utils/http';
 import Edit from './components/edit'
@@ -85,6 +88,7 @@
     const [selectedRows, setSelectedRows] = useState([]);
     const [modalVisible, setModalVisible] = useState(false);
     const [currentRow, setCurrentRow] = useState();
+    const [searchParam, setSearchParam] = useState({});
 
     const intl = useIntl();
 
@@ -94,9 +98,16 @@
 
     const columns = [
         {
+            title: 'No',
+            dataIndex: 'index',
+            valueType: 'indexBorder',
+            width: 48,
+        },
+        {
             title: '濮撳悕',
             dataIndex: 'name',
             valueType: 'text',
+            copyable: true,
         },
         {
             title: '鏍囪瘑',
@@ -148,41 +159,76 @@
         <PageContainer>
             <div style={{ width: '100%', float: 'right' }}>
                 <ProTable
-                    headerTitle={intl.formatMessage({
-                        id: 'pages.searchTable.title',
-                        defaultMessage: '淇℃伅',
-                    })}
-                    cardBordered
+                    key="role"
+                    rowKey="id"
                     actionRef={actionRef}
                     formRef={formTableRef}
-                    rowKey="id"
-                    key="role"
-                    search={{
-                        labelWidth: 120,
+                    columns={columns}
+                    cardBordered
+                    dateFormatter="string"
+                    search={false}
+                    toolbar={{
+                        search: {
+                            onSearch: (value) => {
+                                setSearchParam(prevState => ({
+                                    ...prevState,
+                                    condition: value
+                                }));
+                                actionRef.current?.reload();
+                            },
+                        },
+                        filter: (
+                            <LightFilter>
+                                <ProFormDatePicker name="startdate" label="鍝嶅簲鏃ユ湡" />
+                            </LightFilter>
+                        ),
+                        actions: [
+                            <Button
+                                type="primary"
+                                key="save"
+                                onClick={async () => {
+                                    setModalVisible(true)
+                                }}
+                            >
+                                <PlusOutlined />
+                                娣诲姞
+                            </Button>,
+                            <Button
+                                key="export"
+                                onClick={async () => {
+                                    handleExport();
+                                }}
+                            >
+                                <ExportOutlined />
+                                瀵煎嚭
+                            </Button>,
+                        ],
                     }}
-                    toolBarRender={() => [
-                        <Button
-                            type="primary"
-                            key="save"
-                            onClick={async () => {
-                                setModalVisible(true)
-                            }}
-                        >
-                            <PlusOutlined />
-                            娣诲姞
-                        </Button>,
-                        <Button
-                            key="export"
-                            onClick={async () => {
-                                handleExport();
-                            }}
-                        >
-                            <ExportOutlined />
-                            瀵煎嚭
-                        </Button>,
-                    ]}
-                    request={(params) =>
-                        Http.doPostPromise('/api/role/page', params, (res) => {
+                    // toolBarRender={() => [
+                    //     <Button
+                    //         type="primary"
+                    //         key="save"
+                    //         onClick={async () => {
+                    //             setModalVisible(true)
+                    //         }}
+                    //     >
+                    //         <PlusOutlined />
+                    //         娣诲姞
+                    //     </Button>,
+                    //     <Button
+                    //         key="export"
+                    //         onClick={async () => {
+                    //             handleExport();
+                    //         }}
+                    //     >
+                    //         <ExportOutlined />
+                    //         瀵煎嚭
+                    //     </Button>,
+                    // ]}
+                    request={(params, sorter, filter) =>
+                        Http.doPostPromise('/api/role/page', { ...params, ...searchParam }, (res) => {
+                            console.log({ ...params, ...searchParam });
+                            console.log(filter);
                             return {
                                 data: res.data.records,
                                 total: res.data.total,
@@ -190,15 +236,23 @@
                             }
                         })
                     }
-                    columns={columns}
                     rowSelection={{
                         onChange: (ids, rows) => {
                             setSelectedRows(rows);
                         }
                     }}
+                    columnsState={{
+                        persistenceKey: 'pro-table-role',
+                        persistenceType: 'localStorage',
+                        defaultValue: {
+                            option: { fixed: 'right', disable: true },
+                        },
+                        onChange(value) {
+                        },
+                    }}
                 />
             </div>
-            
+
             {selectedRows?.length > 0 && (
                 <FooterToolbar
                     extra={

--
Gitblit v1.9.1