UI performance improvements

sergejey · sergejey · commit 59abecf2d178 · 2022-08-14T17:56:17.000+03:00
* Support of including Smarty files (.tpl) from html templates
* Objects tree UI improvement
diff --git a/admin.php b/admin.php
@@ -84,7 +84,8 @@
 
 startMeasure('accelerationProcess');
 if ((!defined('DISABLE_PANEL_ACCELERATION') || DISABLE_PANEL_ACCELERATION!=1)) {
- $result = preg_replace('/href="(\/admin\.php.+?)">/is','href="\1" onclick="return partLoad(this.href);">',$result);
+ //$result = preg_replace('/href="(\/admin\.php.+?)">/is','href="\1" onclick="return partLoad(this.href);">',$result);
+ $result = str_replace(' href="/admin.php',' onclick="return partLoad(this.href);" href="/admin.php',$result);
 }
 endMeasure('accelerationProcess');
 
diff --git a/lib/jTemplate.class.php b/lib/jTemplate.class.php
@@ -99,9 +99,11 @@ public function __construct($template, &$data, &$owner = '')
 
         if (strpos($res, '{#')) {
             //second pass
+            startMeasure('secondpass');
             $res = str_replace('{#', '[#', $res);
             $res = str_replace('#}', '#]', $res);
             $res = $this->parse($res, $this->data, $root);
+            endMeasure('secondpass');
         }
 
         if (isset($this->ajax) && $this->ajax) {
@@ -158,30 +160,40 @@ public function parse($res, &$hash, $dir)
 
         // ARRAYS
         if (is_integer(strpos($res, '[#begin '))) {
+            //startMeasure('parsingArrays'.$this->template);
             $this->parseArrays($res, $hash, $dir);
+            //endMeasure('parsingArrays'.$this->template);
         }
 
         // HASHES
         $this->parseHashes($res, $hash);
 
         // CONDITIONS
         if (is_integer(strpos($res, '[#if '))) {
+            //startMeasure('parsingIfs'.$this->template);
             $this->parseIf($res, $hash);
+            //endMeasure('parsingIfs'.$this->template);
         }
 
         // MODULES
         if (is_integer(strpos($res, '[#module '))) {
+            //startMeasure('parsingModules'.$this->template);
             $this->parseModules($res, $hash, $dir);
+            //endMeasure('parsingModules'.$this->template);
         }
 
         // INCLUDE FILES
         if (is_integer(strpos($res, '[#inc '))) {
+            //startMeasure('parsingIncludes'.$this->template);
             $this->parseIncludes($res, $hash, $dir);
+            //endMeasure('parsingIncludes'.$this->template);
         }
 
         // VARIABLES
         if (is_integer(strpos($res, '[#'))) {
+            //startMeasure('parsingVariables'.$this->template);
             $this->parseVariables($res, $hash);
+            //endMeasure('parsingVariables'.$this->template);
         }
 
         return $res;
@@ -332,7 +344,7 @@ public function parseGlobals(&$res, &$hash)
                 if (defined($matches[1][$i])) {
                     $res = str_replace($matches[0][$i], constant($matches[1][$i]), $res);
                 } else {
-                    if (!isset($hash[$matches[1][$i]])) $hash[$matches[1][$i]]=null;
+                    if (!isset($hash[$matches[1][$i]])) $hash[$matches[1][$i]] = null;
                     $res = str_replace($matches[0][$i], $hash[$matches[1][$i]], $res);
                 }
             }
