Merge remote-tracking branch 'remotes/origin/BI4.1'

# Conflicts: # dist/bundle.min.js
7 years ago · 007b7fb9f6
5 changed files with 5 additions and 5 deletions
--- a/bi/case.js
+++ b/bi/case.js
@ -10430,7 +10430,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
            type: "bi.combo",
            element: this,
            toggle: false,
-            direction: "top",
+            direction: "top,left",
            isNeedAdjustWidth: false,
            isNeedAdjustHeight: false,
            adjustLength: 1,
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -71892,7 +71892,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
            type: "bi.combo",
            element: this,
            toggle: false,
-            direction: "top",
+            direction: "top,left",
            isNeedAdjustWidth: false,
            isNeedAdjustHeight: false,
            adjustLength: 1,
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -10430,7 +10430,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
            type: "bi.combo",
            element: this,
            toggle: false,
-            direction: "top",
+            direction: "top,left",
            isNeedAdjustWidth: false,
            isNeedAdjustHeight: false,
            adjustLength: 1,
--- a/src/case/richeditor/richeditor.js
+++ b/src/case/richeditor/richeditor.js
@ -29,7 +29,7 @@ BI.RichEditor = BI.inherit(BI.Widget, {
            type: "bi.combo",
            element: this,
            toggle: false,
-            direction: "top",
+            direction: "top,left",
            isNeedAdjustWidth: false,
            isNeedAdjustHeight: false,
            adjustLength: 1,