From 1b6e17ce728387e2c7d717c0bece2acbb6bc823d Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 3 Jul 2018 09:54:37 +0800 Subject: [PATCH 1/3] BI-25579 --- src/case/combo/iconcombo/combo.icon.js | 2 +- src/case/combo/iconcombo/trigger.iconcombo.js | 4 ++-- src/widget/downlist/popup.downlist.js | 5 +++-- src/widget/numberinterval/numberinterval.js | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/case/combo/iconcombo/combo.icon.js b/src/case/combo/iconcombo/combo.icon.js index 84185a4f8..409e1a003 100644 --- a/src/case/combo/iconcombo/combo.icon.js +++ b/src/case/combo/iconcombo/combo.icon.js @@ -8,7 +8,7 @@ BI.IconCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-icon-combo", - width: 28, + width: 24, height: 24, el: {}, popup: {}, diff --git a/src/case/combo/iconcombo/trigger.iconcombo.js b/src/case/combo/iconcombo/trigger.iconcombo.js index 7d1c4431a..e6042f337 100644 --- a/src/case/combo/iconcombo/trigger.iconcombo.js +++ b/src/case/combo/iconcombo/trigger.iconcombo.js @@ -11,7 +11,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { el: {}, items: [], iconCls: "", - width: 28, + width: 24, height: 24, isShowDown: true, value: "" @@ -30,7 +30,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { cls: "icon-combo-trigger-icon", iconCls: iconCls, disableSelected: true, - width: o.isShowDown ? o.width - 12 : o.width, + width: o.isShowDown ? o.width - 2 : o.width, height: o.height, iconWidth: o.iconWidth, iconHeight: o.iconHeight, diff --git a/src/widget/downlist/popup.downlist.js b/src/widget/downlist/popup.downlist.js index f9974604a..1de602777 100644 --- a/src/widget/downlist/popup.downlist.js +++ b/src/widget/downlist/popup.downlist.js @@ -70,7 +70,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, { BI.createWidget({ type: "bi.vertical", 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.iconCls2 = self.constants.nextIcon; item.popup = { - lgap: 4, el: { type: "bi.button_tree", chooseType: 0, @@ -106,6 +106,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }] }, + vgap: 5, maxHeight: 378 }; item.el.childValues = []; diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js index 243f10e6c..805925475 100644 --- a/src/widget/numberinterval/numberinterval.js +++ b/src/widget/numberinterval/numberinterval.js @@ -11,7 +11,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { signalError: "signalBubble", editorWidth: 114, columns: 5, - width: 30, + width: 24, rows: 1, numberErrorCls: "number-error", border: 1, @@ -23,7 +23,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { extraCls: "bi-number-interval", - height: 25, + height: 24, validation: "valid", closeMin: true }); From 0953aa24cefa2af1146bbb352516da89a4727d4a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 3 Jul 2018 10:27:39 +0800 Subject: [PATCH 2/3] update --- src/widget/singleselect/singleselectlist.insert.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/widget/singleselect/singleselectlist.insert.js b/src/widget/singleselect/singleselectlist.insert.js index c5a79a85f..4af977ef8 100644 --- a/src/widget/singleselect/singleselectlist.insert.js +++ b/src/widget/singleselect/singleselectlist.insert.js @@ -28,7 +28,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, { itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, logic: { - dynamic: false + dynamic: true }, // onLoaded: o.onLoaded, el: {}, From fee56627b136e4e36b00b1e504bea3716c3183a3 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Tue, 3 Jul 2018 11:55:07 +0800 Subject: [PATCH 3/3] BI-25571 --- Gruntfile.js | 2 +- dist/base.css | 2 +- dist/base.js | 6 +- dist/bundle.css | 4 +- dist/bundle.js | 82 ++++++++++--------- dist/case.js | 8 +- dist/fineui.css | 4 +- dist/fineui.js | 82 ++++++++++--------- dist/widget.css | 2 +- dist/widget.js | 68 +++++++-------- src/base/layer/layer.popup.js | 4 +- src/base/pane.js | 2 +- src/case/layer/layer.multipopup.js | 2 +- src/css/base/view/popupview.css | 2 +- .../widget/multiselect/search/multiselect.css | 2 +- src/less/base/view/popupview.less | 2 +- .../search/multiselect.search.pane.less | 2 +- .../check/multiselect.check.pane.js | 19 +++-- src/widget/multiselect/multiselect.combo.js | 8 +- .../multiselect/multiselect.insert.combo.js | 8 +- .../multiselect.insert.combo.nobar.js | 8 +- .../multitextvalue.combo.search.js | 8 +- .../search/singleselect.search.pane.js | 2 +- 23 files changed, 168 insertions(+), 161 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 051b6f171..bcdd9cec7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -214,7 +214,7 @@ module.exports = function (grunt) { uglify: { options: { - banner: "/*! <%= pkg.name %> */\n" + banner: "/*! <%= pkg.name %> <%= grunt.template.today(\"dd-mm-yyyy\") %> */\n" }, dist: { files: { diff --git a/dist/base.css b/dist/base.css index 5de2d4bdf..9a5dcf603 100644 --- a/dist/base.css +++ b/dist/base.css @@ -1941,7 +1941,7 @@ ul.ztree.zTreeDragUL { box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); } .bi-popup-view .list-view-toolbar { - line-height: 30px; + line-height: 24px; } .bi-popup-view .list-view-toolbar > .center-element { border-left: 1px solid #e8eaed; diff --git a/dist/base.js b/dist/base.js index e5b2c21d8..e41888c64 100644 --- a/dist/base.js +++ b/dist/base.js @@ -246,7 +246,7 @@ BI.Pane = BI.inherit(BI.Widget, { height: 25 }); BI.createWidget({ - type: "bi.vertical", + type: "bi.absolute_center_adapt", element: this, items: [this._tipText], bgap: 25 @@ -15693,7 +15693,7 @@ BI.PopupView = BI.inherit(BI.Widget, { return BI.createWidget({ type: "bi.center", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(o.buttons, { once: false, shadow: true, @@ -15716,7 +15716,7 @@ BI.PopupView = BI.inherit(BI.Widget, { }, 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, 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) : diff --git a/dist/bundle.css b/dist/bundle.css index cc3c763ab..b69d50cba 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -3729,7 +3729,7 @@ ul.ztree.zTreeDragUL { box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); } .bi-popup-view .list-view-toolbar { - line-height: 30px; + line-height: 24px; } .bi-popup-view .list-view-toolbar > .center-element { border-left: 1px solid #e8eaed; @@ -3882,7 +3882,7 @@ ul.ztree.zTreeDragUL { border-radius: 2px 2px 2px 2px; } .bi-multi-select-search-pane .multi-select-toolbar { - color: #ff4949; + color: #faaa39; } .bi-multi-select-check-selected-button { z-index: 1; diff --git a/dist/bundle.js b/dist/bundle.js index e1c816876..b97e2cfd1 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -36017,7 +36017,7 @@ BI.Pane = BI.inherit(BI.Widget, { height: 25 }); BI.createWidget({ - type: "bi.vertical", + type: "bi.absolute_center_adapt", element: this, items: [this._tipText], bgap: 25 @@ -51464,7 +51464,7 @@ BI.PopupView = BI.inherit(BI.Widget, { return BI.createWidget({ type: "bi.center", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(o.buttons, { once: false, shadow: true, @@ -51487,7 +51487,7 @@ BI.PopupView = BI.inherit(BI.Widget, { }, 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, 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) : @@ -78145,7 +78145,7 @@ BI.IconCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-icon-combo", - width: 28, + width: 24, height: 24, el: {}, popup: {}, @@ -78310,7 +78310,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { el: {}, items: [], iconCls: "", - width: 28, + width: 24, height: 24, isShowDown: true, value: "" @@ -78329,7 +78329,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { cls: "icon-combo-trigger-icon", iconCls: iconCls, disableSelected: true, - width: o.isShowDown ? o.width - 12 : o.width, + width: o.isShowDown ? o.width - 2 : o.width, height: o.height, iconWidth: o.iconWidth, iconHeight: o.iconHeight, @@ -81018,7 +81018,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, { this.buttongroup = BI.createWidget({ type: "bi.button_group", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(text, { type: "bi.text_button", once: false, @@ -90241,7 +90241,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, { BI.createWidget({ type: "bi.vertical", element: this, - items: [this.popup] + items: [this.popup], + vgap: 5 }); }, @@ -90268,7 +90269,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, { item.el.height = self.constants.height; item.el.iconCls2 = self.constants.nextIcon; item.popup = { - lgap: 4, el: { type: "bi.button_tree", chooseType: 0, @@ -90277,6 +90277,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }] }, + vgap: 5, maxHeight: 378 }; item.el.childValues = []; @@ -90331,7 +90332,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } @@ -95074,7 +95075,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } @@ -96597,9 +96598,10 @@ BI.shortcut("bi.multilayer_single_tree_mid_tree_leaf_item", BI.MultiLayerSingleT BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { constants: { - height: 24, + height: 12, lgap: 10, - tgap: 5 + tgap: 10, + bgap: 5 }, _defaultConfig: function () { @@ -96658,7 +96660,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { items: [{ height: this.constants.height, el: { - type: "bi.left", + type: "bi.vertical_adapt", cls: "multi-select-continue-select", items: [ { @@ -96666,18 +96668,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { type: "bi.label", text: BI.i18nText("BI-Selected_Data") }, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }, { el: this.continueSelect, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }] - } + }, + tgap: this.constants.tgap }, { height: "fill", - el: this.display + el: this.display, + tgap: this.constants.bgap }] }); }, @@ -96820,10 +96822,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -97204,10 +97206,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -97582,10 +97584,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -101921,7 +101923,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { signalError: "signalBubble", editorWidth: 114, columns: 5, - width: 30, + width: 24, rows: 1, numberErrorCls: "number-error", border: 1, @@ -101933,7 +101935,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { extraCls: "bi-number-interval", - height: 25, + height: 24, validation: "valid", closeMin: true }); @@ -103721,10 +103723,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, allValueGetter: function () { @@ -105970,7 +105972,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, { type: "bi.label", invisible: true, text: BI.i18nText("BI-Click_Blank_To_Select"), - cls: "single-select-toolbar", + cls: "multi-select-toolbar", height: this.constants.height }); @@ -107131,7 +107133,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, { itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, logic: { - dynamic: false + dynamic: true }, // onLoaded: o.onLoaded, el: {}, diff --git a/dist/case.js b/dist/case.js index 724574c69..ae535fb2f 100644 --- a/dist/case.js +++ b/dist/case.js @@ -5646,7 +5646,7 @@ BI.IconCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-icon-combo", - width: 28, + width: 24, height: 24, el: {}, popup: {}, @@ -5811,7 +5811,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { el: {}, items: [], iconCls: "", - width: 28, + width: 24, height: 24, isShowDown: true, value: "" @@ -5830,7 +5830,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { cls: "icon-combo-trigger-icon", iconCls: iconCls, disableSelected: true, - width: o.isShowDown ? o.width - 12 : o.width, + width: o.isShowDown ? o.width - 2 : o.width, height: o.height, iconWidth: o.iconWidth, iconHeight: o.iconHeight, @@ -8519,7 +8519,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, { this.buttongroup = BI.createWidget({ type: "bi.button_group", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(text, { type: "bi.text_button", once: false, diff --git a/dist/fineui.css b/dist/fineui.css index 40a3e7780..a93f4b56c 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -3729,7 +3729,7 @@ ul.ztree.zTreeDragUL { box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); } .bi-popup-view .list-view-toolbar { - line-height: 30px; + line-height: 24px; } .bi-popup-view .list-view-toolbar > .center-element { border-left: 1px solid #e8eaed; @@ -3882,7 +3882,7 @@ ul.ztree.zTreeDragUL { border-radius: 2px 2px 2px 2px; } .bi-multi-select-search-pane .multi-select-toolbar { - color: #ff4949; + color: #faaa39; } .bi-multi-select-check-selected-button { z-index: 1; diff --git a/dist/fineui.js b/dist/fineui.js index 4ab3d385c..fd99c3418 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -36266,7 +36266,7 @@ BI.Pane = BI.inherit(BI.Widget, { height: 25 }); BI.createWidget({ - type: "bi.vertical", + type: "bi.absolute_center_adapt", element: this, items: [this._tipText], bgap: 25 @@ -51713,7 +51713,7 @@ BI.PopupView = BI.inherit(BI.Widget, { return BI.createWidget({ type: "bi.center", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(o.buttons, { once: false, shadow: true, @@ -51736,7 +51736,7 @@ BI.PopupView = BI.inherit(BI.Widget, { }, 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, 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) : @@ -78394,7 +78394,7 @@ BI.IconCombo = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.IconCombo.superclass._defaultConfig.apply(this, arguments), { baseCls: "bi-icon-combo", - width: 28, + width: 24, height: 24, el: {}, popup: {}, @@ -78559,7 +78559,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { el: {}, items: [], iconCls: "", - width: 28, + width: 24, height: 24, isShowDown: true, value: "" @@ -78578,7 +78578,7 @@ BI.IconComboTrigger = BI.inherit(BI.Trigger, { cls: "icon-combo-trigger-icon", iconCls: iconCls, disableSelected: true, - width: o.isShowDown ? o.width - 12 : o.width, + width: o.isShowDown ? o.width - 2 : o.width, height: o.height, iconWidth: o.iconWidth, iconHeight: o.iconHeight, @@ -81267,7 +81267,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, { this.buttongroup = BI.createWidget({ type: "bi.button_group", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(text, { type: "bi.text_button", once: false, @@ -90490,7 +90490,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, { BI.createWidget({ type: "bi.vertical", element: this, - items: [this.popup] + items: [this.popup], + vgap: 5 }); }, @@ -90517,7 +90518,6 @@ BI.DownListPopup = BI.inherit(BI.Pane, { item.el.height = self.constants.height; item.el.iconCls2 = self.constants.nextIcon; item.popup = { - lgap: 4, el: { type: "bi.button_tree", chooseType: 0, @@ -90526,6 +90526,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }] }, + vgap: 5, maxHeight: 378 }; item.el.childValues = []; @@ -90580,7 +90581,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } @@ -95323,7 +95324,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } @@ -96846,9 +96847,10 @@ BI.shortcut("bi.multilayer_single_tree_mid_tree_leaf_item", BI.MultiLayerSingleT BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { constants: { - height: 24, + height: 12, lgap: 10, - tgap: 5 + tgap: 10, + bgap: 5 }, _defaultConfig: function () { @@ -96907,7 +96909,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { items: [{ height: this.constants.height, el: { - type: "bi.left", + type: "bi.vertical_adapt", cls: "multi-select-continue-select", items: [ { @@ -96915,18 +96917,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { type: "bi.label", text: BI.i18nText("BI-Selected_Data") }, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }, { el: this.continueSelect, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }] - } + }, + tgap: this.constants.tgap }, { height: "fill", - el: this.display + el: this.display, + tgap: this.constants.bgap }] }); }, @@ -97069,10 +97071,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -97453,10 +97455,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -97831,10 +97833,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -102170,7 +102172,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { signalError: "signalBubble", editorWidth: 114, columns: 5, - width: 30, + width: 24, rows: 1, numberErrorCls: "number-error", border: 1, @@ -102182,7 +102184,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { extraCls: "bi-number-interval", - height: 25, + height: 24, validation: "valid", closeMin: true }); @@ -103970,10 +103972,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, allValueGetter: function () { @@ -106219,7 +106221,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, { type: "bi.label", invisible: true, text: BI.i18nText("BI-Click_Blank_To_Select"), - cls: "single-select-toolbar", + cls: "multi-select-toolbar", height: this.constants.height }); @@ -107380,7 +107382,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, { itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, logic: { - dynamic: false + dynamic: true }, // onLoaded: o.onLoaded, el: {}, diff --git a/dist/widget.css b/dist/widget.css index a704ad9b9..aef8e72ff 100644 --- a/dist/widget.css +++ b/dist/widget.css @@ -137,7 +137,7 @@ border-radius: 2px 2px 2px 2px; } .bi-multi-select-search-pane .multi-select-toolbar { - color: #ff4949; + color: #faaa39; } .bi-multi-select-check-selected-button { z-index: 1; diff --git a/dist/widget.js b/dist/widget.js index 887240cbd..86d554cbd 100644 --- a/dist/widget.js +++ b/dist/widget.js @@ -2554,7 +2554,8 @@ BI.DownListPopup = BI.inherit(BI.Pane, { BI.createWidget({ type: "bi.vertical", 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.iconCls2 = self.constants.nextIcon; item.popup = { - lgap: 4, el: { type: "bi.button_tree", chooseType: 0, @@ -2590,6 +2590,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }] }, + vgap: 5, maxHeight: 378 }; item.el.childValues = []; @@ -2644,7 +2645,7 @@ BI.DownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } @@ -7387,7 +7388,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, { }], cls: "bi-down-list-spliter-container cursor-pointer", lgap: 10, - rgap: 10 + rgap: 0 }); result.push(spliter_container); } @@ -8910,9 +8911,10 @@ BI.shortcut("bi.multilayer_single_tree_mid_tree_leaf_item", BI.MultiLayerSingleT BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { constants: { - height: 24, + height: 12, lgap: 10, - tgap: 5 + tgap: 10, + bgap: 5 }, _defaultConfig: function () { @@ -8971,7 +8973,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { items: [{ height: this.constants.height, el: { - type: "bi.left", + type: "bi.vertical_adapt", cls: "multi-select-continue-select", items: [ { @@ -8979,18 +8981,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { type: "bi.label", text: BI.i18nText("BI-Selected_Data") }, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }, { el: this.continueSelect, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }] - } + }, + tgap: this.constants.tgap }, { 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, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -9517,10 +9519,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -9895,10 +9897,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, @@ -14234,7 +14236,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { signalError: "signalBubble", editorWidth: 114, columns: 5, - width: 30, + width: 24, rows: 1, numberErrorCls: "number-error", border: 1, @@ -14246,7 +14248,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { extraCls: "bi-number-interval", - height: 25, + height: 24, validation: "valid", closeMin: true }); @@ -16034,10 +16036,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, allValueGetter: function () { @@ -18283,7 +18285,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, { type: "bi.label", invisible: true, text: BI.i18nText("BI-Click_Blank_To_Select"), - cls: "single-select-toolbar", + cls: "multi-select-toolbar", height: this.constants.height }); @@ -19444,7 +19446,7 @@ BI.SingleSelectInsertList = BI.inherit(BI.Single, { itemsCreator: o.itemsCreator, valueFormatter: o.valueFormatter, logic: { - dynamic: false + dynamic: true }, // onLoaded: o.onLoaded, el: {}, diff --git a/src/base/layer/layer.popup.js b/src/base/layer/layer.popup.js index f73c82f2b..b7f964db3 100644 --- a/src/base/layer/layer.popup.js +++ b/src/base/layer/layer.popup.js @@ -129,7 +129,7 @@ BI.PopupView = BI.inherit(BI.Widget, { return BI.createWidget({ type: "bi.center", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(o.buttons, { once: false, shadow: true, @@ -152,7 +152,7 @@ BI.PopupView = BI.inherit(BI.Widget, { }, 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, 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) : diff --git a/src/base/pane.js b/src/base/pane.js index 14b720751..49c91e58f 100644 --- a/src/base/pane.js +++ b/src/base/pane.js @@ -41,7 +41,7 @@ BI.Pane = BI.inherit(BI.Widget, { height: 25 }); BI.createWidget({ - type: "bi.vertical", + type: "bi.absolute_center_adapt", element: this, items: [this._tipText], bgap: 25 diff --git a/src/case/layer/layer.multipopup.js b/src/case/layer/layer.multipopup.js index 15834e60c..b063a758c 100644 --- a/src/case/layer/layer.multipopup.js +++ b/src/case/layer/layer.multipopup.js @@ -35,7 +35,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, { this.buttongroup = BI.createWidget({ type: "bi.button_group", cls: "list-view-toolbar bi-high-light bi-border-top", - height: 30, + height: 24, items: BI.createItems(text, { type: "bi.text_button", once: false, diff --git a/src/css/base/view/popupview.css b/src/css/base/view/popupview.css index 991d0bf92..bb4ae6c3b 100644 --- a/src/css/base/view/popupview.css +++ b/src/css/base/view/popupview.css @@ -17,7 +17,7 @@ box-shadow: 0 1px 5px 0 rgba(35, 46, 64, 0.2); } .bi-popup-view .list-view-toolbar { - line-height: 30px; + line-height: 24px; } .bi-popup-view .list-view-toolbar > .center-element { border-left: 1px solid #e8eaed; diff --git a/src/css/widget/multiselect/search/multiselect.css b/src/css/widget/multiselect/search/multiselect.css index f34e916ad..3d881ba36 100644 --- a/src/css/widget/multiselect/search/multiselect.css +++ b/src/css/widget/multiselect/search/multiselect.css @@ -1,3 +1,3 @@ .bi-multi-select-search-pane .multi-select-toolbar { - color: #ff4949; + color: #faaa39; } diff --git a/src/less/base/view/popupview.less b/src/less/base/view/popupview.less index a0158de34..cd1697eb1 100644 --- a/src/less/base/view/popupview.less +++ b/src/less/base/view/popupview.less @@ -14,7 +14,7 @@ .box-shadow(0 1px 5px 0, fade(@color-bi-background-black, 20)); } & .list-view-toolbar { - line-height: 30px; + line-height: 24px; & > .center-element { border-left: 1px solid @color-bi-border-line; } diff --git a/src/less/widget/multiselect/search/multiselect.search.pane.less b/src/less/widget/multiselect/search/multiselect.search.pane.less index 58df8e072..6f31a3dcb 100644 --- a/src/less/widget/multiselect/search/multiselect.search.pane.less +++ b/src/less/widget/multiselect/search/multiselect.search.pane.less @@ -3,6 +3,6 @@ .bi-multi-select-search-pane{ .multi-select-toolbar{ - color: @color-bi-text-failure; + color: @color-bi-text-redmark; } } \ No newline at end of file diff --git a/src/widget/multiselect/check/multiselect.check.pane.js b/src/widget/multiselect/check/multiselect.check.pane.js index 217fdc64a..d9b2b8b9c 100644 --- a/src/widget/multiselect/check/multiselect.check.pane.js +++ b/src/widget/multiselect/check/multiselect.check.pane.js @@ -6,9 +6,10 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { constants: { - height: 24, + height: 12, lgap: 10, - tgap: 5 + tgap: 10, + bgap: 5 }, _defaultConfig: function () { @@ -67,7 +68,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { items: [{ height: this.constants.height, el: { - type: "bi.left", + type: "bi.vertical_adapt", cls: "multi-select-continue-select", items: [ { @@ -75,18 +76,18 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { type: "bi.label", text: BI.i18nText("BI-Selected_Data") }, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }, { el: this.continueSelect, - lgap: this.constants.lgap, - tgap: this.constants.tgap + lgap: this.constants.lgap }] - } + }, + tgap: this.constants.tgap }, { height: "fill", - el: this.display + el: this.display, + tgap: this.constants.bgap }] }); }, diff --git a/src/widget/multiselect/multiselect.combo.js b/src/widget/multiselect/multiselect.combo.js index ed7b16a8f..cb2cba8ae 100644 --- a/src/widget/multiselect/multiselect.combo.js +++ b/src/widget/multiselect/multiselect.combo.js @@ -37,10 +37,10 @@ BI.MultiSelectCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, diff --git a/src/widget/multiselect/multiselect.insert.combo.js b/src/widget/multiselect/multiselect.insert.combo.js index 56ebf08a5..e824477b2 100644 --- a/src/widget/multiselect/multiselect.insert.combo.js +++ b/src/widget/multiselect/multiselect.insert.combo.js @@ -34,10 +34,10 @@ BI.MultiSelectInsertCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, diff --git a/src/widget/multiselect/multiselect.insert.combo.nobar.js b/src/widget/multiselect/multiselect.insert.combo.nobar.js index e647b5457..b3a4382d7 100644 --- a/src/widget/multiselect/multiselect.insert.combo.nobar.js +++ b/src/widget/multiselect/multiselect.insert.combo.nobar.js @@ -37,10 +37,10 @@ BI.MultiSelectInsertNoBarCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 1, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, valueFormatter: o.valueFormatter, diff --git a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js index e97a8b3e9..e170da417 100644 --- a/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js +++ b/src/widget/searchmultitextvaluecombo/multitextvalue.combo.search.js @@ -39,10 +39,10 @@ BI.SearchMultiTextValueCombo = BI.inherit(BI.Single, { // adapter: this.popup, masker: { offset: { - left: 1, - top: 1, - right: 2, - bottom: 33 + left: 0, + top: 0, + right: 0, + bottom: 26 } }, allValueGetter: function () { diff --git a/src/widget/singleselect/search/singleselect.search.pane.js b/src/widget/singleselect/search/singleselect.search.pane.js index e02897d63..8e7973252 100644 --- a/src/widget/singleselect/search/singleselect.search.pane.js +++ b/src/widget/singleselect/search/singleselect.search.pane.js @@ -30,7 +30,7 @@ BI.SingleSelectSearchPane = BI.inherit(BI.Widget, { type: "bi.label", invisible: true, text: BI.i18nText("BI-Click_Blank_To_Select"), - cls: "single-select-toolbar", + cls: "multi-select-toolbar", height: this.constants.height });