Pull request #1599: KERNEL-6234 增加core.js config.js resource.css

Merge in VISUAL/fineui from ~TELLER/fineui:bugfix to master

* commit 'c487aca9d89fcfe41ba9280e938840793249a3ba':
  chore: remove bundle.min.js
  chore: add gitignore
  chore: remove yarn.lock
  KERNEL-6234 chore: 增加core.js config.js resource.css

.gitignore

@@ -6,4 +6,5 @@ node_modules/
 coverage
 unit.test.statistic.json
 package-lock.json
+yarn.lock
 *.tgz

.npmignore

@@ -17,9 +17,6 @@
 !dist/utils.js.map
 !dist/utils.min.js
 !dist/utils.min.js.map
-!dist/bundle.min.css
-!dist/bundle.min.js
-!dist/bundle.min.js.map
 !dist/fineui_without_jquery_polyfill.js
 !dist/2.0/fineui.ie.min.js
 !dist/2.0/fineui.ie.min.js.map

dist/config.js

@@ -0,0 +1,193 @@
+
+BI.i18n = {
+    "BI-Multi_Date_Quarter_End": "季度末",
+    "BI-Multi_Date_Month_Begin": "月初",
+    "BI-Multi_Date_YMD": "年月日",
+    "BI-Custom_Color": "自定义颜色",
+    "BI-Numerical_Interval_Input_Data": "请输入数值",
+    "BI-Please_Input_Natural_Number": "请输入非负整数",
+    "BI-No_More_Data": "无更多数据",
+    "BI-Basic_Altogether": "共",
+    "BI-Basic_Sunday": "星期日",
+    "BI-Widget_Background_Colour": "组件背景",
+    "BI-Color_Picker_Error_Text": "请输入0~255的正整数",
+    "BI-Multi_Date_Month": "月",
+    "BI-No_Selected_Item": "没有可选项",
+    "BI-Multi_Date_Year_Begin": "年初",
+    "BI-Quarter_1": "第1季度",
+    "BI-Quarter_2": "第2季度",
+    "BI-Quarter_3": "第3季度",
+    "BI-Quarter_4": "第4季度",
+    "BI-Multi_Date_Year_Next": "年后",
+    "BI-Multi_Date_Month_Prev": "个月前",
+    "BI-Month_Trigger_Error_Text": "请输入1~12的正整数",
+    "BI-Less_And_Equal": "小于等于",
+    "BI-Year_Trigger_Invalid_Text": "请输入有效时间",
+    "BI-Multi_Date_Week_Next": "周后",
+    "BI-Font_Size": "字号",
+    "BI-Basic_Total": "共",
+    "BI-Already_Selected": "已选择",
+    "BI-Formula_Insert": "插入",
+    "BI-Select_All": "全选",
+    "BI-Basic_Tuesday": "星期二",
+    "BI-Multi_Date_Month_End": "月末",
+    "BI-Load_More": "点击加载更多数据",
+    "BI-Basic_September": "九月",
+    "BI-Current_Is_Last_Page": "当前已是最后一页",
+    "BI-Basic_Auto": "自动",
+    "BI-Basic_Count": "个",
+    "BI-Basic_Value": "值",
+    "BI-Basic_Unrestricted": "无限制",
+    "BI-Quarter_Trigger_Error_Text": "请输入1~4的正整数",
+    "BI-Basic_More": "更多",
+    "BI-Basic_Wednesday": "星期三",
+    "BI-Basic_Bold": "加粗",
+    "BI-Basic_Simple_Saturday": "六",
+    "BI-Multi_Date_Month_Next": "个月后",
+    "BI-Basic_March": "三月",
+    "BI-Current_Is_First_Page": "当前已是第一页",
+    "BI-Basic_Thursday": "星期四",
+    "BI-Basic_Prompt": "提示",
+    "BI-Multi_Date_Today": "今天",
+    "BI-Multi_Date_Quarter_Prev": "个季度前",
+    "BI-Row_Header": "行表头",
+    "BI-Date_Trigger_Error_Text": "日期格式示例:2015-3-11",
+    "BI-Basic_Cancel": "取消",
+    "BI-Basic_January": "一月",
+    "BI-Basic_June": "六月",
+    "BI-Basic_July": "七月",
+    "BI-Basic_April": "四月",
+    "BI-Multi_Date_Quarter_Begin": "季度初",
+    "BI-Multi_Date_Week": "周",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
+    "BI-Basic_August": "八月",
+    "BI-Word_Align_Left": "文字居左",
+    "BI-Basic_November": "十一月",
+    "BI-Font_Colour": "字体颜色",
+    "BI-Multi_Date_Day_Prev": "天前",
+    "BI-Select_Part": "部分选择",
+    "BI-Multi_Date_Day_Next": "天后",
+    "BI-Less_Than": "小于",
+    "BI-Basic_February": "二月",
+    "BI-Multi_Date_Year": "年",
+    "BI-Number_Index": "序号",
+    "BI-Multi_Date_Week_Prev": "周前",
+    "BI-Next_Page": "下一页",
+    "BI-Right_Page": "向右翻页",
+    "BI-Numerical_Interval_Signal_Value": "前后值相等，请将操作符改为“≤”",
+    "BI-Basic_December": "十二月",
+    "BI-Basic_Saturday": "星期六",
+    "BI-Basic_Simple_Wednesday": "三",
+    "BI-Multi_Date_Quarter_Next": "个季度后",
+    "BI-Basic_October": "十月",
+    "BI-Basic_Simple_Friday": "五",
+    "BI-Basic_Save": "保存",
+    "BI-Numerical_Interval_Number_Value": "请保证前面的数值小于/等于后面的数值",
+    "BI-Previous_Page": "上一页",
+    "BI-No_Select": "搜索结果为空",
+    "BI-Basic_Clears": "清空",
+    "BI-Created_By_Me": "我创建的",
+    "BI-Basic_Simple_Tuesday": "二",
+    "BI-Word_Align_Right": "文字居右",
+    "BI-Summary_Values": "汇总",
+    "BI-Basic_Clear": "清除",
+    "BI-Upload_File_Size_Error": "文件大小不支持",
+    "BI-Up_Page": "向上翻页",
+    "BI-Basic_Simple_Sunday": "日",
+    "BI-Multi_Date_Relative_Current_Time": "相对当前时间",
+    "BI-Selected_Data": "已选数据：",
+    "BI-Multi_Date_Quarter": "季度",
+    "BI-Check_Selected": "查看已选",
+    "BI-Basic_Search": "搜索",
+    "BI-Basic_May": "五月",
+    "BI-Continue_Select": "继续选择",
+    "BI-Please_Input_Positive_Integer": "请输入正整数",
+    "BI-Upload_File_Type_Error": "文件类型不支持",
+    "BI-Upload_File_Error": "文件上传失败",
+    "BI-Basic_Friday": "星期五",
+    "BI-Down_Page": "向下翻页",
+    "BI-Basic_Monday": "星期一",
+    "BI-Left_Page": "向左翻页",
+    "BI-Transparent_Color": "透明",
+    "BI-Basic_Simple_Monday": "一",
+    "BI-Multi_Date_Year_End": "年末",
+    "BI-Time_Interval_Error_Text": "请保证开始时间早于/等于结束时间",
+    "BI-Basic_Time": "时间",
+    "BI-Basic_OK": "确定",
+    "BI-Basic_Sure": "确定",
+    "BI-Basic_Simple_Thursday": "四",
+    "BI-Multi_Date_Year_Prev": "年前",
+    "BI-Tiao_Data": "条数据",
+    "BI-Basic_Italic": "斜体",
+    "BI-Basic_Dynamic_Title": "动态时间",
+    "BI-Basic_Year": "年",
+    "BI-Basic_Single_Quarter": "季",
+    "BI-Basic_Month": "月",
+    "BI-Basic_Week": "周",
+    "BI-Basic_Day": "天",
+    "BI-Basic_Work_Day": "工作日",
+    "BI-Basic_Front": "前",
+    "BI-Basic_Behind": "后",
+    "BI-Basic_Empty": "空",
+    "BI-Basic_Month_End": "月末",
+    "BI-Basic_Month_Begin": "月初",
+    "BI-Basic_Year_End": "年末",
+    "BI-Basic_Year_Begin": "年初",
+    "BI-Basic_Quarter_End": "季末",
+    "BI-Basic_Quarter_Begin": "季初",
+    "BI-Basic_Week_End": "周末",
+    "BI-Basic_Week_Begin": "周初",
+    "BI-Basic_Current_Day": "当天",
+    "BI-Basic_Begin_Start": "初",
+    "BI-Basic_End_Stop": "末",
+    "BI-Basic_Current_Year": "今年",
+    "BI-Basic_Year_Fen": "年份",
+    "BI-Basic_Current_Month": "本月",
+    "BI-Basic_Current_Quarter": "本季度",
+    "BI-Basic_Year_Month": "年月",
+    "BI-Basic_Year_Quarter": "年季度",
+    "BI-Basic_Input_Can_Not_Null": "输入框不能为空",
+    "BI-Basic_Date_Time_Error_Text": "日期格式示例:2015-3-11 00:00:00",
+    "BI-Basic_Input_From_To_Number": "请输入{R1}的数值",
+    "BI-Basic_Or": "或",
+    "BI-Basic_And": "且",
+    "BI-Conf_Add_Formula": "添加公式",
+    "BI-Conf_Add_Condition": "添加条件",
+    "BI-Conf_Formula_And": "且公式条件",
+    "BI-Conf_Formula_Or": "或公式条件",
+    "BI-Conf_Condition_And": "且条件",
+    "BI-Conf_Condition_Or": "或条件",
+    "BI-Microsoft_YaHei": "微软雅黑",
+    "BI-Apple_Light": "苹方-light",
+    "BI-Font_Family": "字体",
+    "BI-Basic_Please_Input_Content": "请输入内容",
+    "BI-Word_Align_Center": "文字居中",
+    "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
+    "BI-More_Than": "大于",
+    "BI-More_And_Equal": "大于等于",
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "+点击新增\"{R1}\"",
+    "BI-Basic_Please_Select": "请选择",
+    "BI-Basic_Font_Color": "文字颜色",
+    "BI-Basic_Background_Color": "背景色",
+    "BI-Basic_Underline": "下划线",
+    "BI-Basic_Param_Month": "{R1}月",
+    "BI-Basic_Param_Day": "{R1}日",
+    "BI-Basic_Param_Quarter": "{R1}季度",
+    "BI-Basic_Param_Week_Count": "第{R1}周",
+    "BI-Basic_Param_Hour": "{R1}时",
+    "BI-Basic_Param_Minute": "{R1}分",
+    "BI-Basic_Param_Second": "{R1}秒",
+    "BI-Basic_Param_Year": "{R1}年",
+    "BI-Basic_Date_Day": "日",
+    "BI-Basic_Hour_Sin": "时",
+    "BI-Basic_Seconds": "秒",
+    "BI-Basic_Minute": "分",
+    "BI-Basic_Wan": "万",
+    "BI-Basic_Million": "百万",
+    "BI-Basic_Billion": "亿",
+    "BI-Basic_Quarter": "季度",
+    "BI-Basic_No_Select": "不选",
+    "BI-Basic_Now": "此刻",
+    "BI-Color_Picker_Error_Text_Hex": "请输入6位16进制颜色编号"
+};

