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

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

* commit 'fee56627b136e4e36b00b1e504bea3716c3183a3':
  BI-25571
  update
  BI-25579
es6
Young 6 years ago
parent
5362ac1558 fee56627b1
commit
e9a4af6c5b
28 changed files with 171 additions and 163 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Gruntfile.js
  2. 2
      dist/base.css
  3. 6
      dist/base.js
  4. 4
      dist/bundle.css
  5. 78
      dist/bundle.js
  6. 8
      dist/case.js
  7. 4
      dist/fineui.css
  8. 78
      dist/fineui.js
  9. 2
      dist/widget.css
  10. 64
      dist/widget.js
  11. 4
      src/base/layer/layer.popup.js
  12. 2
      src/base/pane.js
  13. 2
      src/case/combo/iconcombo/combo.icon.js
  14. 4
      src/case/combo/iconcombo/trigger.iconcombo.js
  15. 2
      src/case/layer/layer.multipopup.js
  16. 2
      src/css/base/view/popupview.css
  17. 2
      src/css/widget/multiselect/search/multiselect.css
  18. 2
      src/less/base/view/popupview.less
  19. 2
      src/less/widget/multiselect/search/multiselect.search.pane.less
  20. 5
      src/widget/downlist/popup.downlist.js
  21. 19
      src/widget/multiselect/check/multiselect.check.pane.js
  22. 8
      src/widget/multiselect/multiselect.combo.js
  23. 8
      src/widget/multiselect/multiselect.insert.combo.js
  24. 8
      src/widget/multiselect/multiselect.insert.combo.nobar.js
  25. 4
      src/widget/numberinterval/numberinterval.js
  26. 8
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
  27. 2
      src/widget/singleselect/search/singleselect.search.pane.js
  28. 2
      src/widget/singleselect/singleselectlist.insert.js

2
Gruntfile.js
Unescape View File