@@ -355,7 +367,7 @@ public function parseArrays(&$res, &$hash, $dir)
             $count_matches_0 = count($matches[0]);
 
             for ($i = 0; $i < $count_matches_0; $i++) {
-                if (!isset($hash[$matches[1][$i]])) $hash[$matches[1][$i]]=null;
+                if (!isset($hash[$matches[1][$i]])) $hash[$matches[1][$i]] = null;
                 $var = $hash[$matches[1][$i]];
                 $line1 = $matches[2][$i];
                 $res1 = "";
@@ -456,7 +468,7 @@ public function parseHashes(&$res, &$hash)
         if (preg_match_all('/<#(\w+?)\.(\w+?)#>/', $res, $matches, PREG_PATTERN_ORDER)) {
             $count_matches_1 = count($matches[1]);
             for ($i = 0; $i < $count_matches_1; $i++) {
-                if (!isset($hash[$matches[1][$i]][$matches[2][$i]])) $hash[$matches[1][$i]][$matches[2][$i]]=null;
+                if (!isset($hash[$matches[1][$i]][$matches[2][$i]])) $hash[$matches[1][$i]][$matches[2][$i]] = null;
                 $res = str_replace($matches[0][$i], $this->templateSafe($hash[$matches[1][$i]][$matches[2][$i]]), $res);
             }
         }
@@ -724,19 +736,43 @@ public function parseIncludes(&$res, &$hash, $dir)
                 if (!file_exists($file_name)) {
                     $res = str_replace($matches[0][$i], "<!-- Cannot find file $file_name -->", $res);
                 } else {
+                    startMeasure('including '.$file_name);
+                    $old_template = $this->template;
+                    $this->template = $file_name;
+
                     if ((defined("DEBUG_MODE")) && !is_integer(strpos($file_name, ".js"))) {
                         $id = "block" . (int)rand(0, 100000);
-
                         /*
                         $replaceStr  = "<!-- begin of file $file_name -->";
                         $replaceStr .= $this->parse($this->loadfile($file_name) . "<!-- end of file $file_name -->", $new_hash, $new_root);
                         $res = str_replace($matches[0][$i], $replaceStr, $res);
                         */
-
-                        $res = str_replace($matches[0][$i], "" . $this->parse($this->loadfile($file_name) . "", $new_hash, $new_root), $res);
+                        if (preg_match('/\.tpl$/', $file_name)) {
+                            require_once ROOT . 'lib/smarty/Smarty.class.php';
+                            $smarty = new Smarty;
+                            $smarty->setCacheDir(ROOT . 'cms/cached/template_c');
+                            $smarty->setTemplateDir(ROOT . './templates')
+                                ->setCompileDir(ROOT . './cms/cached/templates_c')
+                                ->setCacheDir(ROOT . './cms/cached');
+                            $smarty->debugging = false;
+                            $smarty->caching = true;
+                            $smarty->setCaching(120);
+                            foreach ($new_hash as $k => $v) {
+                                $smarty->assign($k, $v);
+                            }
+                            $res = str_replace($matches[0][$i], "" . $smarty->fetch($file_name), $res);
+                        } else {
+                            $res = str_replace($matches[0][$i], "" . $this->parse($this->loadfile($file_name) . "", $new_hash, $new_root), $res);
+                        }
                     } else {
-                        $res = str_replace($matches[0][$i], $this->parse($this->loadfile($file_name), $new_hash, $new_root), $res);
+                        if (preg_match('/\.tpl$/', $file_name)) {
+                            dprint($new_hash);
+                        } else {
+                            $res = str_replace($matches[0][$i], $this->parse($this->loadfile($file_name), $new_hash, $new_root), $res);
+                        }
                     }
+                    $this->template = $old_template;
+                    endMeasure('including '.$file_name);
                 }
             }
         }
@@ -756,7 +792,7 @@ public function parseVariables(&$res, &$hash)
         if (preg_match_all('/\[#(\w+?)#\]/', $res, $matches, PREG_PATTERN_ORDER)) {
             $count_matches_1 = count($matches[1]);
             for ($i = 0; $i < $count_matches_1; $i++) {
-                if (!isset($hash[$matches[1][$i]])) $hash[$matches[1][$i]]='';
+                if (!isset($hash[$matches[1][$i]])) $hash[$matches[1][$i]] = '';
                 $res = str_replace($matches[0][$i], $this->templateSafe($hash[$matches[1][$i]]), $res);
             }
         }
@@ -765,7 +801,7 @@ public function parseVariables(&$res, &$hash)
         if (preg_match_all('/\[#(\w+?)\.(\w+?)#\]/', $res, $matches, PREG_PATTERN_ORDER)) {
             $count_matches_1 = count($matches[1]);
             for ($i = 0; $i < $count_matches_1; $i++) {
-                if (!isset($hash[$matches[1][$i]][$matches[2][$i]])) $hash[$matches[1][$i]][$matches[2][$i]]='';
+                if (!isset($hash[$matches[1][$i]][$matches[2][$i]])) $hash[$matches[1][$i]][$matches[2][$i]] = '';
                 $res = str_replace($matches[0][$i], $this->templateSafe($hash[$matches[1][$i]][$matches[2][$i]]), $res);
             }
         }
@@ -788,7 +824,6 @@ public function templateSafe($val)
         $res = str_replace('#}', '#&#125', $res);
         $res = str_replace('<#', '&#060#', $res);
         $res = str_replace('#>', '#&#062', $res);
