Merge branch 'new'

This commit is contained in:
rickcole 2020-07-29 19:36:03 +08:00
commit 547a22840c
234 changed files with 24344 additions and 963 deletions

4
.gitignore vendored
View File

@ -20,4 +20,6 @@ node_modules
/toolkit/amis-renderer /toolkit/amis-renderer
/toolkit/output /toolkit/output
/coverage /coverage
/package-lock.json /package-lock.json
_examples
docs-new

View File

@ -179,9 +179,8 @@ module.exports = function (content, file) {
return placeholder[id] || ''; return placeholder[id] || '';
}); });
content = content = fis.compile.partial(content, file, 'html');
fis.compile.partial(content, file, 'html') + // + `\n\n<div class="m-t-lg b-l b-info b-3x wrapper bg-light dk">文档内容有误?欢迎大家一起来编写,文档地址:<i class="fa fa-github"></i><a href="https://github.com/baidu/amis/tree/master${file.subpath}">${file.subpath}</a>。</div>`;
`\n\n<div class="m-t-lg b-l b-info b-3x wrapper bg-light dk">文档内容有误?欢迎大家一起来编写,文档地址:<i class="fa fa-github"></i><a href="https://github.com/baidu/amis/tree/master${file.subpath}">${file.subpath}</a>。</div>`;
info.html = content; info.html = content;
info.toc = toc; info.toc = toc;

Some files were not shown because too many files have changed in this diff Show More