Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 9af3d87
Author: lan <adwerrd@hotmail.com>
Date:   Mon Nov 6 10:40:32 2017 +0800

    radio adn switch dark

commit 914a145
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:27:07 2017 +0800

    slider dark

commit 83c7b53
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 17:03:22 2017 +0800

    progress dark

commit 85c812f
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 13:58:21 2017 +0800

    tooltip dark

commit 664d022
Author: xiaoyu <852483353@qq.com>
Date:   Sat Nov 4 11:48:41 2017 +0800

    poptip dark

commit d02a4fa
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 20:28:18 2017 +0800

    spin dark

commit bb38adf
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 19:19:17 2017 +0800

    tabs dark

commit 90713f1
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:55:08 2017 +0800

    tag dark

commit ba22112
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 16:18:17 2017 +0800

    input-number dark

commit ef06cf2
Author: xiaoyu <852483353@qq.com>
Date:   Fri Nov 3 15:18:32 2017 +0800

    input dark

commit bbc598f
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:44:57 2017 +0800

    version change

commit 4f84332
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:52 2017 +0800

    switch bugfix

commit 99d0b55
Author: lan <adwerrd@hotmail.com>
Date:   Thu Nov 2 19:43:16 2017 +0800

    Squashed commit of the following:

    commit 427dd34
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Nov 2 18:23:10 2017 +0800

        update issue guide

    commit 0819648
    Merge: 470930e d1f698c
    Author: Aresn <admin@aresn.com>
    Date:   Wed Nov 1 04:03:17 2017 -0500

        Merge pull request iview#2274 from yangdan8/patch-2

        Modal弹窗请添加on-visible-change给外部api访问

    commit d1f698c
    Author: yangdan8 <13532023084@139.com>
    Date:   Wed Nov 1 15:12:12 2017 +0800

        Modal弹窗请添加on-visible-change给外部api访问

        Modal弹窗请添加on-visible-change给外部api访问

    commit 470930e
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 14:15:00 2017 +0800

        update issue template

    commit d44e817
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 31 10:33:50 2017 +0800

        update Readme

    commit 1a1f7c3
    Merge: 75fa706 915e06d
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:09:25 2017 +0800

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

    commit 75fa706
    Author: 梁灏 <admin@aresn.com>
    Date:   Mon Oct 30 16:01:18 2017 +0800

        update tabs demo

    commit 915e06d
    Merge: 1231c1a 3be0aa1
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 03:01:06 2017 -0500

        Merge pull request iview#2230 from cheng-kang/2.0

        fix issue iview#1846

    commit 1231c1a
    Merge: 5a83c4a 0c0683e
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 02:46:05 2017 -0500

        Merge pull request iview#2018 from Baoyx007/patch-1

        feat(form) : support promise for validate method iview#1857

    commit 3be0aa1
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Mon Oct 30 00:33:31 2017 -0700

        Import custom MutationObserver; remove mutation observer before component get destroyed

    commit 5a83c4a
    Merge: 7a9f6b2 b30250a
    Author: Aresn <admin@aresn.com>
    Date:   Mon Oct 30 01:40:31 2017 -0500

        Merge pull request iview#2223 from chavyleung/2.0

        fixed: iview#2219 & ColorPicker icon position

    commit 7988575
    Author: Kang Cheng <me@chengkang.pw>
    Date:   Sun Oct 29 15:39:45 2017 -0700

        fix issue iview#1846

    commit b30250a
    Author: Chavy <chavyleung@163.com>
    Date:   Sat Oct 28 11:57:38 2017 +0800

        fixed: iview#2219 & ColorPicker icon position

    commit 7a9f6b2
    Merge: 7d25930 a892ba6
    Author: Aresn <admin@aresn.com>
    Date:   Fri Oct 27 02:22:16 2017 -0500

        Merge pull request iview#2213 from SergioCrisostomo/fix-number-input

        prevent firing change when typing numbers < min

    commit a892ba6
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Fri Oct 27 08:40:11 2017 +0200

        prevent firing change when typing numbers < min

    commit 7d25930
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:47:54 2017 +0800

        release 2.6.0

    commit f673ca4
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 14:18:07 2017 +0800

        publish 2.6.0 beta

    commit 86cdfb8
    Merge: 252717e 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:52 2017 -0500

        Merge pull request iview#2194 from SergioCrisostomo/add-scroll-distance-to-edge

        add distance-to-edge property

    commit 19ad5f4
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:14:36 2017 -0500

        Update scroll.vue

    commit 252717e
    Merge: 9147e63 dfae43a
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:13:02 2017 -0500

        Merge pull request iview#2193 from SergioCrisostomo/fix-2191

        correct input value in filterable mode

    commit 9147e63
    Merge: 51939f8 cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:10:44 2017 -0500

        Merge pull request iview#2195 from yangdan8/patch-4

        Update table.vue  解决tabs切换时,tab中的table调试时控制台报$el undefined的问题

    commit cbdac01
    Author: Aresn <admin@aresn.com>
    Date:   Thu Oct 26 00:09:42 2017 -0500

        Update table.vue

    commit 51939f8
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 12:55:18 2017 +0800

        update Select tag

    commit 2079c47
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:57:24 2017 +0800

        update Tag

    commit 2993f4e
    Author: 梁灏 <admin@aresn.com>
    Date:   Thu Oct 26 11:26:05 2017 +0800

        update Tab

    commit f6a787f
    Author: yangdan8 <13532023084@139.com>
    Date:   Thu Oct 26 09:48:47 2017 +0800

        Update table.vue

    commit 72ba666
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 21:21:35 2017 +0200

        add distance-to-edge property

    commit dfae43a
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Wed Oct 25 20:49:38 2017 +0200

        correct input value in filterable mode

    commit af7d72b
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 22:34:58 2017 +0800

        update Tree selected

    commit 6ff0e34
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 21:10:29 2017 +0800

        update Tree Render function

    commit 97098fc
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 19:12:14 2017 +0800

        update Tree example

    commit b64204f
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 17:41:37 2017 +0800

        update Tree demo

    commit 174836c
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 16:45:42 2017 +0800

        update Tree Render function use

    commit 3ea2461
    Author: 梁灏 <admin@aresn.com>
    Date:   Wed Oct 25 14:33:22 2017 +0800

        update checkbox style

    commit 69460a5
    Merge: 8711920 610fd3a
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 21:44:41 2017 -0500

        Merge pull request iview#2181 from lisafra/update-carousel

        Update carousel component: add loop and radiusDot property

    commit 610fd3a
    Author: houyl <houyl@okooo.net>
    Date:   Wed Oct 25 09:30:46 2017 +0800

        [fix bug]  carousel component: remove no use code

    commit 8711920
    Merge: 2be2b97 692be62
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 19:14:01 2017 -0500

        Merge pull request iview#2185 from md678685/patch-1

        Fix some English grammar in README

    commit 692be62
    Author: md678685 <mathew678@hotmail.co.uk>
    Date:   Tue Oct 24 21:06:04 2017 +0100

        Fix some English grammar in README

        This PR changes some of the English sentences in the `README.md` to sound more natural. I have tried to keep the structure as close as possible to the original. If anything sounds confusing, please reply below.

        这个PR改变了`README.md`中的一些英文句子,使其听起来更自然。 我试图保持结构尽可能接近原来。 如有任何疑问,请在下面回覆。

    commit 2be2b97
    Merge: b31aab7 da76a83
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 07:46:14 2017 -0500

        Merge pull request iview#2184 from SergioCrisostomo/fix-tree-examples

        fix dom rendering when adding new nodes in example

    commit da76a83
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 14:08:52 2017 +0200

        fix dom rendering problems

    commit b31aab7
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 18:14:22 2017 +0800

        Tree add async loading

    commit 76a4781
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:48:28 2017 +0800

        fixed iview#2128

    commit ccf544d
    Author: houyl <houyl@okooo.net>
    Date:   Tue Oct 24 16:47:12 2017 +0800

        Merge branch 'master' of https://github.com/iview/iview into 2.0
        Update carousel component: add loop and radiusDot property
        # Conflicts:
        #	package.json
        #	src/components/date-picker/picker.vue
        #	src/components/select/select.vue

    commit 9b24f1a
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 16:20:09 2017 +0800

        Tree add Render function

        fixed iview#2133
        fixed iview#1784
        fixed iview#1333
        fixed iview#1362

    commit ecf6c2f
    Author: 梁灏 <admin@aresn.com>
    Date:   Tue Oct 24 15:47:07 2017 +0800

        update dependence

    commit c89e0e1
    Merge: 7053de4 0a8f9b4
    Author: Aresn <admin@aresn.com>
    Date:   Tue Oct 24 02:44:19 2017 -0500

        Merge pull request iview#2090 from SergioCrisostomo/refactor-tree

        Refactor tree

    commit 0a8f9b4
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Tue Oct 24 09:30:09 2017 +0200

        Keep original data pointers and correct if clause

    commit d44420b
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:49:13 2017 +0200

        refactor and make indeterminate accessible outside tree

    commit 94d177c
    Author: Sergio Crisostomo <sergiosbox@gmail.com>
    Date:   Sat Oct 14 09:47:33 2017 +0200

        add width to expand icon so we can click on it easier

    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

    commit 0c0683e
    Author: Haven <baoyx007@gmail.com>
    Date:   Thu Sep 28 00:40:16 2017 -0500

        feat(form) : support promise for validate method iview#1857

