From f27eca5669ee31dded236ec29fd609bb5bf6c4eb Mon Sep 17 00:00:00 2001
From: wodezy66 <wodezy66@163.com>
Date: Sun, 30 Aug 2020 22:01:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datagear/management/domain/DataSetEntity.java |  9 +++++++++
 .../org/datagear/web/locales/datagear.properties  |  5 ++++-
 .../freemarker/analysis/dataSet/dataSet_grid.ftl  | 15 ++++++++++++---
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java
index 4acb3d45..fe82c921 100644
--- a/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java
+++ b/datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java
@@ -34,6 +34,15 @@ public interface DataSetEntity extends DataSet, CreateUserEntity<String>, DataPe
 	/** 数据集类型：Excel */
 	String DATA_SET_TYPE_Excel = "Excel";
 
+	/** 数据集类型：CSV */
+	String DATA_SET_TYPE_Csv = "Csv";
+
+	/** 数据集类型：CSV文件 */
+	String DATA_SET_TYPE_CsvFile = "CsvFile";
+
+	/** 数据集类型：HTTP接口 */
+	String DATA_SET_TYPE_HttpAPI = "HttpAPI";
+
 	/**
 	 * 设置名称。
 	 * 
diff --git a/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties b/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties
index 615870ed..2adf8d49 100644
--- a/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties
+++ b/datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties
@@ -604,9 +604,12 @@ dataSet.selectDataSet=\u9009\u62E9\u6570\u636E\u96C6
 dataSet.name=\u540D\u79F0
 dataSet.dataSetType=\u7C7B\u578B
 dataSet.dataSetType.SQL=SQL
+dataSet.dataSetType.Excel=Excel
+dataSet.dataSetType.Csv=CSV
+dataSet.dataSetType.CsvFile=CSV\u6587\u4EF6
 dataSet.dataSetType.JsonValue=JSON
 dataSet.dataSetType.JsonFile=JSON\u6587\u4EF6
-dataSet.dataSetType.Excel=Excel
+dataSet.dataSetType.HttpAPI=HTTP\u63A5\u53E3
 dataSet.dataSource=\u6570\u636E\u6E90
 dataSet.sql=SQL\u67E5\u8BE2\u8BED\u53E5
 dataSet.json=JSON\u6587\u672C
diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl
index 768b5812..f2873c98 100644
--- a/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl
+++ b/datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl
@@ -39,9 +39,12 @@ boolean readonly 是否只读操作，默认为false
 					<div class="add-button-panel ui-widget ui-widget-content ui-corner-all ui-widget-shadow ui-front">
 						<ul class="add-button-list">
 							<li addURL="addForSql"><div><@spring.message code='dataSet.dataSetType.SQL' /></div></li>
+							<li addURL="addForExcel"><div><@spring.message code='dataSet.dataSetType.Excel' /></div></li>
+							<li addURL="addForCsv"><div><@spring.message code='dataSet.dataSetType.Csv' /></div></li>
+							<li addURL="addForCsvFile"><div><@spring.message code='dataSet.dataSetType.CsvFile' /></div></li>
 							<li addURL="addForJsonValue"><div><@spring.message code='dataSet.dataSetType.JsonValue' /></div></li>
 							<li addURL="addForJsonFile"><div><@spring.message code='dataSet.dataSetType.JsonFile' /></div></li>
-							<li addURL="addForExcel"><div><@spring.message code='dataSet.dataSetType.Excel' /></div></li>
+							<li addURL="addForHttpAPI"><div><@spring.message code='dataSet.dataSetType.HttpAPI' /></div></li>
 						</ul>
 					</div>
 				</div>
@@ -190,12 +193,18 @@ boolean readonly 是否只读操作，默认为false
 	{
 		if("${DataSetEntity.DATA_SET_TYPE_SQL}" == data)
 			return "<@spring.message code='dataSet.dataSetType.SQL' />";
+		else if("${DataSetEntity.DATA_SET_TYPE_Excel}" == data)
+			return "<@spring.message code='dataSet.dataSetType.Excel' />";
+		else if("${DataSetEntity.DATA_SET_TYPE_Csv}" == data)
+			return "<@spring.message code='dataSet.dataSetType.Csv' />";
+		else if("${DataSetEntity.DATA_SET_TYPE_CsvFile}" == data)
+			return "<@spring.message code='dataSet.dataSetType.CsvFile' />";
 		else if("${DataSetEntity.DATA_SET_TYPE_JsonValue}" == data)
 			return "<@spring.message code='dataSet.dataSetType.JsonValue' />";
 		else if("${DataSetEntity.DATA_SET_TYPE_JsonFile}" == data)
 			return "<@spring.message code='dataSet.dataSetType.JsonFile' />";
-			else if("${DataSetEntity.DATA_SET_TYPE_Excel}" == data)
-				return "<@spring.message code='dataSet.dataSetType.Excel' />";
+		else if("${DataSetEntity.DATA_SET_TYPE_HttpAPI}" == data)
+			return "<@spring.message code='dataSet.dataSetType.HttpAPI' />";
 		else
 			return "";
 	};