From 55a444f905c7c8d874ff8c90bbc9fc273ea86259 Mon Sep 17 00:00:00 2001
From: windy <1374721899@qq.com>
Date: Fri, 12 Jul 2019 14:21:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20flex-shrink?=
 =?UTF-8?q?=E5=92=8Ccmd?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/single/input/input.js                               | 2 +-
 .../wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js   | 5 ++++-
 .../wrapper/layout/flex/wrapper/flex.wrapper.vertical.js     | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/base/single/input/input.js b/src/base/single/input/input.js
index 4cf79ae89..4bbf61b4a 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 d47d1a745..c8fad11db 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 eb341dba2..24c71554a 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]);
         }