From d14672667fbf97a729b86a3813c46092abb7f474 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sun, 16 Dec 2018 12:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=BC=94=E7=A4=BA=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=EF=BC=8C=E5=B8=AE=E5=8A=A9=E7=90=86?=
 =?UTF-8?q?=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly 1dfab754fe77b7a8f6fa1d053c7f2df52a72fb3d [formerly c126939c14dfc1f4de83826542d25b6742a0efba [formerly 0feb4c994c1b1ec96b04e19165d22f3d9b9798b5]]]]]
Former-commit-id: b86edf90b0d5a101666f974c0870383d4bddf4d4
Former-commit-id: 1fff3f00778fdc111a1afe6b510c2aaf9eaa90a6
Former-commit-id: c493552f0eec495528ad7fce12850accce9faef7 [formerly d269ed5b45a082222ecc68712255f8496c817f2e]
Former-commit-id: 5ee1efa4e3fbf9355d9715cf5ba0521934320503
Former-commit-id: f5ad3a4b65fcaef1387fe5ca7acf77ff7b10f15c
Former-commit-id: 079eebf234456b8b466d44f7513f2da9e43d4bce
Former-commit-id: 544e86957c428321a8461a2bba43494fa2cf00ba
Former-commit-id: 0505b45caaf091d3fad13337a13be7f612619f47
---
 .../day/components/code-and-result.vue        |  36 +++---
 src/pages/demo/filters/day/index.vue          | 118 +++++++++---------
 2 files changed, 73 insertions(+), 81 deletions(-)

diff --git a/src/pages/demo/filters/day/components/code-and-result.vue b/src/pages/demo/filters/day/components/code-and-result.vue
index 67463d06..b3c1fb50 100644
--- a/src/pages/demo/filters/day/components/code-and-result.vue
+++ b/src/pages/demo/filters/day/components/code-and-result.vue
@@ -1,18 +1,26 @@
 <template>
   <div class="d2-mb-10">
+    <el-button-group>
+      <el-button
+        class="code-and-result--button"
+        size="mini">
+        原值
+      </el-button>
+    </el-button-group>
+    <d2-icon name="plus" class="code-and-result--icon"/>
     <el-button-group>
       <el-button
         v-for="(label, index) in labelList"
         :key="index"
-        :class="buttonClass(index)"
+        class="code-and-result--button"
         size="mini"
         type="primary"
         @click="handleClip(label)">
         {{label}}
       </el-button>
     </el-button-group>
-    <d2-icon name="arrow-right" class="code-and-result--arrow-right"/>
-    {{value}}
+    <d2-icon name="arrow-right" class="code-and-result--icon"/>
+    <span class="code-and-result--value">{{value}}</span>
   </div>
 </template>
 
