数据表格

o2web/source/x_component_process_FormDesigner/Module/Datatable.js

@@ -130,20 +130,20 @@ MWF.xApplication.process.FormDesigner.Module.Datatable = MWF.FCDatatable = new C
 			}.bind(this));
 		}.bind(this), false);
 	},
-	_getDroppableNodes: function(){
-		var nodes = [this.form.node].concat(this.form.moduleElementNodeList, this.form.moduleContainerNodeList, this.form.moduleComponentNodeList);
-		this.form.moduleList.each( function(module){
-			//数据网格不能往数据模板里拖
-			if( module.moduleName === "datatemplate" ){
-				var subDoms = this.form.getModuleNodes(module.node);
-				nodes.erase( module.node );
-				subDoms.each(function (dom) {
-					nodes.erase( dom );
-				})
-			}
-		}.bind(this));
-		return nodes;
-	},
+	// _getDroppableNodes: function(){
+	// 	var nodes = [this.form.node].concat(this.form.moduleElementNodeList, this.form.moduleContainerNodeList, this.form.moduleComponentNodeList);
+	// 	this.form.moduleList.each( function(module){
+	// 		//数据网格不能往数据模板里拖
+	// 		if( module.moduleName === "datatemplate" ){
+	// 			var subDoms = this.form.getModuleNodes(module.node);
+	// 			nodes.erase( module.node );
+	// 			subDoms.each(function (dom) {
+	// 				nodes.erase( dom );
+	// 			})
+	// 		}
+	// 	}.bind(this));
+	// 	return nodes;
+	// },
 	_createNode: function(callback){
 		var module = this;
 		var url = this.path+"datatableCreate.html";

o2web/source/x_component_process_FormDesigner/Module/Datatable/datatable.html

@@ -13,6 +13,13 @@
                 <td class="editTableTitle">{{$.lp.description}}:</td>
                 <td class="editTableValue"><input type="text" name="description" value="text{$.description}" class="editTableInput"/></td>
             </tr>
+            <tr>
+                <td class="editTableTitle">{{$.lp.datatableEditMode}}:</td>
+                <td class="editTableValue">
+                    <input type="radio" name="editMode" value="single" text{($.editMode!=='single')?'checked':''}/>{{$.lp.datatableEditModeValue[0]}}
+                    <input type="radio" name="editMode" value="multi" text{($.editMode==='multi')?'checked':''}/>{{$.lp.datatableEditModeValue[1]}}
+                </td>
+            </tr>
         </table>
         <div class="MWFFormulaArea" name="defaultData" title="{{$.lp.defaultData}} (S)"></div>
 

o2web/source/x_component_process_FormDesigner/lp/en.js

@@ -906,8 +906,9 @@ MWF.xApplication.process.FormDesigner.LP = {
         "validationContentTdStyle": "Validation Content Td Style",
         "validationTableAttribute": "Validation Table Attribute",
         "count": "Count",
-        "import" : "Import"
-
+        "import" : "Import",
+        "datatableEditMode": "Edit Mode",
+        "datatableEditModeValue": ["single row","multiple rows"]
     },
     "actionBar": {
         "close":"Close",

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

@@ -910,7 +910,9 @@ MWF.xApplication.process.FormDesigner.LP = {
         "validationContentTdStyle": "校验内容单元格样式",
         "validationTableAttribute": "校验表格属性",
         "count": "数量",
-        "import" : "导入"
+        "import" : "导入",
+        "datatableEditMode": "编辑方式",
+        "datatableEditModeValue": ["每次编辑单行","同时编辑多行"]
     },
     "actionBar": {
         "close":"关闭",

o2web/source/x_component_process_Xform/$Input.js

@@ -175,7 +175,10 @@ MWF.xApplication.process.Xform.$Input = MWF.APP$Input =  new Class(
 
         this.node.getFirst().addEvent("change", function(){
             this.validationMode();
-            if (this.validation()) this._setBusinessData(this.getInputData("change"));
+            if (this.validation()) {
+                this._setBusinessData(this.getInputData("change"));
+                this.fireEvent("change");
+            }
         }.bind(this));
 	},
     _loadStyles: function(){

o2web/source/x_component_process_Xform/Checkbox.js

@@ -187,7 +187,10 @@ MWF.xApplication.process.Xform.Checkbox = MWF.APPCheckbox =  new Class(
 
                     radio.addEvent("click", function(){
                         this.validationMode();
-                        if (this.validation()) this._setBusinessData(this.getInputData("change") || []);
+                        if (this.validation()) {
+                            this._setBusinessData(this.getInputData("change") || []);
+                            this.fireEvent("change");
+                        }
                     }.bind(this));
 
                     Object.each(this.json.events, function(e, key){

o2web/source/x_component_process_Xform/Form.js

@@ -1174,7 +1174,7 @@ MWF.xApplication.process.Xform.Form = MWF.APPForm = new Class(
                     moduleNodes.push(subDom);
                 }
                 // && mwftype !== "tab$Content"
-                if (mwftype !== "datagrid" && mwftype !== "subSource" && mwftype !== "tab$Content" && mwftype !== "datatemplate") {
+                if (mwftype !== "datagrid" && mwftype !== "datatable" && mwftype !== "subSource" && mwftype !== "tab$Content" && mwftype !== "datatemplate") {
                     moduleNodes = moduleNodes.concat(this._getModuleNodes(subDom));
                 }
             } else {

o2web/source/x_component_process_Xform/Number.js

@@ -235,7 +235,10 @@ debugger;
 
         this.node.getFirst().addEvent("change", function(){
             this.validationMode();
-            if (this.validation()) this._setBusinessData(this.getInputData("change"));
+            if (this.validation()) {
+                this._setBusinessData(this.getInputData("change"));
+                this.fireEvent("change");
+            }
         }.bind(this));
 
         this.node.getFirst().addEvent("blur", function(){

o2web/source/x_component_process_Xform/Opinion.js

@@ -165,6 +165,7 @@ MWF.xApplication.process.Xform.Opinion = MWF.APPOpinion =  new Class(
 
         this.node.addEvent("change", function(){
             this._setBusinessData(this.getInputData());
+            this.fireEvent("change");
         }.bind(this));
 
         this.node.getFirst().addEvent("blur", function(){

o2web/source/x_component_process_Xform/Package.js

@@ -23,6 +23,7 @@ MWF.xApplication.process.Xform.require = function(callback){
         ["process.Xform", "Address"],
         ["process.Xform", "Table"],
         ["process.Xform", "Datagrid"],
+        ["process.Xform", "Datatable"],
         ["process.Xform", "Datatemplate"],
         ["process.Xform", "Tab"],
         ["process.Xform", "Tree"],

o2web/source/x_component_process_Xform/Radio.js

@@ -206,7 +206,10 @@ MWF.xApplication.process.Xform.Radio = MWF.APPRadio =  new Class(
 
                     radio.addEvent("click", function(){
                         this.validationMode();
-                        if (this.validation()) this._setBusinessData(this.getInputData("change"));
+                        if (this.validation()) {
+                            this._setBusinessData(this.getInputData("change"));
+                            this.fireEvent("change");
+                        }
                     }.bind(this));
 
                     Object.each(this.json.events, function(e, key){

o2web/source/x_component_process_Xform/Select.js

@@ -142,7 +142,10 @@ MWF.xApplication.process.Xform.Select = MWF.APPSelect =  new Class(
 			var v = this.getInputData("change");
 			this._setBusinessData(v);
             this.validationMode();
-            if (this.validation()) this._setBusinessData(v);
+            if (this.validation()) {
+				this._setBusinessData(v);
+				this.fireEvent("change");
+			}
         }.bind(this));
 
 	},

o2web/source/x_component_process_Xform/Textarea.js

@@ -146,6 +146,7 @@ MWF.xApplication.process.Xform.Textarea = MWF.APPTextarea =  new Class({
 		});
         this.node.addEvent("change", function(){
             this._setBusinessData(this.getInputData());
+            this.fireEvent("change");
         }.bind(this));
 
         this.node.getFirst().addEvent("blur", function(){

o2web/source/x_component_process_Xform/Textfield.js

@@ -149,7 +149,10 @@ MWF.xApplication.process.Xform.Textfield = MWF.APPTextfield =  new Class({
             var v = this.getInputData("change");
             this._setBusinessData(v);
             this.validationMode();
-            if (this.validation()) this._setBusinessData(v);
+            if (this.validation()) {
+                this._setBusinessData(v);
+                this.fireEvent("change");
+            }
         }.bind(this));
         if (this.json.ANNModel){
             this.node.getFirst().addEvent("focus", function(){