lib/postbuild/postbuild.js

@@ -2,6 +2,8 @@ const { resolve } = require("path");
 const { existsSync, mkdirSync, readFileSync, writeFileSync } = require("fs");
 const rimraf = require("rimraf");
 const grunt = require("grunt");
+const concat = require("concat");
+const { config } = require("../../webpack/attachments")
 
 const dest = resolve(__dirname, '../../dist');
 
@@ -16,6 +18,8 @@ const deleteList = [
     "fineui_without_jquery_polyfill.css",
     "font.js",
     "font.js.map",
+    "resource.js",
+    "resource.js.map",
     "2.0/fineui.ie.min.css",
     "2.0/fineui_without_normalize.js",
     "2.0/fineui_without_normalize.js.map",
@@ -34,12 +38,18 @@ deleteList.forEach(filename => {
     });
 });
 
-const fileList = ['demo.js', 'fineui.js', '2.0/fineui.js'];
+const fileList = ['demo.js', 'fineui.js', '2.0/fineui.js', 'core.js'];
 fileList.forEach(filename => {
     const sourcefile = resolve(dest, `./${filename}`);
+
+    const paths = filename.split("/");
+
+    const name = paths[paths.length - 1];
     
     const content = `${readFileSync(sourcefile, { encoding: 'utf8' })}
-//# sourceMappingURL=./${filename}.map`;
+//# sourceMappingURL=./${name}.map`;
 
     writeFileSync(sourcefile, content);
 });
