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

[web]完善CSV导入界面处理逻辑

This commit is contained in:
datagear 2019-06-14 10:34:51 +08:00
parent c3379e33cd
commit 0569c2cf1b
3 changed files with 71 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -435,7 +435,8 @@ dataimport.uploadCsvDataFile=\u4E0A\u4F20CSV\u6570\u636E\u6587\u4EF6
dataimport.importFileName=\u6587\u4EF6\u540D\u79F0
dataimport.importFileSize=\u6587\u4EF6\u5927\u5C0F
dataimport.importTableName=\u5BFC\u5165\u8868\u540D\u79F0
dataimport.importProgress=\u5BFC\u5165\u8FDB\u5EA6\uFF08\u6210\u529F\u6570/\u5931\u8D25\u6570\uFF09
dataimport.importProgress=\u5BFC\u5165\u8FDB\u5EA6
dataimport.importProgressWithSuccessFail=\u5BFC\u5165\u8FDB\u5EA6\uFF08\u6210\u529F\u6570/\u5931\u8D25\u6570\uFF09
dataimport.importStatus.unstart=\u672A\u5F00\u59CB
dataimport.importStatus.waiting=\u7B49\u5F85\u5BFC\u5165
dataimport.importStatus.importing=\u5BFC\u5165\u4E2D
@ -444,5 +445,7 @@ dataimport.importStatus.abort=\u5DF2\u7EC8\u6B62
dataimport.importStatus.rollback=\u5DF2\u56DE\u6EDA
dataimport.importStatus.finish=\u5DF2\u5B8C\u6210
dataimport.importProgressInfo={0}\uFF08{1}/{2}\uFF09
dataimport.fileEncoding=\u6587\u4EF6\u7F16\u7801
dataimport.cancelImportDeniedWithReason=\u53EA\u6709\u672A\u5F00\u59CB\u7684\u5BFC\u5165\u624D\u53EF\u4EE5\u53D6\u6D88
dataexport.dataexport=\u5BFC\u51FA\u6570\u636E

79
datagear-web/src/main/webapp/WEB-INF/view/dataexchange/import_csv.ftl
View File

