From 6bfebb1d7aae6b75840b80f9883bb08c2709d8fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Tue, 23 Jul 2024 11:59:22 +0800 Subject: [PATCH] =?UTF-8?q?jstree=E6=8F=92=E4=BB=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=9A=20=E4=BF=AE=E5=A4=8D=E9=80=89=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E9=97=AE=E9=A2=98=EF=BC=9A=E6=88=91=E4=BB=AC=E5=B7=B2?= =?UTF-8?q?=E8=A7=A3=E5=86=B3jstree=E6=8F=92=E4=BB=B6=E5=9C=A8=E9=83=A8?= =?UTF-8?q?=E9=97=A8=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E4=B8=AD=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E6=AD=A3=E7=A1=AE=E9=80=89=E4=B8=AD=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=E7=8E=B0=E5=9C=A8=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=83=BD=E5=A4=9F=E6=B5=81=E7=95=85=E5=9C=B0?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=82=B9=E5=87=BB=E6=88=96=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E6=9D=A5=E9=80=89=E4=B8=AD=E6=88=96=E5=8F=96=E6=B6=88=E9=80=89?= =?UTF-8?q?=E4=B8=AD=E4=BB=BB=E4=BD=95=E9=83=A8=E9=97=A8=EF=BC=8C=E6=9E=81?= =?UTF-8?q?=E5=A4=A7=E5=9C=B0=E6=8F=90=E5=8D=87=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=9A=84=E5=87=86=E7=A1=AE=E6=80=A7=E5=92=8C?= =?UTF-8?q?=E6=95=88=E7=8E=87=E3=80=82=20=E6=90=9C=E7=B4=A2=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=85=BC=E5=AE=B9=E6=80=A7=E5=A2=9E=E5=BC=BA=EF=BC=9A?= =?UTF-8?q?=E5=90=8C=E6=97=B6=EF=BC=8C=E6=88=91=E4=BB=AC=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=86jstree=E6=8F=92=E4=BB=B6=E4=B8=8E=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7=E3=80=82?= =?UTF-8?q?=E5=9C=A8=E4=BD=BF=E7=94=A8=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E5=86=8D=E5=87=BA=E7=8E=B0=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E5=B7=B2=E9=80=89=E6=88=90=E5=91=98=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1=E7=9A=84=E6=83=85=E5=86=B5?= =?UTF-8?q?=EF=BC=8C=E7=A1=AE=E4=BF=9D=E7=94=A8=E6=88=B7=E5=9C=A8=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=B9=B6=E7=AD=9B=E9=80=89=E9=83=A8=E9=97=A8=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84=E6=88=90=E5=91=98?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BE=97=E4=BB=A5=E5=AE=8C=E6=95=B4=E4=BF=9D?= =?UTF-8?q?=E7=95=99=EF=BC=8C=E6=8F=90=E5=8D=87=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=9A=84=E8=BF=9E=E8=B4=AF=E6=80=A7=E5=92=8C?= =?UTF-8?q?=E7=A8=B3=E5=AE=9A=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/class/class_template.php | 7 ++----- core/core_version.php | 4 ++-- dzz/system/template/orgtree.htm | 8 +++++--- 3 files changed, 9 insertions(+), 10 deletions(-) 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":{