diff --git a/core/class/class_template.php b/core/class/class_template.php index 14ea533..8b72dc0 100644 --- a/core/class/class_template.php +++ b/core/class/class_template.php @@ -144,7 +144,6 @@ class template { } function parse_template(&$template) { - $template = str_replace('self.$', 'self.$', $template); $var_regexp = "((?!\\\$[a-zA-Z]+\()(\\\$[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*(\-\>)?[a-zA-Z0-9_\x7f-\xff]*)(\[[a-zA-Z0-9_\-\.\"\'\[\]\$\x7f-\xff]+\])*)"; $const_regexp = "([A-Z_\x7f-\xff][A-Z0-9_\x7f-\xff]*)"; @@ -153,9 +152,9 @@ class template { $template = preg_replace("/\<\!\-\-\{(.+?)\}\-\-\>/s", "{\\1}", $template); // js的lang替换 $template = preg_replace_callback("/]+?src=\"(.+?)\".*?>[\s\S]*?/is", array($this, 'parse_template_callback_javascript'), $template); -// 模版lang替换 +// 模版lang替换 $template = preg_replace_callback("/\{lang\s+(.+?)\}/is", array($this, 'parse_template_callback_languagevar_1'), $template); -// 模版__lang替换 +// 模版__lang替换 $template = preg_replace_callback("/__lang\.(\w+)/i", array($this, 'parse_template_callback_languagevar_2'), $template); // img的src替换 $template = preg_replace_callback("/]*?)>/is", array($this, 'parse_template_callback_img'), $template); @@ -200,8 +199,6 @@ class template { $template = preg_replace_callback("/[\n\r\t]*\{block\s+([a-zA-Z0-9_\[\]]+)\}(.+?)\{\/block\}/is", array($this, 'parse_template_callback_stripblock_12'), $template); $template = preg_replace("/\<\?(\s{1})/is", "/is", "", $template); - $template = str_replace('self.$','self.$', $template); - $template = str_replace('_$','$', $template); } function parse_template_callback_javascript($matches) { diff --git a/core/core_version.php b/core/core_version.php index ca901c9..ab1ef62 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.88.5'); - define('CORE_XHRELEASE', '20240722'); + define('CORE_XHVERSION', '1.88.6'); + define('CORE_XHRELEASE', '20240723'); define('CORE_XHFIXBUG' , '20240706'); } \ No newline at end of file diff --git a/dzz/system/template/orgtree.htm b/dzz/system/template/orgtree.htm index 1d28b63..596e2fc 100644 --- a/dzz/system/template/orgtree.htm +++ b/dzz/system/template/orgtree.htm @@ -39,7 +39,7 @@ html, body { top:0px; width:24px; height:32px; - padding:8px 5px; + padding:2px 5px; font-size: 18px; color: rgba(78,85,99,0.65); } @@ -117,7 +117,7 @@ var callback_url = '{$callback_url}'; @@ -173,8 +173,10 @@ jQuery(document).ready(function(e) { "keep_selected_style" : false ,"three_state": false//父子级别级联选择 - ,"tie_selection": false + + ,"three_state": true//父子级别级联选择 + ,"tie_selection": true }, "search":{