Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js

dist/bundle.js

@@ -88022,7 +88022,6 @@ BI.extend(BI.DynamicDateCard, {
 
     setValue: function (v) {
         this.storeValue = v;
-        this.popup.setValue(v);
         this.trigger.setValue(v);
         this._checkDynamicValue(v);
     },
@@ -106279,5 +106278,26 @@ BI.i18n = {
     "BI-Basic_Simple_Thursday": "四",
     "BI-Multi_Date_Year_Prev": "年前",
     "BI-Tiao_Data": "条数据",
-    "BI-Basic_Italic": "斜体"
+    "BI-Basic_Italic": "斜体",
+    "BI-Basic_Dynamic_Title": "动态时间",
+    "BI-Basic_Year": "年",
+    "BI-Basic_Quarter": "季",
+    "BI-Basic_Month": "月",
+    "BI-Basic_Week": "周",
+    "BI-Basic_Day": "天",
+    "BI-Basic_Work_Day": "工作日",
+    "BI-Basic_Front": "前",
+    "BI-Basic_Behind": "后",
+    "BI-Basic_Empty": "空",
+    "BI-Basic_Month_End": "月末",
+    "BI-Basic_Month_Begin": "月初",
+    "BI-Basic_Year_End": "年末",
+    "BI-Basic_Year_Begin": "年初",
+    "BI-Basic_Quarter_End": "季末",
+    "BI-Basic_Quarter_Begin": "季初",
+    "BI-Basic_Week_End": "周末",
+    "BI-Basic_Week_Begin": "周初",
+    "BI-Basic_Current_Day": "当天",
+    "BI-Basic_Begin_Start": "初",
+    "BI-Basic_End_Stop": "末"
 };

dist/widget.js

@@ -3030,7 +3030,6 @@ BI.extend(BI.DynamicDateCard, {
 
     setValue: function (v) {
         this.storeValue = v;
-        this.popup.setValue(v);
         this.trigger.setValue(v);
         this._checkDynamicValue(v);
     },

public/js/index.js

@@ -118,5 +118,26 @@ BI.i18n = {
     "BI-Basic_Simple_Thursday": "四",
     "BI-Multi_Date_Year_Prev": "年前",
     "BI-Tiao_Data": "条数据",
-    "BI-Basic_Italic": "斜体"
+    "BI-Basic_Italic": "斜体",
+    "BI-Basic_Dynamic_Title": "动态时间",
+    "BI-Basic_Year": "年",
+    "BI-Basic_Quarter": "季",
+    "BI-Basic_Month": "月",
+    "BI-Basic_Week": "周",
+    "BI-Basic_Day": "天",
+    "BI-Basic_Work_Day": "工作日",
+    "BI-Basic_Front": "前",
+    "BI-Basic_Behind": "后",
+    "BI-Basic_Empty": "空",
+    "BI-Basic_Month_End": "月末",
+    "BI-Basic_Month_Begin": "月初",
+    "BI-Basic_Year_End": "年末",
+    "BI-Basic_Year_Begin": "年初",
+    "BI-Basic_Quarter_End": "季末",
+    "BI-Basic_Quarter_Begin": "季初",
+    "BI-Basic_Week_End": "周末",
+    "BI-Basic_Week_Begin": "周初",
+    "BI-Basic_Current_Day": "当天",
+    "BI-Basic_Begin_Start": "初",
+    "BI-Basic_End_Stop": "末"
 };

src/widget/dynamicdate/dynamicdate.card.js

@@ -28,7 +28,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
                     text: BI.i18nText("BI-Basic_Year"),
                     value: BI.DynamicDateCard.TYPE.YEAR
                 }, {
-                    text: BI.i18nText("BI-Basic_Quarter"),
+                    text: BI.i18nText("BI-Basic_Single_Quarter"),
                     value: BI.DynamicDateCard.TYPE.QUARTER
                 }, {
                     text: BI.i18nText("BI-Basic_Month"),

src/widget/dynamicdate/dynamicdate.combo.js

@@ -229,7 +229,6 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
 
     setValue: function (v) {
         this.storeValue = v;
-        this.popup.setValue(v);
         this.trigger.setValue(v);
         this._checkDynamicValue(v);
     },

src/widget/dynamicdate/dynamicdate.param.item.js

@@ -70,7 +70,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
                 text = BI.i18nText("BI-Basic_Year");
                 break;
             case BI.DynamicDateCard.TYPE.QUARTER:
-                text = BI.i18nText("BI-Basic_Quarter");
+                text = BI.i18nText("BI-Basic_Single_Quarter");
                 break;
             case BI.DynamicDateCard.TYPE.MONTH:
                 text = BI.i18nText("BI-Basic_Month");

src/widget/dynamicdate/dynamicdate.trigger.js

@@ -148,7 +148,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
             value += Math.abs(obj.year) + BI.i18nText("BI-Basic_Year") + (obj.year < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position);
         }
         if(BI.isNotNull(obj.quarter)) {
-            value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position);
+            value += Math.abs(obj.quarter) + BI.i18nText("BI-Basic_Single_Quarter") + (obj.quarter < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Year"), obj.position);
         }
         if(BI.isNotNull(obj.month)) {
             value += Math.abs(obj.month) + BI.i18nText("BI-Basic_Month") + (obj.month < 0 ? BI.i18nText("BI-Basic_Front") : BI.i18nText("BI-Basic_Behind")) + getPositionText(BI.i18nText("BI-Basic_Month"), obj.position);

ui/js/index.js

@@ -119,5 +119,26 @@ BI.i18n = {
     "BI-Basic_Simple_Thursday": "四",
     "BI-Multi_Date_Year_Prev": "年前",
     "BI-Tiao_Data": "条数据",
-    "BI-Basic_Italic": "斜体"
+    "BI-Basic_Italic": "斜体",
+    "BI-Basic_Dynamic_Title": "动态时间",
+    "BI-Basic_Year": "年",
+    "BI-Basic_Single_Quarter": "季",
+    "BI-Basic_Month": "月",
+    "BI-Basic_Week": "周",
+    "BI-Basic_Day": "天",
+    "BI-Basic_Work_Day": "工作日",
+    "BI-Basic_Front": "前",
+    "BI-Basic_Behind": "后",
+    "BI-Basic_Empty": "空",
+    "BI-Basic_Month_End": "月末",
+    "BI-Basic_Month_Begin": "月初",
+    "BI-Basic_Year_End": "年末",
+    "BI-Basic_Year_Begin": "年初",
+    "BI-Basic_Quarter_End": "季末",
+    "BI-Basic_Quarter_Begin": "季初",
+    "BI-Basic_Week_End": "周末",
+    "BI-Basic_Week_Begin": "周初",
+    "BI-Basic_Current_Day": "当天",
+    "BI-Basic_Begin_Start": "初",
+    "BI-Basic_End_Stop": "末"
 };