From 7417794b1b5c2a3b24cf9cb0025da083c80492d8 Mon Sep 17 00:00:00 2001 From: imp Date: Thu, 13 Jun 2019 19:16:13 +0800 Subject: [PATCH] =?UTF-8?q?BI-46199=20feat:combo=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E6=8B=93=E5=B1=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.ie.js | 5 ++++- dist/2.0/fineui.js | 5 ++++- dist/base.js | 5 ++++- dist/bundle.ie.js | 5 ++++- dist/bundle.js | 5 ++++- dist/fineui.ie.js | 5 ++++- dist/fineui.js | 5 ++++- dist/fineui_without_jquery_polyfill.js | 5 ++++- src/base/combination/combo.js | 5 ++++- 9 files changed, 36 insertions(+), 9 deletions(-) diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index ee54094290..8be77777a7 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -38881,7 +38881,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -39258,6 +39258,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index 23cad43607..01f89aa1b3 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -39285,7 +39285,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -39662,6 +39662,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/dist/base.js b/dist/base.js index cc07aab8a3..00f4039991 100644 --- a/dist/base.js +++ b/dist/base.js @@ -3324,7 +3324,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -3701,6 +3701,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index ee54094290..8be77777a7 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -38881,7 +38881,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -39258,6 +39258,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/dist/bundle.js b/dist/bundle.js index 23cad43607..01f89aa1b3 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -39285,7 +39285,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -39662,6 +39662,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 1da57e9a9e..f0d64f8982 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -39126,7 +39126,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -39503,6 +39503,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/dist/fineui.js b/dist/fineui.js index f27b778312..617f7d78ec 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -39530,7 +39530,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -39907,6 +39907,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 7d84487315..dcf4c11ec9 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -26656,7 +26656,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -27033,6 +27033,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight); diff --git a/src/base/combination/combo.js b/src/base/combination/combo.js index 74dded9029..e6186cf5f5 100644 --- a/src/base/combination/combo.js +++ b/src/base/combination/combo.js @@ -9,7 +9,7 @@ BI.Combo = BI.inherit(BI.Widget, { baseCls: (conf.baseCls || "") + " bi-combo", trigger: "click", toggle: true, - direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight + direction: "bottom", // top||bottom||left||right||top,left||top,right||bottom,left||bottom,right||right,innerRight||right,innerLeft logic: { dynamic: true }, @@ -386,6 +386,9 @@ BI.Combo = BI.inherit(BI.Widget, { case "right,innerRight": p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerRight", "innerLeft", "bottom", "top"], o.offsetStyle); break; + case "right,innerLeft": + p = BI.DOM.getComboPosition(combo, this.popupView, o.adjustXOffset || o.adjustLength, o.adjustYOffset, o.isNeedAdjustHeight, ["right", "left", "innerLeft", "innerRight", "bottom", "top"], o.offsetStyle); + break; case "top,custom": case "custom,top": p = BI.DOM.getTopAdaptPosition(combo, this.popupView, o.adjustYOffset || o.adjustLength, o.isNeedAdjustHeight);