Browse Source

Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

Frans 7 years ago
parent
commit
551dda465d
5 changed files with 33 additions and 27 deletions
  1. 1 0
      package.json
  2. 26 21
      scripts/mdToVue.js
  3. 4 4
      src/packages/backtop/doc.md
  4. 1 1
      src/packages/buttongroup/doc.md
  5. 1 1
      src/packages/cell/doc.md

+ 1 - 0
package.json

@@ -72,6 +72,7 @@
     "babel-preset-env": "1.7.0",
     "babel-preset-env": "1.7.0",
     "babel-preset-stage-2": "6.24.1",
     "babel-preset-stage-2": "6.24.1",
     "chalk": "2.4.1",
     "chalk": "2.4.1",
+    "chokidar": "^2.0.4",
     "clipboard": "2.0.1",
     "clipboard": "2.0.1",
     "copy": "0.3.2",
     "copy": "0.3.2",
     "copy-webpack-plugin": "4.5.4",
     "copy-webpack-plugin": "4.5.4",

+ 26 - 21
scripts/mdToVue.js

@@ -1,12 +1,14 @@
 const fs = require('fs');
 const fs = require('fs');
 var path = require('path');
 var path = require('path');
+//hash获取工具
 let { hashElement } = require('folder-hash');
 let { hashElement } = require('folder-hash');
 //marked转换工具
 //marked转换工具
 let marked = require('marked');
 let marked = require('marked');
 if (!marked) {
 if (!marked) {
     console.log('you need npm i marked -D!');
     console.log('you need npm i marked -D!');
 }
 }
-
+//文件监听
+let Chokidar = require('chokidar');
 // 基本配置文件信息
 // 基本配置文件信息
 let {version} = require("../package.json");
 let {version} = require("../package.json");
 //vue js脚本
 //vue js脚本
@@ -249,19 +251,20 @@ function comparehash(path,callback){
      
      
 }
 }
 //文件监听
 //文件监听
-function filelisten(){    
-    let fsWatcher = fs.watchFile(filedir, {
+function filelisten(param){  
+    let watcher = Chokidar.watch(param.entry,{
         persistent: true,
         persistent: true,
-        persistent: 1000
-    }, (err, data) => {
-        //  console.log(err,data,filedir);
-        fs.readFile(filedir, 'utf-8', (err, data) => {
-            let html = marked(data);
-            let filedirarry = filedir.split('/');
-            let fileNames = filedirarry[filedirarry.length - 2];
-            createdFile(outPath + fileNames + '.vue', html, nohead)
-        });
-    });
+        usePolling: true,
+    })
+    let log = console.dir.bind(console);
+    let watchAction = function({event, eventPath}){      
+        // 这里进行文件更改后的操作
+        fileReadStar(eventPath,(res)=>{           
+            createdFile(param.output + res.mdName + '.vue', res.html, param.needCode)
+        })
+    }
+    watcher.on('change', path => watchAction({event: 'change', eventPath: path}))
+    .on('unlink', path => watchAction({event: 'remove', eventPath: path}));
 }
 }
 /**
 /**
  * 文件转md
  * 文件转md
@@ -273,7 +276,8 @@ function filelisten(){
 function fileDisplay(param) {
 function fileDisplay(param) {
     //检查文件是否第一次初始化并获取hash
     //检查文件是否第一次初始化并获取hash
     comparehash(param.entry,(hashMsgObj)=>{
     comparehash(param.entry,(hashMsgObj)=>{
-        // 获取文件
+        
+        // 获取目录下所有文件
         readDirRecur(param.entry, function(filePath) {    
         readDirRecur(param.entry, function(filePath) {    
             //文件列表        
             //文件列表        
             fileList.map(item=>{              
             fileList.map(item=>{              
@@ -286,21 +290,20 @@ function fileDisplay(param) {
     });
     });
     
     
 }
 }
-//md转 其他格式类型
+
 /**
 /**
- * 
+ * 输出的文件目录 是否存在
  * @outPath {String} 输出的文件目录 
  * @outPath {String} 输出的文件目录 
  */
  */
 function ishasOutFile(outPath,callback){
 function ishasOutFile(outPath,callback){
     fs.stat(outPath,(err,res)=>{       
     fs.stat(outPath,(err,res)=>{       
         if(err){
         if(err){
-            fs.mkdir(outPath,erro=>{
-                if(erro){
-                    
+            fs.mkdir(outPath,err=>{
+                if(err){
+                    console.log(err)
                 }else{                  
                 }else{                  
                     callback()
                     callback()
-                }
-               
+                }               
             })
             })
         }else{
         }else{
             callback()
             callback()
@@ -325,6 +328,8 @@ function MdToHtml(commomOption) {
     ishasOutFile(params.output,()=>{
     ishasOutFile(params.output,()=>{
          //获取所有的md 转html的结果
          //获取所有的md 转html的结果
         fileDisplay(params);
         fileDisplay(params);
+        //文件监听 
+        filelisten(params);
     });
     });
    
    
 }
 }

+ 4 - 4
src/packages/backtop/doc.md

@@ -41,21 +41,21 @@ export default {
 
 
 ## 设置样式
 ## 设置样式
 ```html
 ```html
-<nut-switch 
+<nut-backtop 
   :bottom="20"
   :bottom="20"
   :right="20"
   :right="20"
   :zIndex="10"
   :zIndex="10"
 >
 >
-</nut-switch>
+</nut-backtop>
 ```
 ```
 
 
 
 
 ## 设置动画持续时间
 ## 设置动画持续时间
 ```html
 ```html
-<nut-switch 
+<nut-backtop 
   :duration="1000"  
   :duration="1000"  
 >
 >
-</nut-switch>
+</nut-backtop>
 ```
 ```
 
 
 
 

+ 1 - 1
src/packages/buttongroup/doc.md

@@ -4,7 +4,7 @@
 
 
 常规按钮组
 常规按钮组
 
 
-```html
+```html3123123213123123123423423423431231233123123123123123123
 <nut-button-group>
 <nut-button-group>
   <nut-button 
   <nut-button 
     type="light"
     type="light"

+ 1 - 1
src/packages/cell/doc.md

@@ -16,7 +16,7 @@
 ```html
 ```html
 <nut-cell 
 <nut-cell 
   :isLink = "true"
   :isLink = "true"
-  title = "左侧主标题" 
+  title = "左侧主标题" 312312312423423423423
   subTitle = "左侧副标题"
   subTitle = "左侧副标题"
   desc="右侧描述文字">
   desc="右侧描述文字">
 </nut-cell>
 </nut-cell>