-
         return $res;
     }
 
diff --git a/modules/classes/classes_search.inc.php b/modules/classes/classes_search.inc.php
@@ -69,21 +69,9 @@
       if ($methods[0]['ID']) {
        $total_m=count($methods);
        for($im=0;$im<$total_m;$im++) {
-
-        if ($methods[$im]['ID']==272) {
-         //print_r($parent_methods);exit;
-        }
-
         if ($parent_methods_titles[$methods[$im]['TITLE']]) {
          $methods[$im]['ID']=$parent_methods_titles[$methods[$im]['TITLE']];
         }
-
-        /*
-        $parent_method=SQLSelectOne("SELECT ID FROM methods WHERE OBJECT_ID=0 AND CLASS_ID='".$objects[$o]['CLASS_ID']."' AND TITLE='".DBSafe($methods[$im]['TITLE'])."'");
-        if ($parent_method['ID']) {
-         $methods[$im]['ID']=$parent_method['ID'];
-        }
-        */
        }
        $objects[$o]['METHODS']=$methods;
       }
@@ -100,4 +88,3 @@
    endMeasure('classesBuildTree');
    $out['RESULT']=$res;
   }
-?>
diff --git a/templates/classes/classes_search_admin.html b/templates/classes/classes_search_admin.html
@@ -3,4 +3,4 @@
 #-->
 
 
