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

Merge pull request #429 in FUI/fineui from ~WINDY/fui:master to master 

* commit 'd4b6a75b2975d48daec21033fbdc984a01567913':
  时区
es6
guy 7 years ago
parent
0c05114c8c d4b6a75b29
commit
74a6320a18
8 changed files with 25 additions and 25 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. 8
      dist/bundle.js
  3. 2
      dist/bundle.min.js
  4. 8
      dist/core.js
  5. 8
      dist/fineui.js
  6. 4
      dist/fineui.min.js
  7. 8
      src/core/base.js
  8. 8
      utils/utils.js

4
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/bundle.js vendored
Unescape View File

@ -20909,11 +20909,11 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime();
var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + Date.timeZone);// + Pool.timeZone.offset);
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
}
return dt;
@ -20960,8 +20960,8 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone)) {
return dt.getTime() - Date.timeZone - dt.getTimezoneOffset() * 60000;
if (BI.isNotNull(BI.timeZone)) {
return dt.getTime() - BI.timeZone - dt.getTimezoneOffset() * 60000;
}
return dt.getTime();

2
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/core.js vendored
Unescape View File

@ -20909,11 +20909,11 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime();
var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + Date.timeZone);// + Pool.timeZone.offset);
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
}
return dt;
@ -20960,8 +20960,8 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone)) {
return dt.getTime() - Date.timeZone - dt.getTimezoneOffset() * 60000;
if (BI.isNotNull(BI.timeZone)) {
return dt.getTime() - BI.timeZone - dt.getTimezoneOffset() * 60000;
}
return dt.getTime();

8
dist/fineui.js vendored
Unescape View File

@ -21152,11 +21152,11 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime();
var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + Date.timeZone);// + Pool.timeZone.offset);
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
}
return dt;
@ -21203,8 +21203,8 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone)) {
return dt.getTime() - Date.timeZone - dt.getTimezoneOffset() * 60000;
if (BI.isNotNull(BI.timeZone)) {
return dt.getTime() - BI.timeZone - dt.getTimezoneOffset() * 60000;
}
return dt.getTime();

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
src/core/base.js
Unescape View File

@ -1300,11 +1300,11 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime();
var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + Date.timeZone);// + Pool.timeZone.offset);
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
}
return dt;
@ -1351,8 +1351,8 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone)) {
return dt.getTime() - Date.timeZone - dt.getTimezoneOffset() * 60000;
if (BI.isNotNull(BI.timeZone)) {
return dt.getTime() - BI.timeZone - dt.getTimezoneOffset() * 60000;
}
return dt.getTime();

8
utils/utils.js
Unescape View File

@ -12108,11 +12108,11 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
if (BI.isNotNull(BI.timeZone) && (arguments.length === 0 || (arguments.length === 1 && BI.isNumber(arguments[0])))) {
var localTime = dt.getTime();
var localOffset = dt.getTimezoneOffset() * 60000; // 获得当地时间偏移的毫秒数
var utc = localTime + localOffset; // utc即GMT时间标准时区
return new Date(utc + Date.timeZone);// + Pool.timeZone.offset);
return new Date(utc + BI.timeZone);// + Pool.timeZone.offset);
}
return dt;
@ -12159,8 +12159,8 @@ if (!window.BI) {
dt = new Date();
break;
}
if (BI.isNotNull(Date.timeZone)) {
return dt.getTime() - Date.timeZone - dt.getTimezoneOffset() * 60000;
if (BI.isNotNull(BI.timeZone)) {
return dt.getTime() - BI.timeZone - dt.getTimezoneOffset() * 60000;
}
return dt.getTime();

Write Preview
Loading…
Cancel
Save