diff --git a/build/bin/build-entry.js b/build/bin/build-entry.js index 51c108792..3cb84161a 100644 --- a/build/bin/build-entry.js +++ b/build/bin/build-entry.js @@ -16,11 +16,11 @@ const install = function(Vue) { }; // auto install -if (typeof window !== 'undefined' && window.Vue) { - install(window.Vue); -} +// if (typeof window !== 'undefined' && window.Vue) { +// install(window.Vue); +// } -export default { +module.exports = { install, version: '{{version}}', {{list}} diff --git a/build/release.sh b/build/release.sh index 10858e8de..b9b11885b 100644 --- a/build/release.sh +++ b/build/release.sh @@ -19,7 +19,7 @@ then echo "Releasing zanui-css $VERSION ..." cd packages/zanui-css npm version $VERSION --message "[release] $VERSION" - npm publish + npm publish --registry=http://registry.npm.qima-inc.com cd ../.. # commit @@ -31,5 +31,5 @@ then git push origin master git push origin refs/tags/v$VERSION - npm publish + npm publish --registry=http://registry.npm.qima-inc.com fi diff --git a/components.json b/components.json index 902276d41..4cd925021 100644 --- a/components.json +++ b/components.json @@ -14,5 +14,12 @@ "loading": "./packages/loading/index.js", "panel": "./packages/panel/index.js", "card": "./packages/card/index.js", - "steps": "./packages/steps/index.js" + "steps": "./packages/steps/index.js", + "tag": "./packages/tag/index.js", + "checkbox": "./packages/checkbox/index.js", + "checkbox-group": "./packages/checkbox-group/index.js", + "badge-group": "./packages/badge-group/index.js", + "badge": "./packages/badge/index.js", + "search": "./packages/search/index.js", + "step": "./packages/step/index.js" } diff --git a/docs/ExamplesApp.vue b/docs/ExamplesApp.vue index efa0bb765..d939f4f6e 100644 --- a/docs/ExamplesApp.vue +++ b/docs/ExamplesApp.vue @@ -1,7 +1,7 @@ @@ -61,9 +61,9 @@ padding: 0 20px; } } - @component-namespace z { + @component-namespace zan { @b button-group { - .z-button-1 { + .zan-button-1 { margin-bottom: 10px; } } diff --git a/docs/examples/card.vue b/docs/examples/card.vue index e4b99abf0..8dbe6a4f0 100644 --- a/docs/examples/card.vue +++ b/docs/examples/card.vue @@ -3,30 +3,30 @@

Card

基础用法

- - +

高级用法

- -
-

商品名称是什么,两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余

- ¥ 2.00 +
+

商品名称是什么,两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余

+ ¥ 2.00
-
-

商品sku

- x 2 +
+

商品sku

+ x 2
- diff --git a/docs/examples/cell.vue b/docs/examples/cell.vue index c9f823609..5180d5ccb 100644 --- a/docs/examples/cell.vue +++ b/docs/examples/cell.vue @@ -3,39 +3,39 @@

Cell

基础用法

- - - - + + + +

标题带描述信息

- - - - + + + +

带图标

- - - - + + + +

可点击的链接

- - - - + + + +

高级用法

- - + + - - - + + +
diff --git a/docs/examples/checkbox.vue b/docs/examples/checkbox.vue new file mode 100644 index 000000000..e4ac8b63f --- /dev/null +++ b/docs/examples/checkbox.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/docs/examples/dialog.vue b/docs/examples/dialog.vue index dd6a8b30d..c4766c7c4 100644 --- a/docs/examples/dialog.vue +++ b/docs/examples/dialog.vue @@ -2,12 +2,12 @@

Dialog

-
- 点击我打开alert提示框 +
+ 点击我打开alert提示框
-
- 点击我打开confirm提示框 +
+ 点击我打开confirm提示框
@@ -46,7 +46,7 @@ export default { @b dialog { padding: 0 15px; - .z-button-1 { + .zan-button-1 { margin-bottom: 10px; } } diff --git a/docs/examples/field.vue b/docs/examples/field.vue index 15ab52a08..265090b22 100644 --- a/docs/examples/field.vue +++ b/docs/examples/field.vue @@ -3,21 +3,21 @@

Field

基础用法

- - - - - + + + + +

无label的输入框

- - - + + +

监听change事件

- - - + + +
diff --git a/docs/examples/loading.vue b/docs/examples/loading.vue new file mode 100644 index 000000000..fcb2289c4 --- /dev/null +++ b/docs/examples/loading.vue @@ -0,0 +1,9 @@ + diff --git a/docs/examples/panel.vue b/docs/examples/panel.vue index 6f1e1c270..f3bb9a73e 100644 --- a/docs/examples/panel.vue +++ b/docs/examples/panel.vue @@ -3,61 +3,61 @@

Panel

基础用法

- - + -
-

商品名称是什么,两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余

- ¥ 2.00 +
+

商品名称是什么,两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余两行显示状态如效果图,多余多余多余

+ ¥ 2.00
-
-

商品sku

- x 2 +
+

商品sku

+ x 2
-