-[#inc view_tree.html#]
+[#inc view_tree.tpl#]
diff --git a/templates/classes/view_tree.tpl b/templates/classes/view_tree.tpl
@@ -0,0 +1,176 @@
+<div class="row" style="margin-right: -15px;margin-left: -15px;">
+    <div class="col-lg-6 col-md-5 col-sm-12 col-xs-12">
+        <script>
+            function filterProp() {
+                term = $('#filterProp').val().toLowerCase();
+                if(term.length <= 2) {
+                    $('ul.classSearch>li').attr('style', 'padding: 5px;display: block;border: 0px;border-radius: 0px;border-bottom: 1px solid #ddd;');
+                    $('ul.classSearch>li').removeAttr('id');
+                    return;
+                }
+                $('ul.classSearch>li').each(function(index) {
+                    textForSearch = $(this).children().children().text().trim();
+                    searchResult = textForSearch.toLowerCase().indexOf(term);
+
+                    if(searchResult >= 0) {
+                        $(this).attr('style', 'padding: 5px;display: block;border: 0px;border-radius: 0px;border-bottom: 1px solid #ddd;color: red;background: #fff2f2;');
+                        $($(this).prev()).attr('id', 'foundSearch');
+                    } else {
+                        $(this).attr('style', 'padding: 5px;display: block;border: 0px;border-radius: 0px;border-bottom: 1px solid #ddd;');
+                        $(this).removeAttr('id');
+                    }
+                });
+
+                if($('#foundSearch').length == 1) {
+                    $('html, body').stop().animate({
+                        scrollTop: $('#foundSearch').offset().top
+                    }, 1000);
+                }
+            }
+
+            function toggleClass(sub_id) {
+                splitSub = sub_id.split(',');
+                splitSubLength = splitSub.length-1;
+
+                $('#sub_'+splitSub[0]).collapse('toggle');
+
+                if($('#sub_'+splitSub[0]).attr('style') == 'height: 0px;') {
+                    console.log('vis');
+                    $.cookie("sub_classes_"+splitSub[0], '0');
+                } else {
+                    console.log('hid');
+                    $.cookie("sub_classes_"+splitSub[0], '1');
+                }
+
+                if(splitSubLength != 1) {
+                    $.each(splitSub,function(index,value){
+                        if($('#sub_'+splitSub[0]).is(':hidden')) {
+                            $('#sub_'+value).collapse('hide');
+                        }
+                    });
+                }
+            }
+        </script>
+        <input type="text" class="form-control" id="filterProp" oninput="filterProp();" placeholder="{$smarty.const.LANG_NEWMARKET_SEARCH_INPUT_PLACEHOLDER}">
+    </div>
+    <div class="col-lg-6 col-md-7 col-sm-12 col-xs-12 text-right" style="margin-bottom: 15px;">
+        <div class="visible-sm visible-xs" style="margin-top: 5px;"></div>
+        <a href="?view_mode=edit_classes" class="btn btn-success"><i class="glyphicon glyphicon-plus"></i> {$smarty.const.LANG_ADD_NEW_CLASS}</a>
+        <div class="visible-sm visible-xs" style="margin-top: 5px;"></div>
+        <a href="{$smarty.const.ROOTHTML}panel/class/0/object/0.html?md=objects&view_mode=edit_objects&id=" class="btn btn-success" title="{$smarty.const.LANG_EDIT}"><i class="glyphicon glyphicon-plus"></i> {$smarty.const.LANG_ADD_NEW_OBJECT}</a>
+    </div>
+</div>
+
+<div class="row" style="margin-right: -15px;margin-left: -15px;">
+    <div class="col-md-12" style="margin-bottom: 15px;">
+        <form action="?" method="post" name="frmList_classes" style="padding:0px">
+            {function name=classes}
+            {foreach $items as $item}
+            <script language="javascript">
+                $(function() {
+                    if ($.cookie("sub_classes_{$item.ID}") == '1') {
+                        $('#sub_{$item.ID}').collapse('show');
+                    }
+                });
+            </script>
+            <div class="panel panel-{if $item.TITLE == 'SDevices'}primary{else}{if $item.TITLE == 'Computer' OR $item.TITLE == 'systemStates' OR $item.TITLE == 'OperationalModes' OR $item.TITLE == 'Timer'}danger{else}default{/if}{/if}" style="margin-bottom: 5px;{if $item.LEVEL_PAD!=0}margin:10px;{/if}">
+                <div class="panel-heading">
+                    <div class="row">
+                        <div class="col-lg-8 col-md-8 col-sm-7 col-xs-9" onclick="toggleClass('{if $item.SUB_LIST!=$item.ID}{$item.ID},{/if}{$item.SUB_LIST}');" style="cursor: pointer;{if $item.CAN_DELETE=="1"}opacity: 0.3;{/if}">
+                        <h3 class="panel-title">
+                            <i class="glyphicon glyphicon-search" style="margin-right: 10px;vertical-align: text-top;cursor: pointer;" onclick="$('#filter_modules').val('{$item.TITLE}');filterSearch();$('#mdmGlobalSearchModal').modal('show');"></i> {$item.TITLE}
+                        </h3>
+                        {if $item.DESCRIPTION!=''}<div style="font-size: 1rem;padding-left: 30px;">{$item.DESCRIPTION}</div>{/if}
+                    </div>
+                    <div class="col-lg-4 col-md-4 col-sm-5 col-xs-3 text-right">
+                        <div class="btn-group btn-group-xs">
+                            <a href="?view_mode=edit_classes&id={$item.ID}" class="btn btn-success btn-sm" title="{$smarty.const.LANG_EDIT}"><i class="glyphicon glyphicon-pencil"></i></a>
+                            <a href="?view_mode=edit_classes&id={$item.ID}&tab=properties" class="btn btn-default btn-sm" title="{$smarty.const.LANG_PROPERTIES}"><i class="glyphicon glyphicon-th"></i></a>
+                            <a href="?view_mode=edit_classes&id={$item.ID}&tab=methods" class="btn btn-default btn-sm hidden-xs" title="{$smarty.const.LANG_METHODS}"><i class="glyphicon glyphicon-th-list"></i></a>
+                            <a href="?view_mode=edit_classes&id={$item.ID}&tab=objects" class="btn btn-default btn-sm hidden-xs" title="{$smarty.const.LANG_OBJECTS}"><i class="glyphicon glyphicon-th-large"></i></a>
+                            <a href="?view_mode=edit_classes&parent_id={$item.ID}" class="btn btn-default btn-sm hidden-xs" title="{$smarty.const.LANG_EXPAND}"><i class=""></i>{$smarty.const.LANG_EXPAND}</a>
+                            {if $item.CAN_DELETE=="1"}
+                            <a href="?view_mode=delete_classes&id={$item.ID}" onClick="return confirm('{$smarty.const.LANG_ARE_YOU_SURE}')" class="btn btn-danger btn-sm" title="{$smarty.const.LANG_DELETE}"><i class="glyphicon glyphicon-remove"></i></a>
+                            {/if}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="panel-collapse collapse out" id="sub_{$item.ID}">
+                {if $item.OBJECTS}
+                <ul class="list-group classSearch">
+                    {foreach $item.OBJECTS as $object}
+                    <li style="padding: 5px;display: block;border: 0px;border-radius: 0px;border-bottom: 1px solid #ddd;">
+                        <div class="row">
+                            <div class="col-md-12">
+                                <a href="{$smarty.const.ROOTHTML}panel/class/{$item.ID}/object/{$object.ID}.html">{$object.TITLE}</a> {if $object.DESCRIPTION != ''}<span style="font-size: 1rem;color: gray;vertical-align: middle;">→ {$object.DESCRIPTION}</span>{/if}
+                                {if $object.KEY_DATA!=""} → <i>{$object.KEY_DATA}</i>{/if}
+                                {if $object.METHODS}
+                                <div style="padding-left: 10px">
+                                    {foreach $object.METHODS as $method}
+                                    <p style="color: gray;font-size: 1.2rem;margin: 0px;">↳
+                                        <span class="label label-primary" style="margin-bottom: 5px;">{$smarty.const.LANG_METHOD}:
+                                         <a style="color: white;text-decoration: none;"
+                                         href="{$smarty.const.ROOTHTML}panel/class/{$item.ID}/object/{$object.ID}.html?tab=methods&overwrite=1&method_id={$method.ID}">{$method.TITLE}</a></span></p>
+                                    {/foreach}
+                                </div>
+                                {/if}
+                            </div>
+                        </div>
+                    </li>
+                    {/foreach}
+                </ul>
+                {/if}
+
+                {if $item.RESULT}
+                    {classes items=$item.RESULT}
+                {/if}
+
+            </div>
+    </div>
+     {/foreach}
+    {/function}
+    {classes items=$RESULT}
+    <input type="hidden" name="data_source" value="<#DATA_SOURCE#>">
+    <input type="hidden" name="view_mode" value="multiple_classes">
+    </form>
+</div>
+</div>
+
+
+
+
+
+&nbsp;
+<a href="#" onClick="$('#tools').toggle();return false;" class="btn btn-default">{$smarty.const.LANG_TOOLS}</a>
+<br>&nbsp;
+<div id='tools' style="display:none">
+    <form action="?" enctype="multipart/form-data" method="post">
+        <table border="0">
+            <tr>
+                <td valign="top">
+{$smarty.const.LANG_IMPORT_CLASS_FROM_FILE}:
+                </td>
+                <td valign="top"><input type="file" name="file" enctype="multipart/form-data"></td>
+            </tr>
+            <tr>
+                <td valign="top">&nbsp;</td>
+                <td valign="top"><label><input type="checkbox" name="overwrite" value="1">
+{$smarty.const.LANG_OVERWRITE}
+                    </label></td>
+            </tr>
+            <tr>
+                <td valign="top">&nbsp;</td>
+                <td valign="top"><label><input type="checkbox" name="only_classes" value="1">
+{$smarty.const.LANG_ONLY_CLASSES}
+                    </label></td>
+            </tr>
+            <tr>
+                <td valign="top">&nbsp;</td>
+                <td valign="top"><input type="submit" name="submit" value="{$smarty.const.LANG_IMPORT}" class="btn btn-default">
+                </td>
+            </tr>
+        </table>
+        <input type="hidden" name="view_mode" value="import_classes">
+    </form>
+</div>
diff --git a/templates/panel.html b/templates/panel.html
@@ -101,7 +101,7 @@
 					</ul>
 				</li>
 				[#if HIDE_LEFT_PANEL="1"#]
-				[#inc panel_nav_top.html#]
+				[#inc panel_nav_top.tpl#]
 				[#else#]
 				<li class="dropdown">
 					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="glyphicon glyphicon-dashboard" style="vertical-align: top;font-size: 11pt;"></i> <#LANG_SECTION_SYSTEM#> <b class="caret"></b></a>

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,8 @@`
`84`	`84`
`85`	`85`	`startMeasure('accelerationProcess');`
`86`	`86`	`if ((!defined('DISABLE_PANEL_ACCELERATION') \|\| DISABLE_PANEL_ACCELERATION!=1)) {`
`87`		`- $result = preg_replace('/href="(\/admin\.php.+?)">/is','href="\1" onclick="return partLoad(this.href);">',$result);`
	`87`	`+ //$result = preg_replace('/href="(\/admin\.php.+?)">/is','href="\1" onclick="return partLoad(this.href);">',$result);`
	`88`	`+ $result = str_replace(' href="/admin.php',' onclick="return partLoad(this.href);" href="/admin.php',$result);`
`88`	`89`	`}`
`89`	`90`	`endMeasure('accelerationProcess');`
`90`	`91`
Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@`
`3`	`3`	`#-->`
`4`	`4`
`5`	`5`
`6`		`-[#inc view_tree.html#]`
	`6`	`+[#inc view_tree.tpl#]`