From df7768e47ea871ba5349d6e9cc41a0d6d1aa417f Mon Sep 17 00:00:00 2001 From: Tw93 Date: Wed, 13 Dec 2017 12:07:09 +0800 Subject: [PATCH 1/2] update weex-vue-render next --- example/{button => _mods}/index.html | 2 +- example/cell/index.html | 35 ---- example/checkbox/index.html | 35 ---- example/countdown/index.html | 35 ---- example/dialog/index.html | 35 ---- example/ep-slider/index.html | 35 ---- example/ep-slider/index.vue | 3 +- example/grid-select/index.html | 35 ---- example/indexlist/index.html | 35 ---- example/lightbox/index.html | 35 ---- example/loading/index.html | 35 ---- example/lottery-rain/index.html | 35 ---- example/mask/index.html | 35 ---- example/minibar/index.html | 35 ---- example/noticebar/index.html | 35 ---- example/overlay/index.html | 35 ---- example/page-calendar/index.html | 35 ---- example/popup/index.html | 35 ---- example/progress/index.html | 35 ---- example/radio/index.html | 35 ---- example/result/index.html | 35 ---- example/rich-text/index.html | 35 ---- example/searchbar/index.html | 35 ---- example/simple-flow/index.html | 35 ---- example/slide-nav/index.html | 35 ---- example/slider-bar/index.html | 35 ---- example/stepper/index.html | 35 ---- example/tab-bar/index.html | 35 ---- example/tab-bar/index.vue | 5 +- example/tab-page/index.html | 35 ---- example/tag/index.html | 35 ---- package-lock.json | 218 +++++++++++++++++++++-- package.json | 13 +- packages/wxc-lottery-rain/libs/region.js | 14 +- packages/wxc-tab-bar/README.md | 6 +- packages/wxc-tab-bar/README_cn.md | 4 +- packages/wxc-tab-bar/index.vue | 17 +- webpack.config.js | 67 ++++--- 38 files changed, 277 insertions(+), 1052 deletions(-) rename example/{button => _mods}/index.html (93%) delete mode 100644 example/cell/index.html delete mode 100644 example/checkbox/index.html delete mode 100644 example/countdown/index.html delete mode 100644 example/dialog/index.html delete mode 100644 example/ep-slider/index.html delete mode 100644 example/grid-select/index.html delete mode 100644 example/indexlist/index.html delete mode 100644 example/lightbox/index.html delete mode 100644 example/loading/index.html delete mode 100644 example/lottery-rain/index.html delete mode 100644 example/mask/index.html delete mode 100644 example/minibar/index.html delete mode 100644 example/noticebar/index.html delete mode 100644 example/overlay/index.html delete mode 100644 example/page-calendar/index.html delete mode 100644 example/popup/index.html delete mode 100644 example/progress/index.html delete mode 100644 example/radio/index.html delete mode 100644 example/result/index.html delete mode 100644 example/rich-text/index.html delete mode 100644 example/searchbar/index.html delete mode 100644 example/simple-flow/index.html delete mode 100644 example/slide-nav/index.html delete mode 100644 example/slider-bar/index.html delete mode 100644 example/stepper/index.html delete mode 100644 example/tab-bar/index.html delete mode 100644 example/tab-page/index.html delete mode 100644 example/tag/index.html diff --git a/example/button/index.html b/example/_mods/index.html similarity index 93% rename from example/button/index.html rename to example/_mods/index.html index 51e94c13..d2153826 100644 --- a/example/button/index.html +++ b/example/_mods/index.html @@ -28,7 +28,7 @@
- + diff --git a/example/cell/index.html b/example/cell/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/cell/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/checkbox/index.html b/example/checkbox/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/checkbox/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/countdown/index.html b/example/countdown/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/countdown/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/dialog/index.html b/example/dialog/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/dialog/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/ep-slider/index.html b/example/ep-slider/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/ep-slider/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/ep-slider/index.vue b/example/ep-slider/index.vue index 1086ef6a..803c06c3 100644 --- a/example/ep-slider/index.vue +++ b/example/ep-slider/index.vue @@ -81,10 +81,11 @@ width: 250px; height: 80px; margin-left: 250px; + margin-bottom: 40px; + margin-top: 40px; background-color: #635147; align-items: center; justify-content: center; - margin-bottom: 40px; } .btn-text { diff --git a/example/grid-select/index.html b/example/grid-select/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/grid-select/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/indexlist/index.html b/example/indexlist/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/indexlist/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/lightbox/index.html b/example/lightbox/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/lightbox/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/loading/index.html b/example/loading/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/loading/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/lottery-rain/index.html b/example/lottery-rain/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/lottery-rain/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/mask/index.html b/example/mask/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/mask/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/minibar/index.html b/example/minibar/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/minibar/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/noticebar/index.html b/example/noticebar/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/noticebar/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/overlay/index.html b/example/overlay/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/overlay/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/page-calendar/index.html b/example/page-calendar/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/page-calendar/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/popup/index.html b/example/popup/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/popup/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/progress/index.html b/example/progress/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/progress/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/radio/index.html b/example/radio/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/radio/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/result/index.html b/example/result/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/result/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/rich-text/index.html b/example/rich-text/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/rich-text/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/searchbar/index.html b/example/searchbar/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/searchbar/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/simple-flow/index.html b/example/simple-flow/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/simple-flow/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/slide-nav/index.html b/example/slide-nav/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/slide-nav/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/slider-bar/index.html b/example/slider-bar/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/slider-bar/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/stepper/index.html b/example/stepper/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/stepper/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/tab-bar/index.html b/example/tab-bar/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/tab-bar/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/tab-bar/index.vue b/example/tab-bar/index.vue index 03a0b703..6f916c24 100644 --- a/example/tab-bar/index.vue +++ b/example/tab-bar/index.vue @@ -5,7 +5,6 @@
首页
特别推荐
@@ -35,8 +34,8 @@ }), created () { setTitle('TabBar'); - this.tabPageHeight = Utils.env.getPageHeight(); - const { tabPageHeight, tabStyles } = this; + const tabPageHeight = Utils.env.getPageHeight(); + const { tabStyles } = this; this.contentStyle = { height: (tabPageHeight - tabStyles.height) + 'px' }; }, methods: { diff --git a/example/tab-page/index.html b/example/tab-page/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/tab-page/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/example/tag/index.html b/example/tag/index.html deleted file mode 100644 index 51e94c13..00000000 --- a/example/tag/index.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - Weex Vue Component Demo - - - - - - - - - - - -
- - - - - - diff --git a/package-lock.json b/package-lock.json index 99c07ca2..45aa95df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "weex-ui", - "version": "0.3.2", + "version": "0.3.5", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -437,13 +437,13 @@ "dev": true }, "autoprefixer": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.1.tgz", - "integrity": "sha512-lTbsa2X03maxG45xCNh30sJaRKDn8JPnanOeQOW3wvD9yPGmIsf041LHqlrZ1lXPF/1M3yTZKXqqYfmxU69xuQ==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.2.tgz", + "integrity": "sha512-eTVoSHiGp2cDytg7RS7gtqAnfH+WFcNQMTjywGNu+hH7ViQZ/ZKsvNz2C1oVhCtd9DjMIC15iatpxmtp5Kxvpg==", "dev": true, "requires": { - "browserslist": "2.9.1", - "caniuse-lite": "1.0.30000778", + "browserslist": "2.10.0", + "caniuse-lite": "1.0.30000782", "normalize-range": "0.1.2", "num2fraction": "1.2.2", "postcss": "6.0.14", @@ -1393,6 +1393,12 @@ "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", "dev": true }, + "bowser": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.8.1.tgz", + "integrity": "sha512-NMPaR8ILtdLSWzxQtEs16XbxMcY8ohWGQ5V+TZSJS3fNUt/PBAGkF6YWO9B/4qWE23bK3o0moQKq8UyFEosYkA==", + "dev": true + }, "brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", @@ -1668,12 +1674,12 @@ } }, "browserslist": { - "version": "2.9.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.9.1.tgz", - "integrity": "sha512-3n3nPdbUqn3nWmsy4PeSQthz2ja1ndpoXta+dwFFNhveGjMg6FXpWYe12vsTpNoXJbzx3j7GZXdtoVIdvh3JbA==", + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.10.0.tgz", + "integrity": "sha512-WyvzSLsuAVPOjbljXnyeWl14Ae+ukAT8MUuagKVzIDvwBxl4UAwD1xqtyQs2eWYPGUKMeC3Ol62goqYuKqTTcw==", "dev": true, "requires": { - "caniuse-lite": "1.0.30000778", + "caniuse-lite": "1.0.30000782", "electron-to-chromium": "1.3.28" } }, @@ -1780,9 +1786,9 @@ "dev": true }, "caniuse-lite": { - "version": "1.0.30000778", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000778.tgz", - "integrity": "sha1-8efLixOx9nREAikddfC81MMWA2k=", + "version": "1.0.30000782", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000782.tgz", + "integrity": "sha1-W4K4w4XyU0h0XEccpRMgr7G38lQ=", "dev": true }, "capture-stack-trace": { @@ -2530,6 +2536,25 @@ } } }, + "cpx": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/cpx/-/cpx-1.5.0.tgz", + "integrity": "sha1-GFvgGFEdhycN7czCkxceN2VauI8=", + "dev": true, + "requires": { + "babel-runtime": "6.26.0", + "chokidar": "1.7.0", + "duplexer": "0.1.1", + "glob": "7.1.2", + "glob2base": "0.0.12", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "resolve": "1.5.0", + "safe-buffer": "5.1.1", + "shell-quote": "1.6.1", + "subarg": "1.0.0" + } + }, "create-ecdh": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", @@ -2640,6 +2665,15 @@ "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", "dev": true }, + "css-in-js-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-2.0.0.tgz", + "integrity": "sha512-yuWmPMD9FLi50Xf3k8W8oO3WM1eVnxEGCldCLyfusQ+CgivFk0s23yst4ooW6tfxMuSa03S6uUEga9UhX6GRrA==", + "dev": true, + "requires": { + "hyphenate-style-name": "1.0.2" + } + }, "css-loader": { "version": "0.28.7", "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz", @@ -3281,6 +3315,12 @@ "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", "dev": true }, + "envd": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/envd/-/envd-0.1.2.tgz", + "integrity": "sha1-be1HGBunhulEwTYr5BCkk80XpGQ=", + "dev": true + }, "errno": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", @@ -3751,6 +3791,41 @@ "object-assign": "4.1.1" } }, + "filemanager-webpack-plugin": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/filemanager-webpack-plugin/-/filemanager-webpack-plugin-1.0.16.tgz", + "integrity": "sha512-L01tbYs1pBpl6pSK5LMwPHe4ZaetDx5xh8ucGX0p/4AfVTupOBCt/ZEppNvk3rDCpyvfPdrl1RXN8Ac4V1gl3Q==", + "dev": true, + "requires": { + "cpx": "1.5.0", + "fs-extra": "4.0.3", + "make-dir": "1.1.0", + "mv": "2.1.1", + "rimraf": "2.6.2" + }, + "dependencies": { + "fs-extra": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz", + "integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "4.0.0", + "universalify": "0.1.1" + } + }, + "jsonfile": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", + "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + } + } + }, "filename-regex": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", @@ -3802,6 +3877,12 @@ "pkg-dir": "2.0.0" } }, + "find-index": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz", + "integrity": "sha1-Z101iyyjiS15Whq0cjL4tuLg3eQ=", + "dev": true + }, "find-parent-dir": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz", @@ -4982,6 +5063,15 @@ "path-dirname": "1.0.2" } }, + "glob2base": { + "version": "0.0.12", + "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz", + "integrity": "sha1-nUGbPijxLoOjYhZKJ3BVkiycDVY=", + "dev": true, + "requires": { + "find-index": "0.1.1" + } + }, "globals": { "version": "9.18.0", "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", @@ -5184,6 +5274,18 @@ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", "dev": true }, + "httpurl": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/httpurl/-/httpurl-0.1.2.tgz", + "integrity": "sha1-O9nIJoKRlLht8xGEkPZMTxlUt5A=", + "dev": true + }, + "hyphenate-style-name": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz", + "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=", + "dev": true + }, "iconv-lite": { "version": "0.4.19", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", @@ -5283,6 +5385,16 @@ } } }, + "inline-style-prefixer": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-3.0.8.tgz", + "integrity": "sha1-hVG45bTVcyROZqNLBPfTIHaitTQ=", + "dev": true, + "requires": { + "bowser": "1.8.1", + "css-in-js-utils": "2.0.0" + } + }, "inquirer": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz", @@ -6398,6 +6510,41 @@ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=", "dev": true }, + "mv": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz", + "integrity": "sha1-rmzg1vbV4KT32JN5jQPB6pVZtqI=", + "dev": true, + "requires": { + "mkdirp": "0.5.1", + "ncp": "2.0.0", + "rimraf": "2.4.5" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "rimraf": { + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz", + "integrity": "sha1-7nEM5dk6j9uFb7Xqj/Di11k0sto=", + "dev": true, + "requires": { + "glob": "6.0.4" + } + } + } + }, "nan": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", @@ -6417,6 +6564,12 @@ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", "dev": true }, + "ncp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz", + "integrity": "sha1-GVoh1sRuNh0vsSgbo4uR6d9727M=", + "dev": true + }, "negotiator": { "version": "0.4.7", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz", @@ -8464,6 +8617,15 @@ } } }, + "postcss-plugin-weex": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-plugin-weex/-/postcss-plugin-weex-0.1.1.tgz", + "integrity": "sha512-XFTXJf9yD3Z41XGhdBW4YhNoctKdtk+1MNiwmnCxTvYVRHcAQ14DS6EWACEiyrE1Kdd0ECmYM65Iljiw3r6dsg==", + "dev": true, + "requires": { + "postcss": "6.0.14" + } + }, "postcss-px2rem": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/postcss-px2rem/-/postcss-px2rem-0.3.0.tgz", @@ -11197,16 +11359,17 @@ } }, "weex-vue-precompiler": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/weex-vue-precompiler/-/weex-vue-precompiler-0.1.4.tgz", - "integrity": "sha512-WNhLxgq5m6dNaU+VMHGlGQSTLndOp0uV/r6tZGeDXpvmTc+GXiqmN6V9qt2Wxlzg1+Rktr7bo+L/jGFhs7w4Mg==", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/weex-vue-precompiler/-/weex-vue-precompiler-0.1.10.tgz", + "integrity": "sha512-a2HYUlIv757azF1SsyB8m6CFH2OCw0owaVlbKrkXgnZlM9rFfd0/MlRJv8aeaEW1l4TFNBXTCfA6YFRZWPuY/Q==", "dev": true, "requires": { - "autoprefixer": "7.2.1", + "autoprefixer": "7.2.2", "escodegen": "1.9.0", "esprima": "4.0.0", "postcss": "6.0.14", - "postcss-plugin-px2rem": "0.7.0" + "postcss-plugin-px2rem": "0.7.0", + "wxv-transformer": "0.1.0" }, "dependencies": { "escodegen": { @@ -11245,6 +11408,19 @@ } } }, + "weex-vue-render": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/weex-vue-render/-/weex-vue-render-1.0.2.tgz", + "integrity": "sha512-UPwoffKQy80xNtwGCfxdP6qMzVEGiEWdUVj07niXGOgiYLLtPY3KM2lQSwD2Lid9P2Zx8CrKbXlLg7RFPBb/5g==", + "dev": true, + "requires": { + "core-js": "2.5.1", + "envd": "0.1.2", + "httpurl": "0.1.2", + "inline-style-prefixer": "3.0.8", + "query-string": "4.3.4" + } + }, "whatwg-fetch": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", @@ -11425,6 +11601,12 @@ } } }, + "wxv-transformer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/wxv-transformer/-/wxv-transformer-0.1.0.tgz", + "integrity": "sha512-mQSWUWhWjCjcTLCRLcLOWkltrBcq0lVylvGM0wuR0PVEcOzbBgA51XyvPnWscmBy9mBndaCz8rVkDiYgYVuBng==", + "dev": true + }, "xtend": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", diff --git a/package.json b/package.json index b504f3ea..7b94c2d2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "weex-ui", - "version": "0.3.5", + "version": "0.3.7", "description": "A rich interaction, lightweight, high performance UI library based on Weex", "main": "index.js", "lib": "vue", @@ -10,7 +10,7 @@ "build": "webpack --progress", "watch": "webpack --progress --watch", "serve": "anywhere -d build/example/ -p 8080", - "start": "npm run build; npm run serve & npm run watch" + "start": "npm run build && (npm run serve & npm run watch)" }, "keywords": [ "Weex Ui", @@ -33,6 +33,7 @@ "license": "MIT", "devDependencies": { "anywhere": "^1.4.0", + "autoprefixer": "^7.2.2", "babel-core": "^6.26.0", "babel-eslint": "~8.0.1", "babel-loader": "^7.1.2", @@ -45,14 +46,20 @@ "eslint": "^4.11.0", "eslint-config-vue": "^2.0.2", "eslint-plugin-vue": "^2.1.0", + "filemanager-webpack-plugin": "^1.0.16", "glob": "^7.1.2", "lerna": "^2.5.1", + "postcss-plugin-px2rem": "^0.7.0", + "postcss-plugin-weex": "^0.1.1", + "postcss-px2rem": "^0.3.0", "vue": "^2.5.3", "vue-loader": "^12.2.2", "vue-template-compiler": "^2.5.3", "webpack": "^2.7.0", "weex-loader": "^0.6.0-beta.3", - "weex-vue-loader": "^0.5.0-beta.3" + "weex-vue-loader": "^0.5.0-beta.3", + "weex-vue-precompiler": "^0.1.10", + "weex-vue-render": "^1.0.2" }, "dependencies": { "url-parse": "^1.1.9" diff --git a/packages/wxc-lottery-rain/libs/region.js b/packages/wxc-lottery-rain/libs/region.js index 64c9ca1e..beb0743b 100644 --- a/packages/wxc-lottery-rain/libs/region.js +++ b/packages/wxc-lottery-rain/libs/region.js @@ -19,7 +19,7 @@ const Region = { // 两区域相交 curRegion.right = curRegion.left + curRegion.width; curRegion.bottom = curRegion.top + curRegion.height; - if (!(region.left > curRegion.right || region.right < curRegion.left || region.bottom < curRegion.top || region.top > curRegion.bottom )) { + if (!(region.left > curRegion.right || region.right < curRegion.left || region.bottom < curRegion.top || region.top > curRegion.bottom)) { return true; } } @@ -38,14 +38,14 @@ const Region = { wrapWidth = wrapWidth < 0 ? 0 : wrapWidth; const region = { - left: -9999, - top: -9999, - width: width, - height: height + left: '-9999px', + top: '-9999px', + width: width + 'px', + height: height + 'px' }; while (i--) { - region.left = Math.round(Math.random() * wrapWidth); - region.top = Math.round(Math.random() * wrapHeight + height); + region.left = Math.round(Math.random() * wrapWidth) + 'px'; + region.top = Math.round(Math.random() * wrapHeight + height) + 'px'; if (!this.isCross(region)) { this.add(region); return region; diff --git a/packages/wxc-tab-bar/README.md b/packages/wxc-tab-bar/README.md index c36d1a17..c4cf5432 100644 --- a/packages/wxc-tab-bar/README.md +++ b/packages/wxc-tab-bar/README.md @@ -18,7 +18,6 @@
Home
@@ -55,8 +54,8 @@ tabStyles: Config.tabStyles }), created () { - this.tabPageHeight = Utils.env.getPageHeight(); - const { tabPageHeight, tabStyles } = this; + const tabPageHeight = Utils.env.getPageHeight(); + const { tabStyles } = this; this.contentStyle = { height: (tabPageHeight - tabStyles.height) + 'px' }; }, methods: { @@ -79,7 +78,6 @@ More details can be found in [here](https://github.com/alibaba/weex-ui/blob/mast | tab-titles | `Array` |`Y`| `[]` | Tab list [config](https://github.com/alibaba/weex-ui/blob/master/example/tab-bar/config.js#L7)| | title-type | `String` |`N`| `icon` | type `icon`/`text`| | tab-styles | `Array` |`N`| `[]` | bottom Tab [config](https://github.com/alibaba/weex-ui/blob/master/example/tab-bar/config.js)| -| tab-page-height | `Number` |`N`| `1334` |Tab page height | | is-tab-view | `Boolean` |`N`| `true` |if set `false`,add tab-titles config with `url` can be jumped out | | duration | `Number` |`N`| `300` | page slider time of animation | | timing-function | `String` |`N`| `-` | page slider function of animation | diff --git a/packages/wxc-tab-bar/README_cn.md b/packages/wxc-tab-bar/README_cn.md index e27973e0..479727f2 100644 --- a/packages/wxc-tab-bar/README_cn.md +++ b/packages/wxc-tab-bar/README_cn.md @@ -55,8 +55,8 @@ tabStyles: Config.tabStyles }), created () { - this.tabPageHeight = Utils.env.getPageHeight(); - const { tabPageHeight, tabStyles } = this; + const tabPageHeight = Utils.env.getPageHeight(); + const { tabStyles } = this; this.contentStyle = { height: (tabPageHeight - tabStyles.height) + 'px' }; }, methods: { diff --git a/packages/wxc-tab-bar/index.vue b/packages/wxc-tab-bar/index.vue index 5834c6db..dd0a57b5 100644 --- a/packages/wxc-tab-bar/index.vue +++ b/packages/wxc-tab-bar/index.vue @@ -4,10 +4,8 @@