diff --git a/assets/css/tpextbuilder.css b/assets/css/tpextbuilder.css index c5c6985..400709f 100644 --- a/assets/css/tpextbuilder.css +++ b/assets/css/tpextbuilder.css @@ -426,7 +426,7 @@ form label.full-label { } .panel-body.page-main { - padding: 15px 8px; + padding: 10px 8px; } .table-hover>tbody>tr.checked:hover { diff --git a/src/tree/JSTree.php b/src/tree/JSTree.php index a43bbad..10a0d80 100644 --- a/src/tree/JSTree.php +++ b/src/tree/JSTree.php @@ -91,6 +91,13 @@ class JSTree extends Widget implements Renderable */ public function fill($treeData, $textField = 'name', $idField = 'id', $pidField = 'parent_id', $rootText = '全部') { + if (empty($idField)) { + $idField = 'id'; + } + if (empty($pidField)) { + $pidField = 'parent_id'; + } + $tree = []; if ($rootText == '全部') { @@ -114,6 +121,10 @@ class JSTree extends Widget implements Renderable foreach ($treeData as $k => $li) { + if (!isset($li[$pidField])) { + $li[$pidField] = $li['pid'] ?? 0; + } + if ($li[$pidField] !== 0 && $li[$pidField] !== '') { continue; } diff --git a/src/tree/ZTree.php b/src/tree/ZTree.php index 8e92bc8..b865e1f 100644 --- a/src/tree/ZTree.php +++ b/src/tree/ZTree.php @@ -110,6 +110,13 @@ class ZTree extends Widget implements Renderable */ public function fill($treeData, $textField = 'name', $idField = 'id', $pidField = 'parent_id', $rootText = '全部') { + if (empty($idField)) { + $idField = 'id'; + } + if (empty($pidField)) { + $pidField = 'parent_id'; + } + $tree = []; if ($rootText == '全部') { @@ -130,6 +137,10 @@ class ZTree extends Widget implements Renderable foreach ($treeData as $li) { + if (!isset($li[$pidField])) { + $li[$pidField] = $li['pid'] ?? 0; + } + if (empty($idField)) { $idField = $li->getPk(); } @@ -159,7 +170,7 @@ class ZTree extends Widget implements Renderable $tree[] = [ 'id' => $li[$idField], - 'pId' => $li[$pidField] ?? $li['pid'], + 'pId' => $li[$pidField], 'name' => str_replace($keys, $replace, $textField), ]; } else {