From 2eccfc99381f3f5bbbf510edac1e08de4b1bf8fa Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Tue, 23 Jan 2018 18:14:23 +0800
Subject: [PATCH] fixed #2852

---
 examples/routers/slider.vue      | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
 src/components/modal/modal.vue   |  1 +
 src/components/slider/slider.vue | 20 ++++++++++++++++++--
 3 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/examples/routers/slider.vue b/examples/routers/slider.vue
index a2fe2cc..d997bf7 100644
--- a/examples/routers/slider.vue
+++ b/examples/routers/slider.vue
@@ -1,40 +1,68 @@
-<template>
-    <div style="margin: 0 400px;">
-        <Slider v-model="valueSingle" @on-change="updateSingleDisplayValue"></Slider>
-        <Button @click="randomSingle">change</Button> {{singleDisplayValue}}
+<!--<template>-->
+    <!--<div style="margin: 0 400px;">-->
+        <!--<Slider v-model="valueSingle" @on-change="updateSingleDisplayValue"></Slider>-->
+        <!--<Button @click="randomSingle">change</Button> {{singleDisplayValue}}-->
+
+        <!--<Slider v-model="valueRange" range @on-change="updateRangeDisplayValue"></Slider>-->
+        <!--<Button @click="randomRange">change</Button> {{rangeDisplayValue}}-->
+    <!--</div>-->
+<!--</template>-->
+<!--<script>-->
+    <!--export default {-->
+        <!--data () {-->
+            <!--return {-->
+                <!--valueSingle: 10,-->
+                <!--valueRange: [20, 50],-->
+                <!--singleDisplayValue: 10,-->
+                <!--rangeDisplayValue: [20, 50]-->
+            <!--};-->
+        <!--},-->
+        <!--methods: {-->
+            <!--updateSingleDisplayValue (val){-->
+                <!--console.log('updateSingleDisplayValue', val);-->
+                <!--this.singleDisplayValue = val;-->
+            <!--},-->
+            <!--updateRangeDisplayValue (val){-->
+                <!--console.log('updateRangeDisplayValue', val);-->
+                <!--this.rangeDisplayValue = val.join(' - ');-->
+            <!--},-->
+            <!--randomSingle () {-->
+                <!--this.valueSingle = this.random(0, 100);-->
+            <!--},-->
+            <!--randomRange () {-->
+                <!--this.valueRange = [this.random(0, 50), this.random(50, 100)];-->
+            <!--},-->
+            <!--random (min, max){-->
+                <!--return Math.round(Math.random() * (max - min)) + min;-->
+            <!--}-->
+        <!--}-->
+    <!--};-->
+<!--</script>-->
 
-        <Slider v-model="valueRange" range @on-change="updateRangeDisplayValue"></Slider>
-        <Button @click="randomRange">change</Button> {{rangeDisplayValue}}
+
+<template>
+    <div>
+        <Button type="primary" @click="modal1 = true">Display dialog box</Button>
+        <Modal v-model="modal1">
+            <Slider v-model="value2" range show-tip="always"></Slider>
+        </Modal>
     </div>
 </template>
 <script>
     export default {
         data () {
             return {
-                valueSingle: 10,
-                valueRange: [20, 50],
-                singleDisplayValue: 10,
-                rangeDisplayValue: [20, 50]
-            };
+                modal1: false,
+                value2: [20, 50],
+            }
         },
         methods: {
-            updateSingleDisplayValue (val){
-                console.log('updateSingleDisplayValue', val);
-                this.singleDisplayValue = val;
-            },
-            updateRangeDisplayValue (val){
-                console.log('updateRangeDisplayValue', val);
-                this.rangeDisplayValue = val.join(' - ');
-            },
-            randomSingle () {
-                this.valueSingle = this.random(0, 100);
-            },
-            randomRange () {
-                this.valueRange = [this.random(0, 50), this.random(50, 100)];
+            ok () {
+                this.$Message.info('Clicked ok');
             },
-            random (min, max){
-                return Math.round(Math.random() * (max - min)) + min;
+            cancel () {
+                this.$Message.info('Clicked cancel');
             }
         }
-    };
+    }
 </script>
diff --git a/src/components/modal/modal.vue b/src/components/modal/modal.vue
index 0339204..6f01c9e 100644
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@@ -229,6 +229,7 @@
                     }
                 }
                 this.broadcast('Table', 'on-visible-change', val);
+                this.broadcast('Slider', 'on-visible-change', val);  // #2852
                 this.$emit('on-visible-change', val);
             },
             loading (val) {
diff --git a/src/components/slider/slider.vue b/src/components/slider/slider.vue
index 0cfe445..b7b624a 100644
--- a/src/components/slider/slider.vue
+++ b/src/components/slider/slider.vue
@@ -272,8 +272,7 @@
                 }
             },
 
-
-            sliderClick: function (event) {
+            sliderClick (event) {
                 if (this.disabled) return;
                 const currentX = this.getPointerX(event);
                 const sliderOffsetLeft = this.$refs.slider.getBoundingClientRect().left;
@@ -290,6 +289,23 @@
                 this.$emit('on-change', exportValue);
                 this.dispatch('FormItem', 'on-form-change', exportValue);
             },
+        },
+        mounted () {
+            // #2852
+            this.$on('on-visible-change', (val) => {
+                if (val && this.showTip === 'always') {
+                    this.$refs.minTooltip.doDestroy();
+                    if (this.range) {
+                        this.$refs.maxTooltip.doDestroy();
+                    }
+                    this.$nextTick(() => {
+                        this.$refs.minTooltip.updatePopper();
+                        if (this.range) {
+                            this.$refs.maxTooltip.updatePopper();
+                        }
+                    });
+                }
+            });
         }
     };
 </script>
--
libgit2 0.21.4