update sites

sites/demo/app.js

@@ -4,7 +4,6 @@ import "core-js/modules/es6.array.iterator";
 import Vue from 'vue';
 import App from './App.vue';
 import router from './router';
-import Conf from '../../src/config.json';
 import NutUI from '../../src/nutui';
 // import en from '../../src/locales/lang/en-US';
 // import demoEN from './lang/en-US';
@@ -50,7 +49,7 @@ const app = new Vue({
   template: '<App/>'
 })
 
-Vue.prototype.NUTCONF = Conf;
+//Vue.prototype.NUTCONF = Conf;
 
 
 let pageLoading = app.$toast.loading();

sites/demo/router.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import Conf from '../../src/config.json';
+import { packages } from '../../src/config.json';
 import vueg from 'vueg';
 import 'vueg/css/transition-min.css';
 
@@ -30,7 +30,7 @@ const routes = [
 ];
 
 //组件示例页面
-Conf.packages.map(item => {
+packages.map(item => {
   if (item.showDemo === false) return;
   const pkgName =  item.name.toLowerCase();
   routes.push({

sites/demo/view/index.vue

@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import Conf from "../../../src/config.json";
+import { packages,sorts } from "../../../src/config.json";
 export default {
   name: "index",
   data() {
@@ -37,8 +37,7 @@ export default {
       sortedPackages: [],
       oriSorts:[],
       sorts: [1,2,0,3,4,5],
-      foldStatus: [],
-      version: ""
+      foldStatus: []
     };
   },
   methods: {
@@ -48,9 +47,8 @@ export default {
     }
   },
   created() {
-    this.packages = Conf.packages;
-    this.version = Conf.version;
-    this.oriSorts = Conf.sorts;
+    this.packages = packages;
+    this.oriSorts = sorts;
     
     this.foldStatus = Array(this.sorts.length)
       .join(",")

sites/doc/app.js

@@ -21,7 +21,6 @@ import 'highlight.js/styles/github.css';
 //import prettify from 'google-code-prettify/src/prettify';
 //import  'google-code-prettify/src/prettify.css';
 //import  'google-code-prettify/styles/sunburst.css';
-import Conf from '../../src/config.json';
  //import qrcode from './qrcode/index.js';
 import codes from 'qrcode';
  //import NutUI from '../../src/nutui.js';
@@ -37,6 +36,7 @@ new Vue({
   router,
   components: { App },
   template: '<App/>'
-})
-Vue.prototype.NUTCONF = Conf;
+});
+
+//Vue.prototype.NUTCONF = Conf;
 

sites/doc/app.vue

@@ -66,7 +66,7 @@
 <script>
 import "./asset/css/common.scss";
 import "./asset/css/style-blue.scss";
-import Conf from "../../src/config.json";
+import { packages } from "../../src/config.json";
 import PackageJson from "../../package.json";
 import search from './search.vue';
 export default {
@@ -134,7 +134,7 @@ export default {
     fetchData(obj) {  
       this.routerName = obj.name;
       this.showPhone = false;
-      for (let i = 0, item; (item = Conf.packages[i]); i++) {
+      for (let i = 0, item; (item = packages[i]); i++) {
         if (obj.name == item.name) {
           this.showPhone = true;
         }
@@ -174,10 +174,10 @@ export default {
   },
   created() {
     let that = this;
-    this.packages = Conf.packages;   
+    this.packages = packages;   
     let name = this.$route.name;
     this.version = PackageJson.version; 
-    for (let i = 0, item; (item = Conf.packages[i]); i++) {
+    for (let i = 0, item; (item = packages[i]); i++) {
       if (name == item.name) {
         this.showPhone = true;
       }

sites/doc/index.vue

@@ -539,7 +539,6 @@ export default {
     top: 0;
     min-width: 990px;
     width: 100%;
-    z-index: 999;
     height: 64px;
     display: flex;
 		 align-items:center;

sites/doc/info.vue

@@ -50,7 +50,7 @@
 </div>
 </template>
 <script>
-import Conf from "../../src/config.json";
+import { sorts,packages } from "../../src/config.json";
 export default {
   name: "index",
   data() {
@@ -58,7 +58,6 @@ export default {
       path: "",
       packages: {},
       sortedPackages: [],
-      version: "",
       cur: [],
       curName: ""
     };
@@ -134,13 +133,12 @@ export default {
   },
   created() {
     let nameRt = this.$route.name;
-    let packgs = Conf.packages;
+    let packgs = packages;
     
-    this.cur = Conf.sorts
+    this.cur = sorts
     this.curName = nameRt;
     this.packages = packgs;
-    this.version = Conf.version;
-    this.sorts = Conf.sorts;
+    this.sorts = sorts;
   }
 };
 </script>

sites/doc/router.js

@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import VueRouter from 'vue-router';
-import Conf from '../../src/config.json';
+import { packages } from '../../src/config.json';
 import vueg from 'vueg';
 import 'vueg/css/transition-min.css';
 
@@ -65,7 +65,7 @@ const routes = [
   }
 ];
 //组件md文件展示
-Conf.packages.map(item => {
+packages.map(item => {
   if (item.showDemo === false) return;
   const pkgName =  item.name.toLowerCase();
   routes.push({

sites/doc/search.vue

@@ -1,170 +1,162 @@
 <template>
-      <div class="search-box">
-          <input
-            @focus="onfocus"
-            @input="search"
-            @keyup="choseList"
-            v-model="searchVal"
-            class="search"
-            type="text"
-            placeholder="在NutUI中搜索"
-          >
-          <!-- <transition name="fade"> -->
-            <ul class="search-list" v-if="searchList.length>0">
-              <li :class="searchCurName==item.name?'cur':''" @click="checklist(item)" v-for="(item,index) in searchList" :key="index">
-                <router-link :to="{name:item.name}">
-                  {{item.name}}
-                  <span>{{item.chnName}}</span>
-                </router-link>
-              </li>
-            </ul>
-          <!-- </transition> -->
-        </div>
+  <div class="search-box">
+    <input
+      @focus="onfocus"
+      @keyup="choseList"
+      v-model="searchVal"
+      class="search"
+      type="text"
+      placeholder="搜索组件..."
+    >
+    <!-- <transition name="fade"> -->
+    <ul class="search-list" v-if="searchList.length>0">
+      <li
+        :class="searchCurName==item.name?'cur':''"
+        @click="checklist(item)"
+        v-for="(item,index) in searchList"
+        :key="index"
+      >
+        <router-link :to="{name:item.name}">
+          {{item.name}}
+          <span>{{item.chnName}}</span>
+        </router-link>
+      </li>
+    </ul>
+    <!-- </transition> -->
+  </div>
 </template>
 <script>
-import Conf from "../../src/config.json";
+import { packages } from "../../src/config.json";
 export default {
-    data(){
-        return {
-            packages : Conf.packages,
-            searchVal: "",           
-            searchList: [],
-            searchCurName:'',
-             searchIndex:0,
-        }
-    },   
-    mounted() {
-      let list = document.querySelector('.search-list');
-      let that = this;
-      window.addEventListener('click',that.closelist)
+  data() {
+    return {
+      packages,
+      searchVal: "",
+      searchList: [],
+      searchCurName: "",
+      searchIndex: 0
+    };
+  },
+  watch: {
+    searchVal(sVal) {
+      if (sVal) {
+        this.searchList = this.packages.filter(item => {
+          if (item.showDemo === false) return false;
+          const rx = new RegExp(sVal, "gi");
+          return rx.test(item.name + " " + item.chnName + "" + item.desc);
+        });
+      } else {
+        this.searchCurName = "";
+        this.searchIndex = 0;
+        this.searchList = [];
+      }
+    }
+  },
+  mounted() {
+    document.documentElement.addEventListener("click", this.closelist);
+  },
+  methods: {
+    closelist() {
+      this.searchVal = "";
+      this.searchCurName = "";
+      this.searchIndex = 0;
+    },
+    onfocus(e) {
+      e.target.select();
     },
-    methods:{
-        closelist(){           
-            this.searchList = [];
-            this.searchCurName='';
-            this.searchIndex=0;          
-        },
-        onfocus(e) {
-            e.target.select();
-          },
-          clearSearch() {
-            this.searchList = [];
-          },    
-          search(e) {
-            let val = e.target.value.toLowerCase();     
-            this.searchIndex=0;
-            if (val) {
-              let packages = this.packages;
-              let list = [];
-              for (let i = 0, item; (item = packages[i]); i++) {
-                let cn = item.chnName.toLowerCase();
-                let en = item.name.toLowerCase();
-                if (cn.indexOf(val) > -1 || en.indexOf(val) > -1) {
-                  list.push(item);
-                }
-              }
-              this.searchList = list;
-            }else{
+    checklist() {
+      this.searchVal = "";
+      this.searchCurName = "";
+      this.searchIndex = 0;
+    },
+    choseList(e) {
+      let searchIndex = this.searchIndex;
+      if (e.keyCode == 40) {
+        searchIndex++;
+      }
+      if (e.keyCode == 38) {
+        searchIndex--;
+      }
+      if (searchIndex < 0) {
+        searchIndex = 0;
+      }
+      let searchList = this.searchList;
+      if (searchList.length > 0) {
+        let chnName = searchList[searchIndex] && searchList[searchIndex].name;
 
-                this.checklist()
-            }
-          },
-          checklist() {
+        if (chnName) {
+          this.searchCurName = chnName;
+          this.searchIndex = searchIndex;
+          if (e.keyCode == 13) {
+            this.$router.push({
+              path: "/" + searchList[searchIndex].name
+            });
+            this.searchCurName = "";
+            this.searchIndex = 0;
             this.searchVal = "";
-            this.searchList = [];
-            this.searchCurName='';
-            this.searchIndex=0;
-          },
-          choseList(e){           
-            let searchIndex = this.searchIndex;
-            if(e.keyCode==40){
-              searchIndex++;
-            }
-            if(e.keyCode==38){
-              searchIndex--;
-            }
-            if(searchIndex<0){
-              searchIndex = 0;
-            }      
-            let searchList = this.searchList;
-            if(searchList.length>0){       
-             
-            let chnName = searchList[searchIndex].name;
-            
-            if(chnName){
-              this.searchCurName = chnName;
-              this.searchIndex = searchIndex;
-              if(e.keyCode==13){
-                  this.$router.push({
-                      path:'/'+searchList[searchIndex].name
-                  })
-                this.searchCurName='';
-                this.searchIndex=0;
-                this.searchList=[];
-                this.searchVal='';
-              }
-            }       
-            }
           }
+        }
+      }
     }
-}
+  }
+};
 </script>
 <style lang="scss" scoped>
 .search-box {
-      height: 22px;
-      min-width: 300px;
-      position: relative;
-      input {
-        width: 100%;
-      }
-    }
- .search {
-      height: 22px;
-      font-size: 14px;
-      color: #666;
-      border: none;
-      background: url(./asset/css/i/sreach.png) no-repeat left center;
-      padding-left: 45px;
-      &:focus {
-        outline: none;
-      }
-    }
+  height: 22px;
+  min-width: 300px;
+  position: relative;
+  input {
+    width: 100%;
+  }
+}
+.search {
+  height: 22px;
+  font-size: 14px;
+  color: #666;
+  border: none;
+  background: url(./asset/css/i/sreach.png) no-repeat left center;
+  padding-left: 45px;
+  &:focus {
+    outline: none;
+  }
+}
 .search-list {
-    background: #fff;
-    position: absolute;
-    width: 300px;
-    list-style: none;
-    border: 1px solid #f2f2f2;
-    z-index: 99999;
-    top: 27px;
-    padding: 0;
-    li {
+  background: #fff;
+  position: absolute;
+  width: 300px;
+  list-style: none;
+  border: 1px solid #f2f2f2;
+  z-index: 99999;
+  top: 27px;
+  padding: 0;
+  li {
     height: 40px;
     line-height: 40px;
-    font-size:12px;
+    font-size: 12px;
     a {
-        display: inline-block;
-        box-sizing: border-box;
-        width: 100%;
-        padding-left: 40px;
-        text-decoration: none;
-        color: #666;
+      display: inline-block;
+      box-sizing: border-box;
+      width: 100%;
+      padding-left: 40px;
+      text-decoration: none;
+      color: #666;
     }
     &:hover {
-        background: #6096ff;
-        color: #fff;
-        a {
+      background: #6096ff;
+      color: #fff;
+      a {
         color: #fff;
-        }
-    }
+      }
     }
-    .cur{
-        background: #6096ff;
-        color: #fff;
-        a {
-        color: #fff;
-        }
+  }
+  .cur {
+    background: #6096ff;
+    color: #fff;
+    a {
+      color: #fff;
     }
+  }
 }
 </style>
 

src/nutui.js

@@ -1,4 +1,5 @@
-import { version, packages } from './config.json';
+import { version } from '../package.json';
+import { packages } from './config.json';
 import { locale } from './locales';
 
 const components = {};
@@ -69,7 +70,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 // }, components, filters, directives, methods);
 
 const API = {
-    version: version,
+    version,
     locale,
     install,
     ...components,