Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#52590,done,1h] Convert string to latin1 before base64 encryption.

Browse Source
This commit is contained in:
daitingting
2024-07-18 14:51:31 +08:00
committed by 綦新志
parent 01db6bc82d
commit ce4c61ff80
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/pivot/js/preview.ui.js
+14 -3
View File
@@ -239,14 +239,25 @@ window.clickCell = function(col, {colName, rowInfo})
if(!Array.isArray(drillConditions) || !drillConditions.length) return false;
if(Array.isArray(value)) value = value[0];
const [originField, conditions] = drillConditions;
const filterValues = getFilterValues();
let [originField, conditions] = drillConditions;
let filterValues = getFilterValues();
const drillModalLink = $.createLink('pivot', 'drillModal', `pivotID=${pivotID}&colName=${originField}&drillFields=${btoa(JSON.stringify(conditions))}&filterValues=${btoa(JSON.stringify(filterValues))}&value=${value}`);
conditions = latin1ToBase64(JSON.stringify(conditions))
filterValues = latin1ToBase64(JSON.stringify(filterValues))
const drillModalLink = $.createLink('pivot', 'drillModal', `pivotID=${pivotID}&colName=${originField}&drillFields=${conditions}&filterValues=${filterValues}&value=${value}`);
zui.Modal.open({url: drillModalLink, size: 'lg'});
}
latin1ToBase64 = function(str)
{
const encoder = new TextEncoder();
const latin1Array = encoder.encode(str);
const latin1String = String.fromCharCode.apply(null, latin1Array);
return btoa(latin1String);
}
/**
* 合并单元格。
* Merge cell.