diff --git a/o2web/source/x_component_process_FormDesigner/Module/Datagrid/datagrid.html b/o2web/source/x_component_process_FormDesigner/Module/Datagrid/datagrid.html index cd901f402c6806a9ac4f56b2ecff4641fb275ffc..8b46f9bd234aea18d3c8b1446d3e1dfedb2a4f79 100644 --- a/o2web/source/x_component_process_FormDesigner/Module/Datagrid/datagrid.html +++ b/o2web/source/x_component_process_FormDesigner/Module/Datagrid/datagrid.html @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/o2web/source/x_component_process_Xform/DatagridMobile.js b/o2web/source/x_component_process_Xform/DatagridMobile.js index b93df707cc72dbb268266327d4f25174c0e08b33..95c3dfbfbf2cadb4b175e1a60c8a5d10ae962149 100644 --- a/o2web/source/x_component_process_Xform/DatagridMobile.js +++ b/o2web/source/x_component_process_Xform/DatagridMobile.js @@ -1,8 +1,8 @@ MWF.xDesktop.requireApp("process.Xform", "$Module", null, false); MWF.xApplication.process.Xform.DatagridMobile = new Class({ - Implements: [Events], - Extends: MWF.APP$Module, - isEdit: false, + Implements: [Events], + Extends: MWF.APP$Module, + isEdit: false, options: { "moduleEvents": ["queryLoad","postLoad","load","completeLineEdit", "addLine", "deleteLine", "afterDeleteLine","editLine"] }, @@ -15,13 +15,13 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({ this.field = true; }, - _loadUserInterface: function(){ + _loadUserInterface: function(){ this.fireEvent("queryLoad"); - this.editModules = []; + this.editModules = []; this.node.setStyle("overflow-x", "hidden"); this.node.setStyle("overflow-y", "hidden"); - this.table = this.node.getElement("table"); + this.table = this.node.getElement("table"); this.createMobileTable(); @@ -35,22 +35,22 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({ this.gridData = this._getValue(); this.totalModules = []; - this._loadDatagridTitleModules(); + this._loadDatagridTitleModules(); - if (this.editable!=false){ + if (this.editable!=false){ this._loadDatagridDataModules(); //this._addTitleActionColumn(); - this._loadEditDatagrid(); - //this._loadReadDatagrid(); + this._loadEditDatagrid(); + //this._loadReadDatagrid(); this.fireEvent("postLoad"); this.fireEvent("load"); - }else{ + }else{ this._loadDatagridDataModules(); - this._loadReadDatagrid(); + this._loadReadDatagrid(); this.fireEvent("postLoad"); this.fireEvent("load"); - } - }, + } + }, createMobileTable: function(){ var mobileTable = new Element("table").inject(this.node); mobileTable.set(this.json.properties); @@ -80,87 +80,87 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({ this.table = mobileTable; }, - _loadStyles: function(){ - //this.table.setStyles(this.json.tableStyles); + _loadStyles: function(){ + //this.table.setStyles(this.json.tableStyles); this.node.setStyles(this.json.styles); var tables = this.node.getElements("table"); tables.each(function(table){ table.setStyles(this.json.tableStyles); }.bind(this)); - }, - _getValue: function(){ - var value = []; - value = this._getBusinessData(); - if (!value){ - if (this.json.defaultData && this.json.defaultData.code) value = this.form.Macro.exec(this.json.defaultData.code, this); + }, + _getValue: function(){ + var value = []; + value = this._getBusinessData(); + if (!value){ + if (this.json.defaultData && this.json.defaultData.code) value = this.form.Macro.exec(this.json.defaultData.code, this); value = {"data": value || []}; - } - return value || []; - }, - - _getValueText: function(idx, value){ - var module = this.editModules[idx]; - if (module){ - switch (module.json.type){ - case "Select": - for (var i=0; i1) ? arr[1] : arr[0]; - if (value===v) return text; - } + } + return value || []; + }, + + _getValueText: function(idx, value){ + var module = this.editModules[idx]; + if (module){ + switch (module.json.type){ + case "Select": + for (var i=0; i1) ? arr[1] : arr[0]; + if (value===v) return text; + } - // var ops = module.node.getElements("option"); - // for (var i=0; i1) ? arr[1] : arr[0]; - if (value===v) return text; - } - // var ops = module.node.getElements("option"); - // for (var i=0; i1) ? arr[1] : arr[0]; + if (value===v) return text; + } + // var ops = module.node.getElements("option"); + // for (var i=0; i2){ - //this.table.rows[1].destroy(); - //} - if (this.editable!=false){ - this._loadEditDatagrid(); - //this._loadReadDatagrid(); - }else{ - this._loadReadDatagrid(); - } - this._loadDatagridStyle(); - } - - - }, - getTotal: function(){ - this._loadTotal(); - return this.totalResaults; - }, + //while (this.table.rows.length>2){ + //this.table.rows[1].destroy(); + //} + if (this.editable!=false){ + this._loadEditDatagrid(); + //this._loadReadDatagrid(); + }else{ + this._loadReadDatagrid(); + } + this._loadDatagridStyle(); + } + + + }, + getTotal: function(){ + this._loadTotal(); + return this.totalResaults; + }, isEmpty: function(){ var data = this.getData(); if( !data )return true; @@ -1011,195 +1011,195 @@ MWF.xApplication.process.Xform.DatagridPC = new Class({ return false; }, getData: function(){ - if (this.editable!=false){ + if (this.editable!=false){ if (this.isEdit) this._completeLineEdit(); - var data = []; - var trs = this.table.getElements("tr"); - for (var i=1; idata.value){ - this.notValidationMode(data.prompt); - return false; - } - break; - case "lt": - if (vdata.value){ + this.notValidationMode(data.prompt); + return false; + } + break; + case "lt": + if (v