* Finish task #81386,81385,81384.

2022-12-27 13:14:59 +08:00
parent b291f3cc95
commit 37237950ce
18 changed files with 68 additions and 7 deletions
@@ -11,6 +11,9 @@
 */
 ?>
 <?php include '../../common/view/header.html.php';?>
+<style>
+.table-form  tr:first-child td:last-child{width:2%;}
+</style>
 <div id='mainContent' class='main-content'>
  <div class='center-block'>
    <div class='main-header'>
@@ -22,21 +25,33 @@
      <table class='table table-form'>
        <?php if(!$productID):?>
        <tr>
-          <th class='w-80px'><?php echo $lang->testcase->product;?></th>
+          <th class='w-100px'><?php echo $lang->testcase->product;?></th>
          <td class='required'><?php echo html::select('product', $products, '', "class='form-control picker-select' onchange='loadProduct(this.value)'");?></td>
+          <td></td>
        </tr>
        <?php endif;?>
        <tr>
-          <th class='w-80px'><?php echo $lang->zanode->common;?></th>
+          <th class='w-100px'><?php echo $lang->zanode->common;?></th>
          <td class='required'><?php echo html::select('node', $nodeList, !empty($automation->node) ? $automation->node : '', "class='form-control picker-select'");?></td>
+          <td></td>
        </tr>
        <tr>
-          <th><?php echo $lang->zanode->scriptPath;?></th>
+          <th>
+            <?php echo $lang->zanode->scriptPath;?>
+          </th>
          <td class='required'><?php echo html::input('scriptPath', !empty($automation->scriptPath) ? $automation->scriptPath : '', "class='form-control'");?></td>
+          <td>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='left' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->scriptTips;?>"></icon>
+          </td>
        </tr>
        <tr>
-          <th><?php echo $lang->zanode->shell;?></th>
+          <th>
+            <?php echo $lang->zanode->shell;?>
+          </th>
          <td><?php echo html::textarea('shell', !empty($automation->shell) ? $automation->shell : '', "rows='6' class='form-control'");?></td>
+          <td>
+            <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='left' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->shellTips;?>"></icon>
+          </td>
        </tr>
        <tr>
          <td colspan='2' class='text-center'>
@@ -50,6 +65,8 @@
  </div>
 </div>
 <script>
+$('[data-toggle="popover"]').popover();
+
 $(function()
 {
    if($("#product").length > 0){
@@ -1,4 +1,5 @@
 <?php js::set('flow', $config->global->flow);?>
+<?php $this->app->loadLang('zanode');?>
 <?php $isProjectApp       = $this->app->tab == 'project'?>
 <?php $currentModule      = $isProjectApp ? 'project'  : 'testcase';?>
 <?php $currentMethod      = $isProjectApp ? 'testcase' : 'browse';?>
@@ -10,6 +11,8 @@
 <?php if($config->global->flow == 'full'):?>
 <style>
 .btn-group a i.icon-plus {font-size: 16px;}
+.btn-group .icon-help {line-height: 30px;}
+.btn-group .popover {width:300px;}
 .btn-group a.btn-primary {border-right: 1px solid rgba(255,255,255,0.2);}
 .btn-group button.dropdown-toggle.btn-primary {padding:6px;}
 .body-modal #mainMenu>.btn-toolbar {width: auto;}
@@ -192,6 +195,7 @@
    <?php if(!empty($productID)): ?>
    <div class='btn-group'>
      <?php common::printLink('testcase', 'automation', "productID=$productID", "<i class='icon-wrench muted'> </i>" . $lang->testcase->automation, '', "class='btn btn-link iframe'", true, true)?>
+      <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='bottom' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->automationTips;?>"></icon>
    </div>
    <div class='btn-group'>
      <button type='button' class='btn btn-link dropdown-toggle' data-toggle='dropdown'>
@@ -318,5 +322,7 @@ $(function()
            $needconfirmTab.after("<div class='dividing-line'></div>");
        }
    }
+
+    $('[data-toggle="popover"]').popover();
 });
 </script>
@@ -0,0 +1 @@
+.icon-help{line-height: 34px;}
@@ -31,4 +31,6 @@ $(function()
    });

    $('#osCategory').change();
