From e5ac79258a39dd1db1458d3b2f8ddc44305ddc19 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Tue, 17 Jan 2017 15:49:34 +0800
Subject: [PATCH] update Rate

---
 assets/iview.png                | Bin 167520 -> 0 bytes
 src/components/rate/rate.vue    | 10 ++++++++++
 src/locale/lang/en-US.js        |  4 ++++
 src/locale/lang/zh-CN.js        |  4 ++++
 src/locale/lang/zh-TW.js        |  4 ++++
 src/styles/components/rate.less |  8 +++++++-
 test/main.js                    |  3 ++-
 test/routers/rate.vue           |  2 +-
 8 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/assets/iview.png b/assets/iview.png
index 9c4c0f2..8bd104f 100644
Binary files a/assets/iview.png and b/assets/iview.png differ
diff --git a/src/components/rate/rate.vue b/src/components/rate/rate.vue
index 77cdf57..467ad75 100644
--- a/src/components/rate/rate.vue
+++ b/src/components/rate/rate.vue
@@ -7,12 +7,18 @@
             @click="handleClick(item)">
             <span :class="[prefixCls + '-star-content']" type="half"></span>
         </div>
+        <div :class="[prefixCls + '-text']" v-if="showText">
+            <slot>{{ value }} <template v-if="value <= 1">{{ t('i.rate.star') }}</template><template v-else>{{ t('i.rate.stars') }}</template></slot>
+        </div>
     </div>
 </template>
 <script>
+    import Locale from '../../mixins/locale';
+
     const prefixCls = 'ivu-rate';
 
     export default {
+        mixins: [ Locale ],
         props: {
             count: {
                 type: Number,
@@ -29,6 +35,10 @@
             disabled: {
                 type: Boolean,
                 default: false
+            },
+            showText: {
+                type: Boolean,
+                default: false
             }
         },
         data () {
diff --git a/src/locale/lang/en-US.js b/src/locale/lang/en-US.js
index 98bfeff..9b21baf 100644
--- a/src/locale/lang/en-US.js
+++ b/src/locale/lang/en-US.js
@@ -83,6 +83,10 @@ export default {
             page: '/page',
             goto: 'Goto',
             p: ''
+        },
+        rate: {
+            star: 'Star',
+            stars: 'Stars'
         }
     }
 };
\ No newline at end of file
diff --git a/src/locale/lang/zh-CN.js b/src/locale/lang/zh-CN.js
index f279247..c44f917 100644
--- a/src/locale/lang/zh-CN.js
+++ b/src/locale/lang/zh-CN.js
@@ -83,6 +83,10 @@ export default {
             page: '条/页',
             goto: '跳至',
             p: '页'
+        },
+        rate: {
+            star: '星',
+            stars: '星'
         }
     }
 };
\ No newline at end of file
diff --git a/src/locale/lang/zh-TW.js b/src/locale/lang/zh-TW.js
index 998a370..e7c8d6c 100644
--- a/src/locale/lang/zh-TW.js
+++ b/src/locale/lang/zh-TW.js
@@ -83,6 +83,10 @@ export default {
             page: '條/頁',
             goto: '跳至',
             p: '頁'
+        },
+        rate: {
+            star: '星',
+            stars: '星'
         }
     }
 };
\ No newline at end of file
diff --git a/src/styles/components/rate.less b/src/styles/components/rate.less
index 82002ff..d1ad172 100644
--- a/src/styles/components/rate.less
+++ b/src/styles/components/rate.less
@@ -8,7 +8,6 @@
     vertical-align: middle;
     font-weight: normal;
     font-style: normal;
-    font-family: 'Ionicons';
 
     &-disabled &-star {
         &:before,
@@ -26,6 +25,7 @@
         padding: 0;
         margin-right: 8px;
         position: relative;
+        font-family: 'Ionicons';
         transition: all 0.3s ease;
 
         &:hover {
@@ -63,4 +63,10 @@
             color: tint(@rate-star-color, 20%);
         }
     }
+    &-text {
+        margin-left: 8px;
+        vertical-align: middle;
+        display: inline-block;
+        font-size: @font-size-small;
+    }
 }
\ No newline at end of file
diff --git a/test/main.js b/test/main.js
index 6805f1c..f67ab01 100644
--- a/test/main.js
+++ b/test/main.js
@@ -6,9 +6,10 @@ import VueRouter from 'vue-router';
 import App from './app.vue';
 import iView from '../src/index';
 // import locale from '../src/locale/lang/en-US';
+import locale from '../src/locale/lang/zh-CN';
 
 Vue.use(VueRouter);
-Vue.use(iView);
+Vue.use(iView, { locale });
 
 // 开启debug模式
 Vue.config.debug = true;
diff --git a/test/routers/rate.vue b/test/routers/rate.vue
index 7676a3a..faf58f7 100644
--- a/test/routers/rate.vue
+++ b/test/routers/rate.vue
@@ -2,7 +2,7 @@
     <div style="margin: 100px">
         {{value}}
         <br><br><br>
-        <Rate :value.sync="value" :count="5" allow-half></Rate>
+        <Rate :value.sync="value" :count="5" allow-half show-text></Rate>
         <br><br><br>
         <i-button @click="value++">add</i-button>
         <i-button @click="value--">remove</i-button>
--
libgit2 0.21.4