@ -214,7 +214,7 @@ module.exports = function (grunt) {
uglify: { uglify: {
options: { options: {
banner: "/*! <%= pkg.name %> */\n" banner: "/*! <%= pkg.name %> <%= grunt.template.today(\"dd-mm-yyyy\") %> */\n"
}, },
dist: { dist: {
files: { files: {

2
dist/base.css vendored
Unescape View File

@ -1941,7 +1941,7 @@ ul.ztree.zTreeDragUL {
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
} }
.bi-popup-view .list-view-toolbar { .bi-popup-view .list-view-toolbar {
line-height: 30px; line-height: 24px;
} }
.bi-popup-view .list-view-toolbar > .center-element { .bi-popup-view .list-view-toolbar > .center-element {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;

6
dist/base.js vendored
Unescape View File

@ -246,7 +246,7 @@ BI.Pane = BI.inherit(BI.Widget, {
height: 25 height: 25
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.absolute_center_adapt",
element: this, element: this,
items: [this._tipText], items: [this._tipText],
bgap: 25 bgap: 25
@ -15694,7 +15694,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,
shadow: true, shadow: true,
@ -15717,7 +15717,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 30) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) :

4
dist/bundle.css vendored
Unescape View File

@ -3729,7 +3729,7 @@ ul.ztree.zTreeDragUL {
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
} }
.bi-popup-view .list-view-toolbar { .bi-popup-view .list-view-toolbar {
line-height: 30px; line-height: 24px;
} }
.bi-popup-view .list-view-toolbar > .center-element { .bi-popup-view .list-view-toolbar > .center-element {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
@ -3882,7 +3882,7 @@ ul.ztree.zTreeDragUL {
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
} }
.bi-multi-select-search-pane .multi-select-toolbar { .bi-multi-select-search-pane .multi-select-toolbar {
color: #ff4949; color: #faaa39;
} }
.bi-multi-select-check-selected-button { .bi-multi-select-check-selected-button {
z-index: 1; z-index: 1;

78
dist/bundle.js vendored
Unescape View File

@ -36017,7 +36017,7 @@ BI.Pane = BI.inherit(BI.Widget, {
height: 25 height: 25
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.absolute_center_adapt",
element: this, element: this,
items: [this._tipText], items: [this._tipText],
bgap: 25 bgap: 25
@ -51465,7 +51465,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,
shadow: true, shadow: true,
@ -51488,7 +51488,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 30) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) :
@ -78146,7 +78146,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-icon-combo", baseCls: "bi-icon-combo",
width: 28, width: 24,
height: 24, height: 24,
el: {}, el: {},
popup: {}, popup: {},
@ -78311,7 +78311,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
el: {}, el: {},
items: [], items: [],
iconCls: "", iconCls: "",
width: 28, width: 24,
height: 24, height: 24,
isShowDown: true, isShowDown: true,
value: "" value: ""
@ -78330,7 +78330,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon", cls: "icon-combo-trigger-icon",
iconCls: iconCls, iconCls: iconCls,
disableSelected: true, disableSelected: true,
width: o.isShowDown ? o.width - 12 : o.width, width: o.isShowDown ? o.width - 2 : o.width,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
@ -81019,7 +81019,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",
once: false, once: false,
@ -90242,7 +90242,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
items: [this.popup] items: [this.popup],
vgap: 5
}); });
}, },
@ -90269,7 +90270,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.height = self.constants.height; item.el.height = self.constants.height;
item.el.iconCls2 = self.constants.nextIcon; item.el.iconCls2 = self.constants.nextIcon;
item.popup = { item.popup = {
lgap: 4,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
chooseType: 0, chooseType: 0,
@ -90278,6 +90278,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}] }]
}, },
vgap: 5,
maxHeight: 378 maxHeight: 378
}; };
item.el.childValues = []; item.el.childValues = [];
@ -96598,9 +96599,10 @@ BI.shortcut("bi.multilayer_single_tree_mid_tree_leaf_item", BI.MultiLayerSingleT
BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
constants: { constants: {
height: 24, height: 12,
lgap: 10, lgap: 10,
tgap: 5 tgap: 10,
bgap: 5
}, },
_defaultConfig: function () { _defaultConfig: function () {
@ -96659,7 +96661,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
items: [{ items: [{
height: this.constants.height, height: this.constants.height,
el: { el: {
type: "bi.left", type: "bi.vertical_adapt",
cls: "multi-select-continue-select", cls: "multi-select-continue-select",
items: [ items: [
{ {
@ -96667,18 +96669,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}, },
{ {
el: this.continueSelect, el: this.continueSelect,
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}] }]
} },
tgap: this.constants.tgap
}, { }, {
height: "fill", height: "fill",
el: this.display el: this.display,
tgap: this.constants.bgap
}] }]
}); });
}, },
@ -96821,10 +96823,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -97205,10 +97207,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -97583,10 +97585,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -101922,7 +101924,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
signalError: "signalBubble", signalError: "signalBubble",
editorWidth: 114, editorWidth: 114,
columns: 5, columns: 5,
width: 30, width: 24,
rows: 1, rows: 1,
numberErrorCls: "number-error", numberErrorCls: "number-error",
border: 1, border: 1,
@ -101934,7 +101936,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 25, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true
}); });
@ -103722,10 +103724,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 2, right: 0,
bottom: 33 bottom: 26
} }
}, },
allValueGetter: function () { allValueGetter: function () {
@ -105971,7 +105973,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
invisible: true, invisible: true,
text: BI.i18nText("BI-Click_Blank_To_Select"), text: BI.i18nText("BI-Click_Blank_To_Select"),
cls: "single-select-toolbar", cls: "multi-select-toolbar",
height: this.constants.height height: this.constants.height
}); });
@ -107132,7 +107134,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
logic: { logic: {
dynamic: false dynamic: true
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {}, el: {},

8
dist/case.js vendored
Unescape View File

@ -5646,7 +5646,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-icon-combo", baseCls: "bi-icon-combo",
width: 28, width: 24,
height: 24, height: 24,
el: {}, el: {},
popup: {}, popup: {},
@ -5811,7 +5811,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
el: {}, el: {},
items: [], items: [],
iconCls: "", iconCls: "",
width: 28, width: 24,
height: 24, height: 24,
isShowDown: true, isShowDown: true,
value: "" value: ""
@ -5830,7 +5830,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon", cls: "icon-combo-trigger-icon",
iconCls: iconCls, iconCls: iconCls,
disableSelected: true, disableSelected: true,
width: o.isShowDown ? o.width - 12 : o.width, width: o.isShowDown ? o.width - 2 : o.width,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
@ -8519,7 +8519,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",
once: false, once: false,

4
dist/fineui.css vendored
Unescape View File

@ -3729,7 +3729,7 @@ ul.ztree.zTreeDragUL {
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
} }
.bi-popup-view .list-view-toolbar { .bi-popup-view .list-view-toolbar {
line-height: 30px; line-height: 24px;
} }
.bi-popup-view .list-view-toolbar > .center-element { .bi-popup-view .list-view-toolbar > .center-element {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;
@ -3882,7 +3882,7 @@ ul.ztree.zTreeDragUL {
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
} }
.bi-multi-select-search-pane .multi-select-toolbar { .bi-multi-select-search-pane .multi-select-toolbar {
color: #ff4949; color: #faaa39;
} }
.bi-multi-select-check-selected-button { .bi-multi-select-check-selected-button {
z-index: 1; z-index: 1;

78
dist/fineui.js vendored
Unescape View File

@ -36266,7 +36266,7 @@ BI.Pane = BI.inherit(BI.Widget, {
height: 25 height: 25
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.absolute_center_adapt",
element: this, element: this,
items: [this._tipText], items: [this._tipText],
bgap: 25 bgap: 25
@ -51714,7 +51714,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,
shadow: true, shadow: true,
@ -51737,7 +51737,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 30) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) :
@ -78395,7 +78395,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-icon-combo", baseCls: "bi-icon-combo",
width: 28, width: 24,
height: 24, height: 24,
el: {}, el: {},
popup: {}, popup: {},
@ -78560,7 +78560,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
el: {}, el: {},
items: [], items: [],
iconCls: "", iconCls: "",
width: 28, width: 24,
height: 24, height: 24,
isShowDown: true, isShowDown: true,
value: "" value: ""
@ -78579,7 +78579,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon", cls: "icon-combo-trigger-icon",
iconCls: iconCls, iconCls: iconCls,
disableSelected: true, disableSelected: true,
width: o.isShowDown ? o.width - 12 : o.width, width: o.isShowDown ? o.width - 2 : o.width,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
iconHeight: o.iconHeight, iconHeight: o.iconHeight,
@ -81268,7 +81268,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",
once: false, once: false,
@ -90491,7 +90491,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
items: [this.popup] items: [this.popup],
vgap: 5
}); });
}, },
@ -90518,7 +90519,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.height = self.constants.height; item.el.height = self.constants.height;
item.el.iconCls2 = self.constants.nextIcon; item.el.iconCls2 = self.constants.nextIcon;
item.popup = { item.popup = {
lgap: 4,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
chooseType: 0, chooseType: 0,
@ -90527,6 +90527,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}] }]
}, },
vgap: 5,
maxHeight: 378 maxHeight: 378
}; };
item.el.childValues = []; item.el.childValues = [];
@ -96847,9 +96848,10 @@ BI.shortcut("bi.multilayer_single_tree_mid_tree_leaf_item", BI.MultiLayerSingleT
BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
constants: { constants: {
height: 24, height: 12,
lgap: 10, lgap: 10,
tgap: 5 tgap: 10,
bgap: 5
}, },
_defaultConfig: function () { _defaultConfig: function () {
@ -96908,7 +96910,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
items: [{ items: [{
height: this.constants.height, height: this.constants.height,
el: { el: {
type: "bi.left", type: "bi.vertical_adapt",
cls: "multi-select-continue-select", cls: "multi-select-continue-select",
items: [ items: [
{ {
@ -96916,18 +96918,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}, },
{ {
el: this.continueSelect, el: this.continueSelect,
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}] }]
} },
tgap: this.constants.tgap
}, { }, {
height: "fill", height: "fill",
el: this.display el: this.display,
tgap: this.constants.bgap
}] }]
}); });
}, },
@ -97070,10 +97072,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -97454,10 +97456,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -97832,10 +97834,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -102171,7 +102173,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
signalError: "signalBubble", signalError: "signalBubble",
editorWidth: 114, editorWidth: 114,
columns: 5, columns: 5,
width: 30, width: 24,
rows: 1, rows: 1,
numberErrorCls: "number-error", numberErrorCls: "number-error",
border: 1, border: 1,
@ -102183,7 +102185,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 25, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true
}); });
@ -103971,10 +103973,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 2, right: 0,
bottom: 33 bottom: 26
} }
}, },
allValueGetter: function () { allValueGetter: function () {
@ -106220,7 +106222,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
invisible: true, invisible: true,
text: BI.i18nText("BI-Click_Blank_To_Select"), text: BI.i18nText("BI-Click_Blank_To_Select"),
cls: "single-select-toolbar", cls: "multi-select-toolbar",
height: this.constants.height height: this.constants.height
}); });
@ -107381,7 +107383,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
logic: { logic: {
dynamic: false dynamic: true
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {}, el: {},

2
dist/widget.css vendored
Unescape View File

@ -137,7 +137,7 @@
border-radius: 2px 2px 2px 2px; border-radius: 2px 2px 2px 2px;
} }
.bi-multi-select-search-pane .multi-select-toolbar { .bi-multi-select-search-pane .multi-select-toolbar {
color: #ff4949; color: #faaa39;
} }
.bi-multi-select-check-selected-button { .bi-multi-select-check-selected-button {
z-index: 1; z-index: 1;

64
dist/widget.js vendored
Unescape View File

@ -2554,7 +2554,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
items: [this.popup] items: [this.popup],
vgap: 5
}); });
}, },
@ -2581,7 +2582,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.height = self.constants.height; item.el.height = self.constants.height;
item.el.iconCls2 = self.constants.nextIcon; item.el.iconCls2 = self.constants.nextIcon;
item.popup = { item.popup = {
lgap: 4,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
chooseType: 0, chooseType: 0,
@ -2590,6 +2590,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}] }]
}, },
vgap: 5,
maxHeight: 378 maxHeight: 378
}; };
item.el.childValues = []; item.el.childValues = [];
@ -8910,9 +8911,10 @@ BI.shortcut("bi.multilayer_single_tree_mid_tree_leaf_item", BI.MultiLayerSingleT
BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
constants: { constants: {
height: 24, height: 12,
lgap: 10, lgap: 10,
tgap: 5 tgap: 10,
bgap: 5
}, },
_defaultConfig: function () { _defaultConfig: function () {
@ -8971,7 +8973,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
items: [{ items: [{
height: this.constants.height, height: this.constants.height,
el: { el: {
type: "bi.left", type: "bi.vertical_adapt",
cls: "multi-select-continue-select", cls: "multi-select-continue-select",
items: [ items: [
{ {
@ -8979,18 +8981,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}, },
{ {
el: this.continueSelect, el: this.continueSelect,
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}] }]
} },
tgap: this.constants.tgap
}, { }, {
height: "fill", height: "fill",
el: this.display el: this.display,
tgap: this.constants.bgap
}] }]
}); });
}, },
@ -9133,10 +9135,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -9517,10 +9519,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -9895,10 +9897,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
@ -14234,7 +14236,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
signalError: "signalBubble", signalError: "signalBubble",
editorWidth: 114, editorWidth: 114,
columns: 5, columns: 5,
width: 30, width: 24,
rows: 1, rows: 1,
numberErrorCls: "number-error", numberErrorCls: "number-error",
border: 1, border: 1,
@ -14246,7 +14248,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 25, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true
}); });
@ -16034,10 +16036,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 2, right: 0,
bottom: 33 bottom: 26
} }
}, },
allValueGetter: function () { allValueGetter: function () {
@ -18283,7 +18285,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
invisible: true, invisible: true,
text: BI.i18nText("BI-Click_Blank_To_Select"), text: BI.i18nText("BI-Click_Blank_To_Select"),
cls: "single-select-toolbar", cls: "multi-select-toolbar",
height: this.constants.height height: this.constants.height
}); });
@ -19444,7 +19446,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
logic: { logic: {
dynamic: false dynamic: true
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {}, el: {},

4
src/base/layer/layer.popup.js
Unescape View File

@ -129,7 +129,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,
shadow: true, shadow: true,
@ -152,7 +152,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
}, },
resetHeight: function (h) { resetHeight: function (h) {
var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 30) : 0, var tbHeight = this.toolbar ? (this.toolbar.attr("height") || 24) : 0,
tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0, tabHeight = this.tab ? (this.tab.attr("height") || 25) : 0,
toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0); toolHeight = ((this.tool && this.tool.attr("height")) || 25) * ((this.tool && this.tool.isVisible()) ? 1 : 0);
this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) : this.view.resetHeight ? this.view.resetHeight(h - tbHeight - tabHeight - toolHeight - 2) :