@@ -33,15 +41,6 @@ export default {
     }
   },
   methods: {
-    buttonClass (index) {
-      if (index === 0) {
-        return 'code-and-result--button__first'
-      } else if (index === this.labelList.length - 1) {
-        return 'code-and-result--button__last'
-      } else {
-        return 'code-and-result--button'
-      }
-    },
     handleClip (value) {
       clipboard.writeText(value)
       this.$notify({
@@ -56,22 +55,15 @@ export default {
 
 <style lang="scss" scoped>
 .code-and-result--button {
-  padding-left: 5px;
-  padding-right: 5px;
-}
-.code-and-result--button__first {
-  padding-right: 5px;
   padding-left: 10px;
-}
-.code-and-result--button__last {
-  padding-left: 5px;
   padding-right: 10px;
 }
-.code-and-result--arrow-right {
+.code-and-result--icon {
   color: $color-info;
   margin: 0px 20px;
 }
 .code-and-result--value {
-  line-height: 32px;
+  font-size: 14px;
+  color: $color-text-main;
 }
 </style>
diff --git a/src/pages/demo/filters/day/index.vue b/src/pages/demo/filters/day/index.vue
index 7c6ce7ee..1044b18d 100644
--- a/src/pages/demo/filters/day/index.vue
+++ b/src/pages/demo/filters/day/index.vue
@@ -5,76 +5,76 @@
       <el-button size="small" type="primary">原值 value : {{value}}</el-button>
     </div>
     <code-title title="获取" sub-title="获取日期的指定部分"/>
-    <code-and-result label="原值|day_year" :value="value|day_year"/>
-    <code-and-result label="原值|day_month" :value="value|day_month"/>
-    <code-and-result label="原值|day_date" :value="value|day_date"/>
-    <code-and-result label="原值|day_day" :value="value|day_day"/>
-    <code-and-result label="原值|day_hour" :value="value|day_hour"/>
-    <code-and-result label="原值|day_minute" :value="value|day_minute"/>
-    <code-and-result label="原值|day_second" :value="value|day_second"/>
-    <code-and-result label="原值|day_millisecond" :value="value|day_millisecond"/>
+    <code-and-result label="day_year" :value="value|day_year"/>
+    <code-and-result label="day_month" :value="value|day_month"/>
+    <code-and-result label="day_date" :value="value|day_date"/>
+    <code-and-result label="day_day" :value="value|day_day"/>
+    <code-and-result label="day_hour" :value="value|day_hour"/>
+    <code-and-result label="day_minute" :value="value|day_minute"/>
+    <code-and-result label="day_second" :value="value|day_second"/>
+    <code-and-result label="day_millisecond" :value="value|day_millisecond"/>
     <code-title title="设置" sub-title="设置日期指定部分的值"/>
-    <code-and-result label="原值|day_set('year', 2020)|day_format('< YYYY > - MM - DD')" :value="value|day_set('year', 2020)|day_format('< YYYY > - MM - DD')"/>
-    <code-and-result label="原值|day_set('month', 0)|day_format('YYYY - < MM > - DD')" :value="value|day_set('month', 0)|day_format('YYYY - < MM > - DD')"/>
-    <code-and-result label="原值|day_set('date', 1)|day_format('YYYY - MM - < DD >')" :value="value|day_set('date', 1)|day_format('YYYY - MM - < DD >')"/>
-    <code-and-result label="原值|day_set('hour', 0)|day_format('< HH > : mm : ss')" :value="value|day_set('hour', 0)|day_format('< HH > : mm : ss')"/>
-    <code-and-result label="原值|day_set('minute', 0)|day_format('HH : < mm > : ss')" :value="value|day_set('minute', 0)|day_format('HH : < mm > : ss')"/>
-    <code-and-result label="原值|day_set('second', 0)|day_format('HH : mm : < ss >')" :value="value|day_set('second', 0)|day_format('HH : mm : < ss >')"/>
+    <code-and-result label="day_set('year', 2020)|day_format('< YYYY > - MM - DD')" :value="value|day_set('year', 2020)|day_format('< YYYY > - MM - DD')"/>
+    <code-and-result label="day_set('month', 0)|day_format('YYYY - < MM > - DD')" :value="value|day_set('month', 0)|day_format('YYYY - < MM > - DD')"/>
+    <code-and-result label="day_set('date', 1)|day_format('YYYY - MM - < DD >')" :value="value|day_set('date', 1)|day_format('YYYY - MM - < DD >')"/>
+    <code-and-result label="day_set('hour', 0)|day_format('< HH > : mm : ss')" :value="value|day_set('hour', 0)|day_format('< HH > : mm : ss')"/>
+    <code-and-result label="day_set('minute', 0)|day_format('HH : < mm > : ss')" :value="value|day_set('minute', 0)|day_format('HH : < mm > : ss')"/>
+    <code-and-result label="day_set('second', 0)|day_format('HH : mm : < ss >')" :value="value|day_set('second', 0)|day_format('HH : mm : < ss >')"/>
     <code-title title="增加" sub-title="增加时间并返回一个新的 Dayjs 对象"/>
-    <code-and-result label="原值|day_add(1, 'year')|day_format('< YYYY > - MM - DD')" :value="value|day_add(1, 'year')|day_format('< YYYY > - MM - DD')"/>
-    <code-and-result label="原值|day_add(1, 'month')|day_format('YYYY - < MM > - DD')" :value="value|day_add(1, 'month')|day_format('YYYY - < MM > - DD')"/>
-    <code-and-result label="原值|day_add(1, 'day')|day_format('YYYY - MM - < DD >')" :value="value|day_add(1, 'day')|day_format('YYYY - MM - < DD >')"/>
-    <code-and-result label="原值|day_add(1, 'hour')|day_format('< HH > : mm : ss')" :value="value|day_add(1, 'hour')|day_format('< HH > : mm : ss')"/>
-    <code-and-result label="原值|day_add(1, 'minute')|day_format('HH : < mm > : ss')" :value="value|day_add(1, 'minute')|day_format('HH : < mm > : ss')"/>
-    <code-and-result label="原值|day_add(1, 'second')|day_format('HH : mm : < ss >')" :value="value|day_add(1, 'second')|day_format('HH : mm : < ss >')"/>
+    <code-and-result label="day_add(1, 'year')|day_format('< YYYY > - MM - DD')" :value="value|day_add(1, 'year')|day_format('< YYYY > - MM - DD')"/>
+    <code-and-result label="day_add(1, 'month')|day_format('YYYY - < MM > - DD')" :value="value|day_add(1, 'month')|day_format('YYYY - < MM > - DD')"/>
+    <code-and-result label="day_add(1, 'day')|day_format('YYYY - MM - < DD >')" :value="value|day_add(1, 'day')|day_format('YYYY - MM - < DD >')"/>
+    <code-and-result label="day_add(1, 'hour')|day_format('< HH > : mm : ss')" :value="value|day_add(1, 'hour')|day_format('< HH > : mm : ss')"/>
+    <code-and-result label="day_add(1, 'minute')|day_format('HH : < mm > : ss')" :value="value|day_add(1, 'minute')|day_format('HH : < mm > : ss')"/>
+    <code-and-result label="day_add(1, 'second')|day_format('HH : mm : < ss >')" :value="value|day_add(1, 'second')|day_format('HH : mm : < ss >')"/>
     <code-title title="减少" sub-title="减少时间并返回一个新的 Dayjs 对象"/>
-    <code-and-result label="原值|day_subtract(1, 'year')|day_format('< YYYY > - MM - DD')" :value="value|day_subtract(1, 'year')|day_format('< YYYY > - MM - DD')"/>
-    <code-and-result label="原值|day_subtract(1, 'month')|day_format('YYYY - < MM > - DD')" :value="value|day_subtract(1, 'month')|day_format('YYYY - < MM > - DD')"/>
-    <code-and-result label="原值|day_subtract(1, 'day')|day_format('YYYY - MM - < DD >')" :value="value|day_subtract(1, 'day')|day_format('YYYY - MM - < DD >')"/>
-    <code-and-result label="原值|day_subtract(1, 'hour')|day_format('< HH > : mm : ss')" :value="value|day_subtract(1, 'hour')|day_format('< HH > : mm : ss')"/>
-    <code-and-result label="原值|day_subtract(1, 'minute')|day_format('HH : < mm > : ss')" :value="value|day_subtract(1, 'minute')|day_format('HH : < mm > : ss')"/>
-    <code-and-result label="原值|day_subtract(1, 'second')|day_format('HH : mm : < ss >')" :value="value|day_subtract(1, 'second')|day_format('HH : mm : < ss >')"/>
+    <code-and-result label="day_subtract(1, 'year')|day_format('< YYYY > - MM - DD')" :value="value|day_subtract(1, 'year')|day_format('< YYYY > - MM - DD')"/>
+    <code-and-result label="day_subtract(1, 'month')|day_format('YYYY - < MM > - DD')" :value="value|day_subtract(1, 'month')|day_format('YYYY - < MM > - DD')"/>
+    <code-and-result label="day_subtract(1, 'day')|day_format('YYYY - MM - < DD >')" :value="value|day_subtract(1, 'day')|day_format('YYYY - MM - < DD >')"/>
+    <code-and-result label="day_subtract(1, 'hour')|day_format('< HH > : mm : ss')" :value="value|day_subtract(1, 'hour')|day_format('< HH > : mm : ss')"/>
+    <code-and-result label="day_subtract(1, 'minute')|day_format('HH : < mm > : ss')" :value="value|day_subtract(1, 'minute')|day_format('HH : < mm > : ss')"/>
+    <code-and-result label="day_subtract(1, 'second')|day_format('HH : mm : < ss >')" :value="value|day_subtract(1, 'second')|day_format('HH : mm : < ss >')"/>
     <code-title title="开头时间" sub-title="返回当前时间的开头时间的 Dayjs 对象，如月份的第一天"/>
-    <code-and-result label="原值|day_startof('year')|day_format" :value="value|day_startof('year')|day_format"/>
-    <code-and-result label="原值|day_startof('month')|day_format" :value="value|day_startof('month')|day_format"/>
-    <code-and-result label="原值|day_startof('date')|day_format" :value="value|day_startof('date')|day_format"/>
-    <code-and-result label="原值|day_startof('hour')|day_format" :value="value|day_startof('hour')|day_format"/>
-    <code-and-result label="原值|day_startof('minute')|day_format" :value="value|day_startof('minute')|day_format"/>
+    <code-and-result label="day_startof('year')|day_format" :value="value|day_startof('year')|day_format"/>
+    <code-and-result label="day_startof('month')|day_format" :value="value|day_startof('month')|day_format"/>
+    <code-and-result label="day_startof('date')|day_format" :value="value|day_startof('date')|day_format"/>
+    <code-and-result label="day_startof('hour')|day_format" :value="value|day_startof('hour')|day_format"/>
+    <code-and-result label="day_startof('minute')|day_format" :value="value|day_startof('minute')|day_format"/>
     <code-title title="末尾时间" sub-title="返回当前时间的末尾时间的 Dayjs 对象，如月份的最后一天"/>
-    <code-and-result label="原值|day_endof('year')|day_format" :value="value|day_endof('year')|day_format"/>
-    <code-and-result label="原值|day_endof('month')|day_format" :value="value|day_endof('month')|day_format"/>
-    <code-and-result label="原值|day_endof('date')|day_format" :value="value|day_endof('date')|day_format"/>
-    <code-and-result label="原值|day_endof('hour')|day_format" :value="value|day_endof('hour')|day_format"/>
-    <code-and-result label="原值|day_endof('minute')|day_format" :value="value|day_endof('minute')|day_format"/>
+    <code-and-result label="day_endof('year')|day_format" :value="value|day_endof('year')|day_format"/>
+    <code-and-result label="day_endof('month')|day_format" :value="value|day_endof('month')|day_format"/>
+    <code-and-result label="day_endof('date')|day_format" :value="value|day_endof('date')|day_format"/>
+    <code-and-result label="day_endof('hour')|day_format" :value="value|day_endof('hour')|day_format"/>
+    <code-and-result label="day_endof('minute')|day_format" :value="value|day_endof('minute')|day_format"/>
     <code-title title="显示" sub-title="格式化 Dayjs 对象并展示"/>
-    <code-and-result label="原值|day_format" :value="value|day_format"/>
-    <code-and-result label="原值|day_format('YY-MM-DD')" :value="value|day_format('YY-MM-DD')"/>
-    <code-and-result label="原值|day_format('YYYY-M-D')" :value="value|day_format('YYYY-M-D')"/>
-    <code-and-result label="原值|day_format('YYYY-M-D H:m:s')" :value="value|day_format('YYYY-M-D H:m:s')"/>
+    <code-and-result label="day_format" :value="value|day_format"/>
+    <code-and-result label="day_format('YY-MM-DD')" :value="value|day_format('YY-MM-DD')"/>
+    <code-and-result label="day_format('YYYY-M-D')" :value="value|day_format('YYYY-M-D')"/>
+    <code-and-result label="day_format('YYYY-M-D H:m:s')" :value="value|day_format('YYYY-M-D H:m:s')"/>
     <code-title title="时间差" sub-title="获取两个 Dayjs 对象的时间差，默认毫秒"/>
-    <code-and-result label="原值|day_diff('2012-10-31', 'year')" :value="value|day_diff('2012-10-31', 'year')"/>
-    <code-and-result label="原值|day_diff('2012-10-31', 'month')" :value="value|day_diff('2012-10-31', 'month')"/>
-    <code-and-result label="原值|day_diff('2012-10-31', 'day')" :value="value|day_diff('2012-10-31', 'day')"/>
-    <code-and-result label="原值|day_diff('2012-10-31', 'hour')" :value="value|day_diff('2012-10-31', 'hour')"/>
-    <code-and-result label="原值|day_diff('2012-10-31', 'minute')" :value="value|day_diff('2012-10-31', 'minute')"/>
-    <code-and-result label="原值|day_diff('2012-10-31', 'second')" :value="value|day_diff('2012-10-31', 'second')"/>
+    <code-and-result label="day_diff('2012-10-31', 'year')" :value="value|day_diff('2012-10-31', 'year')"/>
+    <code-and-result label="day_diff('2012-10-31', 'month')" :value="value|day_diff('2012-10-31', 'month')"/>
+    <code-and-result label="day_diff('2012-10-31', 'day')" :value="value|day_diff('2012-10-31', 'day')"/>
+    <code-and-result label="day_diff('2012-10-31', 'hour')" :value="value|day_diff('2012-10-31', 'hour')"/>
+    <code-and-result label="day_diff('2012-10-31', 'minute')" :value="value|day_diff('2012-10-31', 'minute')"/>
+    <code-and-result label="day_diff('2012-10-31', 'second')" :value="value|day_diff('2012-10-31', 'second')"/>
     <code-title title="Unix 时间戳" sub-title="返回毫秒和秒"/>
-    <code-and-result label="原值|day_value_millisecond" :value="value|day_value_millisecond"/>
-    <code-and-result label="原值|day_value_second" :value="value|day_value_second"/>
+    <code-and-result label="day_value_millisecond" :value="value|day_value_millisecond"/>
+    <code-and-result label="day_value_second" :value="value|day_value_second"/>
     <code-title title="月份天数" sub-title="返回传入日期月份的天数"/>
-    <code-and-result label="原值|day_days_in_month" :value="value|day_days_in_month"/>
+    <code-and-result label="day_days_in_month" :value="value|day_days_in_month"/>
     <code-title title="处理为其它格式" sub-title="原生的 Date 对象，数组，json，ios 标准，对象，字符串"/>
-    <code-and-result label="原值|day_to_date" :value="value|day_to_date"/>
-    <code-and-result label="原值|day_to_array" :value="value|day_to_array"/>
-    <code-and-result label="原值|day_to_json" :value="value|day_to_json"/>
-    <code-and-result label="原值|day_to_iso" :value="value|day_to_iso"/>
-    <code-and-result label="原值|day_to_object" :value="value|day_to_object"/>
-    <code-and-result label="原值|day_to_string" :value="value|day_to_string"/>
+    <code-and-result label="day_to_date" :value="value|day_to_date"/>
+    <code-and-result label="day_to_array" :value="value|day_to_array"/>
+    <code-and-result label="day_to_json" :value="value|day_to_json"/>
+    <code-and-result label="day_to_iso" :value="value|day_to_iso"/>
+    <code-and-result label="day_to_object" :value="value|day_to_object"/>
+    <code-and-result label="day_to_string" :value="value|day_to_string"/>
     <code-title title="查询" sub-title="是否之前，之后，或者相同"/>
-    <code-and-result label="原值|day_is_before('2020-1-1')" :value="value|day_is_before('2020-1-1')"/>
-    <code-and-result label="原值|day_is_after('2012-1-1')" :value="value|day_is_after('2012-1-1')"/>
-    <code-and-result label="原值|day_is_same(new Date())" :value="value|day_is_same(new Date())"/>
-    <code-and-result label="原值|day_is_same(new Date(), 'date')" :value="value|day_is_same(new Date(), 'date')"/>
+    <code-and-result label="day_is_before('2020-1-1')" :value="value|day_is_before('2020-1-1')"/>
+    <code-and-result label="day_is_after('2012-1-1')" :value="value|day_is_after('2012-1-1')"/>
+    <code-and-result label="day_is_same(new Date())" :value="value|day_is_same(new Date())"/>
+    <code-and-result label="day_is_same(new Date(), 'date')" :value="value|day_is_same(new Date(), 'date')"/>
   </d2-container>
 </template>