+
+    $('[data-toggle="popover"]').popover();
 })
@@ -20,8 +20,8 @@ $lang->zahost->copied         = 'Copy successful';
 $lang->zahost->name        = 'Name';
 $lang->zahost->IP          = 'Extranet Address';
 $lang->zahost->extranet    = 'Extranet Address';
-$lang->zahost->cpuCores    = 'CPU';
 $lang->zahost->memory      = 'Memory Size';
+$lang->zahost->cpuCores    = 'CPU';
 $lang->zahost->diskSize    = 'Disk Size';
 $lang->zahost->desc        = 'Description';
 $lang->zahost->type        = 'Type';
@@ -122,3 +122,5 @@ $lang->zahost->notice->ip              = '『%s』incorrect format!';
 $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s';
 $lang->zahost->notice->loading         = 'loading...';
 $lang->zahost->notice->noImage         = 'No available image';
+
+$lang->zahost->tips = 'Host include physical host, k8s clusters, cloud servers, and cloud container instances. Host used to create VMS or container instances. The recommended host OS is ubuntu or CentOS LTS.';
@@ -20,8 +20,8 @@ $lang->zahost->copied         = 'Copy successful';
 $lang->zahost->name        = 'Name';
 $lang->zahost->IP          = 'Extranet Address';
 $lang->zahost->extranet    = 'Extranet Address';
-$lang->zahost->cpuCores    = 'CPU';
 $lang->zahost->memory      = 'Memory Size';
+$lang->zahost->cpuCores    = 'CPU';
 $lang->zahost->diskSize    = 'Disk Size';
 $lang->zahost->desc        = 'Description';
 $lang->zahost->type        = 'Type';
@@ -122,3 +122,5 @@ $lang->zahost->notice->ip              = '『%s』incorrect format!';
 $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s';
 $lang->zahost->notice->loading         = 'loading...';
 $lang->zahost->notice->noImage         = 'No available image';
+
+$lang->zahost->tips = 'Host include physical host, k8s clusters, cloud servers, and cloud container instances. Host used to create VMS or container instances. The recommended host OS is ubuntu or CentOS LTS.';
@@ -20,8 +20,8 @@ $lang->zahost->copied         = 'Copy successful';
 $lang->zahost->name        = 'Name';
 $lang->zahost->IP          = 'Extranet Address';
 $lang->zahost->extranet    = 'Extranet Address';
-$lang->zahost->cpuCores    = 'CPU';
 $lang->zahost->memory      = 'Memory Size';
+$lang->zahost->cpuCores    = 'CPU';
 $lang->zahost->diskSize    = 'diskSize Size';
 $lang->zahost->desc        = 'Description';
 $lang->zahost->type        = 'Type';
@@ -122,3 +122,5 @@ $lang->zahost->notice->ip              = '『%s』incorrect format!';
 $lang->zahost->notice->registerCommand = 'Register command: ./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s';
 $lang->zahost->notice->loading         = 'loading...';
 $lang->zahost->notice->noImage         = 'No available image';
+
+$lang->zahost->tips = 'Host include physical host, k8s clusters, cloud servers, and cloud container instances. Host used to create VMS or container instances. The recommended host OS is ubuntu or CentOS LTS.';
@@ -122,3 +122,5 @@ $lang->zahost->notice->ip              = '『%s』格式不正确！';
 $lang->zahost->notice->registerCommand = '宿主机注册命令：./zagent-host -t host -s http://%s:%s -i %s -p 8086 -secret %s';
 $lang->zahost->notice->loading         = '加载中...';
 $lang->zahost->notice->noImage         = '无可用的镜像文件';
+
+$lang->zahost->tips = '宿主机包括实体主机、k8s集群、云服务器以及云容器实例，主要用于创建虚拟机或容器实例。宿主机推荐安装的操作系统为ubuntu或CentOS的LTS版本。';
@@ -17,6 +17,7 @@
    <div class='center-block'>
      <div class='main-header'>
        <h2><?php echo $lang->zahost->create;?></h2>
