From fd29439d68d28a7f3da574dc2773360a2d37e366 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 27 May 2020 17:10:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=A1=A8=E5=8D=95=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84isEmpty=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- o2web/source/x_component_process_Xform/$Input.js | 3 +++ o2web/source/x_component_process_Xform/Attachment.js | 8 ++++++++ o2web/source/x_component_process_Xform/Combox.js | 8 ++++++++ o2web/source/x_component_process_Xform/DatagridMobile.js | 9 +++++++++ o2web/source/x_component_process_Xform/DatagridPC.js | 9 +++++++++ o2web/source/x_component_process_Xform/Documenteditor.js | 5 +++++ o2web/source/x_component_process_Xform/Form.js | 2 +- o2web/source/x_component_process_Xform/Office.js | 4 ++++ o2web/source/x_component_process_Xform/Org.js | 6 ++++++ o2web/source/x_component_process_Xform/Orgfield.js | 6 ++++++ o2web/source/x_component_process_Xform/Personfield.js | 6 ++++++ o2web/source/x_component_process_Xform/Stat.js | 7 +++++++ 12 files changed, 72 insertions(+), 1 deletion(-) diff --git a/o2web/source/x_component_process_Xform/$Input.js b/o2web/source/x_component_process_Xform/$Input.js index 9fb2f79302..f0c431b32d 100644 --- a/o2web/source/x_component_process_Xform/$Input.js +++ b/o2web/source/x_component_process_Xform/$Input.js @@ -216,6 +216,9 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input = new Class({ var text = (this.node.getFirst()) ? this.node.getFirst().get("text") : this.node.get("text"); return {"value": [value || ""] , "text": [text || value || ""]}; }, + isEmpty : function(){ + return !!this.getData(); + }, getData: function(when){ if (this.json.compute == "save") this._setValue(this._computeValue()); return this.getInputData(); diff --git a/o2web/source/x_component_process_Xform/Attachment.js b/o2web/source/x_component_process_Xform/Attachment.js index fdb71f458d..7bf1b48401 100644 --- a/o2web/source/x_component_process_Xform/Attachment.js +++ b/o2web/source/x_component_process_Xform/Attachment.js @@ -1104,6 +1104,14 @@ MWF.xApplication.process.Xform.Attachment = MWF.APPAttachment = new Class({ }.bind(this)); }, + isEmpty : function(){ + var data = this.getData(); + if( typeOf(data) === "array" ){ + return data.length !== 0 + }else{ + return !!data; + } + }, getData: function () { return (this.attachmentController) ? this.attachmentController.getAttachmentNames() : null; }, diff --git a/o2web/source/x_component_process_Xform/Combox.js b/o2web/source/x_component_process_Xform/Combox.js index 3e0369b7f2..f1e5e75e29 100644 --- a/o2web/source/x_component_process_Xform/Combox.js +++ b/o2web/source/x_component_process_Xform/Combox.js @@ -179,6 +179,14 @@ MWF.xApplication.process.Xform.Combox = MWF.APPCombox = new Class({ this.combox.setOptions({"list": list}); } }, + isEmpty : function(){ + var data = this.getData(); + if( typeOf(data) === "array" ){ + return data.length !== 0; + }else{ + return !!data; + } + }, getInputData: function(){ if (this.combox) return this.combox.getData(); return this._getBusinessData(); diff --git a/o2web/source/x_component_process_Xform/DatagridMobile.js b/o2web/source/x_component_process_Xform/DatagridMobile.js index 347629e226..881b7693ca 100644 --- a/o2web/source/x_component_process_Xform/DatagridMobile.js +++ b/o2web/source/x_component_process_Xform/DatagridMobile.js @@ -1133,6 +1133,15 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({ getTotal: function(){ this._loadTotal(); return this.totalResaults; + }, + isEmpty: function(){ + var data = this.getData(); + if( !data )return true; + if( typeOf( data ) === "object" ){ + if( typeOf( data.data ) !== "array" )return true; + if( data.data.length === 0 )return true; + } + return false; }, getData: function(){ if (this.editable!=false){ diff --git a/o2web/source/x_component_process_Xform/DatagridPC.js b/o2web/source/x_component_process_Xform/DatagridPC.js index 9241894f86..dfe9793d83 100644 --- a/o2web/source/x_component_process_Xform/DatagridPC.js +++ b/o2web/source/x_component_process_Xform/DatagridPC.js @@ -984,6 +984,15 @@ MWF.xApplication.process.Xform.DatagridPC = new Class({ this._loadTotal(); return this.totalResaults; }, + isEmpty: function(){ + var data = this.getData(); + if( !data )return true; + if( typeOf( data ) === "object" ){ + if( typeOf( data.data ) !== "array" )return true; + if( data.data.length === 0 )return true; + } + return false; + }, getData: function(){ if (this.editable!=false){ if (this.isEdit) this._completeLineEdit(); diff --git a/o2web/source/x_component_process_Xform/Documenteditor.js b/o2web/source/x_component_process_Xform/Documenteditor.js index 18613a3d74..1bb2daba9f 100644 --- a/o2web/source/x_component_process_Xform/Documenteditor.js +++ b/o2web/source/x_component_process_Xform/Documenteditor.js @@ -1796,6 +1796,11 @@ debugger; this._repage(); }.bind(this)); }, + isEmpty: function(){ + var data = this.getData(); + if( typeOf(data) !== "object" )return true; + return !!data.filetext; + }, getData: function(){ //if (this.editMode){ if (this.layout_copies) this.data.copies = this.layout_copies.get("text"); diff --git a/o2web/source/x_component_process_Xform/Form.js b/o2web/source/x_component_process_Xform/Form.js index 84cda08230..8011fe0da8 100644 --- a/o2web/source/x_component_process_Xform/Form.js +++ b/o2web/source/x_component_process_Xform/Form.js @@ -1082,7 +1082,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class({ // this.setModifedData(data[i], pathList.push(i)); // } //} - } else if (typeOf(data) !== "null") { + } else if (typeOf(data) !== "null") { //后台对null是忽略处理的，认为值没有变化 var od = this.getOrigianlPathData(pathList); if (typeOf(data) !== typeOf(od) || data !== od) { this.setModifedDataByPathList(data, pathList); diff --git a/o2web/source/x_component_process_Xform/Office.js b/o2web/source/x_component_process_Xform/Office.js index 6c1158d9b0..f7736275f3 100644 --- a/o2web/source/x_component_process_Xform/Office.js +++ b/o2web/source/x_component_process_Xform/Office.js @@ -1203,6 +1203,10 @@ MWF.xApplication.process.Xform.Office = MWF.APPOffice = new Class({ this.fileUploadNode = this.uploadFileAreaNode.getFirst(); this.uploadFileAreaNode.inject(this.officeForm); }, + isEmpty : function(){ + var data = this.getData(); + return !!data; + }, getData: function(){ if (this.officeOCX && (this.officeOCX.DocType==1 || this.officeOCX.DocType==6)){ this.officeOCX.ActiveDocument.Application.Selection.WholeStory(); diff --git a/o2web/source/x_component_process_Xform/Org.js b/o2web/source/x_component_process_Xform/Org.js index c441013336..6f69cac85c 100644 --- a/o2web/source/x_component_process_Xform/Org.js +++ b/o2web/source/x_component_process_Xform/Org.js @@ -323,6 +323,12 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class({ //this.setData((v) ? v.join(", ") : ""); this.setData(v); }, + isEmpty: function(){ + var data = this.getData(); + if( typeOf(data) !== "array" )return true; + if( data.length === 0 )return true; + return false; + }, getInputData: function(){ if (this.json.isInput){ if (this.combox)return this.combox.getData(); diff --git a/o2web/source/x_component_process_Xform/Orgfield.js b/o2web/source/x_component_process_Xform/Orgfield.js index 112bab29f6..a3bd3f6e38 100644 --- a/o2web/source/x_component_process_Xform/Orgfield.js +++ b/o2web/source/x_component_process_Xform/Orgfield.js @@ -276,6 +276,12 @@ MWF.xApplication.process.Xform.Orgfield = MWF.APPOrgfield = new Class({ value = this._computeValue(); } return value || ""; + }, + isEmpty: function(){ + var data = this.getData(); + if( typeOf(data) !== "array" )return true; + if( data.length === 0 )return true; + return false; }, getData: function(when){ if (this.json.compute == "save") this._setValue(this._computeValue()); diff --git a/o2web/source/x_component_process_Xform/Personfield.js b/o2web/source/x_component_process_Xform/Personfield.js index 21b36c7265..c7fbf9b9eb 100644 --- a/o2web/source/x_component_process_Xform/Personfield.js +++ b/o2web/source/x_component_process_Xform/Personfield.js @@ -394,6 +394,12 @@ MWF.xApplication.process.Xform.Personfield = MWF.APPPersonfield = new Class({ //this.setData((v) ? v.join(", ") : ""); this.setData(v); }, + isEmpty: function(){ + var data = this.getData(); + if( typeOf(data) !== "array" )return true; + if( data.length === 0 )return true; + return false; + }, getInputData: function(){ if (this.json.isInput){ if (this.combox) return this.combox.getData(); diff --git a/o2web/source/x_component_process_Xform/Stat.js b/o2web/source/x_component_process_Xform/Stat.js index 7140cb02f6..7a4115dc49 100644 --- a/o2web/source/x_component_process_Xform/Stat.js +++ b/o2web/source/x_component_process_Xform/Stat.js @@ -37,6 +37,13 @@ MWF.xApplication.process.Xform.Stat = MWF.APPStat = new Class({ }); }.bind(this)); }, + isEmpty: function(){ + var data = this.getData(); + debugger; + if( typeOf(data) !== "array" )return true; + if( data.length === 0 )return true; + return false; + }, getData: function(){ if (!this.stat) return null; if (!this.stat.stat) return null; -- GitLab