Merge pull request #11 in FUI/fineui from ~GUY/fineui:2.0 to 2.0

* commit '5a765a3e5f886e35cbe8cbb08a0d57ac1448f245':
  无JIRA任务 控件交互
  add

bi/core.js

@@ -15623,6 +15623,7 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         this.floatManager = {};
         this.floatLayer = {};
         this.floatContainer = {};
+        this.floatOpened = {};
         this.zindex = BI.zIndex_floatbox;
         this.zindexMap = {};
     },
@@ -15687,7 +15688,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         if (!this._check(name)) {
             return this;
         }
-        if (!this.floatContainer[name].isVisible()) {
+        if (!this.floatOpened[name]) {
+            this.floatOpened[name] = true;
             var container = this.floatContainer[name];
             container.element.css("zIndex", this.zindex++);
             this.modal && container.element.__hasZIndexMask__(this.zindexMap[name]) && container.element.__releaseZIndexMask__(this.zindexMap[name]);
@@ -15718,7 +15720,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         if (!this._check(name)) {
             return this;
         }
-        if (this.floatContainer[name].isVisible()) {
+        if (this.floatOpened[name]) {
+            delete this.floatOpened[name];
             this.floatContainer[name].invisible();
             this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]);
         }

bi/widget.css

@@ -233,13 +233,12 @@
 }
 .bi-fine-tuning-number-editor .top-button {
   border-left: 1px solid #d4dadd;
+  border-bottom: 1px solid #d4dadd;
 }
 .bi-fine-tuning-number-editor .bottom-button {
+  border-top: 1px solid #d4dadd;
   border-left: 1px solid #d4dadd;
 }
-.bi-fine-tuning-number-editor .split-line {
-  background-color: #d4dadd;
-}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/

dist/core.js

@@ -20696,6 +20696,7 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         this.floatManager = {};
         this.floatLayer = {};
         this.floatContainer = {};
+        this.floatOpened = {};
         this.zindex = BI.zIndex_floatbox;
         this.zindexMap = {};
     },
@@ -20760,7 +20761,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         if (!this._check(name)) {
             return this;
         }
-        if (!this.floatContainer[name].isVisible()) {
+        if (!this.floatOpened[name]) {
+            this.floatOpened[name] = true;
             var container = this.floatContainer[name];
             container.element.css("zIndex", this.zindex++);
             this.modal && container.element.__hasZIndexMask__(this.zindexMap[name]) && container.element.__releaseZIndexMask__(this.zindexMap[name]);
@@ -20791,7 +20793,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         if (!this._check(name)) {
             return this;
         }
-        if (this.floatContainer[name].isVisible()) {
+        if (this.floatOpened[name]) {
+            delete this.floatOpened[name];
             this.floatContainer[name].invisible();
             this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]);
         }

dist/widget.css

@@ -233,13 +233,12 @@
 }
 .bi-fine-tuning-number-editor .top-button {
   border-left: 1px solid #d4dadd;
+  border-bottom: 1px solid #d4dadd;
 }
 .bi-fine-tuning-number-editor .bottom-button {
+  border-top: 1px solid #d4dadd;
   border-left: 1px solid #d4dadd;
 }
-.bi-fine-tuning-number-editor .split-line {
-  background-color: #d4dadd;
-}
 /****添加计算宽度的--运算符直接需要space****/
 /****** common color(常用颜色,可用于普遍场景) *****/
 /**** custom color(自定义颜色,用于特定场景) ****/

src/core/controller/controller.floatbox.js

@@ -18,6 +18,7 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         this.floatManager = {};
         this.floatLayer = {};
         this.floatContainer = {};
+        this.floatOpened = {};
         this.zindex = BI.zIndex_floatbox;
         this.zindexMap = {};
     },
@@ -82,7 +83,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         if (!this._check(name)) {
             return this;
         }
-        if (!this.floatContainer[name].isVisible()) {
+        if (!this.floatOpened[name]) {
+            this.floatOpened[name] = true;
             var container = this.floatContainer[name];
             container.element.css("zIndex", this.zindex++);
             this.modal && container.element.__hasZIndexMask__(this.zindexMap[name]) && container.element.__releaseZIndexMask__(this.zindexMap[name]);
@@ -113,7 +115,8 @@ BI.FloatBoxController = BI.inherit(BI.Controller, {
         if (!this._check(name)) {
             return this;
         }
-        if (this.floatContainer[name].isVisible()) {
+        if (this.floatOpened[name]) {
+            delete this.floatOpened[name];
             this.floatContainer[name].invisible();
             this.modal && this.floatContainer[name].element.__releaseZIndexMask__(this.zindexMap[name]);
         }

src/css/widget/finetuningnumbereditor/finetuning.number.editor.css

@@ -9,10 +9,9 @@
 }
 .bi-fine-tuning-number-editor .top-button {
   border-left: 1px solid #d4dadd;
+  border-bottom: 1px solid #d4dadd;
 }
 .bi-fine-tuning-number-editor .bottom-button {
+  border-top: 1px solid #d4dadd;
   border-left: 1px solid #d4dadd;
 }
-.bi-fine-tuning-number-editor .split-line {
-  background-color: #d4dadd;
-}

src/less/widget/finetuningnumbereditor/finetuning.number.editor.less

@@ -5,11 +5,10 @@
   .border-radius(2px);
   & .top-button {
     border-left: 1px solid @border-color-normal;
+    border-bottom: 1px solid @border-color-normal;
   }
   & .bottom-button {
+    border-top: 1px solid @border-color-normal;
     border-left: 1px solid @border-color-normal;
   }
-  & .split-line{
-    background-color: @border-color-normal;
-  }
 }