完善查询表单中日期控制中关于年月日的选择，同时为日期控制添加中文显示功能

ureport2-console/src/main/resources/ureport-asserts/venderjs/bootstrap-datetimepicker.js

@@ -82,7 +82,7 @@
     // when page switch the datetimepicker div will be removed also.
     this.container = options.container || 'body';
 
-    this.language = options.language || this.element.data('date-language') || 'en';
+    this.language = options.language || this.element.data('date-language') || 'zh-CN';
     this.language = this.language in dates ? this.language : this.language.split('-')[0]; // fr-CA fallback to fr
     this.language = this.language in dates ? this.language : 'en';
     this.isRTL = dates[this.language].rtl || false;

ureport2-core/src/main/java/com/bstek/ureport/definition/searchform/DateInputComponent.java

@@ -32,8 +32,12 @@ public class DateInputComponent extends InputComponent {
 	public String initJs(RenderContext context) {
 		StringBuffer sb=new StringBuffer();
 		sb.append("$('#"+context.buildComponentId(this)+"').datetimepicker({");
-		sb.append("format:'"+this.format+"'");
-		sb.append("");
+		sb.append("format:'"+this.format+"',");
+		sb.append("autoclose:1");
+		if(this.format.equals("yyyy-mm-dd")){		
+			sb.append(",startView:2,");
+			sb.append("minView:2");
+		}
 		sb.append("});");
 		
 		String name=getBindParameter();

ureport2-js/src/form/external/bootstrap-datetimepicker.js

@@ -1857,7 +1857,7 @@
                 '</tr>' +
       '</thead>',
     contTemplate: '<tbody><tr><td colspan="7"></td></tr></tbody>',
-    footTemplate: '<tfoot>' + 
+    footTemplate: '<tfoot>' +
                     '<tr><th colspan="7" class="today"></th></tr>' +
                     '<tr><th colspan="7" class="clear"></th></tr>' +
                   '</tfoot>'

ureport2-js/src/form/index.js

@@ -4,6 +4,18 @@
 import FormBuilder from './FormBuilder.js';
 
 $(document).ready(function(){
+    (function($){
+        $.fn.datetimepicker.dates['zh-CN'] = {
+            days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
+            daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+            daysMin:  ["日", "一", "二", "三", "四", "五", "六", "日"],
+            months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+            monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+            today: "今天",
+            suffix: [],
+            meridiem: ["上午", "下午"]
+        };
+    }(jQuery));
     const formBuilder=new FormBuilder($("#container"));
     formBuilder.initData(window.parent.__current_report_def);
-});
+});

ureport2-js/src/form/instance/DatetimeInstance.js

@@ -20,7 +20,10 @@ export default class DatetimeInstance extends Instance{
         var pickerIcon=$("<span class='input-group-addon'><span class='glyphicon glyphicon-calendar'></span></span>");
         this.datePickerinputGroup.append(pickerIcon);
         this.datePickerinputGroup.datetimepicker({
-            format:this.dateFormat
+            format:this.dateFormat,
+            autoclose:1,
+            startView:2,
+            minView:2
         });
         this.element.uniqueId();
         this.id=this.element.prop("id");
@@ -31,9 +34,15 @@ export default class DatetimeInstance extends Instance{
         }
         this.dateFormat=format;
         this.datePickerinputGroup.datetimepicker('remove');
-        this.datePickerinputGroup.datetimepicker({
-            format:this.dateFormat
-        });
+        const options={
+            format:this.dateFormat,
+            autoclose:1
+        };
+        if(this.dateFormat==='yyyy-mm-dd'){
+            options.startView=2;
+            options.minView=2;
+        }
+        this.datePickerinputGroup.datetimepicker(options);
     }
     initFromJson(json){
         super.fromJson(json);
@@ -47,7 +56,7 @@ export default class DatetimeInstance extends Instance{
             label:this.label,
             labelPosition:this.labelPosition,
             bindParameter:this.bindParameter,
-            format:this.format,
+            format:this.dateFormat,
             type:DatetimeInstance.TYPE
         };
     }

ureport2-js/src/preview.js

@@ -9,6 +9,18 @@ import {alert} from './MsgBox.js';
 import PDFPrintDialog from './dialog/PDFPrintDialog.js';
 import defaultI18nJsonData from './i18n/preview.json';
 import en18nJsonData from './i18n/preview_en.json';
+(function($){
+    $.fn.datetimepicker.dates['zh-CN'] = {
+        days: ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六", "星期日"],
+        daysShort: ["周日", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
+        daysMin:  ["日", "一", "二", "三", "四", "五", "六", "日"],
+        months: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+        monthsShort: ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"],
+        today: "今天",
+        suffix: [],
+        meridiem: ["上午", "下午"]
+    };
+}(jQuery));
 
 $(document).ready(function(){
     let language=window.navigator.language || window.navigator.browserLanguage;