Merge pull request #168 in FUI/fineui from ~GUY/fineui:master to master

* commit '791ac9c5275056464af6dab16172373a58a0112c': update update BI-11282 402文本组件背景不受全局样式影响 update BI-6175 滑块宽高
7 years ago · 7d4cfeffd1
11 changed files with 83 additions and 55 deletions
--- a/bi/base.css
+++ b/bi/base.css
@ -884,7 +884,8 @@ li.CodeMirror-hint-active {
  filter: alpha(opacity=0);
  z-index: 2;
 }
-.bi-input {
+.bi-input,
+.bi-textarea {
  border: none;
  outline: none;
  background-color: transparent;
@ -893,10 +894,12 @@ li.CodeMirror-hint-active {
  width: 100%;
  height: 100%;
 }
-.bi-input.bi-input-focus {
+.bi-input.bi-input-focus,
+.bi-textarea.bi-input-focus {
  border: none;
 }
-.bi-input.bi-input-error {
+.bi-input.bi-input-error,
+.bi-textarea.bi-input-error {
  border: none;
  color: #e85050 !important;
 }
--- a/bi/sliders.js
+++ b/bi/sliders.js
@ -6,7 +6,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
        EDITOR_WIDTH: 58,
        EDITOR_R_GAP: 60,
        EDITOR_HEIGHT: 30,
-        HEIGHT: 28,
        SLIDER_WIDTH_HALF: 15,
        SLIDER_WIDTH: 30,
        SLIDER_HEIGHT: 30,
@ -51,7 +50,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
            cls: "slider-editor-button",
            errorText: "",
            allowBlank: false,
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH,
            validationChecker: function (v) {
                return self._checkValidation(v);
@ -78,7 +76,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
            cls: "slider-editor-button",
            errorText: "",
            allowBlank: false,
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH,
            validationChecker: function (v) {
                return self._checkValidation(v);
@ -122,6 +119,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
                var significantPercent = BI.parseFloat(percent.toFixed(1));
                self._setSliderOnePosition(significantPercent);
                self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
+                ui.helper.removeClass("dragging");
+            },
+            start: function (e, ui) {
+                ui.helper.removeClass("dragging").addClass("dragging");
            }
        });

@ -1183,7 +1184,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
    _constant: {
        EDITOR_WIDTH: 90,
        EDITOR_HEIGHT: 30,
-        HEIGHT: 28,
        SLIDER_WIDTH_HALF: 15,
        SLIDER_WIDTH: 30,
        SLIDER_HEIGHT: 30,
@ -1276,7 +1276,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
            type: "bi.sign_editor",
            cls: "slider-editor-button",
            errorText: "",
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH - 2,
            allowBlank: false,
            validationChecker: function (v) {
--- a/dist/base.css
+++ b/dist/base.css
@ -884,7 +884,8 @@ li.CodeMirror-hint-active {
  filter: alpha(opacity=0);
  z-index: 2;
 }
-.bi-input {
+.bi-input,
+.bi-textarea {
  border: none;
  outline: none;
  background-color: transparent;
@ -893,10 +894,12 @@ li.CodeMirror-hint-active {
  width: 100%;
  height: 100%;
 }
-.bi-input.bi-input-focus {
+.bi-input.bi-input-focus,
+.bi-textarea.bi-input-focus {
  border: none;
 }
-.bi-input.bi-input-error {
+.bi-input.bi-input-error,
+.bi-textarea.bi-input-error {
  border: none;
  color: #e85050 !important;
 }
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -2463,7 +2463,8 @@ li.CodeMirror-hint-active {
  filter: alpha(opacity=0);
  z-index: 2;
 }
-.bi-input {
+.bi-input,
+.bi-textarea {
  border: none;
  outline: none;
  background-color: transparent;
@ -2472,10 +2473,12 @@ li.CodeMirror-hint-active {
  width: 100%;
  height: 100%;
 }
-.bi-input.bi-input-focus {
+.bi-input.bi-input-focus,
+.bi-textarea.bi-input-focus {
  border: none;
 }
-.bi-input.bi-input-error {
+.bi-input.bi-input-error,
+.bi-textarea.bi-input-error {
  border: none;
  color: #e85050 !important;
 }
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/index.html
+++ b/dist/index.html
@ -2,37 +2,56 @@
 <html lang="en">

 <head>
-      <meta charset="utf-8">
-      <title></title>
-      <link rel="stylesheet" type="text/css" href="core.css" />
-      <link rel="stylesheet" type="text/css" href="base.css" />
-      <link rel="stylesheet" type="text/css" href="widget.css" />
-      <link rel="stylesheet" type="text/css" href="resource.css" />
-      <link rel="stylesheet" type="text/css" href="demo.css" />
-      <link rel="stylesheet" type="text/css" href="sliders.css" />
+    <meta charset="utf-8">
+    <title></title>
+    <!--核心css文件-->
+    <link rel="stylesheet" type="text/css" href="core.css"/>
+    <!--基础css文件， 包含一些最基本控件的样式-->
+    <link rel="stylesheet" type="text/css" href="base.css"/>
+    <!--BI控件样式-->
+    <link rel="stylesheet" type="text/css" href="widget.css"/>
+    <!--资源样式， 包括font、icon、background、app-->
+    <link rel="stylesheet" type="text/css" href="resource.css"/>
+    <!--单值滑块、双值滑块控件样式-->
+    <link rel="stylesheet" type="text/css" href="sliders.css"/>
+    <!--当前demo定义的样式-->
+    <link rel="stylesheet" type="text/css" href="demo.css"/>

-      <script src="polyfill.js"></script>
-      <script src="core.js"></script>
-      <script src="fix/fix-1.0.js"></script>
-      <script src="fix/fix.js"></script>
-      <script src="fix/fix.compact.js"></script>
-      <script src="jqueryui.js"></script>
-      <script src="base.js"></script>
-      <script src="case.js"></script>
-      <script src="widget.js"></script>
-      <script src="sliders.js"></script>
-      <script src="config.js"></script>
-      <!--图表-->
-      <!--<script src="vancharts-all.js"></script>-->
-      <!--<script src="biconst.js"></script>-->
-      <!--图表用到的常量(直接拿的bi的常量)-->
-      <!--<script src="chart.js"></script>-->
+    <!--IE9及以下兼容-->
+    <script src="polyfill.js"></script>
+    <!--核心js-->
+    <script src="core.js"></script>
+    <!--fix1.0版本框架， 只用ui的话不用引入， 引入的顺序需在core.js之后， 可以和2.0版本同步使用或使用任一个均可-->
+    <script src="fix/fix-1.0.js"></script>
+    <!--fix2.0版本框架， 只用ui的话不用引入， 引入的顺序需在core.js之后-->
+    <script src="fix/fix.js"></script>
+    <!--fix2.0版本框架， 只用ui的话不用引入， 引入的顺序需在core.js之后-->
+    <script src="fix/fix.compact.js"></script>

-      <script src="demo.js"></script>
+    <!--基础js， 包括最基本的控件-->
+    <script src="base.js"></script>
+    <!--基础js， 存放一些通用组件，如选色组件、富文本组件等-->
+    <script src="case.js"></script>
+    <!--BI控件js-->
+    <script src="widget.js"></script>
+
+    <!--jqueryui包括jquery的draggable、droppable、resizable-->
+    <script src="jqueryui.js"></script>
+    <!--单值滑块、双值滑块js， 因为用了jqueryui，所以提出来了-->
+    <script src="sliders.js"></script>
+    <!--工程配置文件，主要是BI.servletURL(根目录)、BI.resourceURL(资源路径)、BI.i18n(国际化)-->
+    <script src="config.js"></script>
+    <!--图表-->
+    <!--<script src="vancharts-all.js"></script>-->
+    <!--<script src="biconst.js"></script>-->
+    <!--图表用到的常量(直接拿的bi的常量)-->
+    <!--<script src="chart.js"></script>-->
+
+    <script src="demo.js"></script>
 </head>

 <body>
-      <div id="wrapper"></div>
+<div id="wrapper"></div>
 </body>

 </html>
--- a/dist/sliders.js
+++ b/dist/sliders.js
@ -6,7 +6,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
        EDITOR_WIDTH: 58,
        EDITOR_R_GAP: 60,
        EDITOR_HEIGHT: 30,
-        HEIGHT: 28,
        SLIDER_WIDTH_HALF: 15,
        SLIDER_WIDTH: 30,
        SLIDER_HEIGHT: 30,
@ -51,7 +50,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
            cls: "slider-editor-button",
            errorText: "",
            allowBlank: false,
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH,
            validationChecker: function (v) {
                return self._checkValidation(v);
@ -78,7 +76,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
            cls: "slider-editor-button",
            errorText: "",
            allowBlank: false,
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH,
            validationChecker: function (v) {
                return self._checkValidation(v);
@ -122,6 +119,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
                var significantPercent = BI.parseFloat(percent.toFixed(1));
                self._setSliderOnePosition(significantPercent);
                self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
+                ui.helper.removeClass("dragging");
+            },
+            start: function (e, ui) {
+                ui.helper.removeClass("dragging").addClass("dragging");
            }
        });

@ -1183,7 +1184,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
    _constant: {
        EDITOR_WIDTH: 90,
        EDITOR_HEIGHT: 30,
-        HEIGHT: 28,
        SLIDER_WIDTH_HALF: 15,
        SLIDER_WIDTH: 30,
        SLIDER_HEIGHT: 30,
@ -1276,7 +1276,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
            type: "bi.sign_editor",
            cls: "slider-editor-button",
            errorText: "",
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH - 2,
            allowBlank: false,
            validationChecker: function (v) {
--- a/src/addons/sliders/js/intervalslider/intervalslider.js
+++ b/src/addons/sliders/js/intervalslider/intervalslider.js
@ -6,7 +6,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
        EDITOR_WIDTH: 58,
        EDITOR_R_GAP: 60,
        EDITOR_HEIGHT: 30,
-        HEIGHT: 28,
        SLIDER_WIDTH_HALF: 15,
        SLIDER_WIDTH: 30,
        SLIDER_HEIGHT: 30,
@ -51,7 +50,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
            cls: "slider-editor-button",
            errorText: "",
            allowBlank: false,
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH,
            validationChecker: function (v) {
                return self._checkValidation(v);
@ -78,7 +76,6 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
            cls: "slider-editor-button",
            errorText: "",
            allowBlank: false,
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH,
            validationChecker: function (v) {
                return self._checkValidation(v);
@ -122,6 +119,10 @@ BI.IntervalSlider = BI.inherit(BI.Widget, {
                var significantPercent = BI.parseFloat(percent.toFixed(1));
                self._setSliderOnePosition(significantPercent);
                self.fireEvent(BI.IntervalSlider.EVENT_CHANGE);
+                ui.helper.removeClass("dragging");
+            },
+            start: function (e, ui) {
+                ui.helper.removeClass("dragging").addClass("dragging");
            }
        });

--- a/src/addons/sliders/js/singleslider/singleslider.js
+++ b/src/addons/sliders/js/singleslider/singleslider.js
@ -5,7 +5,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
    _constant: {
        EDITOR_WIDTH: 90,
        EDITOR_HEIGHT: 30,
-        HEIGHT: 28,
        SLIDER_WIDTH_HALF: 15,
        SLIDER_WIDTH: 30,
        SLIDER_HEIGHT: 30,
@ -98,7 +97,6 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
            type: "bi.sign_editor",
            cls: "slider-editor-button",
            errorText: "",
-            height: c.HEIGHT,
            width: c.EDITOR_WIDTH - 2,
            allowBlank: false,
            validationChecker: function (v) {
--- a/src/css/base/single/input/input.css
+++ b/src/css/base/single/input/input.css
@ -1,4 +1,5 @@
-.bi-input {
+.bi-input,
+.bi-textarea {
  border: none;
  outline: none;
  background-color: transparent;
@ -7,10 +8,12 @@
  width: 100%;
  height: 100%;
 }
-.bi-input.bi-input-focus {
+.bi-input.bi-input-focus,
+.bi-textarea.bi-input-focus {
  border: none;
 }
-.bi-input.bi-input-error {
+.bi-input.bi-input-error,
+.bi-textarea.bi-input-error {
  border: none;
  color: #e85050 !important;
 }
--- a/src/less/base/single/input/input.less
+++ b/src/less/base/single/input/input.less
@ -1,6 +1,6 @@
@import "../../../bibase";

-.bi-input{
+.bi-input, .bi-textarea{
  border: none;
  outline: none;
  background-color: transparent;