diff --git a/Gruntfile.js b/Gruntfile.js index a3d18d86ed..d8b67cc15e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -99,7 +99,7 @@ module.exports = function (grunt) { }, bundleJs: { - src: ['dist/core.js', 'dist/base.js', 'dist/case.js', 'dist/widget.js'], + src: ['dist/core.js', 'dist/base.js', 'dist/case.js', 'dist/widget.js', 'public/js/**/*.js'], dest: 'dist/bundle.js' }, diff --git a/dist/bundle.js b/dist/bundle.js index bf8299aa7a..d63d7e951b 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -93660,4 +93660,19 @@ BI.ValueChooserPane = BI.inherit(BI.AbstractValueChooser, { } }); BI.ValueChooserPane.EVENT_CHANGE = "ValueChooserPane.EVENT_CHANGE"; -BI.shortcut('bi.value_chooser_pane', BI.ValueChooserPane); \ No newline at end of file +BI.shortcut('bi.value_chooser_pane', BI.ValueChooserPane);BI.servletURL = "http://fanruan.coding.me/fineui/dist/"; +BI.resourceURL = "http://fanruan.coding.me/fineui/dist/resource/"; +BI.i18n = { + "BI-Basic_OK": "确定", + "BI-Basic_Sure": "确定", + "BI-Basic_Clears": "清空", + "BI-Basic_Cancel": "取消", + "BI-Basic_Time": "时间", + "BI-Basic_Simple_Sunday": "日", + "BI-Basic_Simple_Monday": "一", + "BI-Basic_Simple_Tuesday": "二", + "BI-Basic_Simple_Wednesday": "三", + "BI-Basic_Simple_Thursday": "四", + "BI-Basic_Simple_Friday": "五", + "BI-Basic_Simple_Saturday": "六", +}; \ No newline at end of file diff --git a/dist/font/iconfont.eot b/dist/font/iconfont.eot index 9e2cbf6106..693b5dc73f 100644 Binary files a/dist/font/iconfont.eot and b/dist/font/iconfont.eot differ diff --git a/dist/font/iconfont.svg b/dist/font/iconfont.svg index 90429dbe17..973571d6b5 100644 --- a/dist/font/iconfont.svg +++ b/dist/font/iconfont.svg @@ -1,674 +1,1002 @@ - + + -Created by FontForge 20120731 at Mon Feb 6 14:42:36 2017 - By admin +Created by iconfont + - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dist/font/iconfont.ttf b/dist/font/iconfont.ttf index 11634db76f..e62143db9c 100644 Binary files a/dist/font/iconfont.ttf and b/dist/font/iconfont.ttf differ diff --git a/dist/font/iconfont.woff b/dist/font/iconfont.woff index f55cb72faa..9c9686cd61 100644 Binary files a/dist/font/iconfont.woff and b/dist/font/iconfont.woff differ diff --git a/public/js/index.js b/public/js/index.js new file mode 100644 index 0000000000..18d0f48ddb --- /dev/null +++ b/public/js/index.js @@ -0,0 +1,16 @@ +BI.servletURL = "http://fanruan.coding.me/fineui/dist/"; +BI.resourceURL = "http://fanruan.coding.me/fineui/dist/resource/"; +BI.i18n = { + "BI-Basic_OK": "确定", + "BI-Basic_Sure": "确定", + "BI-Basic_Clears": "清空", + "BI-Basic_Cancel": "取消", + "BI-Basic_Time": "时间", + "BI-Basic_Simple_Sunday": "日", + "BI-Basic_Simple_Monday": "一", + "BI-Basic_Simple_Tuesday": "二", + "BI-Basic_Simple_Wednesday": "三", + "BI-Basic_Simple_Thursday": "四", + "BI-Basic_Simple_Friday": "五", + "BI-Basic_Simple_Saturday": "六", +}; \ No newline at end of file