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

Merge pull request #461 in VISUAL/fineui from ~WINDY/fineui:master to master 

* commit '4bf425c356063bf7dc2e8fcd87f6926734fffcc6':
  交个keyup,为埋点服务
  BI-25057
  update
  BI-25097
  BI-25122 && BI-25134
es6
windy 6 years ago
parent
e58c2bde7a 4bf425c356
commit
8fb08833bc
39 changed files with 323 additions and 276 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. 3
      demo/js/case/combo/demo.bubble_combo.js
  2. 5
      demo/version.js
  3. 44
      dist/_fineui.min.js
  4. 41
      dist/base.css
  5. 5
      dist/base.js
  6. 59
      dist/bundle.css
  7. 25
      dist/bundle.js
  8. 2
      dist/bundle.min.css
  9. 64
      dist/bundle.min.js
  10. 12
      dist/case.js
  11. 5
      dist/config.js
  12. 6
      dist/core.css
  13. 6
      dist/core_without_normalize.css
  14. 3
      dist/demo.js
  15. 59
      dist/fineui.css
  16. 25
      dist/fineui.js
  17. 2
      dist/fineui.min.css
  18. 49
      dist/fineui.min.js
  19. 12
      dist/resource.css
  20. 3
      dist/widget.js
  21. 12
      public/css/font.css
  22. 5
      public/js/index.js
  23. 5
      src/base/formula/formulaeditor.js
  24. 2
      src/case/button/item.multiselect.js
  25. 6
      src/case/colorchooser/colorchooser.custom.js
  26. 1
      src/case/richeditor/plugins/backgroundchooser/trigger.backgroundchooser.js
  27. 1
      src/case/richeditor/plugins/colorchooser/trigger.colorchooser.js
  28. 2
      src/case/toolbar/toolbar.multiselect.js
  29. 41
      src/css/base/combo/combo.css
  30. 6
      src/css/core/utils/common.css
  31. 12
      src/css/resource/font.css
  32. 6
      src/less/core/utils/common.less
  33. 2
      src/less/lib/colors.less
  34. 1
      src/less/lib/constant.less
  35. 6
      src/less/resource/font.less
  36. 41
      src/less/visual.less
  37. 3
      src/widget/singleselect/singleselect.item.js
  38. 12
      ui/css/font.css
  39. 5
      ui/js/index.js

3
demo/js/case/combo/demo.bubble_combo.js
Unescape View File

