Commit 48420e69 authored by 田翔's avatar 田翔

fix: 导出增加isExportRelationForm参数

parent 0093e63c
{
"name": "panda-xform",
"version": "6.10.23",
"description": "6.10.23 设备选择器支持同步地址",
"version": "6.10.24",
"description": "6.10.24 导出增加isExportRelationForm参数",
"keywords": [
"panda-xform"
],
......
......@@ -414,9 +414,9 @@ export function ImportAccountData(options, params, data) {
}
//导出数据
export function ExportAccountData({ accountName, ids, exportAll }) {
export function ExportAccountData({ accountName, ids, exportAll, isExportRelationForm }) {
return request({
url: `${BASEURL}/ExportAccountData?accountName=${accountName}&ids=${ids}&exportAll=${exportAll}`,
url: `${BASEURL}/ExportAccountData?accountName=${accountName}&ids=${ids}&exportAll=${exportAll}&isExportRelationForm=${isExportRelationForm}`,
method: 'get',
headers: {
// 'Civ-Site': window?.globalConfig?.userInfo?.site,
......
......@@ -65,6 +65,7 @@ const Account = (props, ref) => {
accountId,
defaultType,
pageSizes,
isExportRelationForm,
} = props;
const userID = window?.globalConfig?.userInfo?.OID || 1;
let initParams = {
......@@ -204,7 +205,7 @@ const Account = (props, ref) => {
content: keys.length > 0 ? `共选择${keys.length}条数据,确定要导出吗` : '确定要导出全部数据吗?',
onOk: async () => {
return await new Promise(async (resolve, reject) => {
const blob = await ExportAccountData({ accountName: params.accountName, ids: keys.join(','), exportAll });
const blob = await ExportAccountData({ accountName: params.accountName, ids: keys.join(','), exportAll, isExportRelationForm: isExportRelationForm === 'true' ? 1 : 0 });
const reader = new FileReader();
reader.onload = function () {
const text = reader.result;
......
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