dever 6 gadi atpakaļ
vecāks
revīzija
a70c80ea33
2 mainītis faili ar 70 papildinājumiem un 9 dzēšanām
  1. 1 1
      database/cate.php
  2. 69 8
      database/project.php

+ 1 - 1
database/cate.php

@@ -52,7 +52,7 @@ return array
 			'match' 	=> 'is_numeric',
 			'update'	=> 'select',
 			'search'	=> 'order,select',
-			'list'		=> '{cate_id} > 0 ? Dever::load("forum/cate-one#name", {cate_id}) : "父级分类"',
+			'list'		=> '{cate_id} > 0 ? Dever::load("spider/cate-one#name", {cate_id}) : "父级分类"',
 			'option' 	=> $cate,
 		),
 		

+ 69 - 8
database/project.php

@@ -13,6 +13,7 @@ $status = array
 (
 	1 => '待机',
 	2 => '入队',
+	3 => '停止',
 );
 
 $cate = function()
@@ -37,13 +38,28 @@ $search_cate = function()
 	(
 		-1 => array('id' => '-1', 'name' => '所有分类'),
 	);
-	$cate = Dever::load('forum/cate.all');
+	$cate = Dever::load('spider/cate.get');
 	if ($cate) {
 		$array += $cate;
 	}
 	return $array;
 };
 
+$project = function()
+{
+	$array = array
+	(
+		-1 => array('id' => '-1', 'name' => '父级项目'),
+	);
+	$info = Dever::load('spider/project-main');
+	if ($info) {
+		$array += $info;
+	}
+	return $array;
+};
+
+$id = Dever::input('search_option_project_id', -1);
+
 return array
 (
 	# 表名
@@ -82,6 +98,18 @@ return array
 			'edit'		=> true,
 		),
 
+		'project_id'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '上级项目',
+			'default' 	=> $id,
+			'desc' 		=> '请选择上级分类',
+			'match' 	=> 'is_numeric',
+			'update'	=> 'select',
+			'search'	=> 'select',
+			'option' 	=> $project,
+		),
+
 		'cate_id_parent'		=> array
 		(
 			'type' 		=> 'int-11',
@@ -132,8 +160,8 @@ return array
 			'desc' 		=> '采集规则',
 			'match' 	=> 'is_string',
 			'update'	=> 'textarea',
-			'edit'		=> true,
-			'list'		=> true,
+			//'edit'		=> true,
+			//'list'		=> true,
 		),
 
 		'page_num'		=> array
@@ -155,7 +183,7 @@ return array
 			'match' 	=> 'is_numeric',
 			'option' 	=> $status,
 			'list'		=> true,
-			'update'	=> 'radio',
+			'update'	=> $id > 0 ? 'hidden' : 'radio',
 			'edit'		=> true,
 		),
 
@@ -166,7 +194,7 @@ return array
 			'default' 	=> '0',
 			'desc' 		=> '抓取次数',
 			'match' 	=> 'is_numeric',
-			'list'		=> true,
+			'list'		=> $id > 0 ? false : true,
 		),
 
 		'sdate'		=> array
@@ -176,8 +204,8 @@ return array
 			'default' 	=> '0',
 			'desc' 		=> '抓取开始时间',
 			'match' 	=> 'is_numeric',
-			'update'	=> 'date',
-			'list'		=> 'date("Y-m-d H:i:s", {sdate})',
+			'update'	=> $id > 0 ? 'hidden' : 'date',
+			'list'		=> $id > 0 ? false : '{sdate} > 0 ? date("Y-m-d H:i:s", {sdate}) : ""',
 			'callback'	=> 'maketime',
 		),
 
@@ -188,7 +216,22 @@ return array
 			'default' 	=> '0',
 			'desc' 		=> '抓取间隔秒数',
 			'match' 	=> 'is_numeric',
+			'update'	=> $id > 0 ? 'hidden' : 'text',
+		),
+
+		'reorder'		=> array
+		(
+			'type' 		=> 'int-11',
+			'name' 		=> '排序(数值越大越靠前)',
+			'default' 	=> '1',
+			'desc' 		=> '请输入排序',
+			'match' 	=> 'option',
 			'update'	=> 'text',
+			'search'	=> 'order',
+			'list_name' => '排序',
+			'list'		=> true,
+			'order'		=> 'desc',
+			'edit'		=> true,
 		),
 
 		'state'		=> array
@@ -214,6 +257,7 @@ return array
 
 	'manage' => array
 	(
+		'delete' => false,
 		# 更新数据时,要显示的按钮,这里填写js脚本事件即可。保存当前数据可为固定参数:"save-data",复制数据为:copy-data
 		'update_button' => array
 		(
@@ -226,12 +270,13 @@ return array
 		//'edit' => false,
 		
 		# 列表页的类型
-		//'list_type' => 'parent',
+		'list_type' => 'parent',
 		
 		# 可以删除
 		'list_button' => array
 		(
 			'list_col' => array('字段设置', '"col&search_option_project_id={id}&oper_parent=project"'),
+			'add' => array('新增子项目', '"project&search_option_project_id={id}&oper_parent=project&oper_save_jump=project"'),
 			//'list_data' => array('数据列表', '"data&search_option_project_id={id}&oper_save_jump=project&oper_parent=project"'),
 			//'delete' => array('采集数据', 'Dever::url("spider/data.daemon?id={id}&")'),
 		),
@@ -242,6 +287,22 @@ return array
 	# request 请求接口定义
 	'request' => array
 	(	
+		# main 取所有主分类
+		'main' => array
+		(
+			'where' => array
+			(
+				'project_id' => -1,
+				'state' => 1,
+			),
+			'type' => 'all',
+			'order' => array
+			(
+				'reorder' => 'desc',
+				'id' => 'desc',
+			),
+			'col' => '*|id',
+		),
 		# 获取所有入队并且符合当前时间的配置
 		'get' => array
 		(