update route

bin/build-entry.js

@@ -10,6 +10,8 @@ var ISNTALL_COMPONENT_TEMPLATE = `  Vue.component({{name}}.name, {{name}});`
 var MAIN_TEMPLATE = `{{include}}
 
 const install = function(Vue) {
+  if (install.installed) return;
+
 {{install}}
 
   Vue.use(Loading);

examples/app.vue

@@ -263,23 +263,24 @@
 </style>
 
 <template>
+  <div id="app">
     <div class="pure-g">
       <div class="pure-u-1-6 app__sidebar pure-menu pure-menu-scrollable app__menu">
-      <a class="pure-menu-heading app__brand" v-link="'/'">
+        <router-link class="pure-menu-heading app__brand" to="/">
           <span class="app__eleme">ELEME</span>NT
-      </a>
+        </router-link>
 
-      <template v-for="nav in navs">
+        <template v-for="(nav, key) in navs">
           <a
             href="#"
-          @click.prevent="navState.$set($index, !navState[$index] || false)"
+            @click.prevent="navState.$set(key, !navState[key] || false)"
             class="pure-menu-heading app__menu__label"
-          :class="{ 'unfold': !navState[$index] }"
+            :class="{ 'unfold': !navState[key] }"
             v-text="nav.group"></a>
           <ul
             class="pure-menu-list"
             transition="slidedown"
-          v-show="!navState[$index]"
+            v-show="!navState[key]"
             :style="{
               maxHeight: nav.list.length * 44 + 'px'
             }">
@@ -287,10 +288,10 @@
               class="pure-menu-item app__menu__item"
               v-for="item in nav.list"
               v-if="!item.disabled">
-            <a
+              <router-link
                 class="pure-menu-link app__menu__link"
-              v-link="{ path: item.path, activeClass: 'active' }"
+                :to="{ path: item.path, activeClass: 'active' }"
-              v-text="item.name"></a>
+                v-text="item.name"></router-link>
             </li>
           </ul>
         </template>
@@ -300,7 +301,7 @@
         <header class="app__header">
           <h1 class="app__headline">{{ $route.title || 'element 后台组件' }}</h1>
         </header>
-      <section class="app__main" v-el:main>
+        <section class="app__main" ref="main">
           <p class="app__description">{{ $route.description }}</p>
           <router-view></router-view>
         </section>
@@ -308,7 +309,8 @@
       </div>
     </div>
 
-  <button class="hljs__button" v-el:button></button>
+    <button class="hljs__button" ref="button"></button>
+  </div>
 </template>
 
 <script>
@@ -341,10 +343,10 @@
       this.navs = navs;
     },
 
-    ready() {
+    mounted() {
       this.mainContent = document.querySelector('.app__content');
 
-      E.delegate(this.$els.main, '.hljs__button', 'click.highlight', e => {
+      E.delegate(this.$refs.main, '.hljs__button', 'click.highlight', e => {
         const parent = e.target.parentNode;
 
         toggleClass(parent, 'open');
@@ -352,7 +354,7 @@
     },
 
     beforeDestroy() {
-      E.undelegate(this.$els.main, '.hljs', 'click.highlight');
+      E.undelegate(this.$refs.main, '.hljs', 'click.highlight');
     },
 
     watch: {

examples/docs/tooltip.md

@@ -34,20 +34,20 @@
   module.exports = {
     data() {
       return {
-        switch: true
+        value: true
       }
     },
 
     computed: {
       effect() {
-        return this.switch ? 'dark' : 'light';
+        return this.value ? 'dark' : 'light';
       }
     }
   }
 </script>
 
 <el-switch
-  :value.sync="switch"
+  v-model="value"
   on-text="黑色"
   off-text="白色"
   on-color="#1f2d3d"

examples/entry.js

@@ -5,22 +5,15 @@ import configRouter from './route.config';
 import Element from 'main/index.js';
 import 'packages/theme-default/src/index.css';
 
-// test Released package
-// import Element from '../lib/index.js';
-// import '../lib/theme-default/index.css';
-
 Vue.use(Element);
 Vue.use(VueRouter);
 
-const router = new VueRouter();
+const router = new VueRouter({
-const app = Vue.extend({
+  base: __dirname,
-  template: '<entry></entry>',
+  routes: configRouter
-  components: { entry }
 });
 
-configRouter(router);
+new Vue({ // eslint-disable-line
-router.start(app, 'app');
+  render: h => h(entry),
-
+  router
-router.afterEach(() => {
+}).$mount('#app');
-  document.body.scrollTop = 0;
-});

examples/index.template.html

@@ -1,12 +1,10 @@
 <!DOCTYPE html>
-<html>
+<html lang="en">
   <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
+    <title>test-vue2</title>
-    <title>Element 后台组件</title>
   </head>
   <body>
-    <app></app>
+    <div id="app"></div>
-    <!-- built files will be auto injected -->
   </body>
 </html>

examples/route.config.js

@@ -1,40 +1,36 @@
 import navConfig from './nav.config.json';
 
 const registerRoute = (config) => {
-  let route = {};
+  let route = [];
-  config.map(nav => nav.list.map(page => {
+  config
-    try {
+    .map(nav =>
-      route[page.path] = page.path !== '/changelog' ? {
+      nav.list.map(page => {
-        component: require(`./docs${page.path}.md`),
+        if (page.path === '/changelog') return;
+        const component = require(`./docs${page.path}.md`);
+
+        route.push({
+          path: page.path,
           title: page.title || page.name,
-        description: page.description
+          description: page.description,
-      } : {
+          component: component.default || component
-        component: require('../CHANGELOG.md'),
+        });
-        title: page.title || page.name,
+      })
-        description: page.description
+    );
-      };
-    } catch (e) {
-      console.error(e);
-      page.disabled = true;
-    }
-  }));
 
   return { route, navs: config };
 };
 
 const route = registerRoute(navConfig);
 
-export const navs = route.navs;
+route.route.push({
-export default function configRouter(router) {
+  path: '/changelog',
-  router.map(Object.assign({
+  component: require('../CHANGELOG.md')
-    '*': {
-      component: require('./docs/home.md')
-    }
-  }, route.route));
-
-  router.beforeEach(transition => {
-    document.title = transition.to.title || document.title;
-    transition.to.router.app.$broadcast('element.example.reload');
-    transition.next();
 });
-};
+
+route.route.push({
+  path: '*',
+  component: require('./docs/home.md')
+});
+
+export const navs = route.navs;
+export default route.route;

package.json

@@ -41,10 +41,10 @@
     "purecss": "^0.6.0",
     "q": "^1.4.1",
     "uppercamelcase": "^1.1.0",
-    "vue": "^1.0.26",
+    "vue": "^2.0.0-beta.5",
-    "vue-loader": "^8.5.3",
+    "vue-loader": "^9.2.0",
     "vue-markdown-loader": "^0.4.0",
     "vue-popup": "^0.1.8",
-    "vue-router": "^0.7.13"
+    "vue-router": "^2.0.0-beta.2"
   }
 }

packages/button/src/button.vue

@@ -10,9 +10,9 @@
       }
     ]"
   >
-    <i class="el-icon-loading" v-if="loading"></i><i :class="'el-icon-' + icon" v-if="icon && !loading"></i><span v-if="_slotContents && _slotContents.default">
+    <i class="el-icon-loading" v-if="loading"></i>
+    <i :class="'el-icon-' + icon" v-if="icon && !loading"></i>
     <slot></slot>
-    </span>
   </button>
 </template>
 <script>

scripts/cooking.demo.js

@@ -84,6 +84,6 @@ Object.keys(Components).forEach(function (key) {
 // 开发模式不需要将不存在的 style.css 打包进去
 cooking.add('externals', externals);
 
-cooking.config.vue.loaders.html = 'html?minimize=true&conservativeCollapse=false';
+// cooking.config.vue.loaders.html = 'html?minimize=true&conservativeCollapse=false';
 
 module.exports = cooking.resolve();