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

* commit 'eaae9aa8f51002cab64a602105d7d58ce777f1f5': update 针对codemirrior的修改 update update update
7 years ago · d0761ba0a0
13 changed files with 407 additions and 400 deletions
--- a/bi/base.js
+++ b/bi/base.js
@ -3261,7 +3261,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
        //     return;
        // }
-        if (this.element.find(e.target).length > 0 || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
+        if (this.element.find(e.target).length > 0 || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
        }
        var isHide = this.options.hideChecker.apply(this, [e]);
--- a/bi/core.js
+++ b/bi/core.js
@ -12013,7 +12013,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
    props: function () {
        return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-horizontal-adapt-layout",
-            verticalAlign: BI.VerticalAlign.Middle,
+            verticalAlign: BI.VerticalAlign.Top,
            columnSize: [],
            hgap: 0,
            vgap: 0,
--- a/bi/sliders.js
+++ b/bi/sliders.js
@ -1451,6 +1451,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
        this.min = 0;
        this.max = 0;
        this._setBlueTrack(0);
+        
    },

    populate: function () {
--- a/demo/js/addons/slider/demo.slider.js
+++ b/demo/js/addons/slider/demo.slider.js
@ -2,24 +2,27 @@
 * Created by Urthur on 2017/9/4.
 */
 Demo.Slider = BI.inherit(BI.Widget, {
-    _props: {
+    props: {
            baseCls: "demo-slider",
-        min: 10,
-        max: 50
+            width: 300,
+            height: 50,
+            min: 0,
+            max: 100
    },

    render: function () {
+        var self = this, o = this.options;
        var singleSlider = BI.createWidget({
            type: "bi.single_slider",
            digit: 0,
-            width: 300,
-            height: 50,
+            width: o.width,
+            height: o.height,
            cls: "layout-bg-white"
        });

        singleSlider.setMinAndMax({
            min: 10,
-            max: 100
+            max: o.max
        });

        singleSlider.setValue(30);
@ -28,43 +31,42 @@ Demo.Slider = BI.inherit(BI.Widget, {
            console.log(this.getValue());
        });

-        var singleSliderLabel = BI.createWidget({
-            type: "bi.single_slider_label",
-            height: 50,
-            width: 300,
-            digit: 0,
-            unit: "个",
-            cls: "layout-bg-white"
-        });
-        singleSliderLabel.setMinAndMax({
-            min: 0,
-            max: 100
-        });
-        singleSliderLabel.setValue(10);
-        singleSliderLabel.populate();
-
        var normalSingleSlider = BI.createWidget({
            type: "bi.single_slider_normal",
+            width: o.width,
            height: 30,
-            width: 300,
            cls: "layout-bg-white"
        });
        normalSingleSlider.setMinAndMax({
-            min: 0,
-            max: 100
+            min: o.min,
+            max: o.max
        });
        normalSingleSlider.setValue(10);
        normalSingleSlider.populate();

+        var singleSliderLabel = BI.createWidget({
+            type: "bi.single_slider_label",
+            width: o.width,
+            height: o.height,
+            digit: 0,
+            unit: "个",
+            cls: "layout-bg-white"
+        });
+        singleSliderLabel.setMinAndMax({
+            min: o.min,
+            max: o.max
+        });
+        singleSliderLabel.setValue(10);
+        singleSliderLabel.populate();

        var intervalSlider = BI.createWidget({
            type: "bi.interval_slider",
-            width: 300,
+            width: o.width,
            cls: "layout-bg-white"
        });
        intervalSlider.setMinAndMax({
-            min: 0,
-            max: 120
+            min: o.min,
+            max: o.max
        });
        intervalSlider.setValue({
            min: 10,
@ -74,7 +76,7 @@ Demo.Slider = BI.inherit(BI.Widget, {

        var intervalSliderLabel = BI.createWidget({
            type: "bi.interval_slider_label",
-            width: 300,
+            width: o.width,
            unit: "个",
            cls: "layout-bg-white"
        });
--- a/dist/base.js
+++ b/dist/base.js
@ -3261,7 +3261,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
        //     return;
        // }
-        if (this.element.find(e.target).length > 0 || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
+        if (this.element.find(e.target).length > 0 || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
        }
        var isHide = this.options.hideChecker.apply(this, [e]);
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -25590,7 +25590,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
    props: function () {
        return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-horizontal-adapt-layout",
-            verticalAlign: BI.VerticalAlign.Middle,
+            verticalAlign: BI.VerticalAlign.Top,
            columnSize: [],
            hgap: 0,
            vgap: 0,
@ -32284,7 +32284,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
        //     return;
        // }
-        if (this.element.find(e.target).length > 0 || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
+        if (this.element.find(e.target).length > 0 || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
        }
        var isHide = this.options.hideChecker.apply(this, [e]);
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/core.js
+++ b/dist/core.js
@ -25539,7 +25539,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
    props: function () {
        return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-horizontal-adapt-layout",
-            verticalAlign: BI.VerticalAlign.Middle,
+            verticalAlign: BI.VerticalAlign.Top,
            columnSize: [],
            hgap: 0,
            vgap: 0,
--- a/dist/demo.js
+++ b/dist/demo.js
@ -13,24 +13,27 @@ $(function () {
 * Created by Urthur on 2017/9/4.
 */
 Demo.Slider = BI.inherit(BI.Widget, {
-    _props: {
+    props: {
            baseCls: "demo-slider",
-        min: 10,
-        max: 50
+            width: 300,
+            height: 50,
+            min: 0,
+            max: 100
    },

    render: function () {
+        var self = this, o = this.options;
        var singleSlider = BI.createWidget({
            type: "bi.single_slider",
            digit: 0,
-            width: 300,
-            height: 50,
+            width: o.width,
+            height: o.height,
            cls: "layout-bg-white"
        });

        singleSlider.setMinAndMax({
            min: 10,
-            max: 100
+            max: o.max
        });

        singleSlider.setValue(30);
@ -39,43 +42,42 @@ Demo.Slider = BI.inherit(BI.Widget, {
            console.log(this.getValue());
        });

-        var singleSliderLabel = BI.createWidget({
-            type: "bi.single_slider_label",
-            height: 50,
-            width: 300,
-            digit: 0,
-            unit: "个",
-            cls: "layout-bg-white"
-        });
-        singleSliderLabel.setMinAndMax({
-            min: 0,
-            max: 100
-        });
-        singleSliderLabel.setValue(10);
-        singleSliderLabel.populate();
-
        var normalSingleSlider = BI.createWidget({
            type: "bi.single_slider_normal",
+            width: o.width,
            height: 30,
-            width: 300,
            cls: "layout-bg-white"
        });
        normalSingleSlider.setMinAndMax({
-            min: 0,
-            max: 100
+            min: o.min,
+            max: o.max
        });
        normalSingleSlider.setValue(10);
        normalSingleSlider.populate();

+        var singleSliderLabel = BI.createWidget({
+            type: "bi.single_slider_label",
+            width: o.width,
+            height: o.height,
+            digit: 0,
+            unit: "个",
+            cls: "layout-bg-white"
+        });
+        singleSliderLabel.setMinAndMax({
+            min: o.min,
+            max: o.max
+        });
+        singleSliderLabel.setValue(10);
+        singleSliderLabel.populate();

        var intervalSlider = BI.createWidget({
            type: "bi.interval_slider",
-            width: 300,
+            width: o.width,
            cls: "layout-bg-white"
        });
        intervalSlider.setMinAndMax({
-            min: 0,
-            max: 120
+            min: o.min,
+            max: o.max
        });
        intervalSlider.setValue({
            min: 10,
@ -85,7 +87,7 @@ Demo.Slider = BI.inherit(BI.Widget, {

        var intervalSliderLabel = BI.createWidget({
            type: "bi.interval_slider_label",
-            width: 300,
+            width: o.width,
            unit: "个",
            cls: "layout-bg-white"
        });
--- a/dist/sliders.js
+++ b/dist/sliders.js
@ -1451,6 +1451,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
        this.min = 0;
        this.max = 0;
        this._setBlueTrack(0);
+        
    },

    populate: function () {
--- a/src/addons/sliders/js/singleslider/singleslider.js
+++ b/src/addons/sliders/js/singleslider/singleslider.js
@ -272,6 +272,7 @@ BI.SingleSlider = BI.inherit(BI.Widget, {
        this.min = 0;
        this.max = 0;
        this._setBlueTrack(0);
+        
    },

    populate: function () {
--- a/src/base/combination/combo.js
+++ b/src/base/combination/combo.js
@ -219,7 +219,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        // if (this.element.__isMouseInBounds__(e) || (this.popupView && this.popupView.element.__isMouseInBounds__(e))) {
        //     return;
        // }
-        if (this.element.find(e.target).length > 0 || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
+        if (this.element.find(e.target).length > 0 || e.target.className === "CodeMirror-cursor" || $(e.target).closest(".CodeMirror-hints").length > 0) {//BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
        }
        var isHide = this.options.hideChecker.apply(this, [e]);
--- a/src/core/wrapper/layout/adapt/adapt.horizontal.js
+++ b/src/core/wrapper/layout/adapt/adapt.horizontal.js
@ -7,7 +7,7 @@ BI.HorizontalAdaptLayout = BI.inherit(BI.Layout, {
    props: function () {
        return BI.extend(BI.HorizontalAdaptLayout.superclass.props.apply(this, arguments), {
            baseCls: "bi-horizontal-adapt-layout",
-            verticalAlign: BI.VerticalAlign.Middle,
+            verticalAlign: BI.VerticalAlign.Top,
            columnSize: [],
            hgap: 0,
            vgap: 0,