From 5ccd6d240309f723ba9eadde0aa35a67d87fc05e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Mon, 16 Oct 2023 16:31:28 +0800
Subject: [PATCH] * Fix an error with tree.

---
 lib/zin/wg/tree/v1.php     | 2 +-
 module/execution/model.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/zin/wg/tree/v1.php b/lib/zin/wg/tree/v1.php
index b3d8eac0dd..cc94b9a01b 100644
--- a/lib/zin/wg/tree/v1.php
+++ b/lib/zin/wg/tree/v1.php
@@ -6,6 +6,6 @@ class tree extends wg
 {
     protected function build(): zui
     {
-        return zui::echarts(set::_tag('ul'), inherit($this));
+        return zui::tree(set::_tag('ul'), inherit($this));
     }
 }
diff --git a/module/execution/model.php b/module/execution/model.php
index ea94bac59f..f6673ad5e5 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4416,7 +4416,7 @@ class executionModel extends model
             {
                 case 'task':
                     $label = $tree->parent > 0 ? $this->lang->task->children : $this->lang->task->common;
-                    $treeData[$index]['link']    = helper::createLink('execution', 'treeTask', "taskID={$tree->id}");
+                    $treeData[$index]['url']    = helper::createLink('execution', 'treeTask', "taskID={$tree->id}");
                     $treeData[$index]['content'] = array(
                         'html' => "<div class='tree-link'><span class='label gray-pale rounded-full'>{$label}</span><span class='ml-4'>{$tree->id}</span><span class='title ml-4 text-primary' title='{$tree->title}'>" . $tree->title . '</span> <span class="user"><i class="icon icon-person"></i> ' . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . '</span></div>',
                     );
@@ -4428,7 +4428,7 @@ class executionModel extends model
                     break;
                 case 'story':
                     $this->app->loadLang('story');
-                    $treeData[$index]['link']    = helper::createLink('execution', 'treeStory', "taskID={$tree->storyId}");
+                    $treeData[$index]['url']    = helper::createLink('execution', 'treeStory', "taskID={$tree->storyId}");
                     $treeData[$index]['content'] = array(
                         'html' => "<div class='tree-link'><span class='label gray-pale rounded-full'>{$this->lang->story->common}</span><span class='ml-4'>{$tree->storyId}</span><span class='title text-primary ml-4' title='{$tree->title}'>{$tree->title}</span> <span class='user'><i class='icon icon-person'></i> " . (empty($tree->assignedTo) ? $tree->openedBy : $tree->assignedTo) . "</span></div>",
                     );
@@ -4449,7 +4449,7 @@ class executionModel extends model
             if(isset($tree->children))
             {
                 if($tree->type == 'task') $treeData[$index]['content']['html'] = "<div class='tree-toggle'><span class='title' title='{$tree->title}'>{$tree->title}</span></div>";
-                $treeData[$index]['children'] = $this->buildTree($tree->children, $hasProduct);
+                $treeData[$index]['items'] = $this->buildTree($tree->children, $hasProduct);
             }
         }
         return $treeData;