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

* Fixed an issue with jsVar setting 0 to array.

Browse Source
This commit is contained in:
tianshujie
2023-07-12 14:59:18 +08:00
parent 95d7444ebc
commit f5dc206b73
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/core/h.class.php
+2 -4
View File
@@ -254,9 +254,7 @@ class h extends wg
{
if(empty($var)) continue;
$rawVal = $val;
$val = h::encodeJsonWithRawJs($val);
if(empty($val) && (is_array($rawVal) || is_object($rawVal))) $val = '[]';
$val = h::encodeJsonWithRawJs($val);
if(str_starts_with($var, 'window.')) $jsCode .= "$var=" . $val . ';';
elseif(str_starts_with($var, '+')) $jsCode .= 'let ' . substr($var, 1) . '=' . $val . ';';
@@ -279,7 +277,7 @@ class h extends wg
protected static function encodeJsonWithRawJs($data)
{
$json = json_encode($data, JSON_UNESCAPED_UNICODE);
if(empty($json)) return '[]';
if(empty($json) && (is_array($data) || is_object($data))) return '[]';
$json = str_replace('"RAWJS<', '', str_replace('>RAWJS"', '', $json));
return $json;