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

fix: 导出增加isExportRelationForm参数

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