dever 7 years ago
parent
commit
56e81d6131
1 changed files with 8 additions and 3 deletions
  1. 8 3
      src/Database.php

+ 8 - 3
src/Database.php

@@ -537,11 +537,15 @@ class Database
                 'value' => array(),
                 'value' => array(),
             );
             );
 
 
-            if (!isset($config['manage']['edit']) && $config['update'] == true) {
-                $config['manage']['_list']['value']['update'] = '编辑';
+            if ((!isset($config['manage']['edit']) || !isset($config['manage']['update'])) && $config['update'] == true) {
+                if (!isset($config['manage']['list_button']['update'])) {
+                    $config['manage']['_list']['value']['update'] = '编辑';
+                }
             }
             }
             if (!isset($config['manage']['delete']) || (isset($config['manage']['delete']) && $config['manage']['delete'] == true)) {
             if (!isset($config['manage']['delete']) || (isset($config['manage']['delete']) && $config['manage']['delete'] == true)) {
-                $config['manage']['_list']['value']['delete'] = '删除';
+                if (!isset($config['manage']['list_button']['delete'])) {
+                    $config['manage']['_list']['value']['delete'] = '删除';
+                }
             }
             }
             if (isset($config['manage']['list'][0]) && is_array($config['manage']['list'][0])) {
             if (isset($config['manage']['list'][0]) && is_array($config['manage']['list'][0])) {
                 $config['manage']['_list']['value'] += $config['manage']['list'][0];
                 $config['manage']['_list']['value'] += $config['manage']['list'][0];
@@ -1860,6 +1864,7 @@ class Database
                     $config['manage']['_list']['value']['delete'] = '恢复';
                     $config['manage']['_list']['value']['delete'] = '恢复';
                 }
                 }
             }
             }
+
             foreach ($config['manage']['_list']['value'] as $kj => $vj) {
             foreach ($config['manage']['_list']['value'] as $kj => $vj) {
                 $pj = false;
                 $pj = false;