+
+concat(config, resolve(dest, "config.js"));

package.json

@@ -15,6 +15,7 @@
     "babel-loader": "8.0.6",
     "chai": "4.2.0",
     "cnpm": "6.1.1",
+    "concat": "1.0.3",
     "core-js": "3.3.2",
     "cross-env": "6.0.0",
     "css-loader": "3.0.0",
@@ -78,4 +79,4 @@
   },
   "author": "fanruan",
   "license": "MIT"
-}
+}

private/less/app.less

@@ -0,0 +1,2 @@
+@import "../../src/less/resource/app";
+@import "var";

private/less/background.less

@@ -0,0 +1,2 @@
+@import "../../src/less/resource/background";
+@import "var";

private/less/font.less

@@ -0,0 +1,2 @@
+@import "../../src/less/resource/font";
+@import "var";

private/less/icon.less

@@ -0,0 +1,5 @@
+@import "../../src/less/resource/icon";
+@import "var";
+
+
+

private/less/size.less

@@ -0,0 +1,2 @@
+@import "../../src/less/resource/size";
+@import "var";

private/less/var.less

@@ -0,0 +1,4 @@
+@webUrl: './';
+@fontUrl: '@{webUrl}font/'; //图片的基本地址
+@imageUrl: '@{webUrl}images/1x/'; //图片的基本地址
+@image2xUrl: '@{webUrl}images/2x/'; //2倍图片的基本地址

