Merge branch 'zentaopms_239'

2022-11-08 08:41:28 +08:00
parent 39bee976e5 1ef9917477
commit 9761648d59
458 changed files with 9419 additions and 4940 deletions
@@ -927,6 +927,12 @@ class baseControl
        if($type != 'json') die();

        $data = (array)$data;
+
+        /* Make sure locate in this tab. */
+        global $lang;
+        $moduleName = $this->app->rawModule;
+        if(isset($lang->navGroup->{$moduleName}) and $lang->navGroup->{$moduleName} != $this->app->tab and isset($data['locate']) and $data['locate'][0] == '/' and !helper::inOnlyBodyMode()) $data['locate'] .= "#app={$this->app->tab}";
+
        if(helper::isAjaxRequest() or $this->viewType == 'json')
        {
            /* Process for zh-cn in json. */