diff --git a/.gitignore b/.gitignore index 015e420579..5f5448a3a1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ node_modules/ /.idea/ -dist demo.js -demo.css \ No newline at end of file +demo.css +.DS_Store diff --git a/Gruntfile.js b/Gruntfile.js index d20b063de7..c7f4f3e1b7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -47,10 +47,19 @@ module.exports = function (grunt) { //实现好的一些基础实例 caseJs: { src: [ + 'src/case/combo/popup.bubble.js', 'src/case/**/*.js' ], dest: 'dist/case.js' }, + widgetJs: { + src: [ + 'src/widget/paramsettingcombo/popup.param.js', + 'src/widget/sequencetable/treenumber.sequencetable.js', + 'src/widget/**/*.js' + ], + dest: "dist/widget.js" + }, coreCss: { src: ['src/css/core/**/*.css', 'src/css/utils/**/*.css'], dest: 'dist/core.css' @@ -59,9 +68,13 @@ module.exports = function (grunt) { src: ['src/css/base/**/*.css'], dest: 'dist/base.css' }, + widgetCss: { + src: ['src/css/widget/**/*.css'], + dest: 'dist/widget.css' + }, demoJs: { - src: ['demo/version.js', 'demo/app.js', 'demo/js/**/*.js'], + src: ['demo/version.js', 'demo/app.js', 'demo/js/**/*.js', 'demo/config.js'], dest: 'demo/dist/demo.js' }, demoCss: { @@ -131,7 +144,7 @@ module.exports = function (grunt) { }, watch: { scripts: { - files: ['src/**/*.js', 'demo/**/*.js', 'demo/**/*.less'], + files: ['src/**/*.js', 'demo/js/**/*.js', 'demo/config.js', 'demo/less/**/*.less'], tasks: ['less', 'concat'], options: { spanw: true, diff --git a/demo.html b/demo.html index d0b0cdd45a..20808e0f08 100644 --- a/demo.html +++ b/demo.html @@ -14,10 +14,14 @@ +
+ +