+        <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zahost->tips;?>"></icon>
      </div>
      <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
        <table class='table table-form'>
@@ -17,6 +17,7 @@
    <div class='center-block'>
      <div class='main-header'>
        <h2><?php echo $lang->zahost->editAction;?></h2>
+        <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zahost->tips;?>"></icon>
      </div>
      <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
        <table class='table table-form'>
@@ -0,0 +1 @@
+.icon-help{line-height: 34px;}
@@ -1,5 +1,7 @@
 $(function()
 {
+    $('[data-toggle="popover"]').popover();
+
    if(config.currentMethod == 'create') $('#parent').change();

    $('#parent').change(function()
@@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [
 $lang->zanode->init->title          = "Initialize Node";
 $lang->zanode->init->descTitle      = "Follow these steps to complete the initialization on the node:";
 $lang->zanode->init->initDesc       = "Execute the init script on the node: %s %s   <br>- Click check service status button.";
+
+$lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
+$lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.';
+$lang->zanode->shellTips  = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
+$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.';
@@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [
 $lang->zanode->init->title          = "Initialize Node";
 $lang->zanode->init->descTitle      = "Follow these steps to complete the initialization on the node:";
 $lang->zanode->init->initDesc       = "Execute the init script on the node: %s %s   <br>- Click check service status button.";
+
+$lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
+$lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.';
+$lang->zanode->shellTips  = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
+$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.';
@@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [
 $lang->zanode->init->title          = "Initialize Node";
 $lang->zanode->init->descTitle      = "Follow these steps to complete the initialization on the node:";
 $lang->zanode->init->initDesc       = "Execute the init script on the node: %s %s   <br>- Click check service status button.";
+
+$lang->zanode->tips = "The execution node is a virtual machine or container instance created by the host machine, which is a test environment for executing test tasks. After the execution node is configured with the automated test environment, the script can be automatically executed, and the results can be viewed in the execution results of Zen Dao's application cases.";
+$lang->zanode->scriptTips = 'Write the directory where the script is located on the execution node.';
+$lang->zanode->shellTips  = 'Before running the automated test script on the execution node, you can execute a custom shell command.';
+$lang->zanode->automationTips = 'Before executing the test task on the execution node, you need to set up the execution node corresponding to the product, the directory of the automated test script, and the custom Shell command to execute.';
@@ -110,3 +110,8 @@ $lang->zanode->init->serviceStatus = [
 $lang->zanode->init->title          = "初始化执行节点";
 $lang->zanode->init->descTitle      = "请根据引导完成执行节点上的初始化: ";
 $lang->zanode->init->initDesc       = "- 在执行节点上执行命令：%s %s  <br>- 点击检测服务状态。";$lang->zanode->init->statusTitle    = "服务状态";
+
+$lang->zanode->tips = '执行节点是由宿主机创建的虚拟机或容器实例，是执行测试任务的测试环境，在执行节点配置自动化测试环境后可以自动执行脚本，结果可以在禅道对应用例执行结果中查看。';
+$lang->zanode->scriptTips = '填写执行节点上自动化测试脚本所在的目录。';
+$lang->zanode->shellTips  = '在执行节点上运行自动化测试脚本前，可以执行自定义的shell命令。';
+$lang->zanode->automationTips = '在执行节点上执行测试任务前，需要设置产品对应的执行节点，自动化测试脚本的目录以及需要执行的自定义Shell命令。';
@@ -17,6 +17,7 @@
    <div class='center-block'>
      <div class='main-header'>
        <h2><?php echo $lang->zanode->create;?></h2>
+        <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->tips;?>"></icon>
      </div>
      <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
        <table class='table table-form'>
@@ -17,6 +17,7 @@
    <div class='center-block'>
      <div class='main-header'>
        <h2><?php echo $lang->zanode->editAction;?></h2>
+        <icon class='icon icon-help' data-toggle='popover' data-trigger='focus hover' data-placement='right' data-tip-class='text-muted popover-sm' data-content="<?php echo $lang->zanode->tips;?>"></icon>
      </div>
      <form method='post' target='hiddenwin' id='ajaxForm' class="load-indicator main-form form-ajax">
        <table class='table table-form'>