1.1更新

ilanni2460 · Oct 20, 2016 · 0de2303 · 0de2303
1 parent d0a835e
commit 0de2303
Show file tree

Hide file tree

Showing 53 changed files with 324 additions and 196 deletions.
diff --git a/publish/App_Data/blockPlayDB.db b/publish/App_Data/blockPlayDB.db
diff --git a/publish/Microsoft.ApplicationInsights.AspNetCore.dll b/publish/Microsoft.ApplicationInsights.AspNetCore.dll
diff --git a/publish/Microsoft.AspNetCore.Antiforgery.dll b/publish/Microsoft.AspNetCore.Antiforgery.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.Abstractions.dll b/publish/Microsoft.AspNetCore.Mvc.Abstractions.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.ApiExplorer.dll b/publish/Microsoft.AspNetCore.Mvc.ApiExplorer.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.Core.dll b/publish/Microsoft.AspNetCore.Mvc.Core.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.Cors.dll b/publish/Microsoft.AspNetCore.Mvc.Cors.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.DataAnnotations.dll b/publish/Microsoft.AspNetCore.Mvc.DataAnnotations.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.Formatters.Json.dll b/publish/Microsoft.AspNetCore.Mvc.Formatters.Json.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.Localization.dll b/publish/Microsoft.AspNetCore.Mvc.Localization.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.Razor.Host.dll b/publish/Microsoft.AspNetCore.Mvc.Razor.Host.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.Razor.dll b/publish/Microsoft.AspNetCore.Mvc.Razor.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.TagHelpers.dll b/publish/Microsoft.AspNetCore.Mvc.TagHelpers.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.ViewFeatures.dll b/publish/Microsoft.AspNetCore.Mvc.ViewFeatures.dll
diff --git a/publish/Microsoft.AspNetCore.Mvc.dll b/publish/Microsoft.AspNetCore.Mvc.dll
diff --git a/publish/Microsoft.AspNetCore.Server.Kestrel.dll b/publish/Microsoft.AspNetCore.Server.Kestrel.dll
diff --git a/publish/Microsoft.EntityFrameworkCore.Relational.dll b/publish/Microsoft.EntityFrameworkCore.Relational.dll
diff --git a/publish/Microsoft.EntityFrameworkCore.Sqlite.dll b/publish/Microsoft.EntityFrameworkCore.Sqlite.dll
diff --git a/publish/Microsoft.EntityFrameworkCore.dll b/publish/Microsoft.EntityFrameworkCore.dll
diff --git a/publish/NETCore.Extensions.Excel.dll b/publish/NETCore.Extensions.Excel.dll
diff --git a/publish/System.Private.CoreLib.dll b/publish/System.Private.CoreLib.dll
diff --git a/publish/System.Private.CoreLib.ni.dll b/publish/System.Private.CoreLib.ni.dll
diff --git a/publish/Views/Home/Help.cshtml b/publish/Views/Home/Help.cshtml
@@ -69,6 +69,14 @@
                     </ul>
                 </li>
 
+                <li>
+                    <a href="#help6">数据场景</a>
+                    <ul class="nav">
+                        <li><a href="#help6-1">场景生成</a></li>
+                        <li><a href="#help6-2">数据格式</a></li>
+                    </ul>
+                </li>
+
             </ul>
             <a class="back-to-top" href="#top">
                 返回顶部

diff --git a/publish/Views/Home/Index.cshtml b/publish/Views/Home/Index.cshtml
@@ -14,7 +14,7 @@
             <div class="carousel-caption" role="option">
                 <p>
                     OneBlock 一个跨OS的轻自动化案例管理平台。
-                    <a class="btn btn-default" href="#">
+                    <a class="btn btn-default" href="https://github.com/sunshine4Cpic/OneBlockInstall">
                         下载安装
                     </a>
                 </p>
@@ -55,25 +55,17 @@
 
 <div class="row">
     <div class="col-md-4">
-        <h2>下载</h2>
+        <h2>版本下载</h2>
         <ul>
