rabin 7 سال پیش
والد
کامیت
cf78da5d48
3فایلهای تغییر یافته به همراه5 افزوده شده و 20 حذف شده
  1. 2 1
      database/col.php
  2. 2 18
      database/project.php
  3. 1 1
      lib/Project.php

+ 2 - 1
database/col.php

@@ -104,6 +104,7 @@ return array
 			'name' 		=> '数据状态',
 			'default' 	=> '1',
 			'desc' 		=> '请选择状态',
+			'match' 	=> 'is_numeric',
 		),
 		
 		'cdate'		=> array
@@ -113,7 +114,7 @@ return array
 			'match' 	=> array('is_numeric', time()),
 			'desc' 		=> '',
 			# 只有insert时才生效
-			//'insert'	=> true,
+			'insert'	=> true,
 			'list'		=> 'date("Y-m-d H:i:s", {cdate})',
 		),
 	),

+ 2 - 18
database/project.php

@@ -2,12 +2,6 @@
 
 # 定义几个常用的选项
 
-$single = array
-(
-	1 => '是',
-	2 => '否',
-);
-
 $local = array
 (
 	1 => '关闭',
@@ -131,17 +125,6 @@ return array
 			//'edit'		=> 'textarea',
 		),
 
-		'single'		=> array
-		(
-			'type' 		=> 'tinyint-1',
-			'name' 		=> '是否单页采集-选是则只采集当前采集网址里的内容而不采集下级内容',
-			'default' 	=> '2',
-			'desc' 		=> '是否单页采集',
-			'match' 	=> 'is_numeric',
-			'option' 	=> $single,
-			'update'	=> 'radio',
-		),
-
 		'collect_rule'		=> array
 		(
 			'type' 		=> 'varchar-500',
@@ -153,7 +136,7 @@ return array
 			//'edit'		=> true,
 		),
 
-		'page'		=> array
+		'page_rule'		=> array
 		(
 			'type' 		=> 'varchar-300',
 			'name' 		=> '采集页数规则-填写采集的页数的正则表达式',
@@ -248,6 +231,7 @@ return array
 			'name' 		=> '状态',
 			'default' 	=> '1',
 			'desc' 		=> '请选择状态',
+			'match' 	=> 'is_numeric',
 		),
 		
 		'cdate'		=> array

+ 1 - 1
lib/Project.php

@@ -42,7 +42,7 @@ class Project
 
 	private function setting()
 	{
-		$this->config['col'] = Dever::db('spider/col')->all(['project_id' => $this->config['id']]);
+		$this->config['col'] = Dever::db('spider/col')->state(['project_id' => $this->config['id']]);
 		$this->config['url'] = explode("\r\n", $this->config['site']);
 		$this->config['queue'] = new Queue();
 		array_walk($this->config['url'], [$this->config['queue'], 'push']);