Browse Source

无JIRA任务 flex-shrink和cmd

es6
windy 5 years ago
parent
commit
55a444f905
  1. 2
      src/base/single/input/input.js
  2. 5
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js
  3. 5
      src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

2
src/base/single/input/input.js

@ -41,7 +41,7 @@ BI.Input = BI.inherit(BI.Single, {
this.element this.element
.keydown(function (e) { .keydown(function (e) {
inputEventValid = false; inputEventValid = false;
ctrlKey = e.ctrlKey; ctrlKey = e.ctrlKey || e.metaKey; // mac的cmd支持一下
keyCode = e.keyCode; keyCode = e.keyCode;
self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments); self.fireEvent(BI.Input.EVENT_QUICK_DOWN, arguments);
}) })

5
src/core/wrapper/layout/flex/wrapper/flex.wrapper.horizontal.js

@ -32,7 +32,10 @@ BI.FlexWrapperHorizontalLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) { _addElement: function (i, item) {
var o = this.options; var o = this.options;
var w = BI.FlexWrapperHorizontalLayout.superclass._addElement.apply(this, arguments); 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) { if (o.columnSize[i] > 0) {
w.element.width(o.columnSize[i]); w.element.width(o.columnSize[i]);
} }

5
src/core/wrapper/layout/flex/wrapper/flex.wrapper.vertical.js

@ -32,7 +32,10 @@ BI.FlexWrapperVerticalLayout = BI.inherit(BI.Layout, {
_addElement: function (i, item) { _addElement: function (i, item) {
var o = this.options; var o = this.options;
var w = BI.FlexWrapperVerticalLayout.superclass._addElement.apply(this, arguments); 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) { if (o.rowSize[i] > 0) {
w.element.height(o.rowSize[i]); w.element.height(o.rowSize[i]);
} }

Loading…
Cancel
Save