diff --git a/bi/core.js b/bi/core.js
index b8335b378..29b81c77f 100644
--- a/bi/core.js
+++ b/bi/core.js
@@ -6301,56 +6301,56 @@ BI.Cache = {
         document.cookie = cookieString;
     }
 };// full day names
-Date._DN = [BI.i18nText("BI-Sunday"),
-    BI.i18nText("BI-Monday"),
-    BI.i18nText("BI-Tuesday"),
-    BI.i18nText("BI-Wednesday"),
-    BI.i18nText("BI-Thursday"),
-    BI.i18nText("BI-Friday"),
-    BI.i18nText("BI-Saturday"),
-    BI.i18nText("BI-Sunday")];
+Date._DN = [BI.i18nText("BI-Basic_Sunday"),
+    BI.i18nText("BI-Basic_Monday"),
+    BI.i18nText("BI-Basic_Tuesday"),
+    BI.i18nText("BI-Basic_Wednesday"),
+    BI.i18nText("BI-Basic_Thursday"),
+    BI.i18nText("BI-Basic_Friday"),
+    BI.i18nText("BI-Basic_Saturday"),
+    BI.i18nText("BI-Basic_Sunday")];
 
 // short day names
-Date._SDN = ['',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+Date._SDN = [BI.i18nText("BI-Day_Ri"),
+    BI.i18nText("BI-Basic_One"),
+    BI.i18nText("BI-Basic_Two"),
+    BI.i18nText("BI-Basic_Three"),
+    BI.i18nText("BI-Basic_Four"),
+    BI.i18nText("BI-Basic_Five"),
+    BI.i18nText("BI-Basic_Six"),
+    BI.i18nText("BI-Day_Ri")];
 
 // Monday first, etc.
 Date._FD = 1;
 
 // full month names
 Date._MN = [
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+    BI.i18nText("BI-Basic_January"),
+    BI.i18nText("BI-Basic_February"),
+    BI.i18nText("BI-Basic_March"),
+    BI.i18nText("BI-Basic_April"),
+    BI.i18nText("BI-Basic_May"),
+    BI.i18nText("BI-Basic_June"),
+    BI.i18nText("BI-Basic_July"),
+    BI.i18nText("BI-Basic_August"),
+    BI.i18nText("BI-Basic_September"),
+    BI.i18nText("BI-Basic_October"),
+    BI.i18nText("BI-Basic_November"),
+    BI.i18nText("BI-Basic_December")];
 
 // short month names
-Date._SMN = ['',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+Date._SMN = [0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11];
 
 Date._QN = ["", BI.i18nText("BI-Quarter_1"),
     BI.i18nText("BI-Quarter_2"),
diff --git a/bi/widget.css b/bi/widget.css
index 51d075000..a048dd5bc 100644
--- a/bi/widget.css
+++ b/bi/widget.css
@@ -233,11 +233,13 @@
 }
 .bi-fine-tuning-number-editor .top-button {
   border-left: 1px solid #d4dadd;
-  border-bottom: 1px solid #d4dadd;
 }
 .bi-fine-tuning-number-editor .bottom-button {
   border-left: 1px solid #d4dadd;
 }
+.bi-fine-tuning-number-editor .split-line {
+  background-color: #d4dadd;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
diff --git a/bi/widget.js b/bi/widget.js
index fec31d1b5..75b27e101 100644
--- a/bi/widget.js
+++ b/bi/widget.js
@@ -4857,7 +4857,6 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
         hgap: 4,
         vgap: 2,
         triggerWidth: 30,
-        watermark: BI.i18nText("BI-Unrestricted"),
         yearLength: 4,
         yearMonthLength: 7
     },
@@ -4891,7 +4890,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true,
-            watermark: c.watermark,
+            watermark: BI.i18nText("BI-Unrestricted"),
             errorText: function () {
                 if (self.editor.isEditing()) {
                     return BI.i18nText("BI-Date_Trigger_Error_Text");
diff --git a/dist/core.js b/dist/core.js
index f426c41a0..870551ae6 100644
--- a/dist/core.js
+++ b/dist/core.js
@@ -23672,56 +23672,56 @@ BI.Cache = {
         document.cookie = cookieString;
     }
 };// full day names
-Date._DN = [BI.i18nText("BI-Sunday"),
-    BI.i18nText("BI-Monday"),
-    BI.i18nText("BI-Tuesday"),
-    BI.i18nText("BI-Wednesday"),
-    BI.i18nText("BI-Thursday"),
-    BI.i18nText("BI-Friday"),
-    BI.i18nText("BI-Saturday"),
-    BI.i18nText("BI-Sunday")];
+Date._DN = [BI.i18nText("BI-Basic_Sunday"),
+    BI.i18nText("BI-Basic_Monday"),
+    BI.i18nText("BI-Basic_Tuesday"),
+    BI.i18nText("BI-Basic_Wednesday"),
+    BI.i18nText("BI-Basic_Thursday"),
+    BI.i18nText("BI-Basic_Friday"),
+    BI.i18nText("BI-Basic_Saturday"),
+    BI.i18nText("BI-Basic_Sunday")];
 
 // short day names
-Date._SDN = ['',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+Date._SDN = [BI.i18nText("BI-Day_Ri"),
+    BI.i18nText("BI-Basic_One"),
+    BI.i18nText("BI-Basic_Two"),
+    BI.i18nText("BI-Basic_Three"),
+    BI.i18nText("BI-Basic_Four"),
+    BI.i18nText("BI-Basic_Five"),
+    BI.i18nText("BI-Basic_Six"),
+    BI.i18nText("BI-Day_Ri")];
 
 // Monday first, etc.
 Date._FD = 1;
 
 // full month names
 Date._MN = [
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+    BI.i18nText("BI-Basic_January"),
+    BI.i18nText("BI-Basic_February"),
+    BI.i18nText("BI-Basic_March"),
+    BI.i18nText("BI-Basic_April"),
+    BI.i18nText("BI-Basic_May"),
+    BI.i18nText("BI-Basic_June"),
+    BI.i18nText("BI-Basic_July"),
+    BI.i18nText("BI-Basic_August"),
+    BI.i18nText("BI-Basic_September"),
+    BI.i18nText("BI-Basic_October"),
+    BI.i18nText("BI-Basic_November"),
+    BI.i18nText("BI-Basic_December")];
 
 // short month names
-Date._SMN = ['',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+Date._SMN = [0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11];
 
 Date._QN = ["", BI.i18nText("BI-Quarter_1"),
     BI.i18nText("BI-Quarter_2"),
diff --git a/dist/widget.css b/dist/widget.css
index 51d075000..a048dd5bc 100644
--- a/dist/widget.css
+++ b/dist/widget.css
@@ -233,11 +233,13 @@
 }
 .bi-fine-tuning-number-editor .top-button {
   border-left: 1px solid #d4dadd;
-  border-bottom: 1px solid #d4dadd;
 }
 .bi-fine-tuning-number-editor .bottom-button {
   border-left: 1px solid #d4dadd;
 }
+.bi-fine-tuning-number-editor .split-line {
+  background-color: #d4dadd;
+}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/
diff --git a/dist/widget.js b/dist/widget.js
index fec31d1b5..75b27e101 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -4857,7 +4857,6 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
         hgap: 4,
         vgap: 2,
         triggerWidth: 30,
-        watermark: BI.i18nText("BI-Unrestricted"),
         yearLength: 4,
         yearMonthLength: 7
     },
@@ -4891,7 +4890,7 @@ BI.shortcut('bi.date_combo', BI.DateCombo);BI.DateTrigger = BI.inherit(BI.Trigge
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true,
-            watermark: c.watermark,
+            watermark: BI.i18nText("BI-Unrestricted"),
             errorText: function () {
                 if (self.editor.isEditing()) {
                     return BI.i18nText("BI-Date_Trigger_Error_Text");
diff --git a/src/core/proto/date.js b/src/core/proto/date.js
index 636fafdc7..d1c240377 100644
--- a/src/core/proto/date.js
+++ b/src/core/proto/date.js
@@ -1,54 +1,54 @@
 // full day names
-Date._DN = [BI.i18nText("BI-Sunday"),
-    BI.i18nText("BI-Monday"),
-    BI.i18nText("BI-Tuesday"),
-    BI.i18nText("BI-Wednesday"),
-    BI.i18nText("BI-Thursday"),
-    BI.i18nText("BI-Friday"),
-    BI.i18nText("BI-Saturday"),
-    BI.i18nText("BI-Sunday")];
+Date._DN = [BI.i18nText("BI-Basic_Sunday"),
+    BI.i18nText("BI-Basic_Monday"),
+    BI.i18nText("BI-Basic_Tuesday"),
+    BI.i18nText("BI-Basic_Wednesday"),
+    BI.i18nText("BI-Basic_Thursday"),
+    BI.i18nText("BI-Basic_Friday"),
+    BI.i18nText("BI-Basic_Saturday"),
+    BI.i18nText("BI-Basic_Sunday")];
 
 // short day names
-Date._SDN = ['',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+Date._SDN = [BI.i18nText("BI-Day_Ri"),
+    BI.i18nText("BI-Basic_One"),
+    BI.i18nText("BI-Basic_Two"),
+    BI.i18nText("BI-Basic_Three"),
+    BI.i18nText("BI-Basic_Four"),
+    BI.i18nText("BI-Basic_Five"),
+    BI.i18nText("BI-Basic_Six"),
+    BI.i18nText("BI-Day_Ri")];
 
 // Monday first, etc.
 Date._FD = 1;
 
 // full month names
 Date._MN = [
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+    BI.i18nText("BI-Basic_January"),
+    BI.i18nText("BI-Basic_February"),
+    BI.i18nText("BI-Basic_March"),
+    BI.i18nText("BI-Basic_April"),
+    BI.i18nText("BI-Basic_May"),
+    BI.i18nText("BI-Basic_June"),
+    BI.i18nText("BI-Basic_July"),
+    BI.i18nText("BI-Basic_August"),
+    BI.i18nText("BI-Basic_September"),
+    BI.i18nText("BI-Basic_October"),
+    BI.i18nText("BI-Basic_November"),
+    BI.i18nText("BI-Basic_December")];
 
 // short month names
-Date._SMN = ['',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    '',
-    ''];
+Date._SMN = [0,
+    1,
+    2,
+    3,
+    4,
+    5,
+    6,
+    7,
+    8,
+    9,
+    10,
+    11];
 
 Date._QN = ["", BI.i18nText("BI-Quarter_1"),
     BI.i18nText("BI-Quarter_2"),
diff --git a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css
index d8afcf239..69e34450a 100644
--- a/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css
+++ b/src/css/widget/finetuningnumbereditor/finetuning.number.editor.css
@@ -9,8 +9,10 @@
 }
 .bi-fine-tuning-number-editor .top-button {
   border-left: 1px solid #d4dadd;
-  border-bottom: 1px solid #d4dadd;
 }
 .bi-fine-tuning-number-editor .bottom-button {
   border-left: 1px solid #d4dadd;
 }
+.bi-fine-tuning-number-editor .split-line {
+  background-color: #d4dadd;
+}
diff --git a/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less b/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less
index 2f7905f81..3074def16 100644
--- a/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less
+++ b/src/less/widget/finetuningnumbereditor/finetuning.number.editor.less
@@ -5,9 +5,11 @@
   .border-radius(2px);
   & .top-button {
     border-left: 1px solid @border-color-normal;
-    border-bottom: 1px solid @border-color-normal;
   }
   & .bottom-button {
     border-left: 1px solid @border-color-normal;
   }
+  & .split-line{
+    background-color: @border-color-normal;
+  }
 }
\ No newline at end of file
diff --git a/src/widget/date/trigger.date.js b/src/widget/date/trigger.date.js
index a425ce6f8..75f51a86a 100644
--- a/src/widget/date/trigger.date.js
+++ b/src/widget/date/trigger.date.js
@@ -3,7 +3,6 @@ BI.DateTrigger = BI.inherit(BI.Trigger, {
         hgap: 4,
         vgap: 2,
         triggerWidth: 30,
-        watermark: BI.i18nText("BI-Unrestricted"),
         yearLength: 4,
         yearMonthLength: 7
     },
@@ -37,7 +36,7 @@ BI.DateTrigger = BI.inherit(BI.Trigger, {
             hgap: c.hgap,
             vgap: c.vgap,
             allowBlank: true,
-            watermark: c.watermark,
+            watermark: BI.i18nText("BI-Unrestricted"),
             errorText: function () {
                 if (self.editor.isEditing()) {
                     return BI.i18nText("BI-Date_Trigger_Error_Text");