diff --git a/components.json b/components.json index 90a32fd66..3f311394d 100644 --- a/components.json +++ b/components.json @@ -11,9 +11,6 @@ "dialog": [ "./packages/dialog/index.js" ], - "cascader": [ - "./packages/cascader/index.js" - ], "autocomplete": [ "./packages/autocomplete/index.js" ], diff --git a/examples/docs/autocomplete.md b/examples/docs/autocomplete.md index c0ca13132..026990a6b 100644 --- a/examples/docs/autocomplete.md +++ b/examples/docs/autocomplete.md @@ -3,9 +3,7 @@ .el-autocomplete { width: 180px; } - .el-autocomplete__suggestions.my-autocomplete-suggestions { - width: 300px; - + .my-suggestions-item { & .remark { float: right; font-size: 13px; @@ -14,8 +12,28 @@ } ``` -## 通过键盘控制下拉的显示 +## 自定义模板
```html - + + -``` - -## 自定义模板 - -
- -
- -```html - - - ## 基本用法 -打开 Alert +打开 Alert ```html ``` -打开 confirm +打开 confirm ```html ``` -打开 prompt +打开 prompt ```html ``` -打开 Message Box +打开 Message Box ```html - - - -
- + 上左 - + 上边 - + 上右
- + 左上 - + 左边 - + 左下
- + 右上 - + 右边 - + 右下
- + 下左 - + 下边 - + 下右
diff --git a/package.json b/package.json index 692f26d76..412dc35d2 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ ], "scripts": { "dev": "node bin/build-entry.js && cooking watch -c scripts/cooking.demo.js", - "dist": "rm -rf lib && cooking build -p && cooking build -c scripts/cooking.component.js -p", + "dist": "rm -rf lib && cooking build -c scripts/cooking.conf.js -p && cooking build -c scripts/cooking.component.js -p", "deploy": "cooking build -c scripts/cooking.demo.js -p", "gh-docs": "cooking build -c scripts/cooking.demo.js -p && gh-pages -d examples/element-ui --remote origin", "prepublish": "make dist" @@ -46,8 +46,9 @@ "uppercamelcase": "^1.1.0", "vue": "^2.0.0-beta.7", "vue-loader": "^9.3.2", + "vue": "^2.0.0-beta.8", "vue-markdown-loader": "^0.4.0", - "vue-popup": "^0.1.8", + "vue-popup": "^0.2.1", "vue-router": "^2.0.0-beta.2" } } diff --git a/packages/alert/src/main.vue b/packages/alert/src/main.vue index 8f3db0aa2..e8c27a76b 100644 --- a/packages/alert/src/main.vue +++ b/packages/alert/src/main.vue @@ -1,12 +1,14 @@ diff --git a/packages/dialog/package.json b/packages/dialog/package.json index 32e0c41d9..a223e6050 100644 --- a/packages/dialog/package.json +++ b/packages/dialog/package.json @@ -12,6 +12,6 @@ "author": "elemefe", "license": "MIT", "devDependencies": { - "vue-popup": "^0.1.8" + "vue-popup": "^0.2.1" } } diff --git a/packages/dialog/src/component.vue b/packages/dialog/src/component.vue index 0aa3f3db8..a522a848b 100644 --- a/packages/dialog/src/component.vue +++ b/packages/dialog/src/component.vue @@ -1,16 +1,20 @@ diff --git a/packages/slider/src/main.vue b/packages/slider/src/main.vue index 2fbc8c556..e96ffcb1e 100644 --- a/packages/slider/src/main.vue +++ b/packages/slider/src/main.vue @@ -1,11 +1,11 @@