2
src/base/pane.js
Unescape View File

@ -41,7 +41,7 @@ BI.Pane = BI.inherit(BI.Widget, {
height: 25 height: 25
}); });
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.absolute_center_adapt",
element: this, element: this,
items: [this._tipText], items: [this._tipText],
bgap: 25 bgap: 25

2
src/case/combo/iconcombo/combo.icon.js
Unescape View File

@ -8,7 +8,7 @@ BI.IconCombo = BI.inherit(BI.Widget, {
_defaultConfig: function () { _defaultConfig: function () {
return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-icon-combo", baseCls: "bi-icon-combo",
width: 28, width: 24,
height: 24, height: 24,
el: {}, el: {},
popup: {}, popup: {},

4
src/case/combo/iconcombo/trigger.iconcombo.js
Unescape View File

@ -11,7 +11,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
el: {}, el: {},
items: [], items: [],
iconCls: "", iconCls: "",
width: 28, width: 24,
height: 24, height: 24,
isShowDown: true, isShowDown: true,
value: "" value: ""
@ -30,7 +30,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, {
cls: "icon-combo-trigger-icon", cls: "icon-combo-trigger-icon",
iconCls: iconCls, iconCls: iconCls,
disableSelected: true, disableSelected: true,
width: o.isShowDown ? o.width - 12 : o.width, width: o.isShowDown ? o.width - 2 : o.width,
height: o.height, height: o.height,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
iconHeight: o.iconHeight, iconHeight: o.iconHeight,

2
src/case/layer/layer.multipopup.js
Unescape View File

@ -35,7 +35,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-border-top",
height: 30, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",
once: false, once: false,

2
src/css/base/view/popupview.css
Unescape View File

@ -17,7 +17,7 @@
box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2);
} }
.bi-popup-view .list-view-toolbar { .bi-popup-view .list-view-toolbar {
line-height: 30px; line-height: 24px;
} }
.bi-popup-view .list-view-toolbar > .center-element { .bi-popup-view .list-view-toolbar > .center-element {
border-left: 1px solid #e8eaed; border-left: 1px solid #e8eaed;

2
src/css/widget/multiselect/search/multiselect.css
Unescape View File

@ -1,3 +1,3 @@
.bi-multi-select-search-pane .multi-select-toolbar { .bi-multi-select-search-pane .multi-select-toolbar {
color: #ff4949; color: #faaa39;
} }

2
src/less/base/view/popupview.less
Unescape View File

@ -14,7 +14,7 @@
.box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20)); .box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20));
} }
& .list-view-toolbar { & .list-view-toolbar {
line-height: 30px; line-height: 24px;
& > .center-element { & > .center-element {
border-left: 1px solid @color-bi-border-line; border-left: 1px solid @color-bi-border-line;
} }

2
src/less/widget/multiselect/search/multiselect.search.pane.less
Unescape View File

@ -3,6 +3,6 @@
.bi-multi-select-search-pane{ .bi-multi-select-search-pane{
.multi-select-toolbar{ .multi-select-toolbar{
color: @color-bi-text-failure; color: @color-bi-text-redmark;
} }
} }

5
src/widget/downlist/popup.downlist.js
Unescape View File

@ -70,7 +70,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
BI.createWidget({ BI.createWidget({
type: "bi.vertical", type: "bi.vertical",
element: this, element: this,
items: [this.popup] items: [this.popup],
vgap: 5
}); });
}, },
@ -97,7 +98,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
item.el.height = self.constants.height; item.el.height = self.constants.height;
item.el.iconCls2 = self.constants.nextIcon; item.el.iconCls2 = self.constants.nextIcon;
item.popup = { item.popup = {
lgap: 4,
el: { el: {
type: "bi.button_tree", type: "bi.button_tree",
chooseType: 0, chooseType: 0,
@ -106,6 +106,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, {
}] }]
}, },
vgap: 5,
maxHeight: 378 maxHeight: 378
}; };
item.el.childValues = []; item.el.childValues = [];

