Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/v2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@richard1015
richard1015 committed Mar 2, 2020
2 parents d6243b8 + 21b27b4 commit 06c7012
Show file tree
Hide file tree
Showing 33 changed files with 1,952 additions and 1,011 deletions.
1 change: 1 addition & 0 deletions README-zh_CN.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
## 特性

* 全新的架构
* 40+ 高质量组件
* 30+ 京东移动端项目正在使用
* 参照京东APP 7.0 视觉规范
* 支持按需加载
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ English | [简体中文](./README-zh_CN.md)
## Features

* New structure
* 40+ Reusable components
* Used by 30+ JD mobile projects
* Refer to JD APP 7.0 visual specification
* On-demand loading Support
Expand Down
1 change: 1 addition & 0 deletions docs/intro.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ NutUI是一套京东风格的移动端Vue组件库，开发和服务于移动Web

## 特性

* 40+ 高质量组件
* 30+ 京东移动端项目正在使用
* 基于京东APP 7.0 视觉规范
* 支持按需加载
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
"vue": "^2.6.10",
"vue-i18n": "8.1.0",
"vue-jest": "2.6.0",
"vue-lazyload": "1.3.3",
"vue-lazyload": "^1.3.3",
"vue-loader": "15.4.0",
"vue-router": "^3.0.2",
"vue-style-loader": "^4.1.2",
Expand All @@ -162,4 +162,4 @@
"instrument": false,
"sourceMap": false
}
}
}
129 changes: 96 additions & 33 deletions scripts/mdToVue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ let { version } = require("../package.json");
let marked = require('marked');
let contrast = require('./contrast');
let rimraf = require("rimraf");
let Chokidar = require('chokidar');
if (!marked) {
console.log('you need npm i marked -D!');
}
Expand Down Expand Up @@ -33,6 +34,7 @@ class mdVue{
_that.needHandleFiles = res;
_that.ishasOutFile(_that.options.output).then(res=>{
_that.star();
_that.filelisten()
});
})
})
Expand All @@ -59,6 +61,37 @@ class mdVue{

}
apply(){}
filelisten(){
let _that = this;
let watcher = Chokidar.watch(_that.options.entry,{
persistent: true,
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)
// })
console.log(path.join(__dirname,JSON.stringify(eventPath)))
if(/\.md$/.test(eventPath)){
_that.vueDesWrite(eventPath)
}
// "d:\workplace\nutui\docs\international.md"
// _that.read(eventPath).then(res=>{
// _that.headHandle();
// _that.markHandle();
// let html = _that.marked(res);
// _that.write({
// outsrc:_that.options.output,
// name:fileName + '.vue',
// html:html
// });
// })
}
watcher.on('change', path => watchAction({event: 'change', eventPath: path}))
.on('unlink', path => watchAction({event: 'remove', eventPath: path}));
}
star(){
let _that = this;
hashElement(_that.options.entry, {
Expand All @@ -68,43 +101,73 @@ class mdVue{
}).then(hash => {

nodeFilelist.read([_that.options.entry],{"ext":'md'}, res => {
res.map((item,index) =>{
if(index == 30){
debugger
}
let fileSplits = item.path.split(path.sep);
let fileName = fileSplits.pop();
if(_that.isDoc(fileName)){
fileName = fileSplits.pop();
}else{
fileName = fileName.replace(/\.md/,'');
}
if(_that.needHandleFiles[fileName]){
// _that.read(item.path).then(res=>{
// _that.headHandle();
// _that.markHandle();
// let html = _that.marked(res);
// _that.write({
// outsrc:_that.options.output,
// name:fileName + '.vue',
// html:html
// });
// })
}
_that.read(item.path).then(res=>{
_that.headHandle();
_that.markHandle();
let html = _that.marked(res);
_that.write({
outsrc:_that.options.output,
name:fileName + '.vue',
html:html
});
})
res.map((item,index) =>{
_that.vueDesWrite(item.path)
// let fileSplits = item.path.split(path.sep);
// let fileName = fileSplits.pop();
// if(_that.isDoc(fileName)){
// fileName = fileSplits.pop();
// }else{
// fileName = fileName.replace(/\.md/,'');
// }
// if(_that.needHandleFiles[fileName]){
// // _that.read(item.path).then(res=>{
// // _that.headHandle();
// // _that.markHandle();
// // let html = _that.marked(res);
// // _that.write({
// // outsrc:_that.options.output,
// // name:fileName + '.vue',
// // html:html
// // });
// // })
// }
// _that.read(item.path).then(res=>{
// _that.headHandle();
// _that.markHandle();
// let html = _that.marked(res);
// _that.write({
// outsrc:_that.options.output,
// name:fileName + '.vue',
// html:html
// });
// })
});
});
})
}
vueDesWrite(getpath){
let _that = this;
let fileSplits = getpath.split(path.sep);
let fileName = fileSplits.pop();
if(_that.isDoc(fileName)){
fileName = fileSplits.pop();
}else{
fileName = fileName.replace(/\.md/,'');
}
if(_that.needHandleFiles[fileName]){
// _that.read(item.path).then(res=>{
// _that.headHandle();
// _that.markHandle();
// let html = _that.marked(res);
// _that.write({
// outsrc:_that.options.output,
// name:fileName + '.vue',
// html:html
// });
// })
}
_that.read(getpath).then(res=>{
_that.headHandle();
_that.markHandle();
let html = _that.marked(res);
_that.write({
outsrc:_that.options.output,
name:fileName + '.vue',
html:html
});
})
}
isDoc(name){
return (name == "doc.md") ? true : false;
}
Expand Down
4 changes: 2 additions & 2 deletions sites/demo/view/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<a href="https://github.com/jdf2e/nutui/" target="_blank" class="github-btn">Github</a>

<h1 class="logo"></h1>
<div class="version">NutUI 2.0</div>
<div class="version">NutUI {{version}}</div>
<p>一套京东风格的移动端Vue组件库</p>
<div :class="['demo-list-box',{'unfold':foldStatus[item]}]" v-for="item in sorts" :key="item">
<h4 @click="toggleFold(item)">
Expand Down Expand Up @@ -38,7 +38,7 @@ export default {
version,
sortedPackages: [],
oriSorts: [],
sorts: [1, 2, 0, 3, 4, 5],
sorts: [1, 2, 0, 3, 4, 5, 6],
foldStatus: []
};
},
Expand Down
Loading

0 comments on commit 06c7012

Please sign in to comment.