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

BI-20686

es6
windy 7 years ago
parent
3a13391a90
commit
0909ccd45e
15 changed files with 196 additions and 91 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. 6
      demo/version.js
  2. 11
      dist/bundle.css
  3. 66
      dist/bundle.js
  4. 6
      dist/config.js
  5. 11
      dist/fineui.css
  6. 66
      dist/fineui.js
  7. 11
      dist/resource.css
  8. 61
      dist/widget.js
  9. 11
      public/css/font.css
  10. 5
      public/js/index.js
  11. 11
      src/css/resource/font.css
  12. 2
      src/less/lib/font.less
  13. 2
      src/less/resource/font.less
  14. 11
      ui/css/font.css
  15. 5
      ui/js/index.js

6
demo/version.js
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",
@ -163,5 +163,7 @@ BI.i18n = {
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-Word_Align_Center": "文字居中",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于"
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
};

11
dist/bundle.css vendored
Unescape View File

@ -6390,6 +6390,17 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e74b";
color: inherit;
}
.text-add-tip-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-add-tip-font .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.text-add-tip-font.disabled .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.tree-collapse-icon-type1 .x-icon {
display: block;
background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/tree_collapse_1.png') no-repeat center center;

66
dist/bundle.js vendored
Unescape View File

@ -97841,23 +97841,23 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self._setStartValue("");
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
// if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
// 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword);
}
self.combo.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.populate();
self._setStartValue("");
});
// }
if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
// 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword);
}
self.combo.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.populate();
self._setStartValue("");
});
}
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
var last = BI.last(keywords);
@ -99374,6 +99374,17 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
height: this.constants.height
});
this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height,
handler: function () {
self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
}
});
this.loader = BI.createWidget({
type: "bi.multi_select_search_loader",
keywordGetter: o.keywordGetter,
@ -99394,23 +99405,20 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.vtape",
element: this,
items: [{
el: this.tooltipClick,
height: 0
type: "bi.center_adapt",
items: [this.tooltipClick, this.addNotMatchTip],
height: this.constants.height
}, {
el: this.loader
}]
});
this.tooltipClick.setVisible(false);
},
setKeyword: function (keyword) {
var btn;
var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
if (isVisible !== this.tooltipClick.isVisible()) {
this.tooltipClick.setVisible(isVisible);
this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
this.resizer.resize();
}
var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
this.tooltipClick.setVisible(isMatchTipVisible);
this.addNotMatchTip.setVisible(!isMatchTipVisible);
},
isAllSelected: function () {
@ -99439,6 +99447,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
});
BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
* 查看已选按钮
@ -112961,7 +112970,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",
@ -113066,5 +113075,6 @@ BI.i18n = {
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
};

6
dist/config.js vendored
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",
@ -163,5 +163,7 @@ BI.i18n = {
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-Word_Align_Center": "文字居中",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于"
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
};

11
dist/fineui.css vendored
Unescape View File

@ -6390,6 +6390,17 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e74b";
color: inherit;
}
.text-add-tip-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-add-tip-font .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.text-add-tip-font.disabled .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.tree-collapse-icon-type1 .x-icon {
display: block;
background: url('resources?path=/com/fr/web/ui/images/2x/icon/tree_collapse_1.png') no-repeat center center;

66
dist/fineui.js vendored
Unescape View File

@ -98084,23 +98084,23 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self._setStartValue("");
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
// if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
// 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword);
}
self.combo.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.populate();
self._setStartValue("");
});
// }
if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
// 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword);
}
self.combo.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.populate();
self._setStartValue("");
});
}
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
var last = BI.last(keywords);
@ -99617,6 +99617,17 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
height: this.constants.height
});
this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height,
handler: function () {
self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
}
});
this.loader = BI.createWidget({
type: "bi.multi_select_search_loader",
keywordGetter: o.keywordGetter,
@ -99637,23 +99648,20 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.vtape",
element: this,
items: [{
el: this.tooltipClick,
height: 0
type: "bi.center_adapt",
items: [this.tooltipClick, this.addNotMatchTip],
height: this.constants.height
}, {
el: this.loader
}]
});
this.tooltipClick.setVisible(false);
},
setKeyword: function (keyword) {
var btn;
var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
if (isVisible !== this.tooltipClick.isVisible()) {
this.tooltipClick.setVisible(isVisible);
this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
this.resizer.resize();
}
var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
this.tooltipClick.setVisible(isMatchTipVisible);
this.addNotMatchTip.setVisible(!isMatchTipVisible);
},
isAllSelected: function () {
@ -99682,6 +99690,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
});
BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
* 查看已选按钮
@ -113204,7 +113213,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",
@ -113309,5 +113318,6 @@ BI.i18n = {
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
};

11
dist/resource.css vendored
Unescape View File

