diff --git a/o2web/source/x_component_process_Work/Processor.js b/o2web/source/x_component_process_Work/Processor.js index 4c2286f2bb60bceb924a4e0e28f0c935c99d5a6e..614c6296dd55b481e6e3d74e369e53081e244266 100644 --- a/o2web/source/x_component_process_Work/Processor.js +++ b/o2web/source/x_component_process_Work/Processor.js @@ -741,6 +741,7 @@ MWF.xApplication.process.Work.Processor = new Class({ "cancel" ] } + this.tablet = new MWF.widget.Tablet(this.handwritingAreaNode, handWritingOptions, null); this.tablet.load(); }.bind(this)); diff --git a/o2web/source/x_component_query_Query/Importer.js b/o2web/source/x_component_query_Query/Importer.js index 70355512d79cd4fc588d378e64ea5bc65528255f..11959e69927c229872b49dbe85b18b9ab4b3cb3d 100644 --- a/o2web/source/x_component_query_Query/Importer.js +++ b/o2web/source/x_component_query_Query/Importer.js @@ -524,22 +524,27 @@ MWF.xApplication.query.Query.Importer = MWF.QImporter = new Class({ if( !this.excelUtils ){ this.excelUtils = new MWF.xApplication.query.Query.Importer.ExcelUtils( this ); } + var doExport = function () { + var arg = { + data : [this.getTitleArray()], + colWidthArray : this.getColWidthArray(), + title : this.getFileName(fileName) + }; + if(callback)callback(arg); + + this.excelUtils.exportToExcel( + arg.data, + arg.title, + arg.colWidthArray, + this.getDateIndexArray() + ) + }.bind(this) if( !this.importerJson ){ this.getImporterJSON( function () { - var arg = { - data : [this.getTitleArray()], - colWidthArray : this.getColWidthArray(), - title : this.getFileName(fileName) - }; - if(callback)callback(arg); - - this.excelUtils.exportToExcel( - arg.data, - arg.title, - arg.colWidthArray, - this.getDateIndexArray() - ) + doExport() }.bind(this)) + }else{ + doExport(); } }, getFileName: function(fileName){