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

* commit 'e2ae971e1d5bd3b1ba526ff1c6241c52ce37a90d':
  BI-13413
  update
  update

dist/bundle.css

@@ -6031,6 +6031,38 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e6d7";
   color: inherit;
 }
+.solid-triangle-top-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-top-font .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font:hover .b-font:before,
+.solid-triangle-top-font.hover .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font.disabled .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-bottom-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-bottom-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font:hover .b-font:before,
+.solid-triangle-bottom-font.hover .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .trigger-triangle-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }

dist/bundle.js

@@ -74477,7 +74477,7 @@ BI.ComplexCanvas = BI.inherit(BI.Widget, {
 
 BI.shortcut("bi.complex_canvas", BI.ComplexCanvas);/**
  * Created by roy on 15/10/16.
- * 上箭头与下箭头切换的树节点
+ * 右与下箭头切换的树节点
  */
 BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
@@ -83301,7 +83301,6 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         selected: function (e) {
-            console.log(123);
             var t = e.target;
             if (!t && !(t = this.selElm())) {
                 t = this.selElm();
@@ -94163,6 +94162,28 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
     BI.shortcut("bi.filter_operation", FilterOperation);
 }());
 /**
+ * Created by Windy on 18/05/03.
+ * 上与下箭头切换的checkbox
+ */
+BI.ArrowTreeGroupNodeVerticalCheckbox = BI.inherit(BI.Trigger, {
+    _defaultConfig: function () {
+        return BI.extend(BI.ArrowTreeGroupNodeVerticalCheckbox.superclass._defaultConfig.apply(this, arguments), {
+            extraCls: "bi-arrow-group-node-vertical-checkbox"
+        });
+    },
+    _init: function () {
+        BI.ArrowTreeGroupNodeVerticalCheckbox.superclass._init.apply(this, arguments);
+    },
+    setSelected: function (v) {
+        BI.ArrowTreeGroupNodeVerticalCheckbox.superclass.setSelected.apply(this, arguments);
+        if(v) {
+            this.element.removeClass("solid-triangle-bottom-font").addClass("solid-triangle-top-font");
+        } else {
+            this.element.removeClass("solid-triangle-top-font").addClass("solid-triangle-bottom-font");
+        }
+    }
+});
+BI.shortcut("bi.arrow_group_node_vertical_checkbox", BI.ArrowTreeGroupNodeVerticalCheckbox);/**
  * @class BI.FilterPane
  * @extend BI.Widget
  * 过滤面板
@@ -108282,7 +108303,7 @@ BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.i
                         eventName: BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE,
                         action: function () {
                             var date = BI.getDate();
-                            self.setValue({year: date.getFullYear()});
+                            self.setValue({type: BI.DynamicYearCombo.Static, value: {year: date.getFullYear()}});
                             self.combo.hideView();
                             self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
                         }

dist/case.js

@@ -2022,7 +2022,7 @@ BI.ComplexCanvas = BI.inherit(BI.Widget, {
 
 BI.shortcut("bi.complex_canvas", BI.ComplexCanvas);/**
  * Created by roy on 15/10/16.
- * 上箭头与下箭头切换的树节点
+ * 右与下箭头切换的树节点
  */
 BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
@@ -10846,7 +10846,6 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         selected: function (e) {
-            console.log(123);
             var t = e.target;
             if (!t && !(t = this.selElm())) {
                 t = this.selElm();

dist/fineui.css

@@ -6031,6 +6031,38 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e6d7";
   color: inherit;
 }
+.solid-triangle-top-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-top-font .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font:hover .b-font:before,
+.solid-triangle-top-font.hover .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font.disabled .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-bottom-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-bottom-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font:hover .b-font:before,
+.solid-triangle-bottom-font.hover .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .trigger-triangle-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }

dist/fineui.js

@@ -74720,7 +74720,7 @@ BI.ComplexCanvas = BI.inherit(BI.Widget, {
 
 BI.shortcut("bi.complex_canvas", BI.ComplexCanvas);/**
  * Created by roy on 15/10/16.
- * 上箭头与下箭头切换的树节点
+ * 右与下箭头切换的树节点
  */
 BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
@@ -83544,7 +83544,6 @@ BI.shortcut("bi.rich_editor_text_toolbar", BI.RichEditorTextToolbar);/**
         },
 
         selected: function (e) {
-            console.log(123);
             var t = e.target;
             if (!t && !(t = this.selElm())) {
                 t = this.selElm();
@@ -94406,6 +94405,28 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
     BI.shortcut("bi.filter_operation", FilterOperation);
 }());
 /**
+ * Created by Windy on 18/05/03.
+ * 上与下箭头切换的checkbox
+ */
+BI.ArrowTreeGroupNodeVerticalCheckbox = BI.inherit(BI.Trigger, {
+    _defaultConfig: function () {
+        return BI.extend(BI.ArrowTreeGroupNodeVerticalCheckbox.superclass._defaultConfig.apply(this, arguments), {
+            extraCls: "bi-arrow-group-node-vertical-checkbox"
+        });
+    },
+    _init: function () {
+        BI.ArrowTreeGroupNodeVerticalCheckbox.superclass._init.apply(this, arguments);
+    },
+    setSelected: function (v) {
+        BI.ArrowTreeGroupNodeVerticalCheckbox.superclass.setSelected.apply(this, arguments);
+        if(v) {
+            this.element.removeClass("solid-triangle-bottom-font").addClass("solid-triangle-top-font");
+        } else {
+            this.element.removeClass("solid-triangle-top-font").addClass("solid-triangle-bottom-font");
+        }
+    }
+});
+BI.shortcut("bi.arrow_group_node_vertical_checkbox", BI.ArrowTreeGroupNodeVerticalCheckbox);/**
  * @class BI.FilterPane
  * @extend BI.Widget
  * 过滤面板
@@ -108525,7 +108546,7 @@ BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.i
                         eventName: BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE,
                         action: function () {
                             var date = BI.getDate();
-                            self.setValue({year: date.getFullYear()});
+                            self.setValue({type: BI.DynamicYearCombo.Static, value: {year: date.getFullYear()}});
                             self.combo.hideView();
                             self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
                         }

dist/resource.css

@@ -819,6 +819,38 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e6d7";
   color: inherit;
 }
+.solid-triangle-top-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-top-font .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font:hover .b-font:before,
+.solid-triangle-top-font.hover .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font.disabled .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-bottom-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-bottom-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font:hover .b-font:before,
+.solid-triangle-bottom-font.hover .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .trigger-triangle-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }

dist/widget.js

@@ -6694,6 +6694,28 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
     BI.shortcut("bi.filter_operation", FilterOperation);
 }());
 /**
+ * Created by Windy on 18/05/03.
+ * 上与下箭头切换的checkbox
+ */
+BI.ArrowTreeGroupNodeVerticalCheckbox = BI.inherit(BI.Trigger, {
+    _defaultConfig: function () {
+        return BI.extend(BI.ArrowTreeGroupNodeVerticalCheckbox.superclass._defaultConfig.apply(this, arguments), {
+            extraCls: "bi-arrow-group-node-vertical-checkbox"
+        });
+    },
+    _init: function () {
+        BI.ArrowTreeGroupNodeVerticalCheckbox.superclass._init.apply(this, arguments);
+    },
+    setSelected: function (v) {
+        BI.ArrowTreeGroupNodeVerticalCheckbox.superclass.setSelected.apply(this, arguments);
+        if(v) {
+            this.element.removeClass("solid-triangle-bottom-font").addClass("solid-triangle-top-font");
+        } else {
+            this.element.removeClass("solid-triangle-top-font").addClass("solid-triangle-bottom-font");
+        }
+    }
+});
+BI.shortcut("bi.arrow_group_node_vertical_checkbox", BI.ArrowTreeGroupNodeVerticalCheckbox);/**
  * @class BI.FilterPane
  * @extend BI.Widget
  * 过滤面板
@@ -20813,7 +20835,7 @@ BI.shortcut("bi.static_year_card", BI.StaticYearCard);BI.DynamicYearCombo = BI.i
                         eventName: BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE,
                         action: function () {
                             var date = BI.getDate();
-                            self.setValue({year: date.getFullYear()});
+                            self.setValue({type: BI.DynamicYearCombo.Static, value: {year: date.getFullYear()}});
                             self.combo.hideView();
                             self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
                         }

public/css/font.css

@@ -498,6 +498,38 @@
   content: "\e6d7";
   color: inherit;
 }
+.solid-triangle-top-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-top-font .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font:hover .b-font:before,
+.solid-triangle-top-font.hover .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font.disabled .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-bottom-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-bottom-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font:hover .b-font:before,
+.solid-triangle-bottom-font.hover .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .trigger-triangle-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }

src/case/checkbox/check.arrownode.js

@@ -1,6 +1,6 @@
 /**
  * Created by roy on 15/10/16.
- * 上箭头与下箭头切换的树节点
+ * 右与下箭头切换的树节点
  */
 BI.ArrowTreeGroupNodeCheckbox = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {

src/case/richeditor/niceditor/niceditor.js

@@ -232,7 +232,6 @@
         },
 
         selected: function (e) {
-            console.log(123);
             var t = e.target;
             if (!t && !(t = this.selElm())) {
                 t = this.selElm();

src/css/resource/font.css

@@ -498,6 +498,38 @@
   content: "\e6d7";
   color: inherit;
 }
+.solid-triangle-top-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-top-font .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font:hover .b-font:before,
+.solid-triangle-top-font.hover .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font.disabled .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-bottom-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-bottom-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font:hover .b-font:before,
+.solid-triangle-bottom-font.hover .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .trigger-triangle-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }

src/less/resource/font.less

@@ -65,6 +65,10 @@
 .font-hover(column-pre-page-h-font, @font-solid-top);
 .font-hover(column-next-page-h-font, @font-solid-bottom);
 
+// 实心下拉三角
+.font-hover(solid-triangle-top-font, @font-solid-top);
+.font-hover(solid-triangle-bottom-font, @font-solid-bottom);
+
 //下拉框小小三角
 .font-hover-active(trigger-triangle-font, @font-no-sort-no-filter, @color-bi-text-gray, @color-bi-text-gray, @color-bi-text-highlight);
 

src/widget/year/combo.year.js

@@ -76,7 +76,7 @@ BI.DynamicYearCombo = BI.inherit(BI.Widget, {
                         eventName: BI.DynamicYearPopup.BUTTON_lABEL_EVENT_CHANGE,
                         action: function () {
                             var date = BI.getDate();
-                            self.setValue({year: date.getFullYear()});
+                            self.setValue({type: BI.DynamicYearCombo.Static, value: {year: date.getFullYear()}});
                             self.combo.hideView();
                             self.fireEvent(BI.DynamicDateCombo.EVENT_CONFIRM);
                         }

ui/css/font.css

@@ -498,6 +498,38 @@
   content: "\e6d7";
   color: inherit;
 }
+.solid-triangle-top-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-top-font .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font:hover .b-font:before,
+.solid-triangle-top-font.hover .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-top-font.disabled .b-font:before {
+  content: "\e6d6";
+  color: inherit;
+}
+.solid-triangle-bottom-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.solid-triangle-bottom-font .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font:hover .b-font:before,
+.solid-triangle-bottom-font.hover .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
+.solid-triangle-bottom-font.disabled .b-font:before {
+  content: "\e6d7";
+  color: inherit;
+}
 .trigger-triangle-font .b-font {
   *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
 }