@ -103,7 +103,7 @@ Schema schema 数据库，不允许为null
</div>
<h3><@spring.message code='dataimport.uploadAndImportData' /></h3>
<div>
<div class="form-item form-item-upload">
<div class="form-item form-item-upload upload-state-aware">
<div class="form-item-value">
<span class="form-item-upload-label">
<@spring.message code='dataimport.uploadCsvDataFile' />
@ -112,10 +112,10 @@ Schema schema 数据库，不允许为null
<div class="file-info"></div>
</div>
</div>
<div class="form-item form-item-progress">
<div class="form-item form-item-progress import-state-aware">
<div class="form-item-value">
<span class="form-item-progress-label">
导入进度
<@spring.message code='dataimport.importProgress' />
</span>
<div id="${pageId}-progress"></div>
<span id="${pageId}-progress-percent" class="progress-percent"></span>
@ -123,8 +123,17 @@ Schema schema 数据库，不允许为null
</div>
<div class="form-item form-item-table">
<div class="table-operation-wrapper">
<button type="button" class="table-delete-item-button"><@spring.message code='delete' /></button>
<button type="button" class="table-cancel-import-button"><@spring.message code='cancel' /></button>
<button type="button" class="table-delete-item-button upload-state-aware"><@spring.message code='delete' /></button>
<button type="button" class="table-cancel-import-button import-state-aware"><@spring.message code='cancel' /></button>
</div>
<div class="file-encoding-wrapper">
<span class="file-encoding-label">
<@spring.message code='dataimport.fileEncoding' />
</span>
<select name="fileEncoding">
<option value="GBK">GBK</option>
<option value="UTF-8">UTF-8</option>
</select>
</div>
<div class="table-wrapper minor-dataTable">
<table id="${pageId}-table" width="100%" class="hover stripe"></table>
@ -151,8 +160,6 @@ Schema schema 数据库，不允许为null
po.form = po.element("#${pageId}-form");
po.fileUploadInfo = function(){ return this.element(".file-info"); };
$.initButtons(po.element());
//计算表格高度
po.calTableHeight = function()
{
@ -208,28 +215,25 @@ Schema schema 数据库，不允许为null
po.element("#${pageId}-progress-percent").text(progressNumber + "%");
};
po.toggleUploadAndImportStatus = function(showImport)
po.toggleUploadAndImportStatus = function(importStatus)
{
var importActionEle = po.element("#${pageId}-form .wizard .actions ul li:eq(2)");
if(showImport)
if(importStatus)
{
po.element(".form-item-upload").hide();
po.element(".table-delete-item-button").hide();
po.element(".form-item-progress").show();
po.element(".table-cancel-import-button").show();
po.element(".upload-state-aware").hide();
po.element(".import-state-aware").show();
importActionEle.addClass("ui-state-disabled");
po.element("select[name='fileEncoding']").selectmenu("disable");
po.element(".file-encoding-label").addClass("ui-state-disabled");
}
else
{
po.element(".form-item-progress").hide();
po.element(".table-cancel-import-button").hide();
po.element(".form-item-upload").show();
po.element(".table-delete-item-button").show();
po.element(".upload-state-aware").show();
po.element(".import-state-aware").hide();
importActionEle.removeClass("ui-state-disabled");
po.element("select[name='fileEncoding']").selectmenu("enable");
po.element(".file-encoding-label").removeClass("ui-state-disabled");
}
};
@ -257,10 +261,12 @@ Schema schema 数据库，不允许为null
}
});
$.initButtons(po.element());
po.element("#${pageId}-binaryFormat").buttonset();
po.element("#${pageId}-ignoreInexistentColumn").buttonset();
po.element("#${pageId}-nullForIllegalColumnValue").buttonset();
po.element("#${pageId}-exceptionResolve").buttonset();
po.element("select[name='fileEncoding']").selectmenu();
po.element("input[name='dataFormat.binaryFormat'][value='${defaultDataFormat.binaryFormat}']").click();
po.element("#${pageId}-ignoreInexistentColumn-0").click();
@ -291,7 +297,32 @@ Schema schema 数据库，不允许为null
po.element(".table-delete-item-button").click(function()
{
po.deleteSelectedRows();
po.executeOnSelects(function(rowDatas, rowIndexes)
{
po.deleteRow(rowIndexes);
});
});
po.element(".table-cancel-import-button").click(function()
{
po.executeOnSelects(function(rowDatas, rowIndexes)
{
for(var i=0; i<rowDatas.length; i++)
{
var importProgress = rowDatas[i].importProgress;
if(!importProgress || importProgress.indexOf("waiting") > -1)
{
//TODO 发送取消命令
alert("发送取消命令");
}
else
{
if(rowDatas.length == 1)
$.tipInfo("<@spring.message code='dataimport.cancelImportDeniedWithReason' />");
}
}
});
});
po.renderColumn = function(data, type, row, meta)
@ -330,8 +361,8 @@ Schema schema 数据库，不允许为null
width : "25%"
},
{
title : "<@spring.message code='dataimport.importProgress' />",
data : "",
title : "<@spring.message code='dataimport.importProgressWithSuccessFail' />",
data : "importProgress",
render : function(data, type, row, meta)
{
return po.formatImportProgress(data);

13
datagear-web/src/main/webapp/static/css/common.css
View File

@ -1657,7 +1657,7 @@ table.dataTable tbody tr .column-check .row-data-state .ui-icon{
}
.page-dataimport-text .form-item-progress .ui-progressbar{
display: inline-block;
width: 60%;
width: 40%;
vertical-align: middle;
}
.page-dataimport-text .form-item-progress .progress-percent{
@ -1675,4 +1675,15 @@ table.dataTable tbody tr .column-check .row-data-state .ui-icon{
}
.page-dataimport-text .minor-dataTable table.dataTable thead th, .minor-dataTable table.dataTable thead td{
font-size: medium;
}
.page-dataimport-text .form-item-table .file-encoding-wrapper{
position: absolute;
top : -2.5em;
right: 10em;
}
.page-dataimport-text .form-item-table .file-encoding-wrapper .file-encoding-label{
padding-right: 1em;
}
.page-dataimport-text .form-item-table .file-encoding-wrapper .ui-selectmenu-button.ui-button{
width: 8em;
}