Browse Source

Merge pull request #163 in FUI/fineui from ~GUY/fineui:master to master

* commit 'c078c6d453bff703eae20f5925809a7f57d3214b':
  update
  update
  update
  update
es6
guy 7 years ago
parent
commit
6ffbea9399
  1. 7
      bi/core.js
  2. 2
      demo/js/fix-2.0/demo.js
  3. 149
      demo/version.js
  4. 7
      dist/bundle.js
  5. 149
      dist/config.js
  6. 7
      dist/core.js
  7. 2
      dist/demo.js
  8. 12
      dist/fix/fix.js
  9. 2
      dist/index.html
  10. 2
      src/core/base.js
  11. 3
      src/core/proto/date.js

7
bi/core.js

@ -11592,7 +11592,7 @@ if (!window.BI) {
overrides = sp;
sp = sb;
sb = function () {
sp.apply(this, arguments);
return sp.apply(this, arguments);
};
}
var F = function () {
@ -20623,7 +20623,9 @@ BI.Cache = {
}
document.cookie = cookieString;
}
};// full day names
};$(function () {
//牵扯到国际化这些常量在页面加载后再生效
// full day names
Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
@ -20682,6 +20684,7 @@ Date._QN = ["", BI.i18nText("BI-Quarter_1"),
/** Adds the number of days array to the Date object. */
Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
})
/** Constants used for time computations */
Date.SECOND = 1000 /* milliseconds */;

2
demo/js/fix-2.0/demo.js

@ -20,7 +20,7 @@
var Store = BI.inherit(Fix.VM, {
_init: function () {
this.comp = new Computed(model).model;
this.comp = new Computed(model);
},
computed: {
b: function () {

149
demo/version.js

@ -8,55 +8,122 @@ if (!window.BI) {
BI.servletURL = "";
BI.resourceURL = "resource/";
BI.i18n = {
"BI-Basic_OK": "确定",
"BI-Basic_Sure": "确定",
"BI-Basic_Clears": "清空",
"BI-Basic_Cancel": "取消",
"BI-Basic_Time": "时间",
"BI-Basic_Total": "总",
"BI-Tiao_Data": "条数据",
"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": "六",
"BI-Multi_Date_Year": "年",
"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-Multi_Date_Quarter": "季度",
"BI-Basic_Unrestricted": "无限制",
"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-Basic_Value": "值",
"BI-Load_More": "加载更多",
"BI-Select_All": "全选",
"BI-No_More_Data": "无更多数据",
"BI-No_Selected_Value": "没有可选项",
"BI-Basic_Clear": "清除",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
"BI-Multi_Date_Year_Prev": "年前",
"BI-Multi_Date_Year_Next": "年后",
"BI-Multi_Date_Year_Begin": "年初",
"BI-Multi_Date_Year_End": "年末",
"BI-Multi_Date_Quarter_Prev": "个季度前",
"BI-Multi_Date_Quarter_Next": "个季度后",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Quarter_End": "季度末",
"BI-Multi_Date_Month_Prev": "个月前",
"BI-Multi_Date_Month_Next": "个月后",
"BI-Multi_Date_Month_Begin": "月初",
"BI-Multi_Date_Month_End": "月末",
"BI-Multi_Date_Week_Prev": "周前",
"BI-Month_Trigger_Error_Text": "请输入1~12的正整数",
"BI-Less_And_Equal": "小于等于",
"BI-Year_Trigger_Invalid_Text": "请输入有效时间",
"BI-Multi_Date_Week_Next": "周后",
"BI-Multi_Date_Day_Prev": "天前",
"BI-Multi_Date_Day_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-Date_Trigger_Error_Text": "日期格式示例\\:2015-3-11",
"BI-Year_Trigger_Invalid_Text": "请输入有效时间",
"BI-Multi_Date_YMD": "年/月/日",
"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-Multi_Date_Day": "天"
"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-Primary_Key": "主键",
"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-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_Simple_Thursday": "四",
"BI-Multi_Date_Year_Prev": "年前",
"BI-Tiao_Data": "条数据",
"BI-Basic_Italic": "斜体"
};

7
dist/bundle.js vendored

@ -11643,7 +11643,7 @@ if (!window.BI) {
overrides = sp;
sp = sb;
sb = function () {
sp.apply(this, arguments);
return sp.apply(this, arguments);
};
}
var F = function () {
@ -20674,7 +20674,9 @@ BI.Cache = {
}
document.cookie = cookieString;
}
};// full day names
};$(function () {
//牵扯到国际化这些常量在页面加载后再生效
// full day names
Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
@ -20733,6 +20735,7 @@ Date._QN = ["", BI.i18nText("BI-Quarter_1"),
/** Adds the number of days array to the Date object. */
Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
})
/** Constants used for time computations */
Date.SECOND = 1000 /* milliseconds */;

149
dist/config.js vendored

@ -8,55 +8,122 @@ if (!window.BI) {
BI.servletURL = "";
BI.resourceURL = "resource/";
BI.i18n = {
"BI-Basic_OK": "确定",
"BI-Basic_Sure": "确定",
"BI-Basic_Clears": "清空",
"BI-Basic_Cancel": "取消",
"BI-Basic_Time": "时间",
"BI-Basic_Total": "总",
"BI-Tiao_Data": "条数据",
"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": "六",
"BI-Multi_Date_Year": "年",
"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-Multi_Date_Quarter": "季度",
"BI-Basic_Unrestricted": "无限制",
"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-Basic_Value": "值",
"BI-Load_More": "加载更多",
"BI-Select_All": "全选",
"BI-No_More_Data": "无更多数据",
"BI-No_Selected_Value": "没有可选项",
"BI-Basic_Clear": "清除",
"BI-Multi_Date_Relative_Current_Time": "相对当前时间",
"BI-Multi_Date_Year_Prev": "年前",
"BI-Multi_Date_Year_Next": "年后",
"BI-Multi_Date_Year_Begin": "年初",
"BI-Multi_Date_Year_End": "年末",
"BI-Multi_Date_Quarter_Prev": "个季度前",
"BI-Multi_Date_Quarter_Next": "个季度后",
"BI-Multi_Date_Quarter_Begin": "季度初",
"BI-Multi_Date_Quarter_End": "季度末",
"BI-Multi_Date_Month_Prev": "个月前",
"BI-Multi_Date_Month_Next": "个月后",
"BI-Multi_Date_Month_Begin": "月初",
"BI-Multi_Date_Month_End": "月末",
"BI-Multi_Date_Week_Prev": "周前",
"BI-Month_Trigger_Error_Text": "请输入1~12的正整数",
"BI-Less_And_Equal": "小于等于",
"BI-Year_Trigger_Invalid_Text": "请输入有效时间",
"BI-Multi_Date_Week_Next": "周后",
"BI-Multi_Date_Day_Prev": "天前",
"BI-Multi_Date_Day_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-Date_Trigger_Error_Text": "日期格式示例\\:2015-3-11",
"BI-Year_Trigger_Invalid_Text": "请输入有效时间",
"BI-Multi_Date_YMD": "年/月/日",
"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-Multi_Date_Day": "天"
"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-Primary_Key": "主键",
"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-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_Simple_Thursday": "四",
"BI-Multi_Date_Year_Prev": "年前",
"BI-Tiao_Data": "条数据",
"BI-Basic_Italic": "斜体"
};

7
dist/core.js vendored

@ -11592,7 +11592,7 @@ if (!window.BI) {
overrides = sp;
sp = sb;
sb = function () {
sp.apply(this, arguments);
return sp.apply(this, arguments);
};
}
var F = function () {
@ -20623,7 +20623,9 @@ BI.Cache = {
}
document.cookie = cookieString;
}
};// full day names
};$(function () {
//牵扯到国际化这些常量在页面加载后再生效
// full day names
Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
BI.i18nText("BI-Basic_Tuesday"),
@ -20682,6 +20684,7 @@ Date._QN = ["", BI.i18nText("BI-Quarter_1"),
/** Adds the number of days array to the Date object. */
Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
})
/** Constants used for time computations */
Date.SECOND = 1000 /* milliseconds */;

2
dist/demo.js vendored

@ -10208,7 +10208,7 @@ BI.shortcut("demo.tmp", Demo.Func);
var Store = BI.inherit(Fix.VM, {
_init: function () {
this.comp = new Computed(model).model;
this.comp = new Computed(model);
},
computed: {
b: function () {

12
dist/fix/fix.js vendored

@ -938,6 +938,9 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
initComputed(this, this.computed);
initMethods(this, this.actions);
this._init();
if (this.$$model) {
return this.model;
}
}
VM.prototype.$watch = function $watch(expOrFn, cb, options) {
@ -959,7 +962,8 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}
var watchers = [];
var fns = exps.slice();
var complete = false;
var complete = false,
running = false;
_.each(exps, function (exp, i) {
if (_.has(operators, exp)) {
return;
@ -972,9 +976,13 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (runBinaryFunction(fns)) {
complete = true;
cb.call(vm);
fns = exps.slice();
}
if (!running) {
running = true;
nextTick(function () {
complete = false;
running = false;
fns = exps.slice();
});
}
}, options);

2
dist/index.html vendored

@ -11,7 +11,6 @@
<link rel="stylesheet" type="text/css" href="demo.css" />
<link rel="stylesheet" type="text/css" href="sliders.css" />
<script src="config.js"></script>
<script src="polyfill.js"></script>
<script src="core.js"></script>
<script src="fix/fix-1.0.js"></script>
@ -22,6 +21,7 @@
<script src="case.js"></script>
<script src="widget.js"></script>
<script src="sliders.js"></script>
<script src="config.js"></script>
<!--图表-->
<!--<script src="vancharts-all.js"></script>-->
<!--<script src="biconst.js"></script>-->

2
src/core/base.js

@ -442,7 +442,7 @@ if (!window.BI) {
overrides = sp;
sp = sb;
sb = function () {
sp.apply(this, arguments);
return sp.apply(this, arguments);
};
}
var F = function () {

3
src/core/proto/date.js

@ -1,3 +1,5 @@
$(function () {
//牵扯到国际化这些常量在页面加载后再生效
// full day names
Date._DN = [BI.i18nText("BI-Basic_Sunday"),
BI.i18nText("BI-Basic_Monday"),
@ -57,6 +59,7 @@ Date._QN = ["", BI.i18nText("BI-Quarter_1"),
/** Adds the number of days array to the Date object. */
Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
})
/** Constants used for time computations */
Date.SECOND = 1000 /* milliseconds */;

Loading…
Cancel
Save