add 10.4.2 version

10.4.1/app/admin/model/PluginModel.php → 10.4.2/app/admin/model/PluginModel.php

@@ -1356,6 +1356,8 @@ public function download($param)
                                 } 
                             }
 
+                            $this->pluginUpgradeAuth($module, $plugin['name']);
+
                             $this->update([
                                 'version' => $version
                             ], ['name' => $uuid]);

10.4.1/app/common/model/MenuModel.php → 10.4.2/app/common/model/MenuModel.php

@@ -628,7 +628,8 @@ public function adminMenu(){
 
         $first_menu_plugin = [];
 
-        $navs = NavModel::field('id,name,url,icon,parent_id,plugin')
+        $NavModel = new NavModel();
+        $navs = $NavModel->field('id,name,url,icon,parent_id,plugin')
             ->where($where)
             ->order('order','asc')
             ->select()
@@ -643,12 +644,12 @@ public function adminMenu(){
         }
 
 
-
-        $urls = AuthModel::where('url', '<>', '')
+        $AuthModel = new AuthModel();
+        $urls = $AuthModel->where('url', '<>', '')
             ->column('url');
 
         $adminId = get_admin_id();
-        $auth = AuthModel::alias('au')
+        $auth = $AuthModel->alias('au')
             ->field('au.url,au.plugin')
             ->leftjoin('auth_link al', 'al.auth_id=au.id')
             ->leftjoin('admin_role_link adrl', 'adrl.admin_role_id=al.admin_role_id')
@@ -697,6 +698,9 @@ public function adminMenu(){
         }
         if(empty($menus)){
             $menus = $navs;
+            $menuParentIds = array_filter($NavModel->column('parent_id'));
+        }else{
+            $menuParentIds = array_filter($this->column('parent_id'));
         }
 
         $plugins = PluginModel::where('status', 1)->column('name');
@@ -793,7 +797,7 @@ public function adminMenu(){
             }
         }
         foreach ($tree as $key => $value) {
-            if((!isset($value['child']) || empty($value['child'])) && (empty($value['url']) || $value['url']=='#')){
+            if((!isset($value['child']) || empty($value['child'])) && in_array($value['id'], $menuParentIds)){
                 unset($tree[$key]);
             }
         }

10.4.1/app/home/controller/ViewClientController.php → 10.4.2/app/home/controller/ViewClientController.php

@@ -39,7 +39,7 @@ public function index()
 
         $view_path = '../public/clientarea/template/'.$data['themes'].'/';
 
-        if(!file_exists($view_path.$tplName)){
+        if(!file_exists($view_path.$tplName.'.php')){
             $view_path = '../public/clientarea/template/default/';
         }
 

10.4.1/app/home/controller/ViewController.php → 10.4.2/app/home/controller/ViewController.php

@@ -57,7 +57,7 @@ public function index()
                 $view_path = '../public/web/'.$data['themes'].'/';
             }
 
-            if(!file_exists($view_path.$tplName)){
+            if(!file_exists($view_path.$tplName.'.html')){
                 $theme_config=$this->themeConfig($view_path);
                 if(!empty($theme_config['config-parent-theme'])){
                     $view_path = '../public/web/'.$theme_config['config-parent-theme'].'/';