Browse Source

Merge pull request #699 in VISUAL/fineui from ~NJZY/fineui2.0:master to master

* commit '09c37633a0e93684af55eb672f35164dd54c76ce':
  无JIRA任务 更新fix,BI添加freeze方法
es6
njzy 6 years ago
parent
commit
0eebdcae56
  1. 16
      dist/bundle.ie.js
  2. 6
      dist/bundle.ie.min.js
  3. 47
      dist/bundle.js
  4. 46
      dist/bundle.min.js
  5. 16
      dist/core.js
  6. 16
      dist/fineui.ie.js
  7. 6
      dist/fineui.ie.min.js
  8. 47
      dist/fineui.js
  9. 46
      dist/fineui.min.js
  10. 47
      dist/fineui_without_jquery_polyfill.js
  11. 31
      dist/fix/fix.js
  12. 16
      dist/utils.js
  13. 6
      dist/utils.min.js
  14. 13
      src/core/base.js

16
dist/bundle.ie.js vendored

@ -10589,6 +10589,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -10925,7 +10936,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {
@ -11478,7 +11489,8 @@ if (!_global.BI) {
} }
}); });
})();!(function () { })();
!(function () {
function extend () { function extend () {
var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy; var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy;
for (; i < length; i++) { for (; i < length; i++) {

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

47
dist/bundle.js vendored

@ -10589,6 +10589,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -10925,7 +10936,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {
@ -11478,7 +11489,8 @@ if (!_global.BI) {
} }
}); });
})();!(function () { })();
!(function () {
function extend () { function extend () {
var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy; var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy;
for (; i < length; i++) { for (; i < length; i++) {
@ -34028,6 +34040,29 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return _toString.call(obj) === '[object Object]'; return _toString.call(obj) === '[object Object]';
} }
function isConfigurable(obj, key) {
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
return configurable;
}
function isExtensible(obj) {
if (Object.isExtensible) {
return Object.isExtensible(obj);
}
var name = '';
while (obj.hasOwnProperty(name)) {
name += '?';
}
obj[name] = true;
var returnValue = obj.hasOwnProperty(name);
delete obj[name];
return returnValue;
}
function remove(arr, item) { function remove(arr, item) {
if (arr && arr.length) { if (arr && arr.length) {
var _index = arr.indexOf(item); var _index = arr.indexOf(item);
@ -34426,7 +34461,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) { if (ob) {
@ -34520,11 +34555,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true; var configurable = isConfigurable(obj, key);
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = configurable && !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);

46
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

16
dist/core.js vendored

@ -10589,6 +10589,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -10925,7 +10936,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {
@ -11478,7 +11489,8 @@ if (!_global.BI) {
} }
}); });
})();!(function () { })();
!(function () {
function extend () { function extend () {
var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy; var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy;
for (; i < length; i++) { for (; i < length; i++) {

16
dist/fineui.ie.js vendored

@ -10831,6 +10831,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -11167,7 +11178,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {
@ -11720,7 +11731,8 @@ if (!_global.BI) {
} }
}); });
})();!(function () { })();
!(function () {
function extend () { function extend () {
var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy; var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy;
for (; i < length; i++) { for (; i < length; i++) {

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

47
dist/fineui.js vendored

@ -10831,6 +10831,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -11167,7 +11178,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {
@ -11720,7 +11731,8 @@ if (!_global.BI) {
} }
}); });
})();!(function () { })();
!(function () {
function extend () { function extend () {
var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy; var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy;
for (; i < length; i++) { for (; i < length; i++) {
@ -34270,6 +34282,29 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return _toString.call(obj) === '[object Object]'; return _toString.call(obj) === '[object Object]';
} }
function isConfigurable(obj, key) {
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
return configurable;
}
function isExtensible(obj) {
if (Object.isExtensible) {
return Object.isExtensible(obj);
}
var name = '';
while (obj.hasOwnProperty(name)) {
name += '?';
}
obj[name] = true;
var returnValue = obj.hasOwnProperty(name);
delete obj[name];
return returnValue;
}
function remove(arr, item) { function remove(arr, item) {
if (arr && arr.length) { if (arr && arr.length) {
var _index = arr.indexOf(item); var _index = arr.indexOf(item);
@ -34668,7 +34703,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) { if (ob) {
@ -34762,11 +34797,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true; var configurable = isConfigurable(obj, key);
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = configurable && !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);

46
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

47
dist/fineui_without_jquery_polyfill.js vendored

@ -10589,6 +10589,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -10925,7 +10936,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {
@ -11478,7 +11489,8 @@ if (!_global.BI) {
} }
}); });
})();!(function () { })();
!(function () {
function extend () { function extend () {
var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy; var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy;
for (; i < length; i++) { for (; i < length; i++) {
@ -23039,6 +23051,29 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return _toString.call(obj) === '[object Object]'; return _toString.call(obj) === '[object Object]';
} }
function isConfigurable(obj, key) {
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
return configurable;
}
function isExtensible(obj) {
if (Object.isExtensible) {
return Object.isExtensible(obj);
}
var name = '';
while (obj.hasOwnProperty(name)) {
name += '?';
}
obj[name] = true;
var returnValue = obj.hasOwnProperty(name);
delete obj[name];
return returnValue;
}
function remove(arr, item) { function remove(arr, item) {
if (arr && arr.length) { if (arr && arr.length) {
var _index = arr.indexOf(item); var _index = arr.indexOf(item);
@ -23437,7 +23472,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) { if (ob) {
@ -23531,11 +23566,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true; var configurable = isConfigurable(obj, key);
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = configurable && !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);

31
dist/fix/fix.js vendored

@ -58,6 +58,29 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
return _toString.call(obj) === '[object Object]'; return _toString.call(obj) === '[object Object]';
} }
function isConfigurable(obj, key) {
var configurable = true;
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
return configurable;
}
function isExtensible(obj) {
if (Object.isExtensible) {
return Object.isExtensible(obj);
}
var name = '';
while (obj.hasOwnProperty(name)) {
name += '?';
}
obj[name] = true;
var returnValue = obj.hasOwnProperty(name);
delete obj[name];
return returnValue;
}
function remove(arr, item) { function remove(arr, item) {
if (arr && arr.length) { if (arr && arr.length) {
var _index = arr.indexOf(item); var _index = arr.indexOf(item);
@ -456,7 +479,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
var ob = void 0; var ob = void 0;
if (value.__ob__ instanceof Observer) { if (value.__ob__ instanceof Observer) {
ob = value.__ob__; ob = value.__ob__;
} else if (observerState.shouldConvert && Object.isExtensible(value) && (_.isArray(value) || isPlainObject(value))) { } else if (observerState.shouldConvert && isExtensible(value) && (_.isArray(value) || isPlainObject(value))) {
ob = new Observer(value); ob = new Observer(value);
} }
if (ob) { if (ob) {
@ -550,11 +573,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
if (key in $$skipArray) { if (key in $$skipArray) {
return; return;
} }
var configurable = true; var configurable = isConfigurable(obj, key);
var property = Object.getOwnPropertyDescriptor && Object.getOwnPropertyDescriptor(obj, key);
if (property && property.configurable === false) {
configurable = false;
}
var dep = observer && observer['__dep' + key] || new Dep(); var dep = observer && observer['__dep' + key] || new Dep();
observer && (observer['__dep' + key] = dep); observer && (observer['__dep' + key] = dep);
var childOb = configurable && !shallow && observe(val, observer, key); var childOb = configurable && !shallow && observe(val, observer, key);

16
dist/utils.js vendored

@ -11348,6 +11348,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -11684,7 +11695,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {
@ -12237,7 +12248,8 @@ if (!_global.BI) {
} }
}); });
})();!(function () { })();
!(function () {
function extend () { function extend () {
var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy; var target = arguments[0] || {}, length = arguments.length, i = 1, options, name, src, copy;
for (; i < length; i++) { for (; i < length; i++) {

6
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

13
src/core/base.js

@ -478,6 +478,17 @@ if (!_global.BI) {
return _.has.apply(_, arguments); return _.has.apply(_, arguments);
}, },
freeze: function (value) {
if (Object.freeze) {
return Object.freeze(value);
} else {
if (!BI.isObject(value)) {
throw new TypeError('Object.freeze can only be called on Objects.');
}
return value;
}
},
// 数字和字符串可以作为key // 数字和字符串可以作为key
isKey: function (key) { isKey: function (key) {
return BI.isNumber(key) || (BI.isString(key) && key.length > 0); return BI.isNumber(key) || (BI.isString(key) && key.length > 0);
@ -814,7 +825,7 @@ if (!_global.BI) {
}, },
isNumeric: function (number) { isNumeric: function (number) {
return !isNaN( parseFloat(number) ) && isFinite( number ); return !isNaN(parseFloat(number)) && isFinite(number);
}, },
isFloat: function (number) { isFloat: function (number) {

Loading…
Cancel
Save