Commit 135dc94e authored by 彭俊龙's avatar 彭俊龙

feat:form表单区域到位组件增加用隐藏条件、必填项

parent 74611a86
Pipeline #96669 failed with stages
...@@ -94,8 +94,8 @@ ...@@ -94,8 +94,8 @@
"@wangeditor/editor-for-react": "^1.0.6", "@wangeditor/editor-for-react": "^1.0.6",
"@wisdom-cesium/cesium": "1.1.12", "@wisdom-cesium/cesium": "1.1.12",
"@wisdom-cesium/krpano": "^1.0.29-60", "@wisdom-cesium/krpano": "^1.0.29-60",
"@wisdom-map/arcgismap":"^2.0.97", "@wisdom-map/arcgismap": "^2.0.97",
"@wisdom-map/basemap":"^2.0.4", "@wisdom-map/basemap": "^2.0.4",
"@wisdom-map/gis-component": "^1.0.46", "@wisdom-map/gis-component": "^1.0.46",
"@wisdom-map/gis-utils": "^1.0.41", "@wisdom-map/gis-utils": "^1.0.41",
"@wisdom-map/pd-map": "^1.0.140", "@wisdom-map/pd-map": "^1.0.140",
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
"jszip": "^3.10.1", "jszip": "^3.10.1",
"lodash": "4.17.11", "lodash": "4.17.11",
"minimist": "1.2.0", "minimist": "1.2.0",
"panda-xform": "6.11.14", "panda-xform": "6.11.15",
"parseForm": "^2.3.8", "parseForm": "^2.3.8",
"prop-types": "15.7.2", "prop-types": "15.7.2",
"qrcode.react": "^3.1.0", "qrcode.react": "^3.1.0",
...@@ -165,7 +165,8 @@ ...@@ -165,7 +165,8 @@
"styled-components": "4.2.0", "styled-components": "4.2.0",
"use-merge-value": "^1.0.2", "use-merge-value": "^1.0.2",
"virtuallist-antd": "^0.8.0-beta.1", "virtuallist-antd": "^0.8.0-beta.1",
"voca": "^1.4.0" "voca": "^1.4.0",
"xlsx": "^0.18.5"
}, },
"devDependencies": { "devDependencies": {
"@ant-design/icons": "^4.0.0", "@ant-design/icons": "^4.0.0",
......
import React, { useState, useEffect, useMemo } from 'react'; import React, { useState, useEffect, useMemo } from 'react';
import { DatePicker, Table, Row, Col, Button, notification, message, Spin } from 'antd'; import { DatePicker, Table, Row, Col, Button, notification, message, Spin } from 'antd';
import { SwapRightOutlined, SyncOutlined } from '@ant-design/icons'; import { SwapRightOutlined, SyncOutlined, ExportOutlined } from '@ant-design/icons';
import moment from 'moment'; import moment from 'moment';
import 'moment/dist/locale/zh-cn'; import 'moment/dist/locale/zh-cn';
import locale from 'antd/es/date-picker/locale/zh_CN'; import locale from 'antd/es/date-picker/locale/zh_CN';
import ReactEcharts from 'echarts-for-react'; import ReactEcharts from 'echarts-for-react';
import { post, PUBLISH_SERVICE } from '@/services/index'; import { post, PUBLISH_SERVICE } from '@/services/index';
import styles from './index.less'; import styles from './index.less';
import * as XLSX from "xlsx";
const { RangePicker } = DatePicker; const { RangePicker } = DatePicker;
const LoginLog = () => { const LoginLog = () => {
...@@ -108,6 +109,11 @@ const LoginLog = () => { ...@@ -108,6 +109,11 @@ const LoginLog = () => {
key: 'IPTerritory', key: 'IPTerritory',
width: 250, width: 250,
}, },
{
title: '机构名称',
dataIndex: 'GroupName',
key: 'GroupName',
},
{ {
title: '用户名', title: '用户名',
dataIndex: 'ShowName', dataIndex: 'ShowName',
...@@ -212,6 +218,30 @@ const LoginLog = () => { ...@@ -212,6 +218,30 @@ const LoginLog = () => {
setAllTime([moment().startOf('week'), moment(new Date(), 'YYYY-MM-DD HH:mm:ss')]); setAllTime([moment().startOf('week'), moment(new Date(), 'YYYY-MM-DD HH:mm:ss')]);
setFilteredValue([]); setFilteredValue([]);
}; };
const handleExport = ()=>{
const souceData = data0.map(v=>{
let obj = {}
Object.keys(v).forEach(k=>{
const d = columns.find(x=> x.key === k)
if(d){
obj[`${d.title}`] =v[k]
}
})
return obj
})
// 2. 创建工作表
const worksheet = XLSX.utils.json_to_sheet(souceData);
// 3. 创建工作簿
const workbook = XLSX.utils.book_new();
XLSX.utils.book_append_sheet(workbook, worksheet, "Sheet1");
// 4. 生成 Excel 文件并下载
XLSX.writeFile(workbook, `导出数据_${new Date().toLocaleDateString()}.xlsx`);
}
const onChangeInput = filters => { const onChangeInput = filters => {
// console.log('filters', filters); // console.log('filters', filters);
setFilteredValue(filters.LoginName, filters.ShowName, filters.Client); setFilteredValue(filters.LoginName, filters.ShowName, filters.Client);
...@@ -364,6 +394,17 @@ const LoginLog = () => { ...@@ -364,6 +394,17 @@ const LoginLog = () => {
> >
重置 重置
</Button> */} </Button> */}
<Button
icon={<ExportOutlined className={styles.icon} />}
onClick={handleExport}
style={{
marginLeft: '25px',
verticalAlign: 'middle',
marginTop: '-3px',
}}
>
导出
</Button>
</Col> </Col>
</Row> </Row>
<Spin spinning={loading} tip="loading"> <Spin spinning={loading} tip="loading">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment