grunt to gulp

gulpfile.js

@@ -0,0 +1,164 @@
+var gulp       = require('gulp'),
+	less       = require('gulp-less'),
+	rjs        = require('gulp-requirejs'),
+	uglify     = require('gulp-uglify'),
+	maps       = require('gulp-sourcemaps'),
+	minifycss  = require('gulp-minify-css'),
+	sprite     = require('gulp.spritesmith'),
+	clean      = require('gulp-clean'),
+	plumber    = require('gulp-plumber'),
+	path       = {
+					dev: './www/',
+					dest: './build/'
+				};
+
+//less
+gulp.task('less', function () {
+    gulp
+		.src(path.dev+'less/styles.less')
+        .pipe(maps.init())
+		.pipe(plumber(function(error){
+			console.log(error);
+			console.log('--------------------------  less Syntax Error! --------------------------');
+		}))
+		.pipe(less())
+		.pipe(minifycss({compatibility: 'ie7'}))
+		.pipe(maps.write('./'))
+        .pipe(gulp.dest(path.dest+'css'));
+});
+
+//requirejs
+gulp.task('r', function() {
+	gulp
+		.src(path.dev+'js/config.js')
+		.pipe(gulp.dest(path.dest+'js'));
+
+	gulp
+		.src(path.dev+'js/app/ZeroClipboard.swf')
+		.pipe(gulp.dest(path.dest+'js/app/'));
+
+    rjs({
+        name: 'app/main',
+        baseUrl: path.dev+'js/lib/',
+		paths: {
+			core: '../core',
+			app:  '../app'
+		},
+		mainConfigFile:path.dev+'js/common.js',
+        out: 'main.js',
+		optimize:false
+    })
+	//.pipe(uglify())
+	.pipe(maps.write('./'))
+    .pipe(gulp.dest(path.dest+'js/app/'));
+
+});
+
+//清理图片
+gulp.task('cleanDefaultImg', function() {
+	gulp
+		.src([
+			path.dest+'img/default/*'
+		], {read: false})
+		.pipe(clean({force: true}));
+});
+gulp.task('cleanSpriteImg', function() {
+	gulp
+		.src([
+			path.dest+'img/sprite/*'
+		], {read: false})
+		.pipe(clean({force: true}));
+});
+
+//复制文件
+gulp.task('copy', function(){
+
+	gulp
+		.src(path.dev+'less/lib/font-awesome-ie7.min.css')
+		.pipe(gulp.dest(path.dest+'css/'));
+
+	gulp
+		.src(path.dev+'less/fonts/*')
+		.pipe(gulp.dest(path.dest+'css/fonts/'));	
+
+	gulp
+		.src(path.dev+'js/lib/*')
+		.pipe(gulp.dest(path.dest+'js/lib/'));
+
+	gulp
+		.src(path.dev+'img/default/*')
+		.pipe(gulp.dest(path.dest+'img/'));
+
+});
+
+//合并png
+gulp.task('spritePNG', function () {	
+	var spriteData = gulp
+						.src(path.dev+'img/sprite/**.png')
+						.pipe(sprite({
+							imgName: 'sprite.png',
+							cssName: 'spritePNG.css',
+							imgPath: '../img/sprite.png'
+						}));
+		spriteData
+			.img
+			.pipe(gulp.dest(path.dest+'img/'));
+
+		spriteData
+			.css
+			.pipe(gulp.dest(path.dev+'less/'));
+});
+
+//合并jpg
+gulp.task('spriteJPG', function () {
+	var spriteData = gulp
+						.src(path.dev+'sprite/*.jpg')
+						.pipe(sprite({
+							imgName: 'sprite.jpg',
+							cssName: 'spriteJPG.css',
+							imgPath: '../img/sprite.jpg'
+						}));
+		spriteData
+			.img
+			.pipe(gulp.dest(path.dest+'img/'));
+
+		spriteData
+			.css
+			.pipe(gulp.dest(path.dev+'less/'));
+});
+
+gulp.task('sprite', function(){
+	gulp.run('spritePNG');
+	gulp.run('spriteJPG');
+});
+
+gulp.task('default', function(){
+
+	//监听js
+    gulp.watch(path.dev+'js/**', function(){
+        gulp.run('r');
+    });
+
+    //监听less
+    gulp.watch(path.dev+'less/**', function(){
+        gulp.run('less');
+    });
+
+	//监听不合并图片
+	gulp.watch(path.dev+'img/default/**', function(){
+		gulp.run('cleanDefaultImg');
+		gulp.run('copy');
+	});
+
+	//监听sprite png
+	gulp.watch(path.dev+'img/sprite/**.png', function(){
+		gulp.run('cleanSpriteImg');
+		gulp.run('spritePNG');
+	});
+
+	//监听sprite jpg
+	gulp.watch(path.dev+'img/sprite/**.jpg', function(){
+		gulp.run('spriteJPG');
+	});
+
+});

package.json

@@ -1,32 +1,20 @@
 {
-  "name": "ProjectName",
+  "name": "erp",
   "version": "0.1.0",
   "scripts": {
-    "grunt": "grunt",
     "gulp": "gulp",
-	"jsdoc": "jsdoc saogaUI/www/js/core/ -d saogaUI/doc/api/ -c saogaUI/tools/docstrap/template/jsdoc.conf.json -t saogaUI/tools/docstrap/template",
-    "build": "npm run grunt & gulp"
+    "build": "npm run gulp"
   },
   "devDependencies": {
-    "grunt": "*",
-    "grunt-contrib-less": "*",
-    "grunt-contrib-watch": "*",
-    "grunt-jsdoc": "*",
-    "grunt-contrib-requirejs": "*",
-    "grunt-contrib-jshint": "*",
-    "grunt-contrib-copy": "*",
-    "grunt-contrib-clean": "*",
-	"grunt-livereload": "*",
-	"gulp": "*",
-    "gulp-rename": "*",
-    "gulp-jshint": "*",
-    "gulp-concat": "*",
-    "gulp-uglify": "*",
-    "gulp-sass": "*",
-    "gulp-jsdoc": "*",
+    "gulp": "*",
+    "gulp-base64": "*",
+    "gulp-clean": "*",
     "gulp-less": "*",
+    "gulp-minify-css": "*",
+    "gulp-plumber": "^1.0.1",
     "gulp-requirejs": "*",
-    "requirejs": "*",
-	"jsdoc": "*"
+    "gulp-sourcemaps": "*",
+    "gulp-uglify": "*",
+    "gulp.spritesmith": "*"
   }
 }

run.bat

@@ -1 +1 @@
-start npm run grunt
+start npm run gulp

sprite.bat

@@ -0,0 +1 @@
+start gulp sprite

tools/Gruntfile.js

@@ -0,0 +1,82 @@
+module.exports = function (grunt) {
+	grunt.initConfig({
+		pkg : grunt.file.readJSON('config.json'),
+		clean: {
+			build: {
+				src: [ '<%= pkg.dir %>/build/' ]
+			},
+		},
+		copy: {
+			main:{
+				cwd: '<%= pkg.dir %>/www',
+				src: ['./images/**'],
+				dest: '<%= pkg.dir %>/build',
+				expand: true
+			}
+		},
+		less: {
+			prod: {
+				files: {
+					'<%= pkg.dir %>/build/css/styles.css': '<%= pkg.dir %>/www/less/styles.less'
+				},
+				options: {
+					cleancss: true
+				}
+			}
+		},
+		requirejs: {
+			main: {
+				options: {
+					baseUrl: "www/js/lib",
+					paths: {
+						core: '../core',
+						app:  '../app'
+					},
+					//include: 'requireLib',//如果需要把require也压进去（这样整个项目只需要一个js文件了），设置其path，并
+					mainConfigFile: "www/js/common.js", //用已写好的main.js文件来处理模块依赖关系
+					name: "app/main", // 模块的名称
+					out: "build/js/app/main.js" //输出的文件名
+					,optimize:'none',//注释掉此行即可同时把合并后的js文件压缩
+				}
+			}
+		},
+		livereload: {
+			options: {
+				base: '<%= pkg.root %>',
+			},
+			files: ['**']
+		},
+		watch: {
+			requirejs:{
+				files: ['<%= pkg.dir %>/www/js/*.js', '<%= pkg.dir %>/www/js/**/*.js'],
+				tasks: ['js']
+			},
+			less: {
+				files: ['<%= pkg.dir %>/www/less/*.less', '<%= pkg.dir %>/www/less/**/*.less'],
+				tasks: ['requirejs']
+			},
+			copy:{
+				files: [
+					'<%= pkg.dir %>/www/images/*.*',
+					'<%= pkg.dir %>/www/images/**/*.*',
+					'<%= pkg.dir %>/www/js/*.*',
+					'<%= pkg.dir %>/www/js/**/*.*'
+				],
+				tasks: ['copy']
+			},
+
+			livereload: {
+				options: {livereload: true},
+				files: ['<%= pkg.root %>/**']
+
+			}
+		}
+	});
+	grunt.loadNpmTasks('grunt-contrib-clean');
+	grunt.loadNpmTasks('grunt-contrib-copy');
+	grunt.loadNpmTasks('grunt-contrib-less');
+	grunt.loadNpmTasks('grunt-contrib-watch');
+	grunt.loadNpmTasks('grunt-contrib-requirejs');
+	grunt.registerTask('default', ['watch']);
+	//grunt.registerTask('default', ['clean', 'copy', 'less', 'requirejs']);
+};

tools/config.json

@@ -0,0 +1,4 @@
+{
+	"root":"saogaUI",
+    "dir":"."
+}

www/html/validator.html

@@ -17,6 +17,7 @@
                 <option value="1">1</option>
                 <option value="2">2</option>
             </select>
+			<span class="ui-form-message"></span>
 		</label>
 	</div>
 	<div class="ui-form fn-clear ui-mt10">
@@ -131,17 +132,24 @@
 			<span class="ui-form-message"></span>
 		</label>
 	</div>
+	<div class="ui-form fn-clear ui-mt10 fn-hide" id="requiredWrap">
+		<label>
+			<i class="ui-label ui-w155">隐藏必填(required)：</i>
+			<input class="ui-input" type="text" data-validate="required;number;floatNumber=2" data-validate-requiredText="xxx,必填" />
+			<span class="ui-form-message"></span>
+		</label>
+	</div>
 	<div class="ui-form fn-clear ui-mt10">
 		<label>
 			<i class="ui-label ui-w155">单选(check)：</i>
 		</label>
 		<label class="ui-pl10">
-			<input type="radio" class="ui-radio" name="textRaio" value="单选选项1" data-validate="check" />
-			<i class="ui-label ui-radio-label">单选选项1</i>
+			<input type="radio" class="ui-radio" name="textRaio" value="1" data-validate="check" />
+			<i class="ui-label ui-radio-label">显示</i>
 		</label>
 		<label class="ui-pl10">
-			<input type="radio" class="ui-radio " name="textRaio" value="单选选项2" data-validate="check"  />
-			<i class="ui-label ui-radio-label">单选选项2</i>
+			<input type="radio" class="ui-radio " name="textRaio" value="2" data-validate="check"  />
+			<i class="ui-label ui-radio-label">隐藏</i>
 		</label>
 		<span class="ui-form-message"></span>
 	</div>
@@ -184,7 +192,8 @@
                 }else{
                     return true;
                 }
-            }
+            }else if( obj[0].id == "testProcess2" ){
+			}
         },
         ajax:function(obj, fn){
             if( obj[0].id == "testProcess2" ){
@@ -198,7 +207,6 @@
 
                     },
                     success: function(data){
-                        console.log(data)
                         if( data ){
                             fn(true)
                         }else{
@@ -213,13 +221,23 @@
         }
 	});
 
+	$('input[name="textRaio"]').click(function(){
+		if( $(this).val() == '1' ){
+			$('#requiredWrap').removeClass('fn-hide');
+		}else{
+			$('#requiredWrap').addClass('fn-hide');
+		}
+	})
+
 	$('#submitLink').click(function(){
 
-        //validator.validatorAll();
-		$('#test').submit();
+        if( validator.validatorAll() ){
+
+		}
+		//$('#test').submit();
 
 	});
-
+	    
     $('#reset').click(function(){
         validator.reset();
     });