|
@@ -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);
|