rabin vor 2 Jahren
Ursprung
Commit
e64ea62cdd
3 geänderte Dateien mit 23 neuen und 8 gelöschten Zeilen
  1. 1 1
      database/menu.php
  2. 16 5
      src/Database.php
  3. 6 2
      src/Lib/Input.php

+ 1 - 1
database/menu.php

@@ -244,7 +244,7 @@ return array
 		'button' => array
 		(
 			'更新菜单' => 'manage/menu.update',
-			'菜单分组' => array('location', 'manage/project/database/list&project=manage&oper_parent=menu&table=menu_group'),
+			'菜单分组' => array('location', 'manage/project/database/list&project=manage&oper_parent=menu&table=menu_group&search_option_state=1'),
 			//'全部清空' => 'manage/menu.delete',
 		),
 		# 每页显示条数,第一个为默认值

+ 16 - 5
src/Database.php

@@ -86,6 +86,13 @@ class Database
      */
     private $state = false;
 
+    /**
+     * lang_set
+     *
+     * @var array
+     */
+    private $lang_set = false;
+
     /**
      * __construct
      *
@@ -99,6 +106,8 @@ class Database
         if ($this->top) {
             Dever::load('manage/top.update_action', $this->top);
         }
+
+        $this->lang_set = Dever::config('base')->lang_set && count(Dever::config('base')->lang_set) > 1;
     }
 
     public function setting()
@@ -774,6 +783,8 @@ class Database
                     array_multisort($list_order, SORT_ASC, SORT_NUMERIC, $config['struct']);
                 }
             }
+        } else {
+            echo $file;die;
         }
 
         $config['state'] = $this->getState();
@@ -3209,7 +3220,7 @@ class Database
         if ($desc) {
             $result .= $desc;
         }
-        if (isset($config['manage']['lang']) && Dever::config('base')->lang_set && count(Dever::config('base')->lang_set) > 1) {
+        if (isset($config['manage']['lang']) && $this->lang_set) {
             $result .= '<div class="layui-tab layui-tab-card"><ul class="layui-tab-title">';
             $tab = '<div class="layui-tab-content">';
             $i = 0;
@@ -3325,7 +3336,7 @@ class Database
             $upload_call = $this->value($config['manage']['upload'], $data);
         }
         foreach ($config['struct'] as $k => $v) {
-            if (isset($config['manage']['lang']) && isset($v['sync']) && strpos($k, '-')) {
+            if (isset($config['manage']['lang']) && $this->lang_set && isset($v['sync']) && strpos($k, '-')) {
                 continue;
             }
             $state = false;
@@ -3607,7 +3618,7 @@ class Database
                     
                     if (isset($config['manage']['tab'])) {
                         $param['prefix'] = $prefix;
-                        $param['tab'] = $config['manage']['tab'];
+                        $param['tab_config'] = $config['manage']['tab'];
                         if (isset($config['manage']['tab'])) {
                             $param['lang'] = $config['manage']['lang'];
                         }
@@ -3807,7 +3818,7 @@ class Database
             if ($delete) {
                 $result .= '<div class="dever_form_delete" style="cursor:pointer">[删除]</div>';
             }
-            $result .= $content = $this->update_child_data($data, $param, $key, $index, -1, $config);
+            $result .= $content = $this->update_child_data($data, $param, $key, $index, 0, $config);
             $result .= '</div>';
         }
     }
@@ -4126,7 +4137,7 @@ class Database
             //print_r($update_id);
             //print_r($update_add);die;
             //print_r($input);
-            //print_r($update_other);
+            //print_r($update_other);die;
             //print_r($config['struct']);die;
             # 增加复制的数量
             $copy_num = Dever::input('copy_num');

+ 6 - 2
src/Lib/Input.php

@@ -935,10 +935,14 @@ class Input
         if (isset($param['load'])) {
             $load = $param['load'];
         }
+        $method = $param['name'];
+        if (strstr($method, '-')) {
+            $method = str_replace('-', '', $method);
+        }
 
-        $html .= '<script>function linkage_' . $param['name'] . '(level){select_linkage(level, "' . $id . '","' . $param['option'] . '", "' . $param['name'] . '", \'' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '\', "' . (isset($param['valid']) ? $param['valid'] : '') . '", "' . $w . '", false, "'.$param['search_state'].'", "'.$level_param.'", "'.$col.'", "'.$api.'", "'.$type.'", "'.$title.'", "'.$open.'", "'.$load.'")};';
+        $html .= '<script>function linkage_' . $method . '(level){select_linkage(level, "' . $id . '","' . $param['option'] . '", "' . $param['name'] . '", \'' . (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : '')) . '\', "' . (isset($param['valid']) ? $param['valid'] : '') . '", "' . $w . '", false, "'.$param['search_state'].'", "'.$level_param.'", "'.$col.'", "'.$api.'", "'.$type.'", "'.$title.'", "'.$open.'", "'.$load.'")};';
 
-        $html .= '$(document).ready(function(){linkage_' . $param['name'] . '(' . $level . ');'.$script.'});</script>';
+        $html .= '$(document).ready(function(){linkage_' . $method . '(' . $level . ');'.$script.'});</script>';
 
         $html .= '</' . $div . '><div id="'.$id.'_content"></div><div id="'.$id.'_data"></div>';