BI-24836 && BI-24802

dist/base.js

@@ -16574,6 +16574,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
                 items: [this.icon]
             });
         } else {
+            this.element.css("lineHeight", "1");
             BI.createWidget({
                 element: this,
                 type: "bi.center_adapt",

dist/bundle.css

@@ -3826,6 +3826,12 @@ ul.ztree.zTreeDragUL {
 }
 .bi-multi-select-check-selected-button {
   z-index: 1;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+}
+.bi-multi-select-check-selected-button .count-tip {
+  min-width: 16px;
 }
 .bi-multi-tree-check-pane .multi-tree-check-selected {
   color: #3685f2;

dist/bundle.js

@@ -52344,6 +52344,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
                 items: [this.icon]
             });
         } else {
+            this.element.css("lineHeight", "1");
             BI.createWidget({
                 element: this,
                 type: "bi.center_adapt",
@@ -91398,6 +91399,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
     _init: function () {
         BI.DynamicDateTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -91447,6 +91449,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
             self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -91464,7 +91467,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split("-");
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,
@@ -92379,6 +92382,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
     _init: function () {
         BI.DynamicDateTimeTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -92428,6 +92432,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -92445,7 +92450,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split(/-|\s|:/);
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,
@@ -98724,6 +98729,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
         return BI.createItems(items, {
             type: "bi.multi_select_item",
             logic: this.options.logic,
+            cls: "bi-list-item-active",
             height: 24,
             selected: this.isAllSelected()
         });
@@ -99551,7 +99557,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
 
     _defaultConfig: function () {
         return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-check-selected-button bi-high-light",
+            baseCls: "bi-multi-select-check-selected-button",
             itemsCreator: BI.emptyFn
         });
     },
@@ -99565,7 +99571,8 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
             hgap: 4,
             text: "0",
             textAlign: "center",
-            textHeight: 15
+            textHeight: 16,
+            cls: "bi-high-light-background count-tip"
         });
         this.numberCounter.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

dist/fineui.css

@@ -3826,6 +3826,12 @@ ul.ztree.zTreeDragUL {
 }
 .bi-multi-select-check-selected-button {
   z-index: 1;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+}
+.bi-multi-select-check-selected-button .count-tip {
+  min-width: 16px;
 }
 .bi-multi-tree-check-pane .multi-tree-check-selected {
   color: #3685f2;

dist/fineui.js

@@ -52587,6 +52587,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
                 items: [this.icon]
             });
         } else {
+            this.element.css("lineHeight", "1");
             BI.createWidget({
                 element: this,
                 type: "bi.center_adapt",
@@ -91641,6 +91642,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
     _init: function () {
         BI.DynamicDateTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -91690,6 +91692,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
             self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -91707,7 +91710,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split("-");
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,
@@ -92622,6 +92625,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
     _init: function () {
         BI.DynamicDateTimeTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -92671,6 +92675,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -92688,7 +92693,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split(/-|\s|:/);
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,
@@ -98967,6 +98972,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
         return BI.createItems(items, {
             type: "bi.multi_select_item",
             logic: this.options.logic,
+            cls: "bi-list-item-active",
             height: 24,
             selected: this.isAllSelected()
         });
@@ -99794,7 +99800,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
 
     _defaultConfig: function () {
         return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-check-selected-button bi-high-light",
+            baseCls: "bi-multi-select-check-selected-button",
             itemsCreator: BI.emptyFn
         });
     },
@@ -99808,7 +99814,8 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
             hgap: 4,
             text: "0",
             textAlign: "center",
-            textHeight: 15
+            textHeight: 16,
+            cls: "bi-high-light-background count-tip"
         });
         this.numberCounter.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

dist/widget.css

@@ -181,6 +181,12 @@
 }
 .bi-multi-select-check-selected-button {
   z-index: 1;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+}
