From 7c41ecb3d6ed1c37c4eef0d5a003bffc274fb9a0 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Wed, 19 Jul 2017 18:18:43 +0800
Subject: [PATCH] fixed #1099

---
 examples/routers/modal.vue                 | 127 +++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------
 src/styles/components/select-dropdown.less |   5 +++++
 2 files changed, 36 insertions(+), 96 deletions(-)

diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue
index 258552b..6cddad1 100644
--- a/examples/routers/modal.vue
+++ b/examples/routers/modal.vue
@@ -1,67 +1,11 @@
 <template>
     <div>
-        <Button type="primary" @click="modal1 = true">显示对话框</Button>
-        <Modal
-                v-model="modal1"
-                width="70"
-                title="普通的Modal对话框标题"
-                @on-ok="ok"
-                :transfer="true"
-                @on-cancel="cancel">
+        <i-button @click="modal=true">show modal</i-button>
+        <Modal v-model="modal" @on-ok="resetForm" @on-cancel="resetForm" title="表单">
             <div>
-                <Form :model="formItem" :label-width="80">
-                    <Form-item label="输入框">
-                        <Input v-model="formItem.input" placeholder="请输入"></Input>
-                    </Form-item>
-                    <Form-item label="选择器">
-                        <Select v-model="formItem.select" placeholder="请选择">
-                            <Option value="beijing">北京市</Option>
-                            <Option value="shanghai">上海市</Option>
-                            <Option value="shenzhen">深圳市</Option>
-                        </Select>
-                    </Form-item>
-                    <Form-item label="日期控件">
-                        <Row>
-                            <Col span="11">
-                            <Date-picker type="date" placeholder="选择日期" v-model="formItem.date"></Date-picker>
-                            </Col>
-                            <Col span="2" style="text-align: center">-</Col>
-                            <Col span="11">
-                            <Time-picker type="time" placeholder="选择时间" v-model="formItem.time"></Time-picker>
-                            </Col>
-                        </Row>
-                    </Form-item>
-                    <Form-item label="单选框">
-                        <Radio-group v-model="formItem.radio">
-                            <Radio label="male">男</Radio>
-                            <Radio label="female">女</Radio>
-                        </Radio-group>
-                    </Form-item>
-                    <Form-item label="多选框">
-                        <Checkbox-group v-model="formItem.checkbox">
-                            <Checkbox label="吃饭"></Checkbox>
-                            <Checkbox label="睡觉"></Checkbox>
-                            <Checkbox label="跑步"></Checkbox>
-                            <Checkbox label="看电影"></Checkbox>
-                        </Checkbox-group>
-                    </Form-item>
-                    <Form-item label="开关">
-                        <Switch v-model="formItem.switch" size="large">
-                            <span slot="open">开启</span>
-                            <span slot="close">关闭</span>
-                        </Switch>
-                    </Form-item>
-                    <Form-item label="滑块">
-                        <Slider v-model="formItem.slider" range></Slider>
-                    </Form-item>
-                    <Form-item label="文本域">
-                        <Input v-model="formItem.textarea" type="textarea" :autosize="{minRows: 2,maxRows: 5}" placeholder="请输入..."></Input>
-                    </Form-item>
-                    <Form-item>
-                        <Button type="primary">提交</Button>
-                        <Button type="ghost" style="margin-left: 8px">取消</Button>
-                    </Form-item>
-                </Form>
+                <i-select ref="formSelect" filterable remote clearable :remote-method="remoteMethod" :loading="loading">
+                    <i-option v-for="option in options" :value="option.value" :key="option.value">{{option.label}}</i-option>
+                </i-select>
             </div>
         </Modal>
     </div>
@@ -70,25 +14,19 @@
     export default {
         data () {
             return {
-                formItem: {
-                    input: '',
-                    select: '',
-                    radio: 'male',
-                    checkbox: [],
-                    switch: true,
-                    date: '',
-                    time: '',
-                    slider: [20, 50],
-                    textarea: ''
-                },
-                modal1: false,
-                model13: '',
-                loading1: false,
-                options1: [],
-                model14: [],
-                loading2: false,
-                options2: [],
-                list: ['Alabama', 'Alaska', 'Arizona', 'Arkansas', 'California', 'Colorado', 'Connecticut', 'Delaware', 'Florida', 'Georgia', 'Hawaii', 'Idaho', 'Illinois', 'Indiana', 'Iowa', 'Kansas', 'Kentucky', 'Louisiana', 'Maine', 'Maryland', 'Massachusetts', 'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 'Montana', 'Nebraska', 'Nevada', 'New hampshire', 'New jersey', 'New mexico', 'New york', 'North carolina', 'North dakota', 'Ohio', 'Oklahoma', 'Oregon', 'Pennsylvania', 'Rhode island', 'South carolina', 'South dakota', 'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington', 'West virginia', 'Wisconsin', 'Wyoming']
+                modal: false,
+                loading: false,
+                options: [],
+                cityList: [
+                    {
+                        value: "beijing",
+                        label: "北京市"
+                    },
+                    {
+                        value: "shanghai",
+                        label: "上海市"
+                    }
+                ]
             }
         },
         methods: {
@@ -98,22 +36,19 @@
             cancel () {
                 this.$Message.info('点击了取消');
             },
-            remoteMethod1 (query) {
-                if (query !== '') {
-                    this.loading1 = true;
-                    setTimeout(() => {
-                        this.loading1 = false;
-                        const list = this.list.map(item => {
-                            return {
-                                value: item,
-                                label: item
-                            };
-                        });
-                        this.options1 = list.filter(item => item.label.toLowerCase().indexOf(query.toLowerCase()) > -1);
-                    }, 200);
-                } else {
-                    this.options1 = [];
-                }
+            remoteMethod(query) {
+                this.loading = true;
+                setTimeout(() => {
+                    this.loading = false;
+                    this.options = this.cityList;
+                }, 200);
+            },
+            resetForm() {
+                //加个计时器，就能解决这个定位问题了
+                // setTimeout(()=> {
+                this.$refs["formSelect"].clearSingleSelect();
+                this.options = [];
+                // }, 300)
             }
         }
     }
diff --git a/src/styles/components/select-dropdown.less b/src/styles/components/select-dropdown.less
index bd171cb..91cc4ec 100644
--- a/src/styles/components/select-dropdown.less
+++ b/src/styles/components/select-dropdown.less
@@ -14,4 +14,9 @@
     box-shadow: @shadow-base;
     position: absolute;
     z-index: @zindex-select;
+}
+.@{modal-prefix-cls} {
+    .@{select-dropdown-prefix-cls} {
+        position: absolute !important;
+    }
 }
\ No newline at end of file
--
libgit2 0.21.4