no message

src/biz/dataList.ts

-import { CHARTTYPEENUM, DATALISTTYPEENUM, KEYVALUETYPEENUM, SCATTERFIGURETYPEENUM, STRINGLISTTYPEENUM } from "../config/enum";
-import { getCharModule, getdataListModule, getKeyValueModule, getScatterFigureModule, getStringListModule } from "../data/simulate/dataModule";
+import { MODULEENUM } from "../config/enum";
+import { getCharModule, getDataListModule, getKeyValueModule, getRadarModule, getScatterFigureModule, getStringListModule } from "../data/simulate/dataModule";
 
 export function getData(req, res) {
     let typeName = req.query.typeName;
@@ -9,29 +9,29 @@ export function getData(req, res) {
     let moduleData;
 
     switch(parseInt(typeName)) {
-        case KEYVALUETYPEENUM.键值对字符,KEYVALUETYPEENUM.键值对数值:
-            moduleData = getKeyValueModule(typeName);
-            ret["keyValueApi"] = moduleData;
-        break;
-        case CHARTTYPEENUM.单Y单X,CHARTTYPEENUM.单Y多X,CHARTTYPEENUM.双Y多X:
-            moduleData = getCharModule(typeName);
+        case MODULEENUM.图表数据:
+            moduleData = getCharModule();
             ret["charApi"] = moduleData;
         break;
-        case STRINGLISTTYPEENUM.字符列表:
-            moduleData = getStringListModule(typeName);
+        case MODULEENUM.字符列表:
+            moduleData = getStringListModule();
             ret["dataListApi"] = moduleData;
         break;
-        case SCATTERFIGURETYPEENUM.撒点图:
-            moduleData = getScatterFigureModule(typeName);
+        case MODULEENUM.撒点图:
+            moduleData = getScatterFigureModule();
             ret["stringListApi"] = moduleData;
         break;
-        case DATALISTTYPEENUM.数据列表:
-            moduleData = getdataListModule(typeName);
+        case MODULEENUM.数据列表:
+            moduleData = getDataListModule();
+            ret["scatterFigureApi"] = moduleData;
+        break;
+        case MODULEENUM.雷达图:
+            moduleData = getRadarModule();
             ret["scatterFigureApi"] = moduleData;
         break;
         default:
-            moduleData = getKeyValueModule(2);
-            ret["defaultApi"] = moduleData;
+            moduleData = getKeyValueModule();
+            ret["keyValueApi"] = moduleData;
         break;
     }
 

src/config/enum.ts

-export enum KEYVALUETYPEENUM {
-    键值对数值=1,
-    键值对字符,
-}
-
-export enum CHARTTYPEENUM {
-    单Y单X,
-    单Y多X,
-    双Y多X
-}
-
-export enum DATALISTTYPEENUM {
-    数据列表
-}
-
-export enum STRINGLISTTYPEENUM {
-    字符列表
-}
-
-export enum SCATTERFIGURETYPEENUM {
-    撒点图
-}
-
-export enum RADARENUM {
+export enum MODULEENUM {
+    键值数据 = 1,
+    图表数据,
+    数据列表,
+    字符列表,
+    撒点图,
     雷达图
 }
\ No newline at end of file

src/data/simulate/dataModule.ts

 import { analysisExcelDataOfList, planarArrBecomeChartData, planarArrBecomeKeyValueData, planarArrBecomeListData, planarArrBecomeStringListData } from "../../cal/excelEnter";
 import { getChartOutData, getKeyValueNotNumberOutData, getKeyValueNumberOutData, getListOutData, getScatterFigureOutData, getStringOutData } from "../../cal/out";
-import { CHARTTYPEENUM, DATALISTTYPEENUM, KEYVALUETYPEENUM, SCATTERFIGURETYPEENUM, STRINGLISTTYPEENUM} from "../../config/enum";
+import { MODULEENUM} from "../../config/enum";
 
 /**
  * 生成随机数
@@ -9,92 +9,54 @@ import { CHARTTYPEENUM, DATALISTTYPEENUM, KEYVALUETYPEENUM, SCATTERFIGURETYPEENU
  * @param stringType 是否为string类型 
  * @returns 
  */
- function rand(min,max,stringType) {
-    if(stringType) {
-        return (Math.floor(Math.random()*(max-min))+min).toString();
-    }
+ function rand(min,max) {
     return Math.floor(Math.random()*(max-min))+min;
 }
 
 
-export function getKeyValueModule(typeName) {
+export function getKeyValueModule() {
     let dataList;
-    let result = {};
-    switch(typeName) {
-        case KEYVALUETYPEENUM.键值对数值:
-            dataList = generateArr(3, 2, 10, 100, "数据名称");
-            result = getKeyValueNumberOutData("键值对数值数据", planarArrBecomeKeyValueData(dataList));
-        break;
-        case KEYVALUETYPEENUM.键值对字符:
-            dataList = generateArr(3, 2, 10, 100, "数据名称", "", true);
-            result = getKeyValueNotNumberOutData("键值对字符数据", planarArrBecomeKeyValueData(dataList));
-        break;
-    }
-    
+    dataList = generateArr(5, 2, 10, 100, "数据名称");
+    let result = getKeyValueNumberOutData("键值数据", planarArrBecomeKeyValueData(dataList));
     return result;
 }
 
-export function getCharModule(typeName) {
+export function getCharModule() {
     let dataList;
-    let result = {};
-    switch(typeName){
-        case CHARTTYPEENUM.单Y单X:
-            dataList = generateArr(6, 2, 10, 100, "key");
-            result = getChartOutData("单Y单X数据", planarArrBecomeChartData(dataList));
-        break;
-        case CHARTTYPEENUM.单Y多X:
-            dataList = generateArr(3, 6, 10, 100, "数据名称", "key");
-            result = getChartOutData("单Y多X数据", planarArrBecomeChartData(dataList));
-        break;
-        case CHARTTYPEENUM.双Y多X:
-            dataList = generateArr(3, 6, 10, 100, "数据名称", "key");
-            result = getChartOutData("双Y多X数据", planarArrBecomeChartData(dataList));
-        break;
-    }
-    
+    dataList = generateArr(5, 6, 10, 100, "数据名称", "key");
+    let result = getChartOutData("图表数据", planarArrBecomeChartData(dataList));
     return result;
 }
 
-export function getStringListModule(typeName) {
+export function getStringListModule() {
     let dataList;
-    let result = {};
-    switch(typeName){
-        case STRINGLISTTYPEENUM.字符列表:
-            dataList = generateArr(5, 2, 10, 100, "文本", "标题", true);
-            result = getStringOutData("字符列表数据", planarArrBecomeStringListData(dataList));
-        break;
-    }
-    
+    dataList = generateArr(5, 2, 10, 100, "文本", "标题");
+    let result = getStringOutData("字符列表数据", planarArrBecomeStringListData(dataList));
     return result;
 }
 
-export function getScatterFigureModule(typeName) {
+export function getScatterFigureModule() {
     let dataList;
-    let result = {};
-    switch(typeName){
-        case SCATTERFIGURETYPEENUM.撒点图:
-            dataList = generateArr(5, 2, 10, 100, "", "y", false, "x");
-            result = getScatterFigureOutData("撒点图数据", analysisExcelDataOfList(dataList));
-        break;
-    }
-    
+    dataList = generateArr(5, 2, 10, 100, "", "y", "x");
+    let result = getScatterFigureOutData("撒点图数据", analysisExcelDataOfList(dataList));
     return result;
 }
 
-export function getdataListModule(typeName) {
+export function getDataListModule() {
     let dataList;
-    let result = {};
-    switch(typeName){
-        case DATALISTTYPEENUM.数据列表:
-            dataList = generateArr(5, 4, 10, 100, "数据名称", "标题");
-            result = getListOutData("列表数据", planarArrBecomeListData(dataList));
-        break;
-    }
-    
+    dataList = generateArr(5, 4, 10, 100, "数据名称", "标题");
+    let result = getListOutData("列表数据", planarArrBecomeListData(dataList));
     return result;
 }
 
-export function generateArr(x, y, min, max, xName="", yName="", stringType=false, titleName="数据名称") {
+export function getRadarModule() {
+    let dataList;
+    let result;
+    return result;
+}
+
+
+export function generateArr(x, y, min, max, xName="", yName="", titleName="数据名称") {
     var arr = [];
     arr[0] = [titleName]; 
     for(var i = 1;i < x; i++){
@@ -106,10 +68,7 @@ export function generateArr(x, y, min, max, xName="", yName="", stringType=false
             } else {
                 arr[0][j] = "数据值";
             }
-            if (stringType) {
-                arr[i][j] = rand(min, max, stringType);
-            }
-            arr[i][j] = "value"+j;
+            arr[i][j] = rand(min, max);
         }   
     }
     return arr;