-            <li><a href="https://github.com/sunshine4Cpic/OneBlockInstall" target="_blank">Windows 7(x64) / Windows Server 2008 R2(x64)</a></li>
+            <li><a href="https://github.com/sunshine4Cpic/OneBlockInstall/tree/win7-x86" target="_blank">Win7(x86)</a></li>
+            <li><a href="https://github.com/sunshine4Cpic/OneBlockInstall" target="_blank">Win7(x64) /Server2008 R2(x64)</a></li>
             <li><a href="https://github.com/sunshine4Cpic/OneBlockInstall/tree/win10-x64" target="_blank">Windows 10</a></li>
             <li><a href="https://github.com/sunshine4Cpic/OneBlockInstall/tree/centos.7-x64" target="_blank">Linxu CentOS 7</a> </li>
             <li><a href="https://github.com/sunshine4Cpic/OneBlockInstall/tree/osx.10.10-x64" target="_blank">OS X 10.10</a></li>
             <li><a href="https://github.com/sunshine4Cpic/OneBlockInstall/tree/osx.10.11-x64" target="_blank">OS X 10.11</a></li>
         </ul>
     </div>
-    <div class="col-md-4">
-        <h2>Code By</h2>
-        <ul>
-            <li>ASP.NET Core 1.0</li>
-            <li>EF Core 1.0 Sqlite</li>
-            <li>Sqlite3</li>
-            <li>Bootstrap</li>
-            <li>EasyUI</li>
-        </ul>
-    </div>
+
     <div class="col-md-4">
         <h2>教程</h2>
         <ul>
@@ -84,6 +76,15 @@
             <li><a href="/home/help?#help5">案例执行</a></li>
         </ul>
     </div>
+
+    <div class="col-md-4">
+        <h2>TestSpace执行模块</h2>
+        <ul>
+            <li><a href="~/RunClient.rar">selenium-web自动化执行程序</a></li>
+            <li><a href="https://github.com/sunshine4Cpic/oneBlock.RunClient/">selenium-web自动化(C#源码)</a></li>
+            <li>selenium-web自动化(Python源码)</li>
+        </ul>
+    </div>
 </div>
 
 <script>

diff --git a/publish/Views/Home/_help.cshtml b/publish/Views/Home/_help.cshtml
@@ -204,6 +204,38 @@
         <img class="img-responsive" src="~/help/help11.png" />
     </div>
 
+
+
+</div>
+
+
+
+<div class="bs-docs-section">
+    <h1 id="help6" class="page-header">数据场景</h1>
+
+    <h2 id="help6-1">场景生成</h2>
+    <p>
+        勾选需要测试的案例,点击生成场景.
+    </p>
+    <div class="bs-example">
+        <img class="img-responsive" src="~/help/help6-1.jpg" />
+    </div>
+    <h2 id="help6-2">数据格式</h2>
+    <p>
+        配置sheet中展现了案例的列表,点击案例名可以跳转到参数设置页面
+    </p>
+    <div class="bs-example">
+        <img class="img-responsive" src="~/help/help6-2.png" />
+    </div>
+
+    <p>
+        每个动态参数都会生成一列,你可以配置测试数据,或者为案例添加多条数据.
+    </p>
+    <div class="bs-example">
+        <img class="img-responsive" src="~/help/help6-3.png" />
+    </div>
+
     <div style="height:400px;"></div>
 
-</div>
+</div>
+
diff --git a/publish/Views/TestCase/Index.cshtml b/publish/Views/TestCase/Index.cshtml
@@ -5,16 +5,19 @@
 <div class="row">
     <div class="col-md-3">
 
-        <div id="p" class="easyui-panel" data-options="iconCls:'glyphicon glyphicon-th-large'" title="案例列表" style="width:100%;min-height:200px;padding:10px;">
+        <div id="p" class="easyui-panel" data-options="iconCls:'glyphicon glyphicon-th-large',tools:'#p-tt'" title="案例列表" style="width:100%;min-height:200px;padding:10px;">
             <ul id="caseTreeList"></ul>
         </div>
 
+        <div id="p-tt">
+            <a href="javascript:void(0)" class="icon-excel" title="生成数据场景" onclick="downExcel()"></a>
+        </div>
 
     </div>
 
     <div id="paneltab" class="easyui-tabs col-md-9">
         <div title="帮助" data-options="iconCls:'icon-help',closable:true" style="padding:10px">
-           
+
             <div class="bs-docs-section">
                 <h1 id="help2" class="page-header">案例 TestCase</h1>
 
@@ -142,7 +145,7 @@
 
         using(["tree", "messager"], function () {
             $('#caseTreeList').tree({
-                checkbox: false,
+                checkbox: true,
                 lines: true,
                 animate: true,
                 dnd: true,
@@ -184,19 +187,30 @@
                 onBeforeDrop: function (target, source, point) {
                     var targetNode = $(this).tree("getNode", target);
 
-                    var ret = false;
+                    var defer = $.Deferred();
                     $.ajax({
                         url: 'sort',
                         type: 'post',
-                        async: false,//使用同步的方式,页面会卡住,需要优化
+                        //async: false,//使用同步的方式,页面会卡住,需要优化 re:优化完成
                         data: { targetID: targetNode.id, sourceID: source.id },
                         success: function (data) {
-                            ret = true;
+                            defer.resolve(true);
                         }
                     });
-                    return ret;
+                    return defer.promise();
 
                 },
+                onCheck: function (node, checked) {
+                    if (checked) {
+                        if (node.type == 0 && node.state == "closed")
+                            $(this).tree("expand", node.target);
+                        $(".panel-tool a.icon-excel").addClass("light");
+                    }
+                    else {
+                        if ($(this).tree("getChecked").length == 0)
+                            $(".panel-tool a.icon-excel").removeClass("light");
+                    }
+                }
             });
         });
 
@@ -208,7 +222,7 @@
                     data[i].state = "closed";
             }
         }
