From f89dd9c28740685deb98ec9fe3f6b144decc4d76 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Thu, 27 Apr 2017 17:35:47 +0800
Subject: [PATCH] Paeg、Select add placement

---
 examples/routers/page.vue        | 12 +++---------
 examples/routers/select.vue      | 10 ++++++----
 src/components/page/options.vue  |  5 +++--
 src/components/page/page.vue     |  7 +++++++
 src/components/select/select.vue | 13 +++++++++++--
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/examples/routers/page.vue b/examples/routers/page.vue
index b18e09b..670e89e 100644
--- a/examples/routers/page.vue
+++ b/examples/routers/page.vue
@@ -1,16 +1,10 @@
 <template>
-    <div>
-        <Page :total="100" :current="current"></Page>
-        {{ current }}
-        <Button @click="current = 1">set current</Button>
+    <div style="margin: 100px;">
+        <Page :total="100" show-sizer placement="top"></Page>
     </div>
 </template>
 <script>
     export default {
-        data () {
-            return {
-                current: 2
-            }
-        }
+
     }
 </script>
diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 6d5533b..cad3a96 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -1,8 +1,10 @@
 <template>
-    <Select v-model="fields.pid" filterable>
-        <Option :value="0" label="一级菜单"></Option>
-        <Option :value="1" label="二级菜单"></Option>
-    </Select>
+    <div style="width: 200px;margin: 100px;">
+        <Select v-model="fields.pid" filterable placement="top">
+            <Option :value="0" label="一级菜单"></Option>
+            <Option :value="1" label="二级菜单"></Option>
+        </Select>
+    </div>
 </template>
 
 <script>
diff --git a/src/components/page/options.vue b/src/components/page/options.vue
index ead5b4e..490bfc2 100644
--- a/src/components/page/options.vue
+++ b/src/components/page/options.vue
@@ -1,7 +1,7 @@
 <template>
     <div v-if="showSizer || showElevator" :class="optsClasses">
         <div v-if="showSizer" :class="sizerClasses">
-            <i-select v-model="currentPageSize" :size="size" @on-change="changeSize">
+            <i-select v-model="currentPageSize" :size="size" :placement="placement" @on-change="changeSize">
                 <i-option v-for="item in pageSizeOpts" :key="item" :value="item" style="text-align:center;">{{ item }} {{ t('i.page.page') }}</i-option>
             </i-select>
         </div>
@@ -35,7 +35,8 @@
             _current: Number,
             pageSize: Number,
             allPages: Number,
-            isSmall: Boolean
+            isSmall: Boolean,
+            placement: String
         },
         data () {
             return {
diff --git a/src/components/page/page.vue b/src/components/page/page.vue
index 1463f06..65c8270 100644
--- a/src/components/page/page.vue
+++ b/src/components/page/page.vue
@@ -52,6 +52,7 @@
             :show-sizer="showSizer"
             :page-size="currentPageSize"
             :page-size-opts="pageSizeOpts"
+            :placement="placement"
             :show-elevator="showElevator"
             :_current.once="currentPage"
             :current="currentPage"
@@ -92,6 +93,12 @@
                     return [10, 20, 30, 40];
                 }
             },
+            placement: {
+                validator (value) {
+                    return oneOf(value, ['top', 'bottom']);
+                },
+                default: 'bottom'
+            },
             size: {
                 validator (value) {
                     return oneOf(value, ['small']);
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index f611d08..ee27eb7 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -24,8 +24,8 @@
             <Icon type="ios-close" :class="[prefixCls + '-arrow']" v-show="showCloseIcon" @click.native.stop="clearSingleSelect"></Icon>
             <Icon type="arrow-down-b" :class="[prefixCls + '-arrow']"></Icon>
         </div>
-        <transition name="slide-up">
-            <Drop v-show="visible" ref="dropdown">
+        <transition :name="transitionName">
+            <Drop v-show="visible" :placement="placement" ref="dropdown">
                 <ul v-show="notFound" :class="[prefixCls + '-not-found']"><li>{{ localeNotFoundText }}</li></ul>
                 <ul v-show="!notFound" :class="[prefixCls + '-dropdown-list']" ref="options"><slot></slot></ul>
             </Drop>
@@ -85,6 +85,12 @@
             },
             notFoundText: {
                 type: String
+            },
+            placement: {
+                validator (value) {
+                    return oneOf(value, ['top', 'bottom']);
+                },
+                default: 'bottom'
             }
         },
         data () {
@@ -161,6 +167,9 @@
                 } else {
                     return this.notFoundText;
                 }
+            },
+            transitionName () {
+                return this.placement === 'bottom' ? 'slide-up' : 'slide-down';
             }
         },
         methods: {
--
libgit2 0.21.4