+.bi-multi-select-check-selected-button .count-tip {
+  min-width: 16px;
 }
 .bi-multi-tree-check-pane .multi-tree-check-selected {
   color: #3685f2;

dist/widget.js

@@ -3776,6 +3776,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
     _init: function () {
         BI.DynamicDateTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -3825,6 +3826,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
             self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -3842,7 +3844,7 @@ BI.shortcut("bi.dynamic_date_popup", BI.DynamicDatePopup);BI.DynamicDateTrigger
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split("-");
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,
@@ -4757,6 +4759,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
     _init: function () {
         BI.DynamicDateTimeTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -4806,6 +4809,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -4823,7 +4827,7 @@ BI.extend(BI.DynamicDateTimeSelect, {
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split(/-|\s|:/);
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,
@@ -11102,6 +11106,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
         return BI.createItems(items, {
             type: "bi.multi_select_item",
             logic: this.options.logic,
+            cls: "bi-list-item-active",
             height: 24,
             selected: this.isAllSelected()
         });
@@ -11929,7 +11934,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
 
     _defaultConfig: function () {
         return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-check-selected-button bi-high-light",
+            baseCls: "bi-multi-select-check-selected-button",
             itemsCreator: BI.emptyFn
         });
     },
@@ -11943,7 +11948,8 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
             hgap: 4,
             text: "0",
             textAlign: "center",
-            textHeight: 15
+            textHeight: 16,
+            cls: "bi-high-light-background count-tip"
         });
         this.numberCounter.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);

src/base/single/button/buttons/button.icon.js

@@ -32,6 +32,7 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
                 items: [this.icon]
             });
         } else {
+            this.element.css("lineHeight", "1");
             BI.createWidget({
                 element: this,
                 type: "bi.center_adapt",

src/css/widget/multiselect/trigger/button.css

@@ -1,3 +1,9 @@
 .bi-multi-select-check-selected-button {
   z-index: 1;
+  -webkit-border-radius: 8px;
+  -moz-border-radius: 8px;
+  border-radius: 8px;
+}
+.bi-multi-select-check-selected-button .count-tip {
+  min-width: 16px;
 }

src/less/widget/multiselect/trigger/button.checkselected.less

@@ -2,4 +2,8 @@
 
 .bi-multi-select-check-selected-button {
   z-index: 1;
+  .border-radius(8px);
+  & .count-tip{
+    min-width: 16px;
+  }
 }

src/widget/dynamicdate/dynamicdate.trigger.js

@@ -17,6 +17,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
     _init: function () {
         BI.DynamicDateTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -66,6 +67,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
             self.fireEvent(BI.DynamicDateTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -83,7 +85,7 @@ BI.DynamicDateTrigger = BI.inherit(BI.Trigger, {
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split("-");
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,

src/widget/dynamicdatetime/dynamicdatetime.trigger.js

@@ -17,6 +17,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
     _init: function () {
         BI.DynamicDateTimeTrigger.superclass._init.apply(this, arguments);
         var self = this, o = this.options, c = this._const;
+        this.storeTriggerValue = "";
         this.editor = BI.createWidget({
             type: "bi.sign_editor",
             height: o.height,
@@ -66,6 +67,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_KEY_DOWN);
         });
         this.editor.on(BI.SignEditor.EVENT_FOCUS, function () {
+            self.storeTriggerValue = self.getKey();
             self.fireEvent(BI.DynamicDateTimeTrigger.EVENT_FOCUS);
         });
         this.editor.on(BI.SignEditor.EVENT_STOP, function () {
@@ -83,7 +85,7 @@ BI.DynamicDateTimeTrigger = BI.inherit(BI.Trigger, {
                 self.editor.setState(value);
             }
 
-            if (BI.isNotEmptyString(value)) {
+            if (BI.isNotEmptyString(value) && !BI.isEqual(self.storeTriggerValue, self.getKey())) {
                 var date = value.split(/-|\s|:/);
                 self.storeValue = {
                     type: BI.DynamicDateCombo.Static,

src/widget/multiselect/multiselect.loader.js

@@ -111,6 +111,7 @@ BI.MultiSelectLoader = BI.inherit(BI.Widget, {
         return BI.createItems(items, {
             type: "bi.multi_select_item",
             logic: this.options.logic,
+            cls: "bi-list-item-active",
             height: 24,
             selected: this.isAllSelected()
         });

src/widget/multiselect/trigger/button.checkselected.js

@@ -8,7 +8,7 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
 
     _defaultConfig: function () {
         return BI.extend(BI.MultiSelectCheckSelectedButton.superclass._defaultConfig.apply(this, arguments), {
-            baseCls: "bi-multi-select-check-selected-button bi-high-light",
+            baseCls: "bi-multi-select-check-selected-button",
             itemsCreator: BI.emptyFn
         });
     },
@@ -22,7 +22,8 @@ BI.MultiSelectCheckSelectedButton = BI.inherit(BI.Single, {
             hgap: 4,
             text: "0",
             textAlign: "center",
-            textHeight: 15
+            textHeight: 16,
+            cls: "bi-high-light-background count-tip"
         });
         this.numberCounter.on(BI.Controller.EVENT_CHANGE, function () {
             self.fireEvent(BI.Controller.EVENT_CHANGE, arguments);