增加时间选择方式

o2web/.gitignore

@@ -17,3 +17,4 @@ package-lock.json
 ftpconfig.js
 gulpconfig.js
 jsdoc.dev.json
+/dest2/

o2web/source/o2_core/o2/lp/en.js

@@ -364,6 +364,9 @@ o2.LP.widget = {
 	"year": ", ",
 	"month": " ",
 	"date": " ",
+	"hour": "hour",
+	"minute": "minute",
+	"second": "second",
 	"week": "week",
 	"dateGreaterThanCurrentNotice" : "The selected date must be greater than the current date",
 

o2web/source/o2_core/o2/lp/zh-cn.js

@@ -366,6 +366,9 @@ o2.LP.widget = {
     "year": "年",
     "month": "月",
     "date": "日",
+    "hour": "时",
+    "minute": "分",
+    "second": "秒",
     "week": "周",
     "dateGreaterThanCurrentNotice" : "选择的日期必须大于当前日期",
 

o2web/source/o2_core/o2/widget/Calendar.js

@@ -9,6 +9,7 @@ o2.widget.Calendar = o2.Calendar = new Class({
 		"defaultView": "day", //day, month, year
 		"baseDate": new Date(),
 		"secondEnable" : false,
+		"secondSelectType" : "slider",
 		"isTime": false,
 		"isMulti": false,
 		"before": null,
@@ -417,7 +418,7 @@ o2.widget.Calendar = o2.Calendar = new Class({
 			if(((page.x < elementCoords.left || page.x > (elementCoords.left + elementCoords.width)) ||
 				(page.y < elementCoords.top || page.y > (elementCoords.top + elementCoords.height))) &&
 				((page.x < targetCoords.left || page.x > (targetCoords.left + targetCoords.width)) ||
-				(page.y < targetCoords.top || page.y > (targetCoords.top + targetCoords.height))) ) this.hide();
+					(page.y < targetCoords.top || page.y > (targetCoords.top + targetCoords.height))) ) this.hide();
 		}
 	},
 
@@ -943,7 +944,7 @@ o2.widget.Calendar = o2.Calendar = new Class({
 			//	calendar.showHNode.set("text", this.options[this.selectedIndex].get("value"));
 			//});
 			//this.showHNode.set("text", sel.options[sel.selectedIndex].get("value"));
-            //
+			//
 			//this.itmeMNode.empty();
 			//this.itmeMNode.removeClass("calendarTimeSlider");
 			//this.itmeMNode.setStyles(this.css.calendarTimeSliderNoStyle);
@@ -961,35 +962,88 @@ o2.widget.Calendar = o2.Calendar = new Class({
 			//});
 			//this.showMNode.set("text", sel.options[sel.selectedIndex].get("value"));
 		}else{
-			var hSlider = new Slider(this.itmeHNode, this.itmeHNode.getFirst(), {
-				range: [0, 23],
-				initialStep: h.toInt(),
-				onChange: function(value){
-					var tmp = (value.toInt().toString());
-					if (tmp.length<2){
-						tmp = "0"+tmp
-					}
-					this.showHNode.set("text", tmp);
-					this.itmeHNode.getFirst().set("text", tmp);
-				}.bind(this)
-			});
-			this.itmeHNode.getFirst().set("text", h);
-
-			var mSlider = new Slider(this.itmeMNode, this.itmeMNode.getFirst(), {
-				range: [0, 59],
-				initialStep: m.toInt(),
-				onChange: function(value){
-					var tmp = (value.toInt().toString());
-					if (tmp.length<2){
-						tmp = "0"+tmp
+
+			if(this.options.secondSelectType === "select"){
+
+				this.itmeHNode = this.contentTimeTable.getElement(".MWF_calendar_time_h").empty();
+				this.itmeMNode = this.contentTimeTable.getElement(".MWF_calendar_time_m").empty();
+				this.itmeSNode = this.contentTimeTable.getElement(".MWF_calendar_time_s").empty();
+
+				new Element("span",{"text": o2.LP.widget.hour + "："}).inject(this.itmeHNode);
+				this.itmeSelectHNode = new Element("select").inject(this.itmeHNode);
+				for( var i=0; i<24; i++ ){
+					new Element("option",{
+						"text" : this.addZero(i, 2 ),
+						"value" : this.addZero(i, 2 ),
+						"styles" : this.css.calendarTimeSelectItem_mobile
+					}).inject( this.itmeSelectHNode );
+				}
+				this.itmeSelectHNode.set("value",this.addZero( h.toInt(), 2));
+				this.itmeSelectHNode.addEvent("change",function(){
+					this.showHNode.set("text", this.itmeSelectHNode.get("value") );
+				}.bind(this));
+
+				new Element("span",{"text":o2.LP.widget.minute + "："}).inject(this.itmeMNode);
+				this.itmeSelectMNode = new Element("select").inject(this.itmeMNode);
+				for( var i=0; i<60; i++ ){
+					new Element("option",{
+						"text" : this.addZero(i, 2 ),
+						"value" : this.addZero(i, 2 ),
+						"styles" : this.css.calendarTimeSelectItem_mobile
+					}).inject( this.itmeSelectMNode );
+				}
+				this.itmeSelectMNode.set("value",this.addZero( m.toInt(), 2));
+				this.itmeSelectMNode.addEvent("change",function(){
+					this.showMNode.set("text", this.itmeSelectMNode.get("value") );
+				}.bind(this));
+
+				if( this.options.secondEnable && this.itmeSNode ){
+					new Element("span",{"text":o2.LP.widget.second + "："}).inject(this.itmeSNode);
+					this.itmeSelectSNode = new Element("select").inject(this.itmeSNode);
+					for( var i=0; i<60; i++ ){
+						new Element("option",{
+							"text" : this.addZero(i, 2 ),
+							"value" : this.addZero(i, 2 ),
+							"styles" : this.css.calendarTimeSelectItem_mobile
+						}).inject( this.itmeSelectSNode );
 					}
-					this.showMNode.set("text", tmp);
-					this.itmeMNode.getFirst().set("text", tmp);
-				}.bind(this)
-			});
-			this.itmeMNode.getFirst().set("text", m);
+					this.itmeSelectSNode.set("value",this.addZero( s.toInt(), 2));
+					this.itmeSelectSNode.addEvent("change",function(){
+						this.showSNode.set("text", this.itmeSelectSNode.get("value") );
+					}.bind(this));
+				}
+
+
+			}else {
+				var hSlider = new Slider(this.itmeHNode, this.itmeHNode.getFirst(), {
+					range: [0, 23],
+					initialStep: h.toInt(),
+					onChange: function(value){
+						var tmp = (value.toInt().toString());
+						if (tmp.length<2){
+							tmp = "0"+tmp
+						}
+						this.showHNode.set("text", tmp);
+						this.itmeHNode.getFirst().set("text", tmp);
+					}.bind(this)
+				});
+				this.itmeHNode.getFirst().set("text", h);
+
+				var mSlider = new Slider(this.itmeMNode, this.itmeMNode.getFirst(), {
+					range: [0, 59],
+					initialStep: m.toInt(),
+					onChange: function(value){
+						var tmp = (value.toInt().toString());
+						if (tmp.length<2){
+							tmp = "0"+tmp
+						}
+						this.showMNode.set("text", tmp);
+						this.itmeMNode.getFirst().set("text", tmp);
+					}.bind(this)
+				});
+				this.itmeMNode.getFirst().set("text", m);
 
-			if( this.options.secondEnable && this.itmeSNode ){
+				if( this.options.secondEnable && this.itmeSNode ){
 					var sSlider = new Slider(this.itmeSNode, this.itmeSNode.getFirst(), {
 						range: [0, 59],
 						initialStep: parseInt(s),
@@ -1001,9 +1055,11 @@ o2.widget.Calendar = o2.Calendar = new Class({
 							this.showSNode.set("text", tmp);
 							this.itmeSNode.getFirst().set("text", tmp);
 						}.bind(this)
-				});
-				this.itmeSNode.getFirst().set("text", s);
+					});
+					this.itmeSNode.getFirst().set("text", s);
+				}
 			}
+
 		}
 		this.showHNode.set("text", this.addZero( h.toInt(), 2) );
 		this.showMNode.set("text", this.addZero( m.toInt(), 2));
@@ -1136,7 +1192,7 @@ o2.widget.Calendar = o2.Calendar = new Class({
 		});
 		request.send();
 
-		//this.containerNode = div.getElement(".MWF_calendar_container"); 
+		//this.containerNode = div.getElement(".MWF_calendar_container");
 		this.titleNode = div.getElement(".MWF_calendar_title");
 		this.prevNode = div.getElement(".MWF_calendar_prev");
 		this.currentNode = div.getElement(".MWF_calendar_current");

o2web/source/x_component_process_FormDesigner/Module/Calendar/calendar.html

@@ -48,6 +48,13 @@
                 <input type="radio" name="isSelectSecond" value="true" text{($.isSelectSecond)?'checked':''}/>{{$.lp.yes}}
                 <input type="radio" name="isSelectSecond" value="false" text{(!$.isSelectSecond)?'checked':''}/>{{$.lp.no}}
             </td>
+        </tr>
+        <tr>
+            <td class="editTableTitle">{{$.lp.secondSelectType}}:</td>
+            <td class="editTableValue">
+                <input type="radio" name="secondSelectType" value="slider" text{$.secondSelectType=='select'||!$.secondSelectType ?'checked':''}/>滑块
+                <input type="radio" name="secondSelectType" value="select" text{$.secondSelectType=='slider' ?'checked':''}/>下拉
+            </td>
         </tr>
 		  <tr>
 		    <td class="editTableTitle">{{$.lp.format}}:</td>
@@ -60,9 +67,9 @@
 		    	<!--<input type="radio" name="range" value="range" text{($.range=='range')?'checked':''}/>时间范围-->
 		    <!--</td>-->
 		  <!--</tr>-->
-		  
+
 		</table>
-		
+
 		<div class="MWFMaplist" name="styles" title="{{$.lp.style}}"></div>
         <div class="MWFMaplist" name="inputStyles" title="{{$.lp.inputStyle}}"></div>
 		<div class="MWFMaplist" name="properties" title="{{$.lp.attribute}}"></div>
@@ -81,7 +88,7 @@
 
         <div class="MWFValidation" name="validationConfig"></div>
         <div class="MWFScriptArea" name="validation" title="{{$.lp.verificationScript}} (S)"></div>
-		
+
 	</div>
     <div title="{{$.lp.section}}" class="MWFTab">
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">

o2web/source/x_component_process_FormDesigner/lp/en.js

@@ -522,6 +522,7 @@ MWF.xApplication.process.FormDesigner.LP = {
         "yearOnly": "YearOnly",
         "timeOnly": "TimeOnly",
         "selectSecond": "Select Second",
+        "secondSelectType": "Second Select Type",
         "format": "Format",
 
         "selectStyle": "Select Style",

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

@@ -520,6 +520,7 @@ MWF.xApplication.process.FormDesigner.LP = {
         "yearOnly": "仅年度",
         "timeOnly": "仅时间",
         "selectSecond": "是否选择秒",
+        "secondSelectType": "秒选择方式",
         "format": "格式化",
 
         "selectStyle": "Select样式",

o2web/source/x_component_process_Xform/Calendar.js

@@ -127,6 +127,7 @@ MWF.xApplication.process.Xform.Calendar = MWF.APPCalendar =  new Class(
                 var options = {
                     "style": layout.mobile ? "xform_mobile" : "xform",
                     "secondEnable" : this.json.isSelectSecond,
+                    "secondSelectType" : this.json.secondSelectType,
                     "isTime": (this.json.selectType==="datetime" || this.json.selectType==="time"),
                     "timeOnly": (this.json.selectType === "time"),
                     "monthOnly" : (this.json.selectType === "month"),
@@ -281,4 +282,4 @@ MWF.xApplication.process.Xform.Calendar = MWF.APPCalendar =  new Class(
         }
         return resultArr[0] + "-" + resultArr[1] + "-" + resultArr[2] + " " + resultArr[3]+":"+resultArr[4]+":"+resultArr[5];
     }
-}); 
+});