update

hi-tpext · Jun 21, 2021 · f6381b4 · f6381b4
1 parent e2ed4e3
commit f6381b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 22 deletions.
diff --git a/src/admin/controller/Index.php b/src/admin/controller/Index.php
@@ -541,7 +541,7 @@ public function login()
         } else {
 
             if (!Module::isInstalled()) {
-                Tool::deleteDir(app()->getRuntimePath() . 'cache');
+                Cache::clear();
             }
 
             $this->assign(['login_in_top' => $config['login_in_top'], 'login_css_file' => $config['login_css_file']]);

diff --git a/src/admin/controller/Permission.php b/src/admin/controller/Permission.php
@@ -30,14 +30,12 @@ protected function initialize()
     {
         $this->dataModel = new AdminPermission;
         $this->pageTitle = '权限设置';
+        $this->pagesize = 9999; //不产生分页
     }
 
-    protected function buildDataList()
+    protected function buildDataList($where = [], $sortOrder = '', $page = 1, &$total = -1)
     {
-        $table = $this->table;
-
         $data = [];
-
         $reflectionClass = null;
 
         $contrl = null;
@@ -208,22 +206,7 @@ protected function buildDataList()
             $this->dataModel->destroy(array_values($delIds));
         }
 
-        if ($this->isExporting) {
-            $__ids__ = input('__ids__');
-            if (!empty($__ids__)) {
-                $ids = explode(',', $__ids__);
-                $newd = [];
-                foreach ($data as $d) {
-                    if (in_array($d['id'], $ids)) {
-                        $newd[] = $d;
-                    }
-                }
-                $data = $newd;
-            }
-        }
-
-        $this->buildTable($data);
-        $table->data($data);
+        $total = count($data);
 
         return $data;
     }
@@ -243,7 +226,6 @@ protected function buildTable(&$data = [])
         $table->text('action_name', '动作名称')->mapClass([''], 'hidden')->autoPost('', false)->getWrapper()->addStyle('max-width:100px');
         $table->switchBtn('action_type', '是权限')->autoPost('', false)->mapClass(['-1'], 'hidden')->getWrapper()->addStyle('max-width:80px');
 
-        $table->data($data);
         $table->getToolbar()->btnRefresh();
         $table->useActionbar(false);
         $table->useCheckbox(false);