diff --git a/form/demo/demo1.html b/form/dist/html/demo1.html similarity index 100% rename from form/demo/demo1.html rename to form/dist/html/demo1.html diff --git a/form/dist/js/app/demo1.js b/form/dist/js/app/demo1.js index 6dc49d9..3721545 100644 --- a/form/dist/js/app/demo1.js +++ b/form/dist/js/app/demo1.js @@ -9,7 +9,7 @@ define(function (require, exports, module) { //定义常量及组件初始化 var API = { - save: '/api/user/save' + save: 'api/user/save' }, BUTTONS = { SAVE: $('#btn-save') @@ -21,7 +21,7 @@ define(function (require, exports, module) { //业务逻辑 BUTTONS.SAVE.click(function(){ BUTTONS.SAVE.button('loading'); - Ajax.post(API.save,appForm.getData()).done(function(res){ + Ajax.post(Url.getUrl(API.save,appForm.getData())).done(function(res){ if(res.code == 200) { alert('保存成功!'); } else { diff --git a/form/dist/js/app/index.js b/form/dist/js/app/index.js deleted file mode 100644 index 6dc49d9..0000000 --- a/form/dist/js/app/index.js +++ /dev/null @@ -1,36 +0,0 @@ -define(function (require, exports, module) { - - //引入依赖的组件 - var $ = require('jquery'), - bootstrap = require('lib/bootstrap'), - Form = require('mod/formMap'), - Url = require('mod/url'), - Ajax = require('mod/ajax'); - - //定义常量及组件初始化 - var API = { - save: '/api/user/save' - }, - BUTTONS = { - SAVE: $('#btn-save') - }, - appForm = new Form('#appForm', { - mode: Url.getParam('mode') - }); - - //业务逻辑 - BUTTONS.SAVE.click(function(){ - BUTTONS.SAVE.button('loading'); - Ajax.post(API.save,appForm.getData()).done(function(res){ - if(res.code == 200) { - alert('保存成功!'); - } else { - alert('保存失败!'); - } - }).fail(function(){ - alert('保存失败!'); - }).always(function(){ - BUTTONS.SAVE.button('reset'); - }); - }); -}); \ No newline at end of file diff --git a/form/dist/js/app/mode_1.js b/form/dist/js/app/mode_1.js deleted file mode 100644 index b5814b6..0000000 --- a/form/dist/js/app/mode_1.js +++ /dev/null @@ -1,33 +0,0 @@ -define(function (require, exports, module) { - - //引入依赖的组件 - var $ = require('jquery'), - bootstrap = require('lib/bootstrap'), - Form = require('mod/formMap'), - Ajax = require('mod/ajax'); - - //定义常量及组件初始化 - var API = { - save: '/api/user/save' - }, - BUTTONS = { - SAVE: $('#btn-save') - }, - appForm = new Form('#appForm'); - - //业务逻辑 - BUTTONS.SAVE.click(function(){ - BUTTONS.SAVE.button('loading'); - Ajax.post(API.save,appForm.getData()).done(function(res){ - if(res.code == 200) { - alert('保存成功!'); - } else { - alert('保存失败!'); - } - }).fail(function(){ - alert('保存失败!'); - }).always(function(){ - BUTTONS.SAVE.button('reset'); - }); - }) -}); \ No newline at end of file diff --git a/form/dist/js/mod/url.js b/form/dist/js/mod/url.js index 1f355af..2353101 100644 --- a/form/dist/js/mod/url.js +++ b/form/dist/js/mod/url.js @@ -16,7 +16,7 @@ define(function (require, exports, module) { }); return obj; })(), - baseUrl = location.protocol + '//' + location.hostname + (location.port == '' ? '' : (':' + location.port)) + '/' + '@@CONTEXT_PATH', + baseUrl = location.protocol + '//' + location.hostname + (location.port == '' ? '' : (':' + location.port)) + '/' + '', _getUrl = function (url) { return baseUrl + (url || ''); }; diff --git a/form/gulpfile.js b/form/gulpfile.js index 4a5b1cb..3bef689 100644 --- a/form/gulpfile.js +++ b/form/gulpfile.js @@ -1,11 +1,11 @@ var gulp = require('gulp'), yargs = require('yargs').argv,//获取运行gulp命令时附加的命令行参数 clean = require('gulp-clean'),//清理文件或文件夹 - autoprefixer = require('gulp-autoprefixer'),//自动添加CSS3的前缀 - less = require('gulp-less'),//编译less + replace = require('gulp-replace-task'),//对文件中的字符串进行替换 browserSync = require('browser-sync'), src = 'src', - dist = 'dist'; + dist = 'dist', + CONTEXT_PATH = 'blog/form/'; //清理 gulp.task('clean', function () { @@ -22,6 +22,21 @@ gulp.task('static', function () { .pipe(gulp.dest(dist)); }); +//html +gulp.task('html', function () { + return gulp.src(src + '/html/**/*') + .pipe(replace({ + patterns: [ + { + match: 'CONTEXT_PATH', + replacement: yargs.r ? CONTEXT_PATH : '' + } + ] + })) + .pipe(gulp.dest(dist + '/html/')); +}); + + //style gulp.task('style', function () { return gulp.src(src + '/css/**/*') @@ -31,11 +46,19 @@ gulp.task('style', function () { //scripts gulp.task('script', function () { return gulp.src(src + '/js/**/*') + .pipe(replace({ + patterns: [ + { + match: 'CONTEXT_PATH', + replacement: yargs.r ? CONTEXT_PATH : '' + } + ] + })) .pipe(gulp.dest(dist + '/js/')); }); gulp.task('build', ['clean'], function () { - return gulp.start('style', 'script', 'static'); + return gulp.start('style', 'script', 'static','html'); }); gulp.task('watch', function () { @@ -56,7 +79,7 @@ gulp.task('server', function () { } }, port: yargs.p, - startPath: 'demo/index.html' + startPath: 'dist/html/demo1.html' }); }); @@ -66,6 +89,7 @@ gulp.task('server', function () { * -w: 监听文件改变 * -s: 启动browserAsync * -p: 指定端口 + * -r: 需要更新github上的demo时才会用到的参数 * * 常用命令如下 * 构建:gulp diff --git a/form/package.json b/form/package.json index e51ff93..8037ca6 100644 --- a/form/package.json +++ b/form/package.json @@ -1,14 +1,15 @@ { "private": true, "dependencies": { + "browser-sync": "^2.9.11", "gulp": "^3.9.1", "gulp-autoprefixer": "^3.1.0", "gulp-clean": "^0.3.2", "gulp-less": "^3.0.5", - "browser-sync": "^2.9.11", + "gulp-replace-task": "^0.11.0", "yargs": "^4.4.0" }, "engines": { "node": ">=0.10.0" } -} \ No newline at end of file +} diff --git a/form/src/html/demo1.html b/form/src/html/demo1.html new file mode 100644 index 0000000..a1444db --- /dev/null +++ b/form/src/html/demo1.html @@ -0,0 +1,173 @@ + + +
+ + + + + + + + +