mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 15:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

修正cx标签

Browse Source
This commit is contained in:
yunwuxin
2017-01-16 17:29:07 +08:00
parent 04c81ca6b5
commit 0877798447
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/template/taglib/Cx.php
View File

@@ -98,7 +98,7 @@ class Cx extends Taglib
$name = $this->autoBuildVar($name); $name = $this->autoBuildVar($name);
} }
$parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection): $' . $key . ' = 0;'; $parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator): $' . $key . ' = 0;';
// 设置了输出数组长度 // 设置了输出数组长度
if (0 != $offset || 'null' != $length) { if (0 != $offset || 'null' != $length) {
$parseStr .= '$__LIST__ = is_array(' . $name . ') ? array_slice(' . $name . ',' . $offset . ',' . $length . ', true) : ' . $name . '->slice(' . $offset . ',' . $length . ', true); '; $parseStr .= '$__LIST__ = is_array(' . $name . ') ? array_slice(' . $name . ',' . $offset . ',' . $length . ', true) : ' . $name . '->slice(' . $offset . ',' . $length . ', true); ';
@@ -158,7 +158,7 @@ class Cx extends Taglib
} else { } else {
$name = $this->autoBuildVar($name); $name = $this->autoBuildVar($name);
} }
$parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection): '; $parseStr .= 'if(is_array(' . $name . ') || ' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator): ';
// 设置了输出数组长度 // 设置了输出数组长度
if (0 != $offset || 'null' != $length) { if (0 != $offset || 'null' != $length) {
if (!isset($var)) { if (!isset($var)) {
@@ -431,7 +431,7 @@ class Cx extends Taglib
{ {
$name = $tag['name']; $name = $tag['name'];
$name = $this->autoBuildVar($name); $name = $this->autoBuildVar($name);
$parseStr = '<?php if(empty(' . $name . ') || (' . $name . ' instanceof \think\Collection && ' . $name . '->isEmpty())): ?>' . $content . '<?php endif; ?>'; $parseStr = '<?php if(empty(' . $name . ') || ((' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator ) && ' . $name . '->isEmpty())): ?>' . $content . '<?php endif; ?>';
return $parseStr; return $parseStr;
} }
@@ -448,7 +448,7 @@ class Cx extends Taglib
{ {
$name = $tag['name']; $name = $tag['name'];
$name = $this->autoBuildVar($name); $name = $this->autoBuildVar($name);
$parseStr = '<?php if(!(empty(' . $name . ') || (' . $name . ' instanceof \think\Collection && ' . $name . '->isEmpty()))): ?>' . $content . '<?php endif; ?>'; $parseStr = '<?php if(!(empty(' . $name . ') || ((' . $name . ' instanceof \think\Collection || ' . $name . ' instanceof \think\Paginator) && ' . $name . '->isEmpty()))): ?>' . $content . '<?php endif; ?>';
return $parseStr; return $parseStr;
} }