webpack/attachments.js

@@ -134,6 +134,22 @@ const bundle = [].concat(
     basicAttachmentMap.ts,
 );
 
+const coreJs = [].concat(
+    basicAttachmentMap.polyfill,
+    basicAttachmentMap.core,
+    basicAttachmentMap.fix,
+    basicAttachmentMap.base,
+    basicAttachmentMap.case,
+    basicAttachmentMap.widget,
+    ['./dist/fix/fix.compact.js'],
+    basicAttachmentMap.router,
+    basicAttachmentMap.ts,
+);
+
+const resource = sync(["private/less/app.less", "private/less/**/*.less"]);
+
+const config = sync(["public/js/**/*.js", "public/js/index.js", "i18n/i18n.cn.js"]);
+
 const bundleIE = [].concat(
     basicAttachmentMap.polyfillIE,
     basicAttachmentMap.core,
@@ -255,4 +271,7 @@ module.exports = {
     fineuiWithoutJqueryAndPolyfillJs: uniq(fineuiWithoutJqueryAndPolyfillJs),
     utils: uniq(basicAttachmentMap.utils),
     demo: uniq(demo),
+    coreJs: uniq(coreJs),
+    resource: uniq((resource)),
+    config: uniq(config),
 };

webpack/webpack.prod.js

@@ -19,13 +19,14 @@ module.exports = merge.smart(common, {
         "fineui.ie.min": attachments.fineuiIE,
         utils: attachments.utils,
         "utils.min": attachments.utils,
-        "bundle.min": attachments.bundle,
         "fineui_without_jquery_polyfill": attachments.fineuiWithoutJqueryAndPolyfillJs,
         "2.0/fineui.ie.min": attachments.bundleIE,
         "2.0/fineui": attachments.bundle,
         "2.0/fineui.min": attachments.bundle,
         '2.0/fineui_without_normalize': attachments.bundleWithoutNormalize,
         '2.0/fineui_without_normalize.min': attachments.bundleWithoutNormalize,
+        core: attachments.coreJs,
+        resource: attachments.resource,
     },
     optimization: {
         minimizer: [

yarn.lock

@@ -2405,7 +2405,7 @@ commander@2.17.x:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@^2.20.0:
+commander@^2.20.0, commander@^2.9.0:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
@@ -2482,6 +2482,13 @@ concat-stream@^1.5.0, concat-stream@^1.6.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+concat@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/concat/-/concat-1.0.3.tgz#40f3353089d65467695cb1886b45edd637d8cca8"
+  integrity sha1-QPM1MInWVGdpXLGIa0Xt1jfYzKg=
+  dependencies:
+    commander "^2.9.0"
+
 config-chain@^1.1.12:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"