dever vor 7 Jahren
Ursprung
Commit
c1c02ccd37
2 geänderte Dateien mit 23 neuen und 7 gelöschten Zeilen
  1. 1 1
      database/admin.php
  2. 22 6
      src/Database.php

+ 1 - 1
database/admin.php

@@ -330,7 +330,7 @@ return array
 		(
 			'type' 		=> 'varchar-100',
 			'name' 		=> '角色',
-			'default' 	=> '1',
+			'default' 	=> '',
 			'desc' 		=> '请选择角色',
 			'match' 	=> 'is_string',
 			'option' 	=> $role,

+ 22 - 6
src/Database.php

@@ -2200,13 +2200,26 @@ class Database
                         $v = str_replace('?', '?key='.$name.'&value='.$value.'&source='.$this->name.'&', $v);
                         $child[$k] = $key . '_' . $k .'" dever-ajax="'.Dever::url($v).'"';
                     } else {
-                        $show = $k . '_' . $v;
-                        if ($prefix) {
-                            $k = str_replace($name, $k, $prefix);
-                            $show = str_replace($name, $show, $prefix);
+                        if (strpos($v, ',')) {
+                            $temp = explode(',', $v);
+                            foreach ($temp as $v1) {
+                                $show = $k . '_' . $v1;
+                                if ($prefix) {
+                                    $k = str_replace($name, $k, $prefix);
+                                    $show = str_replace($name, $show, $prefix);
+                                }
+                                $parent[$k] = $key . '_' . $k;
+                                $child[$show] = $key . '_' . $show;
+                            }
+                        } else {
+                            $show = $k . '_' . $v;
+                            if ($prefix) {
+                                $k = str_replace($name, $k, $prefix);
+                                $show = str_replace($name, $show, $prefix);
+                            }
+                            $parent[$k] = $key . '_' . $k;
+                            $child[$show] = $key . '_' . $show;
                         }
-                        $parent[$k] = $key . '_' . $k;
-                        $child[$show] = $key . '_' . $show;
                     }
                 }
             }
@@ -2379,6 +2392,7 @@ class Database
             $prefix = '';
             if ($index < 0) {
                 $v['ext'] = $key . '_c_' . $v['col'];
+                $prefix = $v['ext'];
             } else {
                 $v['ext'] = $key . '_c_' . $index . '_i_' . $v['col'];
                 $prefix = $v['ext'];
@@ -2388,7 +2402,9 @@ class Database
                 $v['default'] = $index+1;
             }
 
+            
             $class = $this->update_class($v['col'], $v, $prefix);
+
             $result .= '<div class="form-group ' . $class . '">';
 
             $this->update_html($v, $key, $v['col'], $data, $result);