From dca78d5fd0c67fd841d6841ef2cd94a10669c356 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 21 二月 2024 15:40:48 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/system/role/index.jsx |  189 ++++++++++++++++++++++++++++++++++------------
 1 files changed, 139 insertions(+), 50 deletions(-)

diff --git a/zy-asrs-flow/src/pages/system/role/index.jsx b/zy-asrs-flow/src/pages/system/role/index.jsx
index bc536b8..6352839 100644
--- a/zy-asrs-flow/src/pages/system/role/index.jsx
+++ b/zy-asrs-flow/src/pages/system/role/index.jsx
@@ -1,17 +1,21 @@
 
 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,
+} from '@ant-design/pro-components';
 import { PlusOutlined, ExportOutlined } from '@ant-design/icons';
 import Http from '@/utils/http';
 import Edit from './components/edit'
+import { TextFilter, SelectFilter, DatetimeRangeFilter, LinkFilter } from '@/components/TableSearch'
 
 const handleSave = async (val) => {
     const hide = message.loading('姝e湪娣诲姞');
     try {
         const resp = await Http.doPost('api/role/save', val);
-        hide();
         if (resp.code === 200) {
             message.success('娣诲姞鎴愬姛');
             return true;
@@ -20,9 +24,10 @@
             return false;
         }
     } catch (error) {
-        hide();
         message.error('娣诲姞澶辫触璇烽噸璇曪紒');
         return false;
+    } finally {
+        hide();
     }
 };
 
@@ -30,7 +35,6 @@
     const hide = message.loading('姝e湪鏇存柊');
     try {
         const resp = await Http.doPost('api/role/update', val);
-        hide();
         if (resp.code === 200) {
             message.success('鏇存柊鎴愬姛');
             return true;
@@ -39,9 +43,10 @@
             return false;
         }
     } catch (error) {
-        hide();
         message.error('閰嶇疆澶辫触璇烽噸璇曪紒');
         return false;
+    } finally {
+        hide();
     }
 };
 
@@ -50,7 +55,6 @@
     const hide = message.loading('姝e湪鍒犻櫎');
     try {
         const resp = await Http.doPost('api/role/remove/' + rows.map((row) => row.id).join(','));
-        hide();
         if (resp.code === 200) {
             message.success('鍒犻櫎鎴愬姛');
             return true;
@@ -59,25 +63,29 @@
             return false;
         }
     } catch (error) {
-        hide();
         message.error('鍒犻櫎澶辫触锛岃閲嶈瘯');
         return false;
+    } finally {
+        hide();
     }
 };
 
 const handleExport = async () => {
     const hide = message.loading('姝e湪瀵煎嚭');
     try {
-        await Http.doPost('api/role/export');
-        hide();
+        const resp = await Http.doPostBlob('api/role/export');
+        const blob = new Blob([resp], { type: 'application/vnd.ms-excel' });
+        window.location.href = window.URL.createObjectURL(blob);
         message.success('瀵煎嚭鎴愬姛');
         return true;
     } catch (error) {
-        hide();
         message.error('瀵煎嚭澶辫触锛岃閲嶈瘯');
         return false;
+    } finally {
+        hide();
     }
 };
+
 
 const Main = () => {
     const formTableRef = useRef();
@@ -85,8 +93,7 @@
     const [selectedRows, setSelectedRows] = useState([]);
     const [modalVisible, setModalVisible] = useState(false);
     const [currentRow, setCurrentRow] = useState();
-
-    const intl = useIntl();
+    const [searchParam, setSearchParam] = useState({});
 
     useEffect(() => {
 
@@ -94,19 +101,76 @@
 
     const columns = [
         {
+            title: 'No',
+            dataIndex: 'index',
+            valueType: 'indexBorder',
+            width: 48,
+        },
+        {
             title: '濮撳悕',
             dataIndex: 'name',
             valueType: 'text',
+            copyable: true,
+            filterDropdown: (props) => <TextFilter
+                name='name'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
         },
         {
             title: '鏍囪瘑',
             dataIndex: 'code',
             valueType: 'text',
+            filterDropdown: (props) => <TextFilter
+                name='code'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
+        },
+        {
+            title: '鏈烘瀯',
+            dataIndex: 'hostId$',
+            valueType: 'text',
+            filterDropdown: (props) => <LinkFilter
+                name='hostId'
+                major='host'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
+        },
+        {
+            title: '鐘舵��',
+            dataIndex: 'status$',
+            valueType: 'text',
+            filterDropdown: (props) => <SelectFilter
+                name='status'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+                data={[
+                    { label: '姝e父', value: 1 },
+                    { label: '绂佺敤', value: 0 },
+                ]}
+            />,
+        },
+        {
+            title: '淇敼鏃堕棿',
+            dataIndex: 'updateTime$',
+            valueType: 'text',
+            filterDropdown: (props) => <DatetimeRangeFilter
+                name='updateTime'
+                {...props}
+                actionRef={actionRef}
+                setSearchParam={setSearchParam}
+            />,
         },
         {
             title: '鎿嶄綔',
             dataIndex: 'option',
-            width: '220px',
+            width: 140,
             valueType: 'option',
             render: (_, record) => [
                 <Button
@@ -148,40 +212,57 @@
         <PageContainer>
             <div style={{ width: '100%', float: 'right' }}>
                 <ProTable
-                    headerTitle={intl.formatMessage({
-                        id: 'pages.searchTable.title',
-                        defaultMessage: '淇℃伅',
-                    })}
+                    key="role"
+                    rowKey="id"
                     actionRef={actionRef}
                     formRef={formTableRef}
-                    rowKey="id"
-                    key="role"
-                    search={{
-                        labelWidth: 120,
+                    columns={columns}
+                    cardBordered
+                    dateFormatter="string"
+                    pagination={{ pageSize: 20 }}
+                    search={false}
+                    toolbar={{
+                        multipleLine: true,
+                        search: {
+                            onSearch: (value) => {
+                                setSearchParam(prevState => ({
+                                    ...prevState,
+                                    condition: value
+                                }));
+                                actionRef.current?.reload();
+                            },
+                        },
+                        filter: (
+                            <LightFilter
+                                onValuesChange={(val) => {
+                                }}
+                            >
+                            </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) => {
+                    request={(params, sorter, filter) =>
+                        Http.doPostPromise('/api/role/page', { ...params, ...searchParam }, (res) => {
                             return {
                                 data: res.data.records,
                                 total: res.data.total,
@@ -189,22 +270,30 @@
                             }
                         })
                     }
-                    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={
                         <div>
-                            <FormattedMessage id="pages.searchTable.chosen" defaultMessage="宸查�夋嫨" />
+                            宸查�夋嫨
                             <a style={{ fontWeight: 600 }}>{selectedRows.length}</a>
-                            <FormattedMessage id="pages.searchTable.item" defaultMessage="椤�" />
+                            椤�
                         </div>
                     }
                 >
@@ -225,7 +314,7 @@
                             });
                         }}
                     >
-                        <FormattedMessage id="pages.searchTable.batchDeletion" defaultMessage="鎵归噺鍒犻櫎" />
+                        鎵归噺鍒犻櫎
                     </Button>
                 </FooterToolbar>
             )}

--
Gitblit v1.9.1