19
src/widget/multiselect/check/multiselect.check.pane.js
Unescape View File

@ -6,9 +6,10 @@
BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
constants: { constants: {
height: 24, height: 12,
lgap: 10, lgap: 10,
tgap: 5 tgap: 10,
bgap: 5
}, },
_defaultConfig: function () { _defaultConfig: function () {
@ -67,7 +68,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
items: [{ items: [{
height: this.constants.height, height: this.constants.height,
el: { el: {
type: "bi.left", type: "bi.vertical_adapt",
cls: "multi-select-continue-select", cls: "multi-select-continue-select",
items: [ items: [
{ {
@ -75,18 +76,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
text: BI.i18nText("BI-Selected_Data") text: BI.i18nText("BI-Selected_Data")
}, },
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}, },
{ {
el: this.continueSelect, el: this.continueSelect,
lgap: this.constants.lgap, lgap: this.constants.lgap
tgap: this.constants.tgap
}] }]
} },
tgap: this.constants.tgap
}, { }, {
height: "fill", height: "fill",
el: this.display el: this.display,
tgap: this.constants.bgap
}] }]
}); });
}, },

8
src/widget/multiselect/multiselect.combo.js
Unescape View File

@ -37,10 +37,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,

8
src/widget/multiselect/multiselect.insert.combo.js
Unescape View File

