从 APIAuto 同步 Headless 模式 Node 环境无 UI 测试、回归测试完继续深度测试等功能

TommyLemon · TommyLemon · commit 005a008b9d85 · 2022-10-20T06:20:47.000+08:00
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
@@ -12,6 +12,16 @@
  See the License for the specific language governing permissions and
  limitations under the License.*/
 
+if (typeof window == 'undefined') {
+  try {
+    eval(`
+      var StringUtil = require("./StringUtil");
+      var JSONObject = require("./JSONObject");
+    `)
+  } catch (e) {
+    console.log(e)
+  }
+}
 
 /**util for generate code
  * @author Lemon
@@ -6716,4 +6726,8 @@ var CodeUtil = {
     return (targetType == 'number' && realType == 'integer') || (targetType == 'string' && ['date', 'time', 'datetime'].indexOf(realType) >= 0);
   }
 
+};
+
+if (typeof module == 'object') {
+  module.exports = CodeUtil;
 }
diff --git a/apijson/JSONObject.js b/apijson/JSONObject.js
@@ -19,12 +19,20 @@
 var JSONObject = {
   TAG: 'JSONObject',
 
+  log: function (tag, msg) {
+
+  },
+
+  isEmpty: function (obj) {
+    return obj == null || Object.keys(obj).length <= 0;
+  },
+
   /**判断key是否为表名
    * @param key
    * @return
    */
   isTableKey: function(key, value, isRestful) {
-    log(this.TAG, 'isTableKey  typeof key = ' + (typeof key));
+    JSONObject.log(this.TAG, 'isTableKey  typeof key = ' + (typeof key));
     if (key == null) {
       return false;
     }
@@ -44,7 +52,7 @@ var JSONObject = {
    * @return
    */
   isArrayKey: function(key, value, isRestful) {
-    log(this.TAG, 'isArrayKey  typeof key = ' + (typeof key));
+    JSONObject.log(this.TAG, 'isArrayKey  typeof key = ' + (typeof key));
 
     if (key == null) {
       return false;
@@ -110,13 +118,17 @@ var JSONObject = {
     }
 
     return {
-      method,
-      isRestful,
-      tag,
+      method: method,
+      isRestful: isRestful,
+      tag: tag,
       table: startName
     }
   }
 
+};
+
+if (typeof module == 'object') {
+  module.exports = JSONObject;
 }
 
 //TODO 取消注释  Object.freeze(JSONObject) //不可修改
diff --git a/apijson/JSONRequest.js b/apijson/JSONRequest.js
@@ -467,5 +467,8 @@ function newArrayString(table, json, count, page) {
     + table + "\":" + JSON.stringify(json) + "}}";
 }
 
+if (typeof module == 'object') {
+  module.exports = this;
+}
 
 //常用请求>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/apijson/JSONResponse.js b/apijson/JSONResponse.js
@@ -17,6 +17,17 @@
  * @author Lemon
  */
 
+if (typeof window == 'undefined') {
+  try {
+    eval(`
+      var StringUtil = require("./StringUtil");
+      var JSONObject = require("./JSONObject");
+      var CodeUtil = require("./CodeUtil");
+    `)
+  } catch (e) {
+    console.log(e)
+  }
+}
 
 //状态信息，非GET请求获得的信息<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
 
@@ -59,8 +70,19 @@ var JSONResponse = {
    * @param code
    * @return
    */
-  isSuccess: function(code) {
-    return code == CODE_SUCCESS;
+  isSuccess: function(obj) {
+    if (obj == null) {
+      return false
+    }
+
+    if (typeof obj == 'number') {
+      return obj == CODE_SUCCESS;
+    }
+    if (obj instanceof Object && obj instanceof Array == false) {
+      return obj.code == CODE_SUCCESS;
+    }
+
+    return false
   },
 
   /**校验服务端是否存在table
@@ -370,10 +392,10 @@ var JSONResponse = {
         };
       }
 
-      if (real == null || real.data == null) {
+      if (real == null || real.list == null) {
         return {
           code: JSONResponse.COMPARE_KEY_LESS, //未上传对比标准
-          msg: '没有校验标准，且缺少非 null 值的 data 字段',
+          msg: '没有校验标准，且缺少非 null 值的 list 字段',
           path: folder == null ? '' : folder
         };
       }
@@ -1544,4 +1566,8 @@ var JSONResponse = {
     return value;
   }
 
+};
+
+if (typeof module == 'object') {
+  module.exports = JSONResponse;
 }
diff --git a/apijson/StringUtil.js b/apijson/StringUtil.js
@@ -173,6 +173,10 @@ var StringUtil = {
     return arr == null ? '' : arr.join(separator)
   }
 
+};
+
+if (typeof module == 'object') {
+  module.exports = StringUtil;
 }
 
 //校正（自动补全等）字符串>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
diff --git a/index.html b/index.html
@@ -111,9 +111,9 @@
                   <a style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(! isPreviewEnabled, 10)">预览左侧输入框:  {{ isPreviewEnabled ? '已开启，点击关闭' : '已关闭，点击开启' }}</a>
                   <a v-show="User.id != null && User.id > 0" style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(! isEditResponse, 11)">当前编辑模式:  {{ isEditResponse ? 'Response 后端响应结果' : 'Request 前端请求参数' }}</a>
                   <a style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(StringUtil.isEmpty(host, true), 3)">{{ StringUtil.isEmpty(host, true) ? '隐藏(固定)URL Host: 可用空格隔开' : '显示(编辑)URL Host: \n' + host }}</a>
+                  <a style="border-bottom: #DDD 1px solid;width: 100%;display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;" href="javascript:void(0)" @click="showConfig(! isHeaderShow, 4)">{{ (isHeaderShow ? '隐藏(固定)' : '显示(编辑)') + (isEditResponse ? '参数值 Argument Value' : '参数值 Argument Value' ) }}</a>
                   <a style="border-bottom: #DDD 1px solid;width: 100%;display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;" href="javascript:void(0)" @click="showConfig(! isRandomShow, 5)">{{ isRandomShow ? '隐藏(固定)参数注入 Random Test' : '显示(编辑)参数注入 Random Test' }}</a>
-                  <a style="border-bottom: #DDD 1px solid;width: 100%;display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;" href="javascript:void(0)" @click="showConfig(! isHeaderShow, 4)">{{ (isHeaderShow ? '隐藏(固定)' : '显示(编辑)') + (isEditResponse ? '响应头 Response Header' : '请求头 Request Header' ) }}</a>
-                  <a style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(true, 2)">生成代码(封装,解析) : {{ language || '例如 Java' }}</a>
+				  <a style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(true, 2)">生成代码(封装,解析) : {{ language || '例如 Java' }}</a>
                   <a style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(true, 0)">数据库类型 Database: {{ database || '例如 MYSQL' }}</a>
                   <a style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(true, 1)">数据库名/模式 Schema: {{ schema || '例如 sys' }}</a>
                   <a v-show="User.id == null || User.id <= 0" style="border-bottom: #DDD 1px solid;width: 100%" href="javascript:void(0)" @click="showConfig(true, 7)">使用的请求类型: {{ types == null || types.length <= 0 ? '点击设置' : (types instanceof Array ? types.join() : types) }}</a>
@@ -171,7 +171,7 @@
         </div>
         <div class="left-panel">
             <ul v-show="isTestCaseShow" class="historys" style="width: 100%;height: 100%;overflow: hidden;overflow-y: scroll;padding-bottom: 50px">
-                <li v-for="(item, index) in testCases" >
+                <li v-for="(item, index) in testCases" :id="'docItem' + index" >
                     <div style="display: inline-table">
                         <button v-show="false && types != null && types.length > 1" style="width: 48px;margin-right: 6px;padding: 0px;position: relative" id="vDocType" @click="restoreRemoteAndTest(index, item)">{{ getTypeName(item.Document.type) }}</button>
                         <a class="hint--rounded hint--no-animate" ref="testCaseTexts" @mouseover="setRequestHint(index, item)" href="javascript:void(0)" @click="restoreRemote(index, item)" :style="{ color: index == currentDocIndex ? 'black' : 'gray' }"> {{(item.Document.version > 0 ? 'V' + item.Document.version : 'V*') + ' ' + item.Document.name  + '    ' + item.Document.url}}</a>
@@ -256,7 +256,7 @@
 
                         <!-- 临时生成的配置子项 -->
                         <ul v-show="isRandomSubListShow" class="historys" style="width: 100%;height: 100%;overflow: hidden;overflow-y: scroll; padding-bottom: 100px">
-                            <li style="width: 100%" v-for="(item, index) in randomSubs" >
+                            <li style="width: 100%" v-for="(item, index) in randomSubs" :id="'randomSubItem' + index" >
                                 <a v-show="! isRandomEditable" class="hint--rounded hint--no-animate" ref="randomSubTexts" @mouseover="setRequestHint(index, item, true)" href="javascript:void(0)" @click="restoreRandom(index, item)" :style="{ color: index == currentRandomSubIndex ? 'black' : 'gray' }">{{ (item.Random || {}).name }}</a>
                                 <input v-show="isRandomEditable" style="width: 96%" v-model="(item.Random || {}).name" @keyup="doOnKeyUp(event, 'randomSub', false, item)" />
 
@@ -286,7 +286,7 @@
 
                         <!-- 持久化存储的配置项 -->
                         <ul v-show="isRandomListShow" class="historys" style="width: 100%;height: 100%;overflow: hidden;overflow-y: scroll;padding-bottom: 100px">
-                            <li style="width: 100%; display: inline-table" v-for="(item, index) in randoms" >
+                            <li style="width: 100%; display: inline-table" v-for="(item, index) in randoms"  :id="'randomItem' + index" >
                                 <input v-model="(item.Random || {}).count" style="min-width: 12px; max-width: 30px; width: auto; text-align: center" type="number" @keyup="doOnKeyUp(event, 'random', false, item)" />
                                 <a style="margin-left: 4px; ">次</a>
                                 <a v-show="! isRandomEditable" style="top: 13px; left: 68px; position: absolute" class="hint--rounded hint--no-animate" ref="randomTexts" @mouseover="setRequestHint(index, item, true)" href="javascript:void(0)" @click="restoreRandom(index, item)" :style="{ color: index == currentRandomIndex ? 'black' : 'gray' }">{{ (item.Random || {}).name }}</a>
@@ -345,7 +345,7 @@
 userId: RANDOM_IN(82001, 82002, 82003)  // 随机选项取值
 limit: ORDER_IN(1, 3, 5, 10)  // 顺序选项取值
 offset: RANDOM_INT(0, 5)  // 随机范围取值
-  // 从数据库随机取值  userId: RANDOM_DB('Comment', 'userId')
+  // 从数据库随机取值  userId: RANDOM_DB(0, 100000, 'Comment', 'userId')
 
   // 注释可省略，但如果未省略则前面两个空格必须；清空文本内容可查看规则。
 
@@ -496,7 +496,7 @@
     </div>
 
     <!--<div class="statement">-->
-    <!--Copyright ©2016-2021 APIJSON.cn All right reserved.-->
+    <!--Copyright ©2022 APIJSON.cn All right reserved.-->
     <!--<a href="https://beian.miit.gov.cn/" target="_blank">-->
     <!--<span >粤ICP备18005508号-1.</span>-->
     <!--</a>-->
@@ -513,19 +513,18 @@
         <button   @click="save()" >保存</button>
     </div>
 
-    <!--弹出下载文本框-->
-    <div class="save-box" v-show="isExportShow">
-        <div id="divSaveBoxCheck" v-show="isExportCheckShow && ! isEditResponse" style="position: absolute; width: 120px; height: 30px; padding: 0px; margin: 0px; left: -45px; top: 6px; display: inline-block">
-            <input type="checkbox" style="position: relative; width: 18px; top: 1px; " id="cbSaveBoxCheck" value="first_checkbox"><label id="lblSaveBox" for="cbSaveBoxCheck" style="top: 0px; right: -36px">{{ exTxt.label || '发布简单接口'}}</label>
-        </div>
-
-        <svg class="icon close-icon" @click="showExport(false, isExportRemote)">
-            <use xlink:href="svg/icon.svg#close"></use>
-        </svg>
-
-        <input type="text" placeholder="请输入名称" v-model="exTxt.name" />
-        <div style="display: inline-block; margin-top: 6px; padding-bottom: 0px"><button @click="exportTxt(0)">{{isExportRemote ? '上传' : '下载'}}</button><button v-show="isExportRemote && (isExportRandom != true || isEditResponse != true)" style="margin-left: 6px" @click="exportTxt(1)">{{isExportRandom ? '发布简单接口' : '分享'}}</button></div>
-    </div>
+  <!--弹出下载文本框-->
+  <div class="save-box" v-show="isExportShow">
+<!--        <div id="divSaveBoxCheck" v-show="isExportCheckShow && ! isEditResponse" style="position: absolute; width: 120px; height: 30px; padding: 0px; margin: 0px; left: -45px; top: 6px; display: inline-block">-->
+<!--            <input type="checkbox" style="position: relative; width: 18px; top: 1px; " id="cbSaveBoxCheck" value="first_checkbox"><label id="lblSaveBox" for="cbSaveBoxCheck" style="top: 0px; right: -36px">{{ exTxt.label || '发布简单接口'}}</label>-->
+<!--        </div>-->
+    <svg class="icon close-icon" @click="showExport(false, isExportRemote)">
+      <use xlink:href="svg/icon.svg#close"></use>
+    </svg>
+
+    <input type="text" placeholder="请输入名称" v-model="exTxt.name" />
+    <div style="display: inline-block; margin-top: 6px; padding-bottom: 0px"><button @click="exportTxt(0)">{{isExportRemote ? '上传' : '下载'}}</button><button v-show="isExportRemote && (isExportRandom != true && isEditResponse != true)" style="margin-left: 6px" @click="exportTxt(1)">{{isExportRandom ? '发布简单接口' : '分享'}}</button></div>
+  </div>
 
     <!--弹出设置文本框-->
     <div class="save-box" v-show="isConfigShow">
diff --git a/js/main.js b/js/main.js
diff --git a/js/server.js b/js/server.js

Original file line number	Diff line number	Diff line change
`@@ -467,5 +467,8 @@ function newArrayString(table, json, count, page) {`
`467`	`467`	`+ table + "\":" + JSON.stringify(json) + "}}";`
`468`	`468`	`}`
`469`	`469`
	`470`	`+if (typeof module == 'object') {`
	`471`	`+ module.exports = this;`
	`472`	`+}`
`470`	`473`
`471`	`474`	`//常用请求>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`
Original file line number	Diff line number	Diff line change
`@@ -173,6 +173,10 @@ var StringUtil = {`
`173`	`173`	`return arr == null ? '' : arr.join(separator)`
`174`	`174`	`}`
`175`	`175`
	`176`	`+};`
	`177`	`+`
	`178`	`+if (typeof module == 'object') {`
	`179`	`+ module.exports = StringUtil;`
`176`	`180`	`}`
`177`	`181`
`178`	`182`	`//校正（自动补全等）字符串>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`