edit

src/collect/api/Test.php

@@ -9,7 +9,8 @@ class Test
 
     public function web()
     {
-        Dever::load('web', 'collect')->run(1, 1);
-        return 'ok';
+        $id = Dever::input('id');
+        $web_path = Dever::db('web_path', 'collect')->find($id);
+        return Dever::load('web', 'collect')->run($web_path['web_id'], $web_path['id']);
     }
 }

src/collect/lib/Common.php

@@ -0,0 +1,17 @@
+<?php namespace Collect\Lib;
+use Dever;
+class Common
+{
+    public function table($data)
+    {
+        $html = '<table class="dever-img" style="margin: 10px;border: 1px solid #E8E8E8;text-align:left" border=1 height=100%">';
+
+        foreach ($data as $k => $v) {
+            $html .= '<tr><td style="word-break:break-all;word-wrap:break-word;">' . $k . '</td><td style="word-break:break-all;word-wrap:break-word;">' . $v . '</td></tr>';
+        }
+
+        $html .= '</table>';
+
+        return $html;
+    }
+}

src/collect/lib/Web.php

@@ -114,6 +114,7 @@ class Web
         }
 
         $data = $dom->queryData();
+        $test = Dever::input('test');
         if ($data && $next) {
             foreach ($data as $k => $v) {
                 foreach ($next as $k1 => $v1) {
@@ -121,6 +122,9 @@ class Web
                         $data[$k] += $this->handle($v1['range'], $v1['rule'], $v[$k1]);
                     }
                 }
+                if ($test == 1 && $k == 0) {
+                    print_r(Dever::load('common', 'collect')->table($data[0]));die;
+                }
             }
         }
         return $data;
@@ -213,7 +217,7 @@ class Web
             $result = $data;
         }
         
-        return Dever::table($result);
+        return Dever::load('common', 'collect')->table($result);
     }
     
     # 更新数据
@@ -298,7 +302,6 @@ class Web
                         $body[$i][] = isset($value[$v['key']]) ? $value[$v['key']] : '';
                     }
                 }
-
                 $i++;
             }
         }
@@ -309,7 +312,19 @@ class Web
     public function view($page)
     {
         # 这里获取基本信息
-        //print_r($page->info);die;
+        $value = Dever::json_decode($page->info['value']);
+        $content = array();
+        foreach ($value as $k => $v) {
+            $content[] = array
+            (
+                'name' => $k,
+                # 类型，text普通文本，tag标签，link链接，image图片 progress进度条 stat统计 timeline时间线 table表格
+                'type' => 'text',
+                'content' => $v,
+                # 样式primary success warning danger info exception
+                //'style' => 'info',
+            );
+        }
         $info[] = array
         (
             # 类型，desc描述 table表格，表格有head和body即可
@@ -321,40 +336,7 @@ class Web
             'border' => true,
             # 排列方向：horizontal横向 vertical纵向
             'direction' => 'horizontal',
-
-            'content' => array
-            (
-                array
-                (
-                    'name' => '标题',
-                    # 类型，text普通文本，tag标签，link链接，image图片 progress进度条 stat统计 timeline时间线 table表格
-                    'type' => 'text',
-                    'content' => '<a style="color:red">内容</a>',
-                    # 样式primary success warning danger info exception
-                    'style' => 'primary',
-                ),
-                array
-                (
-                    'name' => '标题',
-                    'type' => 'tag',
-                    'content' => '内容',
-                    'style' => 'warning',
-                ),
-                array
-                (
-                    'name' => '标题',
-                    'type' => 'link',
-                    'content' => '内容',
-                ),
-                array
-                (
-                    'name' => '图片',
-                    'type' => 'image',
-                    'content' => 'https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg',
-                    # 'fill', 'contain', 'cover', 'none', 'scale-down'
-                    'fit' => 'fill',
-                ),
-            ),
+            'content' => $content,
         );
 
         return array('info' => $info);

src/collect/table/manage/web_path_manage.php

@@ -23,6 +23,7 @@ return array
                     'set' => array('web_path_id' => 'id', 'menu' => 'collect/web_info', 'parent' => 'collect/web_path_manage', 'parent_param' => array('web_id' => $web_id, 'menu' => 'collect/web_info', 'parent' => 'collect/web_info')),
                 ),
             ), 'ChatLineSquare'),
