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

* [bug#57479] adjust delimiter setting for dtable.

Browse Source
This commit is contained in:
caoyanyi
2024-11-27 16:42:38 +08:00
committed by 田淑杰
parent 4ca8498704
commit 553b1c5fca
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/dtable/js/v1.js
+4 -4
View File
@@ -1,14 +1,14 @@
window.setMultipleCell = function(value, pairs, delimiter)
window.setMultipleCell = function(value, info)
{
value = value.filter((data)=>data);
value = value.filter((data) => data);
if(!value.length) return value;
pairs = JSON.parse(pairs);
pairs = info.col.setting.dataPairs;
const result = [];
const data = $.isArray(value) ? value : value.split(',');
$.each(data, function(_, value)
{
if(value && pairs[value]) result.push(pairs[value]);
});
return result.join(delimiter);
return result.join(info.col.setting.delimiter);
};
lib/zin/wg/dtable/v1.php
+4 -2
View File
@@ -175,8 +175,10 @@ class dtable extends wg
{
if(!empty($config['map'])) $dataPairs = $config['map'];
if(!empty($config['userMap'])) $dataPairs = $config['userMap'];
$delimiter = is_string($config['delimiter']) ? $config['delimiter'] : ',';
$config['map'] = jsRaw("(value) => {return window.setMultipleCell(value, '" . json_encode($dataPairs). "', '{$delimiter}')}");
$config['dataPairs'] = $dataPairs;
$config['delimiter'] = is_string($config['delimiter']) ? $config['delimiter'] : ',';
$config['map'] = jsRaw("window.setMultipleCell");
}
if(isset($config['type']))