Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 7053de4
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 24 09:52:42 2017 +0800

    update demo

commit c61015d
Merge: a5f4a1d 65255c9
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 20:22:51 2017 -0500

    Merge pull request iview#2172 from SergioCrisostomo/fix-2164

    format string dates in daterange also

commit a5f4a1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 23:08:40 2017 +0800

    fixed iview#1922

commit 65255c9
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 15:53:12 2017 +0200

    fix date formatting when strings are supplied to DatePicker

commit 6c634aa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 19:01:47 2017 +0800

    fixed iview#2078

commit c2d74ec
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 18:26:42 2017 +0800

    fixed iview#2100

commit b92a1b5
Merge: 6261a49 3ed12b4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:22:44 2017 -0500

    Merge pull request iview#2170 from SergioCrisostomo/use-locale-formated-year-month

    Correct month calculation and add specs for date-picker labels

commit 6261a49
Merge: a1553a9 7afb406
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:19:11 2017 -0500

    Merge pull request iview#2171 from iview/pr/2124

    update Tag style for check

commit a1553a9
Merge: 5064c7b fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 04:17:50 2017 -0500

    Merge pull request iview#2124 from daiyanze/feature/checkable_tag

    Feature/checkable tag (追加功能：可选标签)

commit 7afb406
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 17:14:29 2017 +0800

    update Tag style for check

commit 3ed12b4
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Mon Oct 23 11:13:06 2017 +0200

    Correct month calculation and add specs for date-picker labels

commit fd79f10
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:57:05 2017 -0500

    Update tag.vue

commit 5064c7b
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 16:52:30 2017 +0800

    update ja-JP

commit 4c6d996
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 23 03:40:39 2017 -0500

    Update tag.vue

commit b75ad4a
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 14:12:02 2017 +0800

    fixed iview#1700

commit 6ed0cd7
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:55:35 2017 +0800

    update Tree demo

commit 0e31618
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 11:00:20 2017 +0800

    update demo

commit ba1422c
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:52:56 2017 +0800

    update zh-TW

commit f672ae0
Merge: 0f65109 2537c26
Author: Aresn <admin@aresn.com>
Date:   Sun Oct 22 20:29:51 2017 -0500

    Merge pull request iview#2097 from SergioCrisostomo/use-locale-formated-year-month

    use date.toLocaleDateString to format year/month

commit 0f65109
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 23 09:26:41 2017 +0800

    update

commit a730a84
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 17:44:58 2017 +0800

    update Tabs

commit ec1a5e2
Merge: 758bd76 be3fbd2
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 04:38:28 2017 -0500

    Merge pull request iview#2156 from marxy/tabs-scroll

    Tabs add scroll

commit 758bd76
Merge: 45103ca e15746f
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:56:33 2017 +0800

    Merge branch '2.0' of https://github.com/iview/iview into 2.0

commit 45103ca
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 16:53:59 2017 +0800

    fixed iview#2066

commit be3fbd2
Author: marxy <334905044@qq.com>
Date:   Fri Oct 20 16:30:44 2017 +0800

    Tabs add scroll

commit e15746f
Author: Aresn <admin@aresn.com>
Date:   Fri Oct 20 03:18:08 2017 -0500

    update dependence

commit 485a903
Author: 梁灏 <admin@aresn.com>
Date:   Fri Oct 20 15:36:43 2017 +0800

    fixed iview#2149

commit cbe5ccf
Merge: 11baa9a 437b805
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 22:47:33 2017 -0500

    Merge pull request iview#2114 from SergioCrisostomo/improve-csv

    Improve export to CSV functionality

commit 11baa9a
Merge: 2e8add2 a3336b3
Author: Aresn <admin@aresn.com>
Date:   Thu Oct 19 05:45:31 2017 -0500

    Merge pull request iview#2136 from SergioCrisostomo/fix-scroll-event

    add missing event in callback

commit a3336b3
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Thu Oct 19 10:41:19 2017 +0200

    add missing event in callback

commit 62bf2b3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:21:52 2017 +0900

    Modify: example of tags

commit dc39cc3
Author: daiyanze <ginoalex8964@yahoo.com>
Date:   Wed Oct 18 17:13:06 2017 +0900

    Feature: Checkable tag

commit 2e8add2
Author: 梁灏 <admin@aresn.com>
Date:   Wed Oct 18 08:58:16 2017 +0800

    release 2.5.1

commit 95dfbe1
Merge: 3c6d8ea 5d1c24c
Author: Aresn <admin@aresn.com>
Date:   Tue Oct 17 19:52:02 2017 -0500

    Merge pull request iview#2120 from SergioCrisostomo/fix-2119

    correct behaviour when initialising date-picker with a empty string

commit 5d1c24c
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 15:13:42 2017 +0200

    correct behaviour when initialising date-picker with a empty string

commit 2537c26
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 14:26:12 2017 +0200

    add dateLabel to time panel

commit b27858d
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 13:09:04 2017 +0200

    add date panel label format logic

commit 3d50db5
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 12:25:36 2017 +0200

    add datePanelLabel format in locale files

