caoww
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #483 in VISUAL/fineui from ~TELLER/fineui:bugfix/bugfix to master 

* commit '95a1dec34dd19f8770463cfbda882bb64e03a1bb':
  update
  BI-25852
es6
Teller 7 years ago
parent
9720d7189f 95a1dec34d
commit
ed1599d54f
7 changed files with 30 additions and 19 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dist/_fineui.min.js
  2. 9
      dist/bundle.js
  3. 6
      dist/bundle.min.js
  4. 9
      dist/fineui.js
  5. 4
      dist/fineui.min.js
  6. 9
      dist/widget.js
  7. 8
      src/widget/yearmonthinterval/yearmonthinterval.js

4
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/bundle.js vendored
Unescape View File

@ -111920,11 +111920,13 @@ BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.Year
// 判格式合法
_check: function (smallDate, bigDate) {
var smallObj = smallDate.match(/\d+/g), bigObj = bigDate.match(/\d+/g);
return this._dateCheck(smallDate) && BI.checkDateLegal(smallDate) && this._checkVoid({
var smallDate4Check = (smallObj[0] || "") + "-" + (smallObj[1] || 1);
var bigDate4Check = (bigObj[0] || "") + "-" + (bigObj[1] || 1);
return this._dateCheck(smallDate4Check) && BI.checkDateLegal(smallDate) && this._checkVoid({
year: smallObj[0],
month: smallObj[1],
day: 1
}) && this._dateCheck(bigDate) && BI.checkDateLegal(bigDate) && this._checkVoid({
}) && this._dateCheck(bigDate4Check) && BI.checkDateLegal(bigDate) && this._checkVoid({
year: bigObj[0],
month: bigObj[1],
day: 1
@ -111955,7 +111957,8 @@ BI.YearMonthInterval.EVENT_VALID = "EVENT_VALID";
BI.YearMonthInterval.EVENT_ERROR = "EVENT_ERROR";
BI.YearMonthInterval.EVENT_CHANGE = "EVENT_CHANGE";
BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);/**
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);
/**
* 年份展示面板
*
* Created by GUY on 2015/9/2.

6
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/fineui.js vendored
Unescape View File

@ -112169,11 +112169,13 @@ BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.Year
// 判格式合法
_check: function (smallDate, bigDate) {
var smallObj = smallDate.match(/\d+/g), bigObj = bigDate.match(/\d+/g);
return this._dateCheck(smallDate) && BI.checkDateLegal(smallDate) && this._checkVoid({
var smallDate4Check = (smallObj[0] || "") + "-" + (smallObj[1] || 1);
var bigDate4Check = (bigObj[0] || "") + "-" + (bigObj[1] || 1);
return this._dateCheck(smallDate4Check) && BI.checkDateLegal(smallDate) && this._checkVoid({
year: smallObj[0],
month: smallObj[1],
day: 1
}) && this._dateCheck(bigDate) && BI.checkDateLegal(bigDate) && this._checkVoid({
}) && this._dateCheck(bigDate4Check) && BI.checkDateLegal(bigDate) && this._checkVoid({
year: bigObj[0],
month: bigObj[1],
day: 1
@ -112204,7 +112206,8 @@ BI.YearMonthInterval.EVENT_VALID = "EVENT_VALID";
BI.YearMonthInterval.EVENT_ERROR = "EVENT_ERROR";
BI.YearMonthInterval.EVENT_CHANGE = "EVENT_CHANGE";
BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);/**
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);
/**
* 年份展示面板
*
* Created by GUY on 2015/9/2.

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/widget.js vendored
Unescape View File

@ -24233,11 +24233,13 @@ BI.shortcut("bi.dynamic_year_month_trigger", BI.DynamicYearMonthTrigger);BI.Year
// 判格式合法
_check: function (smallDate, bigDate) {
var smallObj = smallDate.match(/\d+/g), bigObj = bigDate.match(/\d+/g);
return this._dateCheck(smallDate) && BI.checkDateLegal(smallDate) && this._checkVoid({
var smallDate4Check = (smallObj[0] || "") + "-" + (smallObj[1] || 1);
var bigDate4Check = (bigObj[0] || "") + "-" + (bigObj[1] || 1);
return this._dateCheck(smallDate4Check) && BI.checkDateLegal(smallDate) && this._checkVoid({
year: smallObj[0],
month: smallObj[1],
day: 1
}) && this._dateCheck(bigDate) && BI.checkDateLegal(bigDate) && this._checkVoid({
}) && this._dateCheck(bigDate4Check) && BI.checkDateLegal(bigDate) && this._checkVoid({
year: bigObj[0],
month: bigObj[1],
day: 1
@ -24268,7 +24270,8 @@ BI.YearMonthInterval.EVENT_VALID = "EVENT_VALID";
BI.YearMonthInterval.EVENT_ERROR = "EVENT_ERROR";
BI.YearMonthInterval.EVENT_CHANGE = "EVENT_CHANGE";
BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);/**
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);
/**
* 年份展示面板
*
* Created by GUY on 2015/9/2.

8
src/widget/yearmonthinterval/yearmonthinterval.js
Unescape View File

@ -147,11 +147,13 @@ BI.YearMonthInterval = BI.inherit(BI.Single, {
// 判格式合法
_check: function (smallDate, bigDate) {
var smallObj = smallDate.match(/\d+/g), bigObj = bigDate.match(/\d+/g);
return this._dateCheck(smallDate) && BI.checkDateLegal(smallDate) && this._checkVoid({
var smallDate4Check = (smallObj[0] || "") + "-" + (smallObj[1] || 1);
var bigDate4Check = (bigObj[0] || "") + "-" + (bigObj[1] || 1);
return this._dateCheck(smallDate4Check) && BI.checkDateLegal(smallDate) && this._checkVoid({
year: smallObj[0],
month: smallObj[1],
day: 1
}) && this._dateCheck(bigDate) && BI.checkDateLegal(bigDate) && this._checkVoid({
}) && this._dateCheck(bigDate4Check) && BI.checkDateLegal(bigDate) && this._checkVoid({
year: bigObj[0],
month: bigObj[1],
day: 1
@ -182,4 +184,4 @@ BI.YearMonthInterval.EVENT_VALID = "EVENT_VALID";
BI.YearMonthInterval.EVENT_ERROR = "EVENT_ERROR";
BI.YearMonthInterval.EVENT_CHANGE = "EVENT_CHANGE";
BI.YearMonthInterval.EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);
BI.shortcut("bi.year_month_interval", BI.YearMonthInterval);

Write Preview
Loading…
Cancel
Save