From 3706995efd19ec17a95bdb9ffd3e35e0155776fa Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 31 Oct 2017 11:27:20 +0800 Subject: [PATCH 1/4] update --- dist/fix/fix.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dist/fix/fix.js b/dist/fix/fix.js index 02a0b693bc..96aaac5816 100644 --- a/dist/fix/fix.js +++ b/dist/fix/fix.js @@ -959,7 +959,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 +973,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); From a2b9186c66fbcb476ba1510c0a81549d6a9fe460 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 31 Oct 2017 11:44:34 +0800 Subject: [PATCH 2/4] update --- bi/core.js | 2 +- demo/js/fix-2.0/demo.js | 2 +- dist/bundle.js | 2 +- dist/core.js | 2 +- dist/demo.js | 2 +- dist/fix/fix.js | 3 +++ src/core/base.js | 2 +- 7 files changed, 9 insertions(+), 6 deletions(-) diff --git a/bi/core.js b/bi/core.js index 32cf8562b2..0ea9c5d3ef 100644 --- a/bi/core.js +++ b/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 () { diff --git a/demo/js/fix-2.0/demo.js b/demo/js/fix-2.0/demo.js index fb946f8dba..b6fb8fc54f 100644 --- a/demo/js/fix-2.0/demo.js +++ b/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 () { diff --git a/dist/bundle.js b/dist/bundle.js index 05a8c5dad6..39a133120f 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -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 () { diff --git a/dist/core.js b/dist/core.js index 227900b6d2..8de05c6013 100644 --- a/dist/core.js +++ b/dist/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 () { diff --git a/dist/demo.js b/dist/demo.js index ef8ec3265c..7fba7c23e6 100644 --- a/dist/demo.js +++ b/dist/demo.js @@ -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 () { diff --git a/dist/fix/fix.js b/dist/fix/fix.js index 96aaac5816..2db7fad299 100644 --- a/dist/fix/fix.js +++ b/dist/fix/fix.js @@ -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) { diff --git a/src/core/base.js b/src/core/base.js index 9071f40baa..7b62f8b6d0 100644 --- a/src/core/base.js +++ b/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 () { From 83772cd1c2b4ea39be52379665653b531bc14366 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 31 Oct 2017 14:32:36 +0800 Subject: [PATCH 3/4] update --- bi/core.js | 121 +++++++++++++++++++++-------------------- dist/bundle.js | 121 +++++++++++++++++++++-------------------- dist/config.js | 3 - dist/core.js | 121 +++++++++++++++++++++-------------------- dist/index.html | 2 +- src/core/proto/date.js | 121 +++++++++++++++++++++-------------------- 6 files changed, 249 insertions(+), 240 deletions(-) diff --git a/bi/core.js b/bi/core.js index 0ea9c5d3ef..b736a5dd6e 100644 --- a/bi/core.js +++ b/bi/core.js @@ -20623,65 +20623,68 @@ BI.Cache = { } document.cookie = cookieString; } -};// full day names -Date._DN = [BI.i18nText("BI-Basic_Sunday"), - BI.i18nText("BI-Basic_Monday"), - BI.i18nText("BI-Basic_Tuesday"), - BI.i18nText("BI-Basic_Wednesday"), - BI.i18nText("BI-Basic_Thursday"), - BI.i18nText("BI-Basic_Friday"), - BI.i18nText("BI-Basic_Saturday"), - BI.i18nText("BI-Basic_Sunday")]; - -// short day names -Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), - BI.i18nText("BI-Basic_Simple_Monday"), - BI.i18nText("BI-Basic_Simple_Tuesday"), - BI.i18nText("BI-Basic_Simple_Wednesday"), - BI.i18nText("BI-Basic_Simple_Thursday"), - BI.i18nText("BI-Basic_Simple_Friday"), - BI.i18nText("BI-Basic_Simple_Saturday"), - BI.i18nText("BI-Basic_Simple_Sunday")]; - -// Monday first, etc. -Date._FD = 1; - -// full month namesdat -Date._MN = [ - BI.i18nText("BI-Basic_January"), - BI.i18nText("BI-Basic_February"), - BI.i18nText("BI-Basic_March"), - BI.i18nText("BI-Basic_April"), - BI.i18nText("BI-Basic_May"), - BI.i18nText("BI-Basic_June"), - BI.i18nText("BI-Basic_July"), - BI.i18nText("BI-Basic_August"), - BI.i18nText("BI-Basic_September"), - BI.i18nText("BI-Basic_October"), - BI.i18nText("BI-Basic_November"), - BI.i18nText("BI-Basic_December")]; - -// short month names -Date._SMN = [0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11]; - -Date._QN = ["", BI.i18nText("BI-Quarter_1"), - BI.i18nText("BI-Quarter_2"), - BI.i18nText("BI-Quarter_3"), - BI.i18nText("BI-Quarter_4")]; - -/** Adds the number of days array to the Date object. */ -Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; +};$(function () { + //牵扯到国际化这些常量在页面加载后再生效 + // full day names + Date._DN = [BI.i18nText("BI-Basic_Sunday"), + BI.i18nText("BI-Basic_Monday"), + BI.i18nText("BI-Basic_Tuesday"), + BI.i18nText("BI-Basic_Wednesday"), + BI.i18nText("BI-Basic_Thursday"), + BI.i18nText("BI-Basic_Friday"), + BI.i18nText("BI-Basic_Saturday"), + BI.i18nText("BI-Basic_Sunday")]; + + // short day names + Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), + BI.i18nText("BI-Basic_Simple_Monday"), + BI.i18nText("BI-Basic_Simple_Tuesday"), + BI.i18nText("BI-Basic_Simple_Wednesday"), + BI.i18nText("BI-Basic_Simple_Thursday"), + BI.i18nText("BI-Basic_Simple_Friday"), + BI.i18nText("BI-Basic_Simple_Saturday"), + BI.i18nText("BI-Basic_Simple_Sunday")]; + + // Monday first, etc. + Date._FD = 1; + + // full month namesdat + Date._MN = [ + BI.i18nText("BI-Basic_January"), + BI.i18nText("BI-Basic_February"), + BI.i18nText("BI-Basic_March"), + BI.i18nText("BI-Basic_April"), + BI.i18nText("BI-Basic_May"), + BI.i18nText("BI-Basic_June"), + BI.i18nText("BI-Basic_July"), + BI.i18nText("BI-Basic_August"), + BI.i18nText("BI-Basic_September"), + BI.i18nText("BI-Basic_October"), + BI.i18nText("BI-Basic_November"), + BI.i18nText("BI-Basic_December")]; + + // short month names + Date._SMN = [0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11]; + + Date._QN = ["", BI.i18nText("BI-Quarter_1"), + BI.i18nText("BI-Quarter_2"), + BI.i18nText("BI-Quarter_3"), + BI.i18nText("BI-Quarter_4")]; + + /** 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 */; diff --git a/dist/bundle.js b/dist/bundle.js index 39a133120f..22da943687 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -20674,65 +20674,68 @@ BI.Cache = { } document.cookie = cookieString; } -};// full day names -Date._DN = [BI.i18nText("BI-Basic_Sunday"), - BI.i18nText("BI-Basic_Monday"), - BI.i18nText("BI-Basic_Tuesday"), - BI.i18nText("BI-Basic_Wednesday"), - BI.i18nText("BI-Basic_Thursday"), - BI.i18nText("BI-Basic_Friday"), - BI.i18nText("BI-Basic_Saturday"), - BI.i18nText("BI-Basic_Sunday")]; - -// short day names -Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), - BI.i18nText("BI-Basic_Simple_Monday"), - BI.i18nText("BI-Basic_Simple_Tuesday"), - BI.i18nText("BI-Basic_Simple_Wednesday"), - BI.i18nText("BI-Basic_Simple_Thursday"), - BI.i18nText("BI-Basic_Simple_Friday"), - BI.i18nText("BI-Basic_Simple_Saturday"), - BI.i18nText("BI-Basic_Simple_Sunday")]; - -// Monday first, etc. -Date._FD = 1; - -// full month namesdat -Date._MN = [ - BI.i18nText("BI-Basic_January"), - BI.i18nText("BI-Basic_February"), - BI.i18nText("BI-Basic_March"), - BI.i18nText("BI-Basic_April"), - BI.i18nText("BI-Basic_May"), - BI.i18nText("BI-Basic_June"), - BI.i18nText("BI-Basic_July"), - BI.i18nText("BI-Basic_August"), - BI.i18nText("BI-Basic_September"), - BI.i18nText("BI-Basic_October"), - BI.i18nText("BI-Basic_November"), - BI.i18nText("BI-Basic_December")]; - -// short month names -Date._SMN = [0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11]; - -Date._QN = ["", BI.i18nText("BI-Quarter_1"), - BI.i18nText("BI-Quarter_2"), - BI.i18nText("BI-Quarter_3"), - BI.i18nText("BI-Quarter_4")]; - -/** Adds the number of days array to the Date object. */ -Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; +};$(function () { + //牵扯到国际化这些常量在页面加载后再生效 + // full day names + Date._DN = [BI.i18nText("BI-Basic_Sunday"), + BI.i18nText("BI-Basic_Monday"), + BI.i18nText("BI-Basic_Tuesday"), + BI.i18nText("BI-Basic_Wednesday"), + BI.i18nText("BI-Basic_Thursday"), + BI.i18nText("BI-Basic_Friday"), + BI.i18nText("BI-Basic_Saturday"), + BI.i18nText("BI-Basic_Sunday")]; + + // short day names + Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), + BI.i18nText("BI-Basic_Simple_Monday"), + BI.i18nText("BI-Basic_Simple_Tuesday"), + BI.i18nText("BI-Basic_Simple_Wednesday"), + BI.i18nText("BI-Basic_Simple_Thursday"), + BI.i18nText("BI-Basic_Simple_Friday"), + BI.i18nText("BI-Basic_Simple_Saturday"), + BI.i18nText("BI-Basic_Simple_Sunday")]; + + // Monday first, etc. + Date._FD = 1; + + // full month namesdat + Date._MN = [ + BI.i18nText("BI-Basic_January"), + BI.i18nText("BI-Basic_February"), + BI.i18nText("BI-Basic_March"), + BI.i18nText("BI-Basic_April"), + BI.i18nText("BI-Basic_May"), + BI.i18nText("BI-Basic_June"), + BI.i18nText("BI-Basic_July"), + BI.i18nText("BI-Basic_August"), + BI.i18nText("BI-Basic_September"), + BI.i18nText("BI-Basic_October"), + BI.i18nText("BI-Basic_November"), + BI.i18nText("BI-Basic_December")]; + + // short month names + Date._SMN = [0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11]; + + Date._QN = ["", BI.i18nText("BI-Quarter_1"), + BI.i18nText("BI-Quarter_2"), + BI.i18nText("BI-Quarter_3"), + BI.i18nText("BI-Quarter_4")]; + + /** 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 */; diff --git a/dist/config.js b/dist/config.js index b659c50090..c110da8be9 100644 --- a/dist/config.js +++ b/dist/config.js @@ -2,9 +2,6 @@ Demo = { version: 1.0 }; -if (!window.BI) { - window.BI = {}; -} BI.servletURL = ""; BI.resourceURL = "resource/"; BI.i18n = { diff --git a/dist/core.js b/dist/core.js index 8de05c6013..e8b7819c9b 100644 --- a/dist/core.js +++ b/dist/core.js @@ -20623,65 +20623,68 @@ BI.Cache = { } document.cookie = cookieString; } -};// full day names -Date._DN = [BI.i18nText("BI-Basic_Sunday"), - BI.i18nText("BI-Basic_Monday"), - BI.i18nText("BI-Basic_Tuesday"), - BI.i18nText("BI-Basic_Wednesday"), - BI.i18nText("BI-Basic_Thursday"), - BI.i18nText("BI-Basic_Friday"), - BI.i18nText("BI-Basic_Saturday"), - BI.i18nText("BI-Basic_Sunday")]; - -// short day names -Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), - BI.i18nText("BI-Basic_Simple_Monday"), - BI.i18nText("BI-Basic_Simple_Tuesday"), - BI.i18nText("BI-Basic_Simple_Wednesday"), - BI.i18nText("BI-Basic_Simple_Thursday"), - BI.i18nText("BI-Basic_Simple_Friday"), - BI.i18nText("BI-Basic_Simple_Saturday"), - BI.i18nText("BI-Basic_Simple_Sunday")]; - -// Monday first, etc. -Date._FD = 1; - -// full month namesdat -Date._MN = [ - BI.i18nText("BI-Basic_January"), - BI.i18nText("BI-Basic_February"), - BI.i18nText("BI-Basic_March"), - BI.i18nText("BI-Basic_April"), - BI.i18nText("BI-Basic_May"), - BI.i18nText("BI-Basic_June"), - BI.i18nText("BI-Basic_July"), - BI.i18nText("BI-Basic_August"), - BI.i18nText("BI-Basic_September"), - BI.i18nText("BI-Basic_October"), - BI.i18nText("BI-Basic_November"), - BI.i18nText("BI-Basic_December")]; - -// short month names -Date._SMN = [0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11]; - -Date._QN = ["", BI.i18nText("BI-Quarter_1"), - BI.i18nText("BI-Quarter_2"), - BI.i18nText("BI-Quarter_3"), - BI.i18nText("BI-Quarter_4")]; - -/** Adds the number of days array to the Date object. */ -Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; +};$(function () { + //牵扯到国际化这些常量在页面加载后再生效 + // full day names + Date._DN = [BI.i18nText("BI-Basic_Sunday"), + BI.i18nText("BI-Basic_Monday"), + BI.i18nText("BI-Basic_Tuesday"), + BI.i18nText("BI-Basic_Wednesday"), + BI.i18nText("BI-Basic_Thursday"), + BI.i18nText("BI-Basic_Friday"), + BI.i18nText("BI-Basic_Saturday"), + BI.i18nText("BI-Basic_Sunday")]; + + // short day names + Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), + BI.i18nText("BI-Basic_Simple_Monday"), + BI.i18nText("BI-Basic_Simple_Tuesday"), + BI.i18nText("BI-Basic_Simple_Wednesday"), + BI.i18nText("BI-Basic_Simple_Thursday"), + BI.i18nText("BI-Basic_Simple_Friday"), + BI.i18nText("BI-Basic_Simple_Saturday"), + BI.i18nText("BI-Basic_Simple_Sunday")]; + + // Monday first, etc. + Date._FD = 1; + + // full month namesdat + Date._MN = [ + BI.i18nText("BI-Basic_January"), + BI.i18nText("BI-Basic_February"), + BI.i18nText("BI-Basic_March"), + BI.i18nText("BI-Basic_April"), + BI.i18nText("BI-Basic_May"), + BI.i18nText("BI-Basic_June"), + BI.i18nText("BI-Basic_July"), + BI.i18nText("BI-Basic_August"), + BI.i18nText("BI-Basic_September"), + BI.i18nText("BI-Basic_October"), + BI.i18nText("BI-Basic_November"), + BI.i18nText("BI-Basic_December")]; + + // short month names + Date._SMN = [0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11]; + + Date._QN = ["", BI.i18nText("BI-Quarter_1"), + BI.i18nText("BI-Quarter_2"), + BI.i18nText("BI-Quarter_3"), + BI.i18nText("BI-Quarter_4")]; + + /** 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 */; diff --git a/dist/index.html b/dist/index.html index 2014a4c94f..cf5f3f8db7 100644 --- a/dist/index.html +++ b/dist/index.html @@ -11,7 +11,6 @@ - @@ -22,6 +21,7 @@ + diff --git a/src/core/proto/date.js b/src/core/proto/date.js index 8b62bcc108..3ae99bbb5e 100644 --- a/src/core/proto/date.js +++ b/src/core/proto/date.js @@ -1,62 +1,65 @@ -// full day names -Date._DN = [BI.i18nText("BI-Basic_Sunday"), - BI.i18nText("BI-Basic_Monday"), - BI.i18nText("BI-Basic_Tuesday"), - BI.i18nText("BI-Basic_Wednesday"), - BI.i18nText("BI-Basic_Thursday"), - BI.i18nText("BI-Basic_Friday"), - BI.i18nText("BI-Basic_Saturday"), - BI.i18nText("BI-Basic_Sunday")]; - -// short day names -Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), - BI.i18nText("BI-Basic_Simple_Monday"), - BI.i18nText("BI-Basic_Simple_Tuesday"), - BI.i18nText("BI-Basic_Simple_Wednesday"), - BI.i18nText("BI-Basic_Simple_Thursday"), - BI.i18nText("BI-Basic_Simple_Friday"), - BI.i18nText("BI-Basic_Simple_Saturday"), - BI.i18nText("BI-Basic_Simple_Sunday")]; - -// Monday first, etc. -Date._FD = 1; - -// full month namesdat -Date._MN = [ - BI.i18nText("BI-Basic_January"), - BI.i18nText("BI-Basic_February"), - BI.i18nText("BI-Basic_March"), - BI.i18nText("BI-Basic_April"), - BI.i18nText("BI-Basic_May"), - BI.i18nText("BI-Basic_June"), - BI.i18nText("BI-Basic_July"), - BI.i18nText("BI-Basic_August"), - BI.i18nText("BI-Basic_September"), - BI.i18nText("BI-Basic_October"), - BI.i18nText("BI-Basic_November"), - BI.i18nText("BI-Basic_December")]; - -// short month names -Date._SMN = [0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11]; - -Date._QN = ["", BI.i18nText("BI-Quarter_1"), - BI.i18nText("BI-Quarter_2"), - BI.i18nText("BI-Quarter_3"), - BI.i18nText("BI-Quarter_4")]; - -/** Adds the number of days array to the Date object. */ -Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; +$(function () { + //牵扯到国际化这些常量在页面加载后再生效 + // full day names + Date._DN = [BI.i18nText("BI-Basic_Sunday"), + BI.i18nText("BI-Basic_Monday"), + BI.i18nText("BI-Basic_Tuesday"), + BI.i18nText("BI-Basic_Wednesday"), + BI.i18nText("BI-Basic_Thursday"), + BI.i18nText("BI-Basic_Friday"), + BI.i18nText("BI-Basic_Saturday"), + BI.i18nText("BI-Basic_Sunday")]; + + // short day names + Date._SDN = [BI.i18nText("BI-Basic_Simple_Sunday"), + BI.i18nText("BI-Basic_Simple_Monday"), + BI.i18nText("BI-Basic_Simple_Tuesday"), + BI.i18nText("BI-Basic_Simple_Wednesday"), + BI.i18nText("BI-Basic_Simple_Thursday"), + BI.i18nText("BI-Basic_Simple_Friday"), + BI.i18nText("BI-Basic_Simple_Saturday"), + BI.i18nText("BI-Basic_Simple_Sunday")]; + + // Monday first, etc. + Date._FD = 1; + + // full month namesdat + Date._MN = [ + BI.i18nText("BI-Basic_January"), + BI.i18nText("BI-Basic_February"), + BI.i18nText("BI-Basic_March"), + BI.i18nText("BI-Basic_April"), + BI.i18nText("BI-Basic_May"), + BI.i18nText("BI-Basic_June"), + BI.i18nText("BI-Basic_July"), + BI.i18nText("BI-Basic_August"), + BI.i18nText("BI-Basic_September"), + BI.i18nText("BI-Basic_October"), + BI.i18nText("BI-Basic_November"), + BI.i18nText("BI-Basic_December")]; + + // short month names + Date._SMN = [0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11]; + + Date._QN = ["", BI.i18nText("BI-Quarter_1"), + BI.i18nText("BI-Quarter_2"), + BI.i18nText("BI-Quarter_3"), + BI.i18nText("BI-Quarter_4")]; + + /** 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 */; From c078c6d453bff703eae20f5925809a7f57d3214b Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 31 Oct 2017 15:21:49 +0800 Subject: [PATCH 4/4] update --- demo/version.js | 149 ++++++++++++++++++++++++++++++++++------------- dist/config.js | 152 +++++++++++++++++++++++++++++++++++------------- 2 files changed, 219 insertions(+), 82 deletions(-) diff --git a/demo/version.js b/demo/version.js index b659c50090..da3f7bb7ea 100644 --- a/demo/version.js +++ b/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": "斜体" }; \ No newline at end of file diff --git a/dist/config.js b/dist/config.js index c110da8be9..da3f7bb7ea 100644 --- a/dist/config.js +++ b/dist/config.js @@ -2,58 +2,128 @@ Demo = { version: 1.0 }; +if (!window.BI) { + 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": "斜体" }; \ No newline at end of file