commit 437b805
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:14:10 2017 +0200

    Added Table to CSV example and tests

commit fb84799
Author: Sergio Crisostomo <sergiosbox@gmail.com>
Date:   Tue Oct 17 10:13:54 2017 +0200

    Improve export to CSV functionality

     - added`callback`option so we can get CSV data in case we do not want
    to download
     - added options:
        - `quoted` for cases when we have line breaks in content
        - `separator` for cases when we have commas in content

commit 3c6d8ea
Author: 梁灏 <admin@aresn.com>
Date:   Tue Oct 17 16:09:11 2017 +0800

    release 2.5.0

commit 61d1637
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:45:46 2017 +0800

    publish 2.5.0-beta.2

commit 78b46fa
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:41:13 2017 +0800

    Scroll add local loading-text

commit 109465d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 20:10:21 2017 +0800

    optimize  Scroll scroll behavior

commit 6850c1d
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 18:32:47 2017 +0800

    Scroll add `height` prop

commit 7462478
Author: 梁灏 <admin@aresn.com>
Date:   Mon Oct 16 16:05:06 2017 +0800

    publish 2.5.0-beta.1

commit 8c2e53e
Merge: f180098 af6a7c4
Author: Aresn <admin@aresn.com>
Date:   Mon Oct 16 02:54:57 2017 -0500

    Merge pull request iview#2069 from dspangenberg/2.0

    DatePicker: weekStartDay did not influence the order of the weekdays in the header

commit af6a7c4
Author: Danny Spangenberg <danny.spangenberg@twiceware.de>
Date:   Wed Oct 11 17:38:03 2017 +0200

    weekStartDay did not influence the order of the weekdays in the header
  • Loading branch information
@krislavten @ZhaoYuLing
krislavten authored and ZhaoYuLing committed Dec 21, 2017
1 parent fba9f4e commit 1050bac
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 23 deletions.
15 changes: 1 addition & 14 deletions examples/routers/cascader.vue
View file
Expand Up @@ -8,20 +8,7 @@
data: [{
value: 'beijing',
label: '北京',
children: [
{
value: 'gugong',
label: '故宫'
},
{
value: 'tiantan',
label: '天坛'
},
{
value: 'wangfujing',
label: '王府井'
}
]
children: []
}, {
value: 'jiangsu',
label: '江苏',
Expand Down
1 change: 1 addition & 0 deletions examples/routers/select.vue
View file
Expand Up @@ -178,6 +178,7 @@
:loading="loading2">
<Option v-for="(option, index) in options2" :value="option.value" :key="index">{{option.label}}</Option>
</Select>
<Button @click="clear">clear</Button>
</div>
</template>
<script>
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
@@ -1,6 +1,6 @@
{
"name": "iview-bsc",
"version": "2.3.3",
"version": "2.3.4",
"title": "iview-bsc",
"description": "iview for baishancloud",
"homepage": "http://www.iviewui.com",
Expand Down
6 changes: 0 additions & 6 deletions src/components/date-picker/panel/date.vue
View file
Expand Up @@ -196,12 +196,6 @@
this.date = siblingMonth(this.date, dir);
this.setMonthYear(this.date);
},
showYearPicker () {
this.currentView = 'year';
},
showMonthPicker () {
this.currentView = 'month';
},
handleToggleTime () {
if (this.currentView === 'date') {
this.currentView = 'time';
Expand Down
4 changes: 4 additions & 0 deletions src/components/tabs/tabs.vue
View file
Expand Up @@ -3,7 +3,11 @@
<div :class="[prefixCls + '-bar']">
<div :class="[prefixCls + '-nav-right']" v-if="showSlot"><slot name="extra"></slot></div>
<div :class="[prefixCls + '-nav-container']">
<<<<<<< HEAD
<div ref="navWrap" :class="[prefixCls + '-nav-wrap', scrollable ? prefixCls + '-nav-scrollable' : '']">
=======
<div ref="navWrap" :class="[prefixCls + '-nav-wrap', scrollable ? prefixCls + '-nav-scrollable' : '']" >
>>>>>>> Squashed commit of the following:
<span :class="[prefixCls + '-nav-prev', scrollable ? '' : prefixCls + '-nav-scroll-disabled']" @click="scrollPrev"><Icon type="chevron-left"></Icon></span>
<span :class="[prefixCls + '-nav-next', scrollable ? '' : prefixCls + '-nav-scroll-disabled']" @click="scrollNext"><Icon type="chevron-right"></Icon></span>
<div ref="navScroll" :class="[prefixCls + '-nav-scroll']">
Expand Down
2 changes: 1 addition & 1 deletion src/components/tag/tag.vue
View file
Expand Up @@ -54,7 +54,7 @@
return [
`${prefixCls}`,
{
[`${prefixCls}-${this.color}`]: !!this.color,
[`${prefixCls}-${this.color}`]: !!this.color && (this.checkable && this.isChecked),
[`${prefixCls}-${this.type}`]: !!this.type,
[`${prefixCls}-closable`]: this.closable,
[`${prefixCls}-checked`]: this.isChecked
Expand Down

0 comments on commit 1050bac

Please sign in to comment.