@ -34,10 +34,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,

8
src/widget/multiselect/multiselect.insert.combo.nobar.js
Unescape View File

@ -37,10 +37,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 1, right: 0,
bottom: 33 bottom: 26
} }
}, },
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,

4
src/widget/numberinterval/numberinterval.js
Unescape View File

@ -11,7 +11,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
signalError: "signalBubble", signalError: "signalBubble",
editorWidth: 114, editorWidth: 114,
columns: 5, columns: 5,
width: 30, width: 24,
rows: 1, rows: 1,
numberErrorCls: "number-error", numberErrorCls: "number-error",
border: 1, border: 1,
@ -23,7 +23,7 @@ BI.NumberInterval = BI.inherit(BI.Single, {
var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
extraCls: "bi-number-interval", extraCls: "bi-number-interval",
height: 25, height: 24,
validation: "valid", validation: "valid",
closeMin: true closeMin: true
}); });

8
src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js
Unescape View File

@ -39,10 +39,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, {
// adapter: this.popup, // adapter: this.popup,
masker: { masker: {
offset: { offset: {
left: 1, left: 0,
top: 1, top: 0,
right: 2, right: 0,
bottom: 33 bottom: 26
} }
}, },
allValueGetter: function () { allValueGetter: function () {

2
src/widget/singleselect/search/singleselect.search.pane.js
Unescape View File

@ -30,7 +30,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, {
type: "bi.label", type: "bi.label",
invisible: true, invisible: true,
text: BI.i18nText("BI-Click_Blank_To_Select"), text: BI.i18nText("BI-Click_Blank_To_Select"),
cls: "single-select-toolbar", cls: "multi-select-toolbar",
height: this.constants.height height: this.constants.height
}); });

2
src/widget/singleselect/singleselectlist.insert.js
Unescape View File

@ -28,7 +28,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, {
itemsCreator: o.itemsCreator, itemsCreator: o.itemsCreator,
valueFormatter: o.valueFormatter, valueFormatter: o.valueFormatter,
logic: { logic: {
dynamic: false dynamic: true
}, },
// onLoaded: o.onLoaded, // onLoaded: o.onLoaded,
el: {}, el: {},

Write Preview
Loading…
Cancel
Save