Merge branch 'dev' of github.com:didi/cube-ui into dev

# Conflicts: # package.json
wang00100 · Sep 30, 2018 · 2b6ff24 · 2b6ff24
2 parents 0639c5d + 61db031
commit 2b6ff24
Show file tree

Hide file tree

Showing 100 changed files with 297 additions and 223 deletions.
diff --git a/docs/css/app.094393590b40500049be4708259e04b4.css b/docs/css/app.094393590b40500049be4708259e04b4.css
diff --git a/docs/css/app.180aa3f86c925cfdd3c1ac20180ad2c3.css b/docs/css/app.180aa3f86c925cfdd3c1ac20180ad2c3.css
diff --git a/docs/example/css/app.50290fc3a2ccf03fd4b29845db4c4ab0.css b/docs/example/css/app.50290fc3a2ccf03fd4b29845db4c4ab0.css
diff --git a/docs/example/css/app.bbaec7f21a1e1969f03dce86b912b6f7.css b/docs/example/css/app.bbaec7f21a1e1969f03dce86b912b6f7.css
diff --git a/docs/example/index.html b/docs/example/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=UTF-8><title>cube-ui lib</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><link href=css/app.bbaec7f21a1e1969f03dce86b912b6f7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=js/manifest.346dd10710fe9c0348bf.js></script><script type=text/javascript src=js/vendor.a6526fe909133c8ba7de.js></script><script type=text/javascript src=js/app.523ed840d75cfa8f67aa.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=UTF-8><title>cube-ui lib</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><link href=css/app.50290fc3a2ccf03fd4b29845db4c4ab0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=js/manifest.346dd10710fe9c0348bf.js></script><script type=text/javascript src=js/vendor.a6526fe909133c8ba7de.js></script><script type=text/javascript src=js/app.48eabdec941cccf4e2f0.js></script></body></html>
diff --git a/docs/example/js/app.48eabdec941cccf4e2f0.js b/docs/example/js/app.48eabdec941cccf4e2f0.js
diff --git a/docs/example/js/app.523ed840d75cfa8f67aa.js b/docs/example/js/app.523ed840d75cfa8f67aa.js
diff --git a/docs/index.html b/docs/index.html
@@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=x5-cache content=disable><meta name=keywords content=CUBE,UI,VUE,COMPONENT,LIB,LIBRARY><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><title>cube-ui Document</title><link href=/cube-ui/css/app.094393590b40500049be4708259e04b4.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/cube-ui/js/manifest.3068a8128095870f07bb.js></script><script type=text/javascript src=/cube-ui/js/vendor.cc2f17a2a551675ea25a.js></script><script type=text/javascript src=/cube-ui/js/app.47641adfe598e1671f38.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=x5-cache content=disable><meta name=keywords content=CUBE,UI,VUE,COMPONENT,LIB,LIBRARY><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><title>cube-ui Document</title><link href=/cube-ui/css/app.180aa3f86c925cfdd3c1ac20180ad2c3.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/cube-ui/js/manifest.c9808602e28ad090c11c.js></script><script type=text/javascript src=/cube-ui/js/vendor.cc2f17a2a551675ea25a.js></script><script type=text/javascript src=/cube-ui/js/app.47641adfe598e1671f38.js></script></body></html>
diff --git a/docs/js/10.54dab1cc1b5fa24b4ed9.js b/docs/js/10.54dab1cc1b5fa24b4ed9.js
diff --git a/docs/js/10.fc9a767b22cf0dda309e.js b/docs/js/10.fc9a767b22cf0dda309e.js
diff --git a/docs/js/19.36f9a689d2fc7cbd458b.js b/docs/js/19.36f9a689d2fc7cbd458b.js
diff --git a/docs/js/19.52963edc96ae84a7bfdd.js b/docs/js/19.52963edc96ae84a7bfdd.js
diff --git a/docs/js/32.5a32fa6b39e1b6b25388.js → docs/js/32.223fea9417aeea4d589f.js b/docs/js/32.5a32fa6b39e1b6b25388.js → docs/js/32.223fea9417aeea4d589f.js
diff --git a/docs/js/52.25969bfc6d401b69fcf7.js b/docs/js/52.25969bfc6d401b69fcf7.js
diff --git a/docs/js/52.3fdb2c3e01ef58d2bc2d.js b/docs/js/52.3fdb2c3e01ef58d2bc2d.js
diff --git a/docs/js/61.b68bb3c2660787faa44b.js b/docs/js/61.b68bb3c2660787faa44b.js
diff --git a/docs/js/61.e427002da0c2dd6ba223.js b/docs/js/61.e427002da0c2dd6ba223.js
diff --git a/docs/js/74.3297ab8800be14c083d4.js b/docs/js/74.3297ab8800be14c083d4.js
diff --git a/docs/js/74.9b5ee6bbb73addd24256.js b/docs/js/74.9b5ee6bbb73addd24256.js
diff --git a/docs/js/manifest.3068a8128095870f07bb.js → docs/js/manifest.c9808602e28ad090c11c.js b/docs/js/manifest.3068a8128095870f07bb.js → docs/js/manifest.c9808602e28ad090c11c.js
diff --git a/document/components/docs/en-US/image-preview.md b/document/components/docs/en-US/image-preview.md
@@ -46,7 +46,7 @@ The following demo code is [here](https://github.com/didi/cube-ui/tree/master/ex
 - Custom usage
 
   ```html
-  <cube-button @click="showCustomImagePreview">Show Custom ImagePreview</cube
+  <cube-button @click="showCustomImagePreview">Show Custom ImagePreview</cube-button>
   ```
 
   ```js
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!DOCTYPE html><html><head><meta charset=UTF-8><title>cube-ui lib</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><link href=css/app.bbaec7f21a1e1969f03dce86b912b6f7.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=js/manifest.346dd10710fe9c0348bf.js></script><script type=text/javascript src=js/vendor.a6526fe909133c8ba7de.js></script><script type=text/javascript src=js/app.523ed840d75cfa8f67aa.js></script></body></html>
		<!DOCTYPE html><html><head><meta charset=UTF-8><title>cube-ui lib</title><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,viewport-fit=cover"><link rel="shortcut icon" type=images/x-icon href=//webapp.didistatic.com/static/webapp/shield/Cube-UI_logo.ico><link href=css/app.50290fc3a2ccf03fd4b29845db4c4ab0.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=js/manifest.346dd10710fe9c0348bf.js></script><script type=text/javascript src=js/vendor.a6526fe909133c8ba7de.js></script><script type=text/javascript src=js/app.48eabdec941cccf4e2f0.js></script></body></html>
-Original file line number
+Diff line change
@@ Expand Up @@
     - Custom usage
       ```html
-      <cube-button @click="showCustomImagePreview">Show Custom ImagePreview</cube
+      <cube-button @click="showCustomImagePreview">Show Custom ImagePreview</cube-button>
       ```
       ```js
@@ Expand Down @@