Merge branch 'fix/query.importer' into 'wrdp'

Merge of fix/query.importer 修复导入模型多列的样式问题，导入目标校验、数值0问题、空数据问题  to wrdp

See merge request o2oa/o2oa!5642

o2web/source/x_component_Setting/Document.js

@@ -549,7 +549,7 @@ MWF.xApplication.Setting.Document.List = new Class({
         this.itemArea = new Element("div", {"styles": {"overflow": "hidden", "clear": "both"}}).inject(inputArea);
 
         if (this.type=="list"){
-            if (value.length && value.length){
+            if (value && value.length){
                 value.each(function(v){
                     this.createItem(v);
                 }.bind(this));

o2web/source/x_component_query_ImporterDesigner/Importer.js

@@ -72,10 +72,13 @@ MWF.xApplication.query.ImporterDesigner.Importer = new Class({
         }).inject(this.viewTitleNode);
 
         // this.refreshNode = new Element("div", {"styles": this.css.refreshNode}).inject(this.viewTitleNode);
-        this.addColumnLeftNode = new Element("div", {"styles": this.css.addColumnLeftNode}).inject(this.viewTitleNode);
-        this.addColumnNode = new Element("div", {"styles": this.css.addColumnNode}).inject(this.viewTitleNode);
 
-        this.viewTitleContentNode = new Element("div", {"styles": this.css.viewTitleContentNode}).inject(this.viewTitleNode);
+        this.viewColumnNode = new Element("div", {"styles": {"overflow":"hidden"}}).inject(this.viewTitleNode);
+
+        this.addColumnLeftNode = new Element("div", {"styles": this.css.addColumnLeftNode}).inject(this.viewColumnNode);
+        this.addColumnNode = new Element("div", {"styles": this.css.addColumnNode}).inject(this.viewColumnNode);
+
+        this.viewTitleContentNode = new Element("div", {"styles": this.css.viewTitleContentNode}).inject(this.viewColumnNode);
         this.viewTitleTableNode = new Element("table", {
             "styles": this.css.viewTitleTableNode,
             "border": "0px",
@@ -231,9 +234,6 @@ MWF.xApplication.query.ImporterDesigner.Importer = new Class({
     },
 
     addColumn: function( addToLeft ){
-
-        debugger;
-
         MWF.require("MWF.widget.UUID", function(){
             var id = (new MWF.widget.UUID).id;
             var json = {
@@ -261,12 +261,13 @@ MWF.xApplication.query.ImporterDesigner.Importer = new Class({
             //     }.bind(this));
             //     //this.setContentColumnWidth();
             // }
-            this.setViewWidth();
 
             this.items.each( function (item, i) {
                 item.resetIndex(i);
             });
 
+            this.setViewWidth();
+
             if( addToLeft ){
                 this.addColumnLeftNode.scrollIntoView(true);
             }else{
@@ -332,29 +333,31 @@ MWF.xApplication.query.ImporterDesigner.Importer = new Class({
 //        this.addTopItemNode.addEvent("click", this.addTopItem.bind(this));
     },
     setViewWidth: function(){
-        if( !this.viewAreaNode )return;
-        this.viewAreaNode.setStyle("width", "auto");
-        this.viewTitleNode.setStyle("width", "auto");
-
-        var s1 = this.viewTitleTableNode.getSize();
-
-        var m1 = this.viewTitleNode.getStyle("margin-left");
-        var m2 = this.viewTitleNode.getStyle("margin-right");
-
-        var s2 = this.addColumnLeftNode.getSize();
-        var s3 = this.addColumnNode.getSize();
-        var width = s1.x+s2.x+s2.x - m1.toFloat() - m2.toFloat();
-        var size = this.areaNode.getSize();
-
-        if (width>size.x){
-            this.viewTitleNode.setStyle("width", ""+width+"px");
-            this.viewAreaNode.setStyle("width", ""+width+"px");
-        }else{
-            this.viewTitleNode.setStyle("width", ""+size.x+"px");
-            this.viewAreaNode.setStyle("width", ""+size.x+"px");
-        }
-        this.setContentColumnWidth();
-        this.setContentHeight();
+        // window.setTimeout(function() {
+            if (!this.viewAreaNode) return;
+            this.viewAreaNode.setStyle("width", "auto");
+            this.viewTitleNode.setStyle("width", "auto");
+
+            var s1 = this.viewTitleTableNode.getSize();
+
+            var m1 = this.viewTitleNode.getStyle("margin-left");
+            var m2 = this.viewTitleNode.getStyle("margin-right");
+
+            var s2 = this.addColumnLeftNode.getSize();
+            var s3 = this.addColumnNode.getSize();
+            var width = s1.x + s2.x + s2.x - m1.toFloat() - m2.toFloat();
+            var size = this.areaNode.getSize();
+
+            if (width > size.x) {
+                this.viewTitleNode.setStyle("width", "" + width + "px");
+                this.viewAreaNode.setStyle("width", "" + width + "px");
+            } else {
+                this.viewTitleNode.setStyle("width", "" + size.x + "px");
+                this.viewAreaNode.setStyle("width", "" + size.x + "px");
+            }
+            this.setContentColumnWidth();
+            this.setContentHeight();
+        // }.bind(this), 10);
     },
     setContentHeight: function(){
         var size = this.areaNode.getSize();
@@ -422,6 +425,28 @@ MWF.xApplication.query.ImporterDesigner.Importer = new Class({
             return false;
         }
 
+        if( !this.json.type ){
+            this.designer.notice(this.designer.lp.notice.inputType, "error");
+            return false;
+        }
+
+        if (this.json.type==="cms"){
+            if( !this.json.data.category || !this.json.data.category.id ){
+                this.designer.notice(this.designer.lp.notice.inputCategory, "error");
+                return false;
+            }
+        }else if(this.json.type==="process"){
+            if( !this.json.data.process || !this.json.data.process.id ){
+                this.designer.notice(this.designer.lp.notice.inputProcess, "error");
+                return false;
+            }
+        }else if(this.json.type==="dynamicTable"){
+            if( !this.json.data.dynamicTable || !this.json.data.dynamicTable.name ){
+                this.designer.notice(this.designer.lp.notice.inputTable, "error");
+                return false;
+            }
+        }
+
         var fieldArr=[], textArr=[], data = this.json.data;
         var fieldArr2 = [], textArr2 = [];
         if (this.json.type==="cms"){
@@ -869,12 +894,12 @@ MWF.xApplication.query.ImporterDesigner.Importer.Column = new Class({
 
         this.view.selected();
 
-        this.view.setViewWidth();
-
         this.view.items.each( function (item, i) {
             item.resetIndex(i);
         });
 
+        this.view.setViewWidth();
+
         MWF.release(this);
         delete this;
     },
@@ -909,12 +934,13 @@ MWF.xApplication.query.ImporterDesigner.Importer.Column = new Class({
                     td.setStyles(this.css.viewContentTdNode);
                 }.bind(this));
             }
-            this.view.setViewWidth();
 
             this.view.items.each( function (item, i) {
                 item.resetIndex(i);
             });
 
+            this.view.setViewWidth();
+
         }.bind(this));
     },
     resetIndex : function( index ){

o2web/source/x_component_query_ImporterDesigner/lp/en.js

@@ -49,6 +49,11 @@ MWF.xApplication.query.ImporterDesigner.LP = {
         "inputName": "Please enter the name of the imported model",
         "noModifyName": "Cannot modify the name or alias",
 
+        "inputType": "Please select the import destination",
+        "inputProcess": "Please select a process",
+        "inputCategory": "Please select a category",
+        "inputTable": "Please select a self-built table",
+
         "deleteEventTitle": "Delete Event Confirmation",
         "deleteEvent": "Are you sure you want to delete the current event?",
 

o2web/source/x_component_query_ImporterDesigner/lp/zh-cn.js

@@ -49,6 +49,12 @@ MWF.xApplication.query.ImporterDesigner.LP = {
         "inputName": "请输入导入模型名称",
         "noModifyName": "不能修改名称或者别名",
 
+        "inputType": "请选择导入目标",
+        "inputProcess": "请选择流程",
+        "inputCategory": "请选择分类",
+        "inputTable": "请选择自建表",
+
+
         "deleteEventTitle": "删除事件确认",
         "deleteEvent": "是否确定删除当前事件吗？",
 

o2web/source/x_component_query_Query/Importer.js

@@ -120,6 +120,14 @@ MWF.xApplication.query.Query.Importer = MWF.QImporter = new Class({
 
         this.excelUtils.upload( this.getDateColIndexArray(), function (importedData) {
 
+            importedData = importedData.filter(function (array) {
+                for( var i=0; i<array.length; i++ ){
+                    if(array[i])return true;
+                }
+                return false;
+            });
+            debugger;
+
             this.progressBar = new MWF.xApplication.query.Query.Importer.ProgressBar( this, {
                 "onPostShow": function(){
                     this.progressBar.showCheckData();
@@ -996,7 +1004,7 @@ MWF.xApplication.query.Query.Importer.Row = new Class({
             if( !value )return;
 
             var data = this.parseData(value, (json.type === "dynamicTable" ? columnJson.dataType_Querytable : columnJson.dataType_CMSProcess), columnJson);
-            if( !data )return;
+            if( !data && data !== 0 )return;
 
             if( json.type === "dynamicTable" ){
                 this.data[ columnJson.path ] = data;

o2web/source/x_component_query_ViewDesigner/View.js

@@ -1535,7 +1535,7 @@ MWF.xApplication.query.ViewDesigner.View.Column = new Class({
         }
         this.node.setStyles(this.css.viewTitleColumnNode_selected);
         this.listNode.setStyles(this.css.cloumnListNode_selected);
-        new Fx.Scroll(this.view.areaNode, {"wheelStops": false, "duration": 100}).toElementEdge(this.node);
+        // new Fx.Scroll(this.view.areaNode, {"wheelStops": false, "duration": 100}).toElementEdge(this.node);
         new Fx.Scroll(this.view.designer.propertyDomArea, {"wheelStops": false, "duration": 100}).toElement(this.listNode);
 
         this.view.currentSelectedModule = this;