Index: ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js =================================================================== diff -u -r18395 -r20215 --- ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js (.../deviceMaintenanceCostomInsForm.js) (revision 18395) +++ ssts-web/src/main/webapp/disinfectsystem/deviceMaintenance/deviceMaintenanceCostomInsForm.js (.../deviceMaintenanceCostomInsForm.js) (revision 20215) @@ -9,6 +9,17 @@ function cancelFormInstance() { formInstanceWin.close(); } + +/** + * 创建表单元素. + * @param type 表单元素类型 + * @param id 表单元素id + * @param name 表单元素名称 + * @param allowBlank 是否允许为空 + * @param options “单选”或者“多选”的选项值 + * @param value 表单元素的值 + * @returns + */ function createFormDefinitionItemElement(type,id,name,allowBlank,options,value){ if(type == '文本'){ return { @@ -219,6 +230,7 @@ title: name, layout : 'column', autoHeight : true, + collapsible: true, items : optionsArray }; } @@ -248,6 +260,10 @@ }); } +/** + * 根据id获取表单定义. + * @param formId 表单定义id + */ function addFormDefinitionItem(formId){ Ext.Ajax.request({ url : WWWROOT + '/disinfectSystem/formDefinitionAction!loadFormDefinition.do', @@ -287,6 +303,7 @@ title:"设备维护表单元素", layout:'column', autoHeight:true, + collapsible: true, items:items }); } @@ -302,6 +319,10 @@ }); } +/** + * 添加设备维护自定义表单实例 + * @param id + */ function addFormInstanceWin(id) { if(id==null||id=='undentified'){ id=""; @@ -345,6 +366,7 @@ layout : 'column', xtype:"fieldset", title:"基本信息", + collapsible: true, autoHeight:true, items : [{ xtype : 'hidden', Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java =================================================================== diff -u -r18546 -r20215 --- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java (.../FormDefinitionAction.java) (revision 18546) +++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/action/FormDefinitionAction.java (.../FormDefinitionAction.java) (revision 20215) @@ -124,6 +124,9 @@ StrutsResponseUtils.output(result); } + /** + * 根据id获取表单定义. + */ public void loadFormDefinition() { StrutsParamUtils.getResponse().setCharacterEncoding("UTF-8"); String id = StrutsParamUtils.getPraramValue("id", ""); Index: ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java =================================================================== diff -u -r18546 -r20215 --- ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java (.../FormDefinitionManager.java) (revision 18546) +++ ssts-customform/src/main/java/com/forgon/disinfectsystem/customform/formdefinition/service/FormDefinitionManager.java (.../FormDefinitionManager.java) (revision 20215) @@ -16,6 +16,11 @@ public interface FormDefinitionManager { + /** + * 根据id获取表单定义. + * @param id + * @return + */ public FormDefinition getFormDefinitionById(String id); /** * 通过表单类型和名称 获取定义.返回最新部署的值