+            '调试' => array('link', Dever::url('collect/test.web', array('test' => 1))),
         ),
         'button' => array
         (

src/sector/table/manage/core.php

@@ -7,7 +7,7 @@ return array
         (
             'name' => '领域系统',
             'sort' => '1',
-            'partition' => 'database',
+            'partition' => 'database.database',
             'info_table' => 'sector/info',
             'user_table' => 'sector/user',
             'role_table' => 'sector/role',

src/sector/table/role.php

@@ -2,7 +2,7 @@
 return array
 (
     'name' => '领域角色',
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/common.system", array(false, false))',
     'struct' => array
     (
         'name' => array

src/sector/table/user.php

@@ -3,7 +3,7 @@ return array
 (
     'name' => '领域账户',
     # 定义数据分离
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/common.system", array(false, false))',
     'struct' => array
     (
         'name' => array

src/sector/table/user_part.php

@@ -2,7 +2,7 @@
 return array
 (
     'name' => '用户身份关联表',
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/common.system", array(false, false))',
     'struct' => array
     (
         'uid' => array

src/source/lib/Cate.php → src/source/lib/Times.php

@@ -1,18 +1,16 @@
-<?php namespace Source\Lib;
-use Dever;
-class Cate
-{
-    # 获取分类列表
-    public function getList($zone_id = false)
-    {
-        if (!$zone_id) {
-            $extend = Dever::load('common', 'manage')->extend();
-            $zone_id = $extend['data_id'];
-        }
-        $data = array();
-        if ($zone_id) {
-            $data = Dever::db('cate', 'source')->select(array('zone_id' => $zone_id));
-        }
-        return $data;
-    }
+<?php namespace Source\Lib;
+use Dever;
+class Times
+{
+    # 获取分类列表
+    public function getList()
+    {
+        /*
+        if (!$zone_id) {
+            $extend = Dever::load('common', 'manage')->extend();
+            $zone_id = $extend['data_id'];
+        }*/
+        $data = Dever::db('times', 'source')->select([]);
+        return $data;
+    }
 }

src/source/table/cate.php

@@ -1,19 +0,0 @@
-<?php
-return array
-(
-    'name' => '资源分类表',
-    'partition' => 'Dever::call("manage/common.system")',
-    'struct' => array
-    (
-        'name' => array
-        (
-            'name'      => '分类名称',
-            'type'      => 'varchar(32)',
-        ),
-        'zone_id' => array
-        (
-            'name'      => '源区ID',
-            'type'      => 'int(11)',
-        ),
-    ),
-);

src/source/table/channel.php

@@ -12,12 +12,6 @@ return array
             'type'      => 'varchar(32)',
         ),
 
-        'zone_id' => array
-        (
-            'name'      => '源区ID',
-            'type'      => 'int(11)',
-        ),
-
         'info' => array
         (
             'name'      => '简介',

src/source/table/info.php

@@ -12,12 +12,6 @@ return array
             'type'      => 'varchar(32)',
         ),
 
-        'zone_id' => array
-        (
-            'name'      => '源区ID',
-            'type'      => 'int(11)',
-        ),
-
         'info' => array
         (
             'name'      => '简介',
@@ -30,11 +24,12 @@ return array
             'type'      => 'varchar(500)',
         ),
 
-        'cate_id' => array
+        'times_id' => array
         (
-            'name'      => '分类',
+            'name'      => '时序',
             'type'      => 'int(11)',
-            'value'    => 'Dever::call("source/cate.getList")',
+            'value'     => 'Dever::call("source/times.getList")',
+            'default'   => 1,
         ),
 
         'content'       => array

src/source/table/manage/core.php

@@ -70,10 +70,10 @@ return array
             'sort'      => '1',
         ),
 
-        'source_cate' => array
+        'source_times' => array
         (
             'parent'    => 'set_zone_source',
-            'name'      => '分类列表',
+            'name'      => '时序列表',
             'icon'      => 'apps-line',
             'sort'      => '2',
         ),

src/source/table/manage/source_cate.php

@@ -1,35 +0,0 @@
-<?php
-$extend = Dever::load('common', 'manage')->extend();
-$zone_id = $extend['data_id'];
-return array
-(
-    'source' => 'source/cate',
-    'list' => array
-    (
-        'where' => array('zone_id' => $zone_id),
-        'field'      => array
-        (
-            'name',
-        ),
-        'button' => array
-        (
-            '新增' => array('fastadd', array('zone_id' => $zone_id)),
-        ),
-        'data_button' => array
-        (
-            '编辑' => 'fastedit',
-        ),
-        'search'    => array
-        (
-            'name',
-        ),
-    ),
-    'update' => array
-    (
-        'field'    => array
-        (
-            'zone_id',
-            'name',
-        ),
-    ),
-);

src/source/table/manage/source_info.php

@@ -1,19 +1,17 @@
 <?php
-$extend = Dever::load('common', 'manage')->extend();
-$zone_id = $extend['data_id'];
 return array
 (
     'source' => 'source/info',
     'list' => array
     (
-        'where' => array('zone_id' => $zone_id),
         'field'      => array
         (
+            'id',
             'name' => array
             (
                 //'tip' => false,
             ),
-            'cate_id',
+            'times_id',
             'type',
             'status' => array
             (
@@ -26,7 +24,7 @@ return array
         ),
         'button' => array
         (
-            '新增' => array('add', array('zone_id' => $zone_id)),
+            '新增' => array('add'),
         ),
         'data_button' => array
         (
@@ -34,7 +32,7 @@ return array
         ),
         'search'    => array
         (
-            'cate_id',
+            'times_id',
             'type',
             'status',
             'name',
@@ -44,15 +42,11 @@ return array
     (
         'field'    => array
         (
-            'zone_id' => array
-            (
-                'type' => 'hidden',
-            ),
             'name' => array
             (
                 'rules' => true,
             ),
-            'cate_id' => array
+            'times_id' => array
             (
                 'rules' => true,
             ),

src/source/table/manage/source_times.php

@@ -0,0 +1,52 @@
+<?php
+/*
+$extend = Dever::load('common', 'manage')->extend();
+$zone_id = $extend['data_id'];
+*/
+return array
+(
+    'source' => 'source/times',
+    'list' => array
+    (
+        'field'      => array
+        (
+            'id',
+            'name',
+            'year',
+            //'end_year',
+            'cdate',
+        ),
+        'button' => array
+        (
+            '新增' => array('add'),
+        ),
+        'data_button' => array
+        (
+            '编辑' => 'edit',
+        ),
+        'search'    => array
+        (
+            'name',
+        ),
+    ),
+    'update' => array
+    (
+        'field'    => array
+        (
+            'name',
+            'desc' => 'textarea',
+            'year' => array
+            (
+                'type' => 'date',
+                'date_type' => 'year',
+                'desc' => '必填，影响当前时序下所有资源及其发布内容的时间，如果用户未选择时间，则自动使用开始年份作为时间的年份',
+            ),
+            'end_year' => array
+            (
+                'type' => 'date',
+                'date_type' => 'year',
+                'desc' => '选填，填写后，用户可以选择开始时间和结束时间之间的年份作为当前时序',
+            ),
+        ),
+    ),
+);

src/source/table/manage/source_zone.php

@@ -10,7 +10,6 @@ return array
         'field'      => array
         (
             'name',
-            'key',
             'status' => array
             (
                 'type' => 'switch',
@@ -41,7 +40,6 @@ return array
                 'type' => 'hidden',
             ),
             'name',
-            'key',
             'status' => 'radio',
         ),
         'check' => 'key',

src/source/table/times.php

@@ -0,0 +1,38 @@
+<?php
+return array
+(
+    'name' => '资源时序表',
+    'partition' => 'Dever::call("manage/common.system")',
+    'struct' => array
+    (
+        'name' => array
+        (
+            'name'      => '时序名称',
+            'type'      => 'varchar(32)',
+        ),
+        'desc' => array
+        (
+            'name'      => '时序描述',
+            'type'      => 'varchar(800)',
+        ),
+        'year'      => array
+        (
+            'name'      => '开始年份',
+            'type'      => 'int(11)',
+        ),
+        'end_year'      => array
+        (
+            'name'      => '结束年份',
+            'type'      => 'int(11)',
+        ),
+    ),
+    'default' => array
+    (
+        'field' => 'name,year,cdate',
+        'value' => array
+        (
+            '"默认时序","'.DEVER_TIME.'",' . DEVER_TIME,
+        ),
+        'num' => 1,
+    ),
+);

src/source/table/zone.php

@@ -2,7 +2,7 @@
 return array
 (
     'name' => '源区表',
-    'partition' => 'Dever::call("manage/common.system")',
+    'partition' => 'Dever::call("manage/common.system", array(false, false))',
     'struct' => array
     (
         'uid' => array
@@ -15,11 +15,6 @@ return array
             'name'      => '源区名称',
             'type'      => 'varchar(200)',
         ),
-        'key' => array
-        (
-            'name'      => '源区标识',
-            'type'      => 'varchar(32)',
-        ),
         'logo' => array
         (
             'name'      => 'LOGO图片',