Pull request #1749: KERNEL-6836 时间类型控件不做操作收起不发送confirm事件

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit '2250ed8172b459b20c3e78b028c39620cab44414':
  update
  KERNEL-6836 时间类型控件不做操作收起不发送confirm事件

changelog.md

@@ -1,5 +1,6 @@
 # 更新日志
 2.0(2021-01)
+- 日期类型控件不操作下拉面板收起不发Confirm事件
 - 日期类型控件全系列可设置是否显示动态日期
 - 日期类型控件全系列可设置最大最小日期
 - 调整了combo的popup显示位置计算逻辑

src/widget/dynamicdate/dynamicdate.card.js

@@ -284,22 +284,22 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
         var valueMap = {};
         switch (value.dateType) {
             case BI.DynamicDateCard.TYPE.YEAR:
-                valueMap.year = (value.offset === 0 ? -value.value : value.value);
+                valueMap.year = (value.offset === 0 ? -value.value : +value.value);
                 break;
             case BI.DynamicDateCard.TYPE.QUARTER:
-                valueMap.quarter = (value.offset === 0 ? -value.value : value.value);
+                valueMap.quarter = (value.offset === 0 ? -value.value : +value.value);
                 break;
             case BI.DynamicDateCard.TYPE.MONTH:
-                valueMap.month = (value.offset === 0 ? -value.value : value.value);
+                valueMap.month = (value.offset === 0 ? -value.value : +value.value);
                 break;
             case BI.DynamicDateCard.TYPE.WEEK:
-                valueMap.week = (value.offset === 0 ? -value.value : value.value);
+                valueMap.week = (value.offset === 0 ? -value.value : +value.value);
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-                valueMap.day = (value.offset === 0 ? -value.value : value.value);
+                valueMap.day = (value.offset === 0 ? -value.value : +value.value);
                 break;
             case BI.DynamicDateCard.TYPE.WORK_DAY:
-                valueMap.workDay = (value.offset === 0 ? -value.value : value.value);
+                valueMap.workDay = (value.offset === 0 ? -value.value : +value.value);
                 break;
             default:
                 break;
@@ -369,7 +369,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
         }
         if(this.workDayBox.isSelected()) {
             var value = buttons[0].getValue();
-            valueMap.workDay = (value.offset === 0 ? -value.value : value.value);
+            valueMap.workDay = (value.offset === 0 ? -value.value : +value.value);
         }
         return valueMap;
     }

src/widget/dynamicdate/dynamicdate.combo.js

@@ -114,11 +114,11 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
                             }, {
                                 eventName: BI.DynamicDateTrigger.EVENT_CONFIRM,
                                 action: function () {
-                                    if (self.combo.isViewVisible()) {
-                                        return;
-                                    }
                                     var dateStore = self.storeTriggerValue;
                                     var dateObj = self.trigger.getKey();
+                                    if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore)) {
+                                        return;
+                                    }
                                     if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {
                                         self.storeValue = self.trigger.getValue();
                                         self.setValue(self.trigger.getValue());

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -119,11 +119,11 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
                             }, {
                                 eventName: BI.DynamicDateTimeTrigger.EVENT_CONFIRM,
                                 action: function () {
-                                    if (self.combo.isViewVisible()) {
-                                        return;
-                                    }
                                     var dateStore = self.storeTriggerValue;
                                     var dateObj = self.trigger.getKey();
+                                    if (self.combo.isViewVisible() || BI.isEqual(dateObj, dateStore)) {
+                                        return;
+                                    }
                                     if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {
                                         self.storeValue = self.trigger.getValue();
                                         self.setValue(self.trigger.getValue());

src/widget/year/card.dynamic.year.js

@@ -48,7 +48,7 @@ BI.DynamicYearCard = BI.inherit(BI.Widget, {
     _checkDate: function (obj) {
         var o = this.options;
         var date = BI.DynamicDateHelper.getCalculation({
-            year: (obj.offset === 0 ? -obj.value : obj.value)
+            year: (obj.offset === 0 ? -obj.value : +obj.value)
         });
 
         return !BI.checkDateVoid(date.getFullYear(), date.getMonth() + 1, date.getDate(), o.min, o.max)[0];
@@ -82,7 +82,7 @@ BI.DynamicYearCard = BI.inherit(BI.Widget, {
     getValue: function () {
         var value = this.item.getValue();
         return {
-            year: (value.offset === 0 ? -value.value : value.value)
+            year: (value.offset === 0 ? -value.value : +value.value)
         };
     }
 });

src/widget/yearmonth/card.dynamic.yearmonth.js

@@ -76,10 +76,10 @@ BI.DynamicYearMonthCard = BI.inherit(BI.Widget, {
         var valueMap = {};
         switch (value.dateType) {
             case BI.DynamicDateCard.TYPE.YEAR:
-                valueMap.year = (value.offset === 0 ? -value.value : value.value);
+                valueMap.year = (value.offset === 0 ? -value.value : +value.value);
                 break;
             case BI.DynamicDateCard.TYPE.MONTH:
-                valueMap.month = (value.offset === 0 ? -value.value : value.value);
+                valueMap.month = (value.offset === 0 ? -value.value : +value.value);
                 break;
             default:
                 break;

src/widget/yearmonth/combo.yearmonth.js

@@ -38,12 +38,11 @@ BI.DynamicYearMonthCombo = BI.inherit(BI.Single, {
             self.fireEvent(BI.DynamicYearMonthCombo.EVENT_VALID);
         });
         this.trigger.on(BI.DynamicYearMonthTrigger.EVENT_CONFIRM, function () {
-            // 没看出来干啥的，先去掉
-            // if (self.combo.isViewVisible()) {
-            //     return;
-            // }
             var dateStore = self.storeTriggerValue;
             var dateObj = self.trigger.getKey();
+            if (BI.isEqual(dateObj, dateStore)) {
+                return;
+            }
             if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {
                 self.storeValue = self.trigger.getValue();
                 self.setValue(self.trigger.getValue());

src/widget/yearquarter/card.dynamic.yearquarter.js

@@ -76,10 +76,10 @@ BI.DynamicYearQuarterCard = BI.inherit(BI.Widget, {
         var valueMap = {};
         switch (value.dateType) {
             case BI.DynamicDateCard.TYPE.YEAR:
-                valueMap.year = (value.offset === 0 ? -value.value : value.value);
+                valueMap.year = (value.offset === 0 ? -value.value : +value.value);
                 break;
             case BI.DynamicDateCard.TYPE.MONTH:
-                valueMap.quarter = (value.offset === 0 ? -value.value : value.value);
+                valueMap.quarter = (value.offset === 0 ? -value.value : +value.value);
                 break;
             default:
                 break;

src/widget/yearquarter/combo.yearquarter.js

@@ -34,12 +34,11 @@ BI.DynamicYearQuarterCombo = BI.inherit(BI.Widget, {
             self.combo.isViewVisible() && self.combo.hideView();
         });
         this.trigger.on(BI.DynamicYearQuarterTrigger.EVENT_CONFIRM, function () {
-            // 没看出来干啥的，先去掉
-            // if (self.combo.isViewVisible()) {
-            //     return;
-            // }
             var dateStore = self.storeTriggerValue;
             var dateObj = self.trigger.getKey();
+            if (BI.isEqual(dateObj, dateStore)) {
+                return;
+            }
             if (BI.isNotEmptyString(dateObj) && !BI.isEqual(dateObj, dateStore)) {
                 self.storeValue = self.trigger.getValue();
                 self.setValue(self.trigger.getValue());