Merge pull request #351 in FUI/fineui from ~WINDY/fui:master to master

* commit 'a08656d2768d875bd03a8adbe46f85368c146b7a':
  update
  BI-18655 年月区间控件支持高亮

dist/base.css

@@ -309,13 +309,6 @@
 .bi-bubble-popup-view {
 
 }
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}
-
 /*************BI.SearchEditor******************/
 .bi-search-editor .close-font {
   font-size: 20px;

dist/bundle.css

@@ -2362,13 +2362,6 @@ textarea {
 .bi-bubble-popup-view {
 
 }
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}
-
 /*************BI.SearchEditor******************/
 .bi-search-editor .close-font {
   font-size: 20px;

dist/bundle.js

@@ -109392,7 +109392,7 @@ BI.DynamicYearMonthTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
 BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
     constants: {
-        height: 25,
+        height: 26,
         width: 25,
         lgap: 15,
         offset: -15,
@@ -109453,10 +109453,17 @@ BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.Year
     },
 
     _createCombo: function (v) {
-        var self = this;
+        var self = this, o = this.options;
         var combo = BI.createWidget({
             type: "bi.dynamic_year_month_combo",
-            value: v
+            behaviors: o.behaviors,
+            value: v,
+            listeners: [{
+                eventName: BI.DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW,
+                action: function () {
+                    self.fireEvent(BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW);
+                }
+            }]
         });
         combo.on(BI.DynamicYearMonthCombo.EVENT_ERROR, function () {
             self._clearTitle();
@@ -109569,6 +109576,7 @@ BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.Year
 BI.YearMonthInterval.EVENT_VALID = "EVENT_VALID";
 BI.YearMonthInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.YearMonthInterval.EVENT_CHANGE = "EVENT_CHANGE";
+BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);/**
  * 年份展示面板
  *

dist/fineui.css

@@ -2362,13 +2362,6 @@ textarea {
 .bi-bubble-popup-view {
 
 }
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}
-
 /*************BI.SearchEditor******************/
 .bi-search-editor .close-font {
   font-size: 20px;

dist/widget.js

@@ -22245,7 +22245,7 @@ BI.DynamicYearMonthTrigger.EVENT_CONFIRM = "EVENT_CONFIRM";
 BI.DynamicYearMonthTrigger.EVENT_STOP = "EVENT_STOP";
 BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.YearMonthInterval = BI.inherit(BI.Single, {
     constants: {
-        height: 25,
+        height: 26,
         width: 25,
         lgap: 15,
         offset: -15,
@@ -22306,10 +22306,17 @@ BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.Year
     },
 
     _createCombo: function (v) {
-        var self = this;
+        var self = this, o = this.options;
         var combo = BI.createWidget({
             type: "bi.dynamic_year_month_combo",
-            value: v
+            behaviors: o.behaviors,
+            value: v,
+            listeners: [{
+                eventName: BI.DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW,
+                action: function () {
+                    self.fireEvent(BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW);
+                }
+            }]
         });
         combo.on(BI.DynamicYearMonthCombo.EVENT_ERROR, function () {
             self._clearTitle();
@@ -22422,6 +22429,7 @@ BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.Year
 BI.YearMonthInterval.EVENT_VALID = "EVENT_VALID";
 BI.YearMonthInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.YearMonthInterval.EVENT_CHANGE = "EVENT_CHANGE";
+BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);/**
  * 年份展示面板
  *

src/css/base/editor/editor.adapt.css

@@ -1,3 +0,0 @@
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}

src/css/base/editor/editor.css

@@ -1,7 +1,3 @@
-.bi-adapt-editor .adapt-editor-text {
-  font-size: 14px;
-}
-
 /*************BI.SearchEditor******************/
 .bi-search-editor .close-font {
   font-size: 20px;

src/less/base/editor/editor.adapt.less

@@ -1,7 +0,0 @@
-@import "../../index";
-
-.bi-adapt-editor{
-  .adapt-editor-text{
-    font-size: @font-size-14;
-  }
-}

src/widget/yearmonthinterval/yearmonthinterval.js

@@ -1,6 +1,6 @@
 BI.YearMonthInterval = BI.inherit(BI.Single, {
     constants: {
-        height: 25,
+        height: 26,
         width: 25,
         lgap: 15,
         offset: -15,
@@ -61,10 +61,17 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
     },
 
     _createCombo: function (v) {
-        var self = this;
+        var self = this, o = this.options;
         var combo = BI.createWidget({
             type: "bi.dynamic_year_month_combo",
-            value: v
+            behaviors: o.behaviors,
+            value: v,
+            listeners: [{
+                eventName: BI.DynamicYearMonthCombo.EVENT_BEFORE_POPUPVIEW,
+                action: function () {
+                    self.fireEvent(BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW);
+                }
+            }]
         });
         combo.on(BI.DynamicYearMonthCombo.EVENT_ERROR, function () {
             self._clearTitle();
@@ -177,4 +184,5 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
 BI.YearMonthInterval.EVENT_VALID = "EVENT_VALID";
 BI.YearMonthInterval.EVENT_ERROR = "EVENT_ERROR";
 BI.YearMonthInterval.EVENT_CHANGE = "EVENT_CHANGE";
+BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
 BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);