@ -1175,6 +1175,17 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e74b";
color: inherit;
}
.text-add-tip-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-add-tip-font .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.text-add-tip-font.disabled .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.tree-collapse-icon-type1 .x-icon {
display: block;
background: url('images/2x/icon/tree_collapse_1.png') no-repeat center center;

61
dist/widget.js vendored
Unescape View File

@ -10274,23 +10274,23 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
self._setStartValue("");
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_PAUSE, function () {
// if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
// 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword);
}
self.combo.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.populate();
self._setStartValue("");
});
// }
if (this.getSearcher().hasMatched()) {
var keyword = this.getSearcher().getKeyword();
self._join({
type: BI.Selection.Multi,
value: [keyword]
}, function () {
// 如果在不选的状态下直接把该值添加进来
if (self.storeValue.type === BI.Selection.Multi) {
self.storeValue.value.pushDistinct(keyword);
}
self.combo.setValue(self.storeValue);
self._setStartValue(keyword);
assertShowValue();
self.populate();
self._setStartValue("");
});
}
});
this.trigger.on(BI.MultiSelectTrigger.EVENT_SEARCHING, function (keywords) {
var last = BI.last(keywords);
@ -11807,6 +11807,17 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
height: this.constants.height
});
this.addNotMatchTip = BI.createWidget({
type: "bi.icon_text_item",
invisible: true,
text: BI.i18nText("BI-Basic_Click_To_Add_Text", ""),
cls: "text-add-tip-font",
height: this.constants.height,
handler: function () {
self.fireEvent(BI.MultiSelectSearchPane.EVENT_ADD_ITEM, o.keywordGetter());
}
});
this.loader = BI.createWidget({
type: "bi.multi_select_search_loader",
keywordGetter: o.keywordGetter,
@ -11827,23 +11838,20 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.vtape",
element: this,
items: [{
el: this.tooltipClick,
height: 0
type: "bi.center_adapt",
items: [this.tooltipClick, this.addNotMatchTip],
height: this.constants.height
}, {
el: this.loader
}]
});
this.tooltipClick.setVisible(false);
},
setKeyword: function (keyword) {
var btn;
var isVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
if (isVisible !== this.tooltipClick.isVisible()) {
this.tooltipClick.setVisible(isVisible);
this.resizer.attr("items")[0].height = (isVisible ? this.constants.height : 0);
this.resizer.resize();
}
var isMatchTipVisible = this.loader.getAllButtons().length > 0 && (btn = this.loader.getAllButtons()[0]) && (keyword === btn.getValue());
this.tooltipClick.setVisible(isMatchTipVisible);
this.addNotMatchTip.setVisible(!isMatchTipVisible);
},
isAllSelected: function () {
@ -11872,6 +11880,7 @@ BI.MultiSelectSearchPane = BI.inherit(BI.Widget, {
});
BI.MultiSelectSearchPane.EVENT_CHANGE = "EVENT_CHANGE";
BI.MultiSelectSearchPane.EVENT_ADD_ITEM = "EVENT_ADD_ITEM";
BI.shortcut("bi.multi_select_search_pane", BI.MultiSelectSearchPane);/**
* 查看已选按钮

11
public/css/font.css
Unescape View File

@ -854,3 +854,14 @@
content: "\e74b";
color: inherit;
}
.text-add-tip-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-add-tip-font .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.text-add-tip-font.disabled .b-font:before {
content: "\e6dd";
color: #5cb75d;
}

5
public/js/index.js
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",
@ -164,5 +164,6 @@ BI.i18n = {
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
};

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

@ -854,3 +854,14 @@
content: "\e74b";
color: inherit;
}
.text-add-tip-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-add-tip-font .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.text-add-tip-font.disabled .b-font:before {
content: "\e6dd";
color: #5cb75d;
}

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

@ -37,4 +37,6 @@
@font-tip-success: "e756";
@font-tip-warning: "e755";
@font-tip-message: "e74b";
@font-add: "e6dd";

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

@ -107,3 +107,5 @@
.font(toast-success-font, @font-tip-success);
.font(toast-warning-font, @font-tip-warning);
.font(toast-message-font, @font-tip-message);
.font(text-add-tip-font, @font-add, @color-bi-text-success);

11
ui/css/font.css
Unescape View File

@ -854,3 +854,14 @@
content: "\e74b";
color: inherit;
}
.text-add-tip-font .b-font {
*zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
}
.text-add-tip-font .b-font:before {
content: "\e6dd";
color: #5cb75d;
}
.text-add-tip-font.disabled .b-font:before {
content: "\e6dd";
color: #5cb75d;
}

5
ui/js/index.js
Unescape View File

@ -59,7 +59,7 @@ BI.i18n = {
"BI-Basic_April": "四月",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Week": "周",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
"BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
"BI-Basic_August": "八月",
"BI-Word_Align_Left": "文字居左",
"BI-Basic_November": "十一月",
@ -164,5 +164,6 @@ BI.i18n = {
"BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
"BI-More_Than": "大于",
"BI-More_And_Equal": "大于等于",
"BI-Please_Enter_SQL": "请输入SQL"
"BI-Please_Enter_SQL": "请输入SQL",
"BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
};
Write Preview
Loading…
Cancel
Save