@ -30,6 +30,7 @@ Demo.Func = BI.inherit(BI.Widget, {
});
var combo2 = BI.createWidget({
type: "bi.bubble_combo",
direction: "right",
el: {
type: "bi.button",
text: "测试",
@ -104,7 +105,7 @@ Demo.Func = BI.inherit(BI.Widget, {
}, {
el: combo2,
left: 10,
bottom: 10
bottom: 200
}, {
el: combo3,
right: 10,

5
demo/version.js
Unescape View File

@ -166,5 +166,8 @@ BI.i18n = {
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择"
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",
"BI-Basic_Underline": "下划线"
};

44
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

41
dist/base.css vendored
Unescape View File

@ -59,26 +59,26 @@
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;
position: absolute;
width: 16px;
height: 10px;
border-bottom: 1px solid #f5f5f5;
width: 5px;
height: 16px;
border-left: 1px solid #f5f5f5;
}
.bi-bubble-combo .bubble-combo-triangle-left:before {
position: absolute;
left: 0px;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-left: 7px solid #ccc;
border-top: 8px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-left:after {
position: absolute;
right: 1px;
top: 1px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
left: 1px;
right: 0px;
border-bottom: 6px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
content: "";
@ -86,28 +86,27 @@
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
position: absolute;
width: 16px;
height: 6px;
border-bottom: 1px solid #f5f5f5;
width: 7px;
height: 16px;
}
.bi-bubble-combo .bubble-combo-triangle-right:before {
position: absolute;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-right: 7px solid #ccc;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-right:after {
position: absolute;
right: 1px;
top: 1px;
right: 0px;
top: 0px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-right: 7px solid #ffffff;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-top {

5
dist/base.js vendored
Unescape View File

@ -14568,6 +14568,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
this.editor.on("keyup", function (cm, keyboard) {
self.fireEvent(BI.FormulaEditor.EVENT_KEY_UP, keyboard.key);
});
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -14764,6 +14768,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
BI.FormulaEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.FormulaEditor.EVENT_BLUR = "EVENT_BLUR";
BI.FormulaEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.FormulaEditor.EVENT_KEY_UP = "EVENT_KEY_UP";
BI.shortcut("bi.formula_editor", BI.FormulaEditor);
/**
* z-index在1亿层级

59
dist/bundle.css vendored
Unescape View File

@ -472,14 +472,14 @@ textarea {
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
color: #c4c9d1;
cursor: text;
}
.bi-water-mark .bi-input {
color: #cccccc;
color: #c4c9d1;
}
.bi-water-mark .bi-textarea {
color: #cccccc;
color: #c4c9d1;
}
.bi-theme-dark .bi-water-mark {
color: #666666;
@ -1756,26 +1756,26 @@ textarea {
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;
position: absolute;
width: 16px;
height: 10px;
border-bottom: 1px solid #f5f5f5;
width: 5px;
height: 16px;
border-left: 1px solid #f5f5f5;
}
.bi-bubble-combo .bubble-combo-triangle-left:before {
position: absolute;
left: 0px;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-left: 7px solid #ccc;
border-top: 8px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-left:after {
position: absolute;
right: 1px;
top: 1px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
left: 1px;
right: 0px;
border-bottom: 6px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
content: "";
@ -1783,28 +1783,27 @@ textarea {
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
position: absolute;
width: 16px;
height: 6px;
border-bottom: 1px solid #f5f5f5;
width: 7px;
height: 16px;
}
.bi-bubble-combo .bubble-combo-triangle-right:before {
position: absolute;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-right: 7px solid #ccc;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-right:after {
position: absolute;
right: 1px;
top: 1px;
right: 0px;
top: 0px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-right: 7px solid #ffffff;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-top {
@ -5049,18 +5048,18 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-h-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font:hover .b-font:before,
.pull-down-h-font.hover .b-font:before {
@ -5069,14 +5068,14 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-h-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-ha-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font:hover .b-font:before,
.pull-down-ha-font.hover .b-font:before {
@ -5090,7 +5089,7 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-ha-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.check-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

25
dist/bundle.js vendored
Unescape View File

@ -50338,6 +50338,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
this.editor.on("keyup", function (cm, keyboard) {
self.fireEvent(BI.FormulaEditor.EVENT_KEY_UP, keyboard.key);
});
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -50534,6 +50538,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
BI.FormulaEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.FormulaEditor.EVENT_BLUR = "EVENT_BLUR";
BI.FormulaEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.FormulaEditor.EVENT_KEY_UP = "EVENT_KEY_UP";
BI.shortcut("bi.formula_editor", BI.FormulaEditor);
/**
* z-index在1亿层级
@ -72678,7 +72683,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 36
width: 26
}, this.text)
}))));
},
@ -76065,9 +76070,9 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
type: "bi.absolute",
items: [{
el: this.editor,
left: 10,
top: 10,
right: 10
left: 0,
top: 0,
right: 0
}],
height: 30
}, {
@ -83527,6 +83532,7 @@ BI.RichEditorBackgroundChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Background_Color"),
cls: "text-background-font"
});
@ -83846,6 +83852,7 @@ BI.RichEditorColorChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Font_Color"),
cls: "text-color-font"
});
@ -86035,7 +86042,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 36,
width: 26,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]
@ -107260,7 +107267,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
hgap: 10,
height: 24
});
},
@ -107290,7 +107296,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 36
width: 26
}, this.text)
}))));
},
@ -114765,5 +114771,8 @@ BI.i18n = {
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择"
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",
"BI-Basic_Underline": "下划线"
};

2
dist/bundle.min.css vendored
View File

File diff suppressed because one or more lines are too long

64
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/case.js vendored
Unescape View File

@ -199,7 +199,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 36
width: 26
}, this.text)
}))));
},
@ -3586,9 +3586,9 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
type: "bi.absolute",
items: [{
el: this.editor,
left: 10,
top: 10,
right: 10
left: 0,
top: 0,
right: 0
}],
height: 30
}, {
@ -11048,6 +11048,7 @@ BI.RichEditorBackgroundChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Background_Color"),
cls: "text-background-font"
});
@ -11367,6 +11368,7 @@ BI.RichEditorColorChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Font_Color"),
cls: "text-color-font"
});
@ -13556,7 +13558,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 36,
width: 26,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]

5
dist/config.js vendored
Unescape View File

@ -166,5 +166,8 @@ BI.i18n = {
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择"
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",
"BI-Basic_Underline": "下划线"
};

6
dist/core.css vendored
Unescape View File

@ -472,14 +472,14 @@ textarea {
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
color: #c4c9d1;
cursor: text;
}
.bi-water-mark .bi-input {
color: #cccccc;
color: #c4c9d1;
}
.bi-water-mark .bi-textarea {
color: #cccccc;
color: #c4c9d1;
}
.bi-theme-dark .bi-water-mark {
color: #666666;

6
dist/core_without_normalize.css vendored
Unescape View File

@ -194,14 +194,14 @@ textarea {
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
color: #c4c9d1;
cursor: text;
}
.bi-water-mark .bi-input {
color: #cccccc;
color: #c4c9d1;
}
.bi-water-mark .bi-textarea {
color: #cccccc;
color: #c4c9d1;
}
.bi-theme-dark .bi-water-mark {
color: #666666;

3
dist/demo.js vendored
Unescape View File

@ -1845,6 +1845,7 @@ BI.shortcut("demo.tree_view", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
});
var combo2 = BI.createWidget({
type: "bi.bubble_combo",
direction: "right",
el: {
type: "bi.button",
text: "测试",
@ -1919,7 +1920,7 @@ BI.shortcut("demo.tree_view", Demo.Func);Demo.Func = BI.inherit(BI.Widget, {
}, {
el: combo2,
left: 10,
bottom: 10
bottom: 200
}, {
el: combo3,
right: 10,

59
dist/fineui.css vendored
Unescape View File

@ -472,14 +472,14 @@ textarea {
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
color: #c4c9d1;
cursor: text;
}
.bi-water-mark .bi-input {
color: #cccccc;
color: #c4c9d1;
}
.bi-water-mark .bi-textarea {
color: #cccccc;
color: #c4c9d1;
}
.bi-theme-dark .bi-water-mark {
color: #666666;
@ -1756,26 +1756,26 @@ textarea {
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;
position: absolute;
width: 16px;
height: 10px;
border-bottom: 1px solid #f5f5f5;
width: 5px;
height: 16px;
border-left: 1px solid #f5f5f5;
}
.bi-bubble-combo .bubble-combo-triangle-left:before {
position: absolute;
left: 0px;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-left: 7px solid #ccc;
border-top: 8px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-left:after {
position: absolute;
right: 1px;
top: 1px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
left: 1px;
right: 0px;
border-bottom: 6px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
content: "";
@ -1783,28 +1783,27 @@ textarea {
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
position: absolute;
width: 16px;
height: 6px;
border-bottom: 1px solid #f5f5f5;
width: 7px;
height: 16px;
}
.bi-bubble-combo .bubble-combo-triangle-right:before {
position: absolute;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-right: 7px solid #ccc;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-right:after {
position: absolute;
right: 1px;
top: 1px;
right: 0px;
top: 0px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-right: 7px solid #ffffff;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-top {
@ -5049,18 +5048,18 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-h-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font:hover .b-font:before,
.pull-down-h-font.hover .b-font:before {
@ -5069,14 +5068,14 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-h-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-ha-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font:hover .b-font:before,
.pull-down-ha-font.hover .b-font:before {
@ -5090,7 +5089,7 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-ha-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.check-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

25
dist/fineui.js vendored
Unescape View File

@ -50581,6 +50581,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
this.editor.on("keyup", function (cm, keyboard) {
self.fireEvent(BI.FormulaEditor.EVENT_KEY_UP, keyboard.key);
});
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -50777,6 +50781,7 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
BI.FormulaEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.FormulaEditor.EVENT_BLUR = "EVENT_BLUR";
BI.FormulaEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.FormulaEditor.EVENT_KEY_UP = "EVENT_KEY_UP";
BI.shortcut("bi.formula_editor", BI.FormulaEditor);
/**
* z-index在1亿层级
@ -72921,7 +72926,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 36
width: 26
}, this.text)
}))));
},
@ -76308,9 +76313,9 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
type: "bi.absolute",
items: [{
el: this.editor,
left: 10,
top: 10,
right: 10
left: 0,
top: 0,
right: 0
}],
height: 30
}, {
@ -83770,6 +83775,7 @@ BI.RichEditorBackgroundChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Background_Color"),
cls: "text-background-font"
});
@ -84089,6 +84095,7 @@ BI.RichEditorColorChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Font_Color"),
cls: "text-color-font"
});
@ -86278,7 +86285,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 36,
width: 26,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]
@ -107503,7 +107510,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
hgap: 10,
height: 24
});
},
@ -107533,7 +107539,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 36
width: 26
}, this.text)
}))));
},
@ -115008,5 +115014,8 @@ BI.i18n = {
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择"
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",
"BI-Basic_Underline": "下划线"
};

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

49
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
dist/resource.css vendored
Unescape View File

@ -926,18 +926,18 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-h-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font:hover .b-font:before,
.pull-down-h-font.hover .b-font:before {
@ -946,14 +946,14 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-h-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-ha-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font:hover .b-font:before,
.pull-down-ha-font.hover .b-font:before {
@ -967,7 +967,7 @@ textarea::-webkit-scrollbar-thumb:hover {
}
.pull-down-ha-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.check-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

3
dist/widget.js vendored
Unescape View File

@ -19636,7 +19636,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
hgap: 10,
height: 24
});
},
@ -19666,7 +19665,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 36
width: 26
}, this.text)
}))));
},

12
public/css/font.css
Unescape View File

@ -600,18 +600,18 @@
}
.pull-down-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-h-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font:hover .b-font:before,
.pull-down-h-font.hover .b-font:before {
@ -620,14 +620,14 @@
}
.pull-down-h-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-ha-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font:hover .b-font:before,
.pull-down-ha-font.hover .b-font:before {
@ -641,7 +641,7 @@
}
.pull-down-ha-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.check-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

5
public/js/index.js
Unescape View File

@ -166,5 +166,8 @@ BI.i18n = {
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择"
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",
"BI-Basic_Underline": "下划线"
};

5
src/base/formula/formulaeditor.js
Unescape View File

@ -45,6 +45,10 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
self.fireEvent(BI.FormulaEditor.EVENT_BLUR);
});
this.editor.on("keyup", function (cm, keyboard) {
self.fireEvent(BI.FormulaEditor.EVENT_KEY_UP, keyboard.key);
});
if (BI.isKey(this.options.watermark)) {
var self = this;
this.watermark = BI.createWidget({
@ -241,4 +245,5 @@ BI.FormulaEditor = BI.inherit(BI.Single, {
BI.FormulaEditor.EVENT_CHANGE = "EVENT_CHANGE";
BI.FormulaEditor.EVENT_BLUR = "EVENT_BLUR";
BI.FormulaEditor.EVENT_FOCUS = "EVENT_FOCUS";
BI.FormulaEditor.EVENT_KEY_UP = "EVENT_KEY_UP";
BI.shortcut("bi.formula_editor", BI.FormulaEditor);

2
src/case/button/item.multiselect.js
Unescape View File

@ -45,7 +45,7 @@ BI.MultiSelectItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.checkbox],
width: 36
width: 26
}, this.text)
}))));
},

6
src/case/colorchooser/colorchooser.custom.js
Unescape View File

@ -38,9 +38,9 @@ BI.CustomColorChooser = BI.inherit(BI.Widget, {
type: "bi.absolute",
items: [{
el: this.editor,
left: 10,
top: 10,
right: 10
left: 0,
top: 0,
right: 0
}],
height: 30
}, {

1
src/case/richeditor/plugins/backgroundchooser/trigger.backgroundchooser.js
Unescape View File

@ -19,6 +19,7 @@ BI.RichEditorBackgroundChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Background_Color"),
cls: "text-background-font"
});

1
src/case/richeditor/plugins/colorchooser/trigger.colorchooser.js
Unescape View File

@ -19,6 +19,7 @@ BI.RichEditorColorChooserTrigger = BI.inherit(BI.Widget, {
this.font = BI.createWidget({
type: "bi.icon_button",
element: this,
title: BI.i18nText("BI-Basic_Font_Color"),
cls: "text-color-font"
});

2
src/case/toolbar/toolbar.multiselect.js
Unescape View File

@ -70,7 +70,7 @@ BI.MultiSelectBar = BI.inherit(BI.BasicButton, {
type: "bi.htape",
element: this,
items: [{
width: 36,
width: 26,
el: {
type: "bi.center_adapt",
items: [this.checkbox, this.half]

41
src/css/base/combo/combo.css
Unescape View File

@ -5,26 +5,26 @@
.bi-bubble-combo .bubble-combo-triangle-left {
z-index: 1;
position: absolute;
width: 16px;
height: 10px;
border-bottom: 1px solid #f5f5f5;
width: 5px;
height: 16px;
border-left: 1px solid #f5f5f5;
}
.bi-bubble-combo .bubble-combo-triangle-left:before {
position: absolute;
left: 0px;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-left: 7px solid #ccc;
border-top: 8px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-left:after {
position: absolute;
right: 1px;
top: 1px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
left: 1px;
right: 0px;
border-bottom: 6px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
content: "";
@ -32,28 +32,27 @@
.bi-bubble-combo .bubble-combo-triangle-right {
z-index: 1;
position: absolute;
width: 16px;
height: 6px;
border-bottom: 1px solid #f5f5f5;
width: 7px;
height: 16px;
}
.bi-bubble-combo .bubble-combo-triangle-right:before {
position: absolute;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-right: 7px solid #ccc;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-right:after {
position: absolute;
right: 1px;
top: 1px;
right: 0px;
top: 0px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-right: 7px solid #ffffff;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
.bi-bubble-combo .bubble-combo-triangle-top {

6
src/css/core/utils/common.css
Unescape View File

@ -194,14 +194,14 @@ textarea {
border-color: #3685f2;
}
.bi-water-mark {
color: #cccccc;
color: #c4c9d1;
cursor: text;
}
.bi-water-mark .bi-input {
color: #cccccc;
color: #c4c9d1;
}
.bi-water-mark .bi-textarea {
color: #cccccc;
color: #c4c9d1;
}
.bi-theme-dark .bi-water-mark {
color: #666666;

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

@ -600,18 +600,18 @@
}
.pull-down-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-h-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font:hover .b-font:before,
.pull-down-h-font.hover .b-font:before {
@ -620,14 +620,14 @@
}
.pull-down-h-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-ha-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font:hover .b-font:before,
.pull-down-ha-font.hover .b-font:before {
@ -641,7 +641,7 @@
}
.pull-down-ha-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.check-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

6
src/less/core/utils/common.less
Unescape View File

@ -244,13 +244,13 @@ textarea {
//水印
.bi-water-mark {
color: @water-mark-color;
color: @font-color-tips;
cursor: text;
& .bi-input {
color: @water-mark-color;
color: @font-color-tips;
}
& .bi-textarea {
color: @water-mark-color;
color: @font-color-tips;
}
}

2
src/less/lib/colors.less
Unescape View File

@ -12,6 +12,8 @@
@color-bi-text-dark: @font-color-dark;
//灰色字体颜色
@color-bi-text-gray: @font-color-gray;
//浅灰色字体
@color-bi-text-light-gray: @font-color-light-gray;
//白色字体颜色
@color-bi-text: @font-color-white;
//灰化字体颜色

1
src/less/lib/constant.less
Unescape View File

@ -22,6 +22,7 @@
@font-color-disabled-theme-dark: #666666;//
@font-color-tips: #c4c9d1;//
@font-color-dark: #d4dadd;
@font-color-light-gray: #647185;
@font-color-gray: #999999;
@font-color-white: #ffffff;//
@font-color-highlight: #3685f2;

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

@ -80,9 +80,9 @@
//单选下拉框
//向下展开子菜单
.font(pull-up-font, @font-up-triangle);
.font(pull-down-font, @font-down-triangle);
.font-hover(pull-down-h-font, @font-down-triangle);
.font-hover-active(pull-down-ha-font, @font-down-triangle);
.font(pull-down-font, @font-down-triangle, @color-bi-text-light-gray);
.font-hover(pull-down-h-font, @font-down-triangle, @color-bi-text-light-gray);
.font-hover-active(pull-down-ha-font, @font-down-triangle, @color-bi-text-light-gray);
.font(check-font, @font-check-mark, @color-bi-text-highlight);

41
src/less/visual.less
Unescape View File

@ -240,54 +240,53 @@
.triangle-left() {
position: absolute;
width: 16px;
height: 6px;
border-bottom: 1px solid #f5f5f5;
width: 7px;
height: 16px;
&:before {
position: absolute;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-right: 7px solid #ccc;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
&:after {
position: absolute;
right: 1px;
top: 1px;
right: 0px;
top: 0px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
border-right: 7px solid #ffffff;
border-top: 7px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
}
.triangle-right() {
position: absolute;
width: 16px;
height: 10px;
border-bottom: 1px solid #f5f5f5;
width: 5px;
height: 16px;
border-left: 1px solid #f5f5f5;
&:before {
position: absolute;
left: 0px;
top: 0px;
right: 0px;
bottom: 0px;
border-bottom: 10px solid #ccc;
border-left: 8px solid transparent;
border-right: 8px solid transparent;
border-left: 7px solid #ccc;
border-top: 8px solid transparent;
border-bottom: 8px solid transparent;
content: "";
}
&:after {
position: absolute;
right: 1px;
top: 1px;
bottom: 0px;
border-bottom: 9px solid #ffffff;
left: 1px;
right: 0px;
border-bottom: 6px solid #ffffff;
border-left: 7px solid transparent;
border-right: 7px solid transparent;
content: "";

3
src/widget/singleselect/singleselect.item.js
Unescape View File

@ -10,7 +10,6 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
logic: {
dynamic: false
},
hgap: 10,
height: 24
});
},
@ -40,7 +39,7 @@ BI.SingleSelectComboItem = BI.inherit(BI.BasicButton, {
items: BI.LogicFactory.createLogicItemsByDirection("left", {
type: "bi.center_adapt",
items: [this.radio],
width: 36
width: 26
}, this.text)
}))));
},

12
ui/css/font.css
Unescape View File

@ -600,18 +600,18 @@
}
.pull-down-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-h-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-h-font:hover .b-font:before,
.pull-down-h-font.hover .b-font:before {
@ -620,14 +620,14 @@
}
.pull-down-h-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.pull-down-ha-font .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.pull-down-ha-font:hover .b-font:before,
.pull-down-ha-font.hover .b-font:before {
@ -641,7 +641,7 @@
}
.pull-down-ha-font.disabled .b-font:before {
content: "\e70b";
color: inherit;
color: #647185;
}
.check-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');

5
ui/js/index.js
Unescape View File

@ -166,5 +166,8 @@ BI.i18n = {
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\"",
"BI-Basic_Please_Select": "请选择"
"BI-Basic_Please_Select": "请选择",
"BI-Basic_Font_Color": "文字颜色",
"BI-Basic_Background_Color": "背景色",
"BI-Basic_Underline": "下划线"
};
Write Preview
Loading…
Cancel
Save