diff --git a/src/base/single/input/input.js b/src/base/single/input/input.js index 4cf79ae898..4bbf61b4a7 100644 --- a/src/base/single/input/input.js +++ b/src/base/single/input/input.js @@ -41,7 +41,7 @@ BI.Input = BI.inherit(BI.Single, { this.element .keydown(function (e) { inputEventValid = false; - ctrlKey = e.ctrlKey; + ctrlKey = e.ctrlKey || e.metaKey; // mac的cmd支持一下 keyCode = e.keyCode; self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); }) diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js index d47d1a7459..c8fad11db6 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js @@ -32,7 +32,10 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, { _addElement: function (i, item) { var o = this.options; var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments); - w.element.css({position: "relative"}); + w.element.css({ + position: "relative", + "flex-shrink": "0" + }); if (o.columnSize[i] > 0) { w.element.width(o.columnSize[i]); } diff --git a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js index eb341dba2d..24c71554a8 100644 --- a/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js +++ b/src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js @@ -32,7 +32,10 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, { _addElement: function (i, item) { var o = this.options; var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments); - w.element.css({position: "relative"}); + w.element.css({ + position: "relative", + "flex-shrink": "0" + }); if (o.rowSize[i] > 0) { w.element.height(o.rowSize[i]); }