| 
					
				 | 
			
			
				@@ -129,6 +129,9 @@ class Page extends Auth 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $data['column'] = $this->config['column'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (isset($this->config['column']['add'])) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $data['column']['add'] = array('name' => $this->config['column']['add'], 'func' => $this->getFunc('column_add', $name . '-' . $this->config['column']['add'], 101));
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    if (isset($this->config['column']['add_field'])) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        $data['column']['add']['field'] = $this->config['column']['add_field'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (isset($this->config['column']['edit'])) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     $data['column']['edit'] = array('name' => '编辑', 'func' => $this->getFunc('column_edit', $name . '-编辑', 102));
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -427,7 +430,8 @@ class Page extends Auth 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $value['type'] = $type;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         if (isset($value['upload']) && Dever::project('upload')) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            $upload = $this->getUpload($value['key']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            $project = $value['project'] ?? 'api';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            $upload = $this->getUpload($value['key'], $project);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (is_array($value['upload'])) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $upload += $value['upload'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } else {
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -436,7 +440,8 @@ class Page extends Auth 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (empty($upload['id'])) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 Dever::error('上传配置错误');
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            $value['config'] = Dever::load(\Upload\Lib\Save::class)->get($upload['id']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            $value['config'] = Dever::load(\Upload\Lib\Save::class)->get($upload['id'], $project);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             $value['yun'] = false;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if ($value['config']['method'] == 2) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 $value['yun'] = true;
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -459,7 +464,7 @@ class Page extends Auth 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    protected function getUpload($key)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    protected function getUpload($key, $project)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $upload['cate_id'] = 1;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $upload['group_key'] = $this->db->config['table'] . '-' . $key;
 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -467,12 +472,14 @@ class Page extends Auth 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $upload['user_token'] = Dever::load(Util::class)->getToken();
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $upload['user_table'] = $this->user['table'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         $upload['user_id'] = $this->user['id'];
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $upload['project'] = $project;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         return $upload;
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     protected function setEditorUpload(&$value, $key)
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        $upload = $this->getUpload($value['key']);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $project = $value['project'] ?? 'api';
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        $upload = $this->getUpload($value['key'], $project);
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         foreach ($key as $k) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if ($v = Dever::issets($value['editorMenu'], $k)) {
 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (!is_array($v)) {
 
			 |