From 991b0870a81d0f4f141a7d034cc806a6191e5760 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Fri, 11 May 2018 16:57:29 +0800
Subject: [PATCH] BI-19739

---
 dist/bundle.js                                   | 7 +++++--
 dist/fineui.js                                   | 7 +++++--
 dist/widget.js                                   | 7 +++++--
 src/widget/dynamicdate/dynamicdate.param.item.js | 7 +++++--
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/dist/bundle.js b/dist/bundle.js
index bddc8f378..2d87ae02c 100644
--- a/dist/bundle.js
+++ b/dist/bundle.js
@@ -90923,7 +90923,7 @@ BI.extend(BI.DynamicDateCombo, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -90964,9 +90964,12 @@ BI.extend(BI.DynamicDateCombo, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },
diff --git a/dist/fineui.js b/dist/fineui.js
index aacd36d39..b560375b0 100644
--- a/dist/fineui.js
+++ b/dist/fineui.js
@@ -91166,7 +91166,7 @@ BI.extend(BI.DynamicDateCombo, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -91207,9 +91207,12 @@ BI.extend(BI.DynamicDateCombo, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },
diff --git a/dist/widget.js b/dist/widget.js
index 65e26070a..7254ba332 100644
--- a/dist/widget.js
+++ b/dist/widget.js
@@ -3407,7 +3407,7 @@ BI.extend(BI.DynamicDateCombo, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -3448,9 +3448,12 @@ BI.extend(BI.DynamicDateCombo, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },
diff --git a/src/widget/dynamicdate/dynamicdate.param.item.js b/src/widget/dynamicdate/dynamicdate.param.item.js
index 68c8c8c02..06a6bcfc4 100644
--- a/src/widget/dynamicdate/dynamicdate.param.item.js
+++ b/src/widget/dynamicdate/dynamicdate.param.item.js
@@ -45,7 +45,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -86,9 +86,12 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },