p42579631
/
datagear
forked from p85126437/datagear
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

完善数据集添加按钮类型

This commit is contained in:
wodezy66 2020-08-30 22:01:43 +08:00
parent b40c0fd31c
commit f27eca5669
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
datagear-management/src/main/java/org/datagear/management/domain/DataSetEntity.java
View File

@ -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";
/**
* 设置名称。
*

5
datagear-web/src/main/resources/org/datagear/web/locales/datagear.properties
View File

@ -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

15
datagear-web/src/main/resources/org/datagear/web/webapp/view/freemarker/analysis/dataSet/dataSet_grid.ftl
View File

@ -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 "";
};