fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

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

* commit 'e2ae971e1d5bd3b1ba526ff1c6241c52ce37a90d':
  BI-13413
  update
  update
es6
guy 7 years ago
parent
2a92211a79 e2ae971e1d
commit
ba6691dda9
19 changed files with 305 additions and 47 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 22
      dist/_fineui.min.js
  2. 32
      dist/bundle.css
  3. 27
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 22
      dist/bundle.min.js
  6. 3
      dist/case.js
  7. 32
      dist/fineui.css
  8. 27
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 22
      dist/fineui.min.js
  11. 32
      dist/resource.css
  12. 24
      dist/widget.js
  13. 32
      public/css/font.css
  14. 2
      src/case/checkbox/check.arrownode.js
  15. 1
      src/case/richeditor/niceditor/niceditor.js
  16. 32
      src/css/resource/font.css
  17. 4
      src/less/resource/font.less
  18. 2
      src/widget/year/combo.year.js
  19. 32
      ui/css/font.css

22
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

32
dist/bundle.css vendored
Unescape View File

@ -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 = '');
}

27
dist/bundle.js vendored
Unescape View File

@ -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);
}

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

22
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/case.js vendored
Unescape View File

@ -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();

32
dist/fineui.css vendored
Unescape View File

@ -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 = '');
}

27
dist/fineui.js vendored
Unescape View File

@ -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);
}

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

22
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

32
dist/resource.css vendored
Unescape View File

@ -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 = '');
}

24
dist/widget.js vendored
Unescape View File

@ -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);
}

32
public/css/font.css
Unescape View File

@ -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 = '');
}

2
src/case/checkbox/check.arrownode.js
Unescape View File

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

1
src/case/richeditor/niceditor/niceditor.js
Unescape View File

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

32
src/css/resource/font.css
Unescape View File

@ -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 = '');
}

4
src/less/resource/font.less
Unescape View File

@ -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);

2
src/widget/year/combo.year.js
Unescape View File

@ -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);
}

32
ui/css/font.css
Unescape View File

@ -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 = '');
}

Write Preview
Loading…
Cancel
Save