-       
+
 
         $(".txtEdit").click(function (event) {
             var node = $("#caseTreeList").tree("getSelected");
@@ -316,7 +330,7 @@
             editFile(selectNode);
 
         });
-      
+
         function editFile(node) {
             $('#paneltab').tabs('add', {
                 id: node.id,
@@ -325,7 +339,7 @@
                 iconCls: 'icon-file',
                 content: '<iframe scrolling="yes" frameborder="0"  src="caseTab/' + node.id + '" style="width:100%;"></iframe>',
                 closable: true,
-                tools:[{
+                tools: [{
                     iconCls: 'icon-mini-refresh',
                     handler: function () {
                         $.messager.confirm('Message', '确认重新载入:' + node.text + '?', function (r) {
@@ -341,7 +355,7 @@
                                 }
                             }
                         });
-                        
+
                     }
                 }]
             });
@@ -388,7 +402,21 @@
             });
         }
 
-        
+        function downExcel() {
+            var CheckedNode = $('#caseTreeList').tree("getChecked");
+
+            var caseID = [];
+            for (var i = 0; i < CheckedNode.length; i++) {
+                if (CheckedNode[i].type == 1)
+                    caseID.push(CheckedNode[i].id);
+            }
+
+            if (caseID.length == 0)
+                alert("请选择至少一个测试案例,或打开未加载的文件夹!");
+            else {
+                $.download('/TestCase/downExcel', { ids: caseID }, 'post');
+            }
+        }
 
     </script>
 }
diff --git a/publish/blockPlayDataEntities.dll b/publish/blockPlayDataEntities.dll
diff --git a/publish/blockPlayDataEntities.pdb b/publish/blockPlayDataEntities.pdb
diff --git a/publish/clretwrc.dll b/publish/clretwrc.dll
diff --git a/publish/clrjit.dll b/publish/clrjit.dll
diff --git a/publish/coreclr.dll b/publish/coreclr.dll
diff --git a/publish/dbgshim.dll b/publish/dbgshim.dll
diff --git a/publish/mscordaccore.dll b/publish/mscordaccore.dll
diff --git a/publish/mscordbi.dll b/publish/mscordbi.dll
diff --git a/publish/mscorlib.dll b/publish/mscorlib.dll
diff --git a/publish/mscorlib.ni.dll b/publish/mscorlib.ni.dll
diff --git a/publish/mscorrc.debug.dll b/publish/mscorrc.debug.dll
diff --git a/publish/mscorrc.dll b/publish/mscorrc.dll