commit d545cc6
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 17:35:44 2017 +0800

    dark bugfix

commit 2995faf
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 16:50:39 2017 +0800

    date-picker dark

commit d8dc76f
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 16:52:46 2017 +0800

    remove css-dark

commit c4789cd
Author: xiaoyu <852483353@qq.com>
Date:   Thu Nov 2 10:40:41 2017 +0800

    select dark

commit 5ae38e2
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 17:11:50 2017 +0800

    checkbox dark

commit 706736c
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 16:19:36 2017 +0800

    modify modal dark

commit 363dc6f
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 14:52:21 2017 +0800

    simplify table dark

commit e5efbcb
Author: lan <adwerrd@hotmail.com>
Date:   Wed Nov 1 15:15:49 2017 +0800

    button dark

commit 4ccbf8e
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 31 15:51:13 2017 +0800

    button dark

commit 4ba897d
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 12:01:47 2017 +0800

    modify -dark in custom.less

commit 94151fc
Author: xiaoyu <852483353@qq.com>
Date:   Wed Nov 1 11:12:45 2017 +0800

    add -dark in custom.less

commit a361f59
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 19:35:00 2017 +0800

    checkbox dark

commit 023454d
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 17:32:37 2017 +0800

    dark table sort  bugfix

commit 25e3758
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:49:30 2017 +0800

    switch black bugfix

