From 2be5e19028b451e27ed3d952ab3482dce0fb6254 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Fri, 23 Dec 2022 01:49:53 +0000
Subject: [PATCH] * Update style.

---
 module/common/lang/zh-cn.php       | 2 +-
 module/zanode/control.php          | 7 ++++++-
 module/zanode/model.php            | 2 +-
 module/zanode/view/browse.html.php | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 79c89a9fe6..b130a688f5 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -179,7 +179,7 @@ $lang->testtask->common      = '测试单';
 $lang->score->common         = '我的积分';
 $lang->build->common         = '版本';
 $lang->testreport->common    = '测试报告';
-$lang->automation->common    = '自动化：';
+$lang->automation->common    = '自动化:';
 $lang->zahost->common        = '宿主机';
 $lang->zanode->common        = '执行节点';
 $lang->team->common          = '团队';
diff --git a/module/zanode/control.php b/module/zanode/control.php
index b2ea7d500c..b52a2da2d4 100644
--- a/module/zanode/control.php
+++ b/module/zanode/control.php
@@ -246,8 +246,13 @@ class zanode extends control
      * @param  int  $nodeID
      * @return void
      */
-    public function delete($nodeID)
+    public function delete($nodeID, $confirm = 'no')
     {
+        if($confirm == 'no')
+        {
+            return print(js::confirm($this->lang->zanode->confirmDelete, inlink('delete', "zanodeID={$nodeID}&confirm=yes")));
+        }
+
         $error = $this->zanode->destroy($nodeID);
 
         if($error)
diff --git a/module/zanode/model.php b/module/zanode/model.php
index 71e682a2c5..ed0c52f835 100644
--- a/module/zanode/model.php
+++ b/module/zanode/model.php
@@ -402,7 +402,7 @@ class zanodemodel extends model
      */
     public function getListByHost($hostID, $orderBy = 'id_desc')
     {
-        $list = $this->dao->select('id, name, vnc, cpuCores, memory, diskSize, osName, status')->from(TABLE_ZAHOST)
+        $list = $this->dao->select('id, name, vnc, cpuCores, memory, diskSize, osName, status, heartbeat')->from(TABLE_ZAHOST)
             ->where('deleted')->eq(0)
             ->andWhere("parent")->eq($hostID)
             ->orderBy($orderBy)
diff --git a/module/zanode/view/browse.html.php b/module/zanode/view/browse.html.php
index 967d7fc6e3..dc89025625 100644
--- a/module/zanode/view/browse.html.php
+++ b/module/zanode/view/browse.html.php
@@ -95,7 +95,7 @@
                 common::printLink('zanode', 'getVNC', "id={$node->id}", "<i class='icon icon-desktop'></i> ", '_blank', "title='{$lang->zanode->getVNC}' class='btn " . ($node->status == 'running' ? '':'disabled') . "'", '');
                 common::printLink('zanode', 'createImage', "zanodeID={$node->id}", "<i class='icon icon-export'></i> ", '', "class='btn iframe createImage' title='{$lang->zanode->createImage}' data-width='50%'", '', true);
                 common::printIcon('zanode', 'edit', "id={$node->id}", $node, 'list');
-                common::printLink('zanode', 'delete', "zanodeID={$node->id}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->zanode->destroy}' class='btn btn-primary' target='hiddenwin' onclick='if(confirm(\"{$lang->zanode->confirmDelete}\")==false) return false;'");
+                common::printLink('zanode', 'delete', "zanodeID={$node->id}", "<i class='icon icon-trash'></i> ", '', "title='{$lang->zanode->destroy}' class='btn btn-primary' target='hiddenwin'");
                 common::printIcon('zanode', 'init', "hostID={$node->id}", $node, 'list', 'refresh', '', ' init', false, "data-placement='bottom'", $lang->zanode->init->title);
                 ?>
               </td>