From 11a0f98c421fbabd75ba248f324925c51fbeac67 Mon Sep 17 00:00:00 2001
From: Freddy <Freddy@fanruan.com>
Date: Sat, 7 May 2022 13:55:19 +0800
Subject: [PATCH] =?UTF-8?q?Pull=20request=20#2666:=20REPORT-70807=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B4=E4=BB=BD=E6=97=A5=E6=9C=9F=E6=8E=A7?=
 =?UTF-8?q?=E4=BB=B6=E6=B0=B4=E5=8D=B0=E5=8F=AA=E6=98=BE=E7=A4=BA=E6=97=A0?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Merge in VISUAL/fineui from ~FREDDY/fineui:master to master

* commit '6d30eca76f8d7f8d43c6d72ef7840e67e3238009':
  REPORT-70807 fix:给watermark加个props
  REPORT-70807 fix:年份日期控件适配watermark

(cherry picked from commit e60d977be0ad7e5e5ae984163ac92675188675d6)
---
 src/widget/year/combo.year.js   | 8 ++++++--
 src/widget/year/trigger.year.js | 9 +++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/widget/year/combo.year.js b/src/widget/year/combo.year.js
index 62a498d54..1774ca384 100644
--- a/src/widget/year/combo.year.js
+++ b/src/widget/year/combo.year.js
@@ -24,7 +24,8 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
             min: o.minDate,
             max: o.maxDate,
             height: o.height - border,
-            value: o.value || ""
+            value: o.value || "",
+            watermark: o.watermark
         });
         this.trigger.on(BI.DynamicYearTrigger.EVENT_KEY_DOWN, function () {
             if (self.combo.isViewVisible()) {
@@ -211,8 +212,11 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
 
     isStateValid: function () {
         return this.trigger.isValid();
-    }
+    },
 
+    setWaterMark: function (v) {
+        this.trigger.setWaterMark(v);
+    }
 });
 BI.DynamicYearCombo.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearCombo.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
diff --git a/src/widget/year/trigger.year.js b/src/widget/year/trigger.year.js
index 91b80a431..fe8976b2f 100644
--- a/src/widget/year/trigger.year.js
+++ b/src/widget/year/trigger.year.js
@@ -10,7 +10,8 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
             extraCls: "bi-year-trigger",
             min: "1900-01-01", // 最小日期
             max: "2099-12-31", // 最大日期
-            height: 24
+            height: 24,
+            watermark: BI.i18nText("BI-Basic_Unrestricted")
         });
     },
 
@@ -35,7 +36,7 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
             },
             hgap: c.hgap,
             vgap: c.vgap,
-            watermark: BI.i18nText("BI-Basic_Unrestricted"),
+            watermark: o.watermark,
             allowBlank: true,
             errorText: function (v) {
                 if (BI.isPositiveInteger(v)) {
@@ -188,6 +189,10 @@ BI.DynamicYearTrigger = BI.inherit(BI.Trigger, {
 
     getKey: function () {
         return this.editor.getValue() | 0;
+    },
+
+    setWaterMark: function (v) {
+        this.editor.setWaterMark(v);
     }
 });
 BI.DynamicYearTrigger.EVENT_KEY_DOWN = "EVENT_KEY_DOWN";