commit e08998c
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 16:05:36 2017 +0800

    switch black

commit 71a091b
Author: zyl <949472497@qq.com>
Date:   Tue Oct 31 15:00:47 2017 +0800

    tag black

commit 62587b6
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8795f12
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:34:24 2017 +0800

    input-number black

commit eee42f9
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:28:46 2017 +0800

    radio black

commit 8109034
Author: zyl <949472497@qq.com>
Date:   Wed Oct 25 19:17:36 2017 +0800

    input black

commit 8d78de9
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 31 16:25:58 2017 +0800

    date-picker dark

commit dc01707
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 18:56:38 2017 +0800

    modal-dark  and  select-dark

commit f54459a
Author: xiaoyu <852483353@qq.com>
Date:   Wed Oct 25 11:58:57 2017 +0800

    table dark

commit 2fab71a
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:44 2017 +0800

    add dark less

commit ed4e493
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 20:56:34 2017 +0800

    add dark less 2

commit 5060fc8
Author: lan <adwerrd@hotmail.com>
Date:   Tue Oct 24 19:34:26 2017 +0800

    add dark less

commit b51c7cb
Author: xiaoyu <852483353@qq.com>
Date:   Tue Oct 24 17:02:32 2017 +0800

    table black color
  • Loading branch information
krislavten committed Nov 6, 2017
1 parent 7c7ec93 commit 67998b4
Show file tree
Hide file tree
Showing 85 changed files with 6,059 additions and 232 deletions.
19 changes: 14 additions & 5 deletions .github/ISSUE_TEMPLATE.md
@@ -1,5 +1,14 @@
<!-- 请提交与 [Bug Report] 或 [Feature Request] 相关的 issues,对于一般提问,请先查阅已有 issues,仔细阅读 Vue 文档和 iView 文档 -->
<!-- 对于如何使用的问题,建议您到 SegmentFault 平台直接提问 -->
<!-- 请提供能够复现问题的在线链接或 repo,否则可能将直接关闭您的问题 -->
<!-- 使用下面的在线链接可以快速创建示例 -->
<!-- https://jsfiddle.net/yyrzhm46/ -->
<!--
注意:请使用下面的链接来新建 issue:
https://www.iviewui.com/new-issue
不是用上面的链接创建的 issue 会被立即关闭。
-->
<!--
IMPORTANT: Please use the following link to create a new issue:
https://www.iviewui.com/new-issue
If your issue was not created using the app above, it will be closed immediately.
-->
2 changes: 1 addition & 1 deletion examples/app.vue
Expand Up @@ -10,7 +10,7 @@ li + li { border-left: solid 1px #bbb; padding-left: 10px; margin-left: 10px; }
.v-link-active { color: #bbb; }
</style>
<template>
<div class="container">
<div class="container dark">
<nav>
<ul>
<li><router-link to="/affix">Affix</router-link></li>
Expand Down
2 changes: 1 addition & 1 deletion examples/index.html
Expand Up @@ -5,7 +5,7 @@
<title>iView test page</title>
<!-- <link href="/test/dist/main.css" rel="stylesheet"> -->
</head>
<body>
<body class="dark">
<div id="app"></div>
<!-- <script type="text/javascript" src="/test/dist/vendor.js"></script>
<script type="text/javascript" src="/test/dist/main.js"></script> -->
Expand Down
6 changes: 6 additions & 0 deletions examples/routers/button.vue
Expand Up @@ -20,6 +20,12 @@
<br><br>
<h4>配合图标</h4>
<br><br>
<Button type="primary">
<Icon type="chevron-left"></Icon>
前进
</Button>
<Button disabled>今日</Button>
<Button disabled>明日</Button>
<Button-group>
<Button type="primary">
<Icon type="chevron-left"></Icon>
Expand Down
10 changes: 4 additions & 6 deletions examples/routers/carousel.vue
@@ -1,10 +1,8 @@
<template>
<div>
<Carousel v-model="v1" dots="inside" trigger="hover">
<Carousel v-model="v1" dots="inside" trigger="hover" autoplay loop radius-dot easing="fade">
<Carousel-item>
<Card>
<div class="demo-carousel">1</div>
</Card>
<div class="demo-carousel">1</div>
</Carousel-item>
<Carousel-item>
<div class="demo-carousel">2</div>
Expand All @@ -24,8 +22,8 @@
export default {
data () {
return {
v1: 1
}
v1: 0
};
},
methods: {
push () {
Expand Down
45 changes: 44 additions & 1 deletion examples/routers/checkbox.vue
Expand Up @@ -15,7 +15,7 @@
<div>
<Checkbox size="large" true-value="true" false-value="false" v-model="testValue1">Apple</Checkbox>
<Checkbox true-value="true" false-value="false" v-model="testValue1">Apple</Checkbox>
<Checkbox size="small" true-value="true" false-value="false" v-model="testValue1">Apple</Checkbox>
<Checkbox disabled size="small" true-value="true" false-value="false" v-model="testValue1">Apple</Checkbox>
{{ testValue1 }}
</div>
<div>
Expand All @@ -26,6 +26,18 @@
<Checkbox v-for="item in tags" :label="item.label" :key="item.label" true-value="true"></Checkbox>
</Checkbox-group>
<div>{{ fruit }}</div>
<div style="border-bottom: 1px solid #e9e9e9;padding-bottom:6px;margin-bottom:6px;">
<Checkbox
:indeterminate="indeterminate"
:value="checkAll"
@click.prevent.native="handleCheckAll">全选</Checkbox>
</div>
<CheckboxGroup v-model="checkAllGroup" @on-change="checkAllGroupChange">
<Checkbox label="香蕉"></Checkbox>
<Checkbox label="苹果"></Checkbox>
<Checkbox label="西瓜"></Checkbox>
</CheckboxGroup>
<Checkbox disabled>不可用</Checkbox>
</div>
</template>
<script>
Expand All @@ -35,10 +47,41 @@
social: ['facebook', 'github'],
fruit: ['苹果'],
tags: [],
indeterminate: true,
checkAll: false,
checkAllGroup: ['香蕉', '西瓜'],
testValue1: null,
testValue2: null
}
},
methods: {
handleCheckAll () {
if (this.indeterminate) {
this.checkAll = false;
} else {
this.checkAll = !this.checkAll;
}
this.indeterminate = false;
if (this.checkAll) {
this.checkAllGroup = ['香蕉', '苹果', '西瓜'];
} else {
this.checkAllGroup = [];
}
},
checkAllGroupChange (data) {
if (data.length === 3) {
this.indeterminate = false;
this.checkAll = true;
} else if (data.length > 0) {
this.indeterminate = true;
this.checkAll = false;
} else {
this.indeterminate = false;
this.checkAll = false;
}
}
},
mounted () {
setTimeout(() => {
this.tags = [
Expand Down
43 changes: 42 additions & 1 deletion examples/routers/date.vue
@@ -1,17 +1,58 @@
<template>
<div>
{{ value1 }}
<Date-picker v-model="value1" type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="hc"></Date-picker>
<Date-picker v-model="value1" :options="options1" type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="hc"></Date-picker>
<Button @click="setDate">set date</Button>
<Button @click="getDate">get date</Button>
<!--<Date-picker v-model="value2" type="daterange" placeholder="选择日期" style="width: 200px"></Date-picker>-->
<!--<Date-picker transfer type="datetimerange" placeholder="选择日期" style="width: 200px" @on-change="changeDate"></Date-picker>-->
<Date-picker type="date" :options="options4" placeholder="选择日期" style="width: 200px"></Date-picker>
</div>
</template>
<script>
export default {
data () {
return {
options1: {
shortcuts: [
{
text: '今天',
value () {
return new Date();
},
onClick: (picker) => {
this.$Message.info('点击了今天');
}
},
{
text: '昨天',
value () {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24);
return date;
},
onClick: (picker) => {
this.$Message.info('点击了昨天');
}
},
{
text: '一周前',
value () {
const date = new Date();
date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
return date;
},
onClick: (picker) => {
this.$Message.info('点击了一周前');
}
}
]
},
options4: {
disabledDate (date) {
return date && date.valueOf() > Date.now() - 86400000;
}
},
value1: ['2014-10-10 10:00:01', '2017-10-10 10:00:00'],
value2: []
}
Expand Down
1 change: 1 addition & 0 deletions examples/routers/input-number.vue
Expand Up @@ -8,6 +8,7 @@
<!--<Input-number :max="10" :min="1" v-model="obj.v"></Input-number>-->
<InputNumber :editable="false" :max="10" :min="1" :step="1.2" v-model="value2"></InputNumber>
<InputNumber :precision="1" :max="10" :min="1" :step="0.1" v-model="value1"></InputNumber>
<InputNumber :precision="1" :max="10" :min="1" :step="0.1" disabled></InputNumber>
</div>
</template>
<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/routers/input.vue
@@ -1,6 +1,6 @@
<template>
<div style="width: 100px;">
<Input autocomplete="on" v-model="value1" size="large" placeholder="large size"></Input>
<Input disabled autocomplete="on" v-model="value1" size="large" placeholder="large size"></Input>
<br>
<Input v-model="value2" placeholder="default size"></Input>
<br>
Expand Down
11 changes: 11 additions & 0 deletions examples/routers/modal.vue
Expand Up @@ -2,6 +2,7 @@
<div>
<i-button @click="showModal = true">Modal有Tabs</i-button>
<i-button @click="showModal2 = true">Modal无Tabs</i-button>
<i-button @click="showModal3 = true">显示对话框</i-button>
<Modal v-model="showModal" title="弹窗">
<Tabs>
<Tab-pane label="演示" style="height: 80px;">
Expand All @@ -18,6 +19,15 @@
<i-option v-for="item in options" :value="item.value" :key="item.value">{{ item.label }}</i-option>
</i-select>
</Modal>
<Modal
v-model="showModal3"
title="普通的Modal对话框标题"
@on-ok="ok"
@on-cancel="cancel">
<p>对话框内容</p>
<p>对话框内容</p>
<p>对话框内容</p>
</Modal>
</div>
</template>
<script>
Expand All @@ -27,6 +37,7 @@
m1: [],
showModal: false,
showModal2: false,
showModal3: false,
options: [
{
value: 'beijing',
Expand Down
3 changes: 3 additions & 0 deletions examples/routers/poptip.vue
Expand Up @@ -6,6 +6,9 @@
</div>
<Button>click 激活</Button>
</Poptip>
<Poptip title="提示标题" content="提示内容">
<Button>hover 激活</Button>
</Poptip>
</div>
</template>
<script>
Expand Down
7 changes: 7 additions & 0 deletions examples/routers/progress.vue
Expand Up @@ -15,6 +15,13 @@
<i-progress vertical :percent="percent" :stroke-width="20" hide-info></i-progress>
<i-progress vertical :percent="percent"></i-progress>
</div>
<div style="width: 150px">
<Progress :percent="25"></Progress>
<Progress :percent="45" status="active"></Progress>
<Progress :percent="65" status="wrong"></Progress>
<Progress :percent="100"></Progress>
<Progress :percent="25" hide-info></Progress>
</div>
</div>
</template>
<script>
Expand Down
2 changes: 1 addition & 1 deletion examples/routers/radio.vue
Expand Up @@ -9,7 +9,7 @@
<Icon type="social-apple"></Icon>
<span>Apple</span>
</Radio>
<Radio label="android">
<Radio label="android" disabled>
<Icon type="social-android"></Icon>
<span>Android</span>
</Radio>
Expand Down
42 changes: 42 additions & 0 deletions examples/routers/select.vue
Expand Up @@ -185,6 +185,19 @@
<Option v-for="(option, index) in options2" :value="option.value" :key="index">{{option.label}}</Option>
</Select>
<Button @click="clear">clear</Button>
<Select style="width:200px">
<Option disabled value="beijing">北京市</Option>
<Option value="shanghai">上海市</Option>
<Option value="shenzhen">深圳市</Option>
</Select>
<Select v-model="model7" style="width:200px">
<OptionGroup label="热门城市">
<Option v-for="item in cityList1" :value="item.value" :key="item.value">{{ item.label }}</Option>
</OptionGroup>
<OptionGroup label="其它城市">
<Option v-for="item in cityList2" :value="item.value" :key="item.value">{{ item.label }}</Option>
</OptionGroup>
</Select>
</div>
</template>
<script>
Expand Down Expand Up @@ -217,6 +230,35 @@
label: '重庆市'
}
],
cityList1: [
{
value: 'beijing',
label: '北京市'
},
{
value: 'shanghai',
label: '上海市'
},
{
value: 'shenzhen',
label: '深圳市'
}
],
cityList2: [
{
value: 'hangzhou',
label: '杭州市'
},
{
value: 'nanjing',
label: '南京市'
},
{
value: 'chongqing',
label: '重庆市'
}
],
model7: '',
model10: [],
model13: '',
loading1: false,
Expand Down
3 changes: 2 additions & 1 deletion examples/routers/slider.vue
@@ -1,7 +1,8 @@
<template>
<div style="margin: 0 400px;">
<Slider v-model="value" range></Slider>
<Slider v-model="value" range :step="10" show-stops></Slider>
<Button @click="change">change</Button>
<Slider v-model="value" range disabled></Slider>
</div>
</template>
<script>
Expand Down

0 comments on commit 67998b4

Please sign in to comment.