Merge branch 'master' of http://123.207.147.179:8888/standardized/visualDataServer

src/cal/excelEnter.ts

@@ -108,11 +108,30 @@ export function planarArrBecomeStringListData(dataList, titleInY = false) {
  * @param dataList 数据列表 格式 [[标题1, 标题2, 标题3],[a的value1, a的value2, a的value3],[b的value1, b的value2, b的value3]] or
  *  [[标题1, 标题2, 标题3, 标题4],[a的value1, a的value2, a的value3],[b的value1, b的value2, b的value3]]
  * @param headerInx 
- * @returns 
+ * @returns 返回 [{key:"a", values:[a的value1, a的value2, a的value3] }, {key:"b", values:[b的value1, b的value2, b的value3] }]
  */
 export function planarArrBecomeListData(dataList, headerInx?) {
     //todo 
+    let result = [];
+    let dataTitle = dataList[0];
+    for (let i = 1; i <= dataList.length; i++) {
+        let dataValue = {};
+        let ValueData = [];
+        let keyData = dataTitle[i-1];
+
+        for (let x = 0; x < dataList[i].length; x++){
+            ValueData.push(dataList[i][x]);
+        }
+
+        dataValue = {
+            key:keyData,
+            values:ValueData
+        };
+
+        result.push(dataValue);
+    }
 
+    return result;  //
 }
 
 

src/main.ts

+import { planarArrBecomeListData } from "./cal/excelEnter";
 import { getData } from "./data/interface/getOnceInterfaceData";
 import { getPort } from "./serverConfig";
 
@@ -8,7 +9,8 @@ async function lanuch() {
 }
 
 function test() {
-    getData()
+    let dataList = [['a', 'b'],['a的value1', 'a的value2', 'a的value3'],['b的value1', 'b的value2', 'b的value3']];
+    planarArrBecomeListData(dataList);
 }
 
 lanuch();
\ No newline at end of file