Browse Source

Merge pull request #558 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit '8f56f39430b40223ef3bfd0b58b908ee65415524':
  BI-28907 fix
  update
  BI-24643 下拉小三角视觉
es6
windy 6 years ago
parent
commit
cc4182a09d
  1. 46
      dist/_fineui.min.js
  2. 20
      dist/bundle.css
  3. 6
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 30
      dist/bundle.min.js
  6. 20
      dist/fineui.css
  7. 36
      dist/fineui.js
  8. 2
      dist/fineui.min.css
  9. 46
      dist/fineui.min.js
  10. 6
      dist/fix/fix.js
  11. 30
      dist/polyfill.js
  12. 20
      dist/resource.css
  13. 6
      dist/utils.min.js
  14. 20
      public/css/font.css
  15. 20
      src/css/resource/font.css
  16. 4
      src/less/resource/font.less
  17. 29
      src/polyfill/function.js
  18. 20
      ui/css/font.css

46
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

20
dist/bundle.css vendored

@ -5597,16 +5597,6 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
} }
.less-font:hover .b-font:before,
.less-font.hover .b-font:before {
content: "\e75e";
color: inherit;
}
.less-font:active .b-font:before,
.less-font.active .b-font:before {
content: "\e75e";
color: #3f8ce8;
}
.less-font.disabled .b-font:before { .less-font.disabled .b-font:before {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
@ -5618,16 +5608,6 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;
} }
.less-equal-font:hover .b-font:before,
.less-equal-font.hover .b-font:before {
content: "\e761";
color: inherit;
}
.less-equal-font:active .b-font:before,
.less-equal-font.active .b-font:before {
content: "\e761";
color: #3f8ce8;
}
.less-equal-font.disabled .b-font:before { .less-equal-font.disabled .b-font:before {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;

6
dist/bundle.js vendored

@ -35104,11 +35104,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, },
set: function reactiveSetter(newVal) { set: function reactiveSetter(newVal) {
var value = childOb ? childOb.model : val; var value = childOb ? childOb.model : val;
if (newVal === value || newVal !== newVal && value !== value) { if (newVal === value || (newVal !== newVal && value !== value)) {
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps;
}
obj[key] = childOb ? childOb.model : newVal; obj[key] = childOb ? childOb.model : newVal;
notify(model.__ob__, key, dep); notify(model.__ob__, key, dep);
} }

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

30
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

20
dist/fineui.css vendored

@ -5597,16 +5597,6 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
} }
.less-font:hover .b-font:before,
.less-font.hover .b-font:before {
content: "\e75e";
color: inherit;
}
.less-font:active .b-font:before,
.less-font.active .b-font:before {
content: "\e75e";
color: #3f8ce8;
}
.less-font.disabled .b-font:before { .less-font.disabled .b-font:before {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
@ -5618,16 +5608,6 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;
} }
.less-equal-font:hover .b-font:before,
.less-equal-font.hover .b-font:before {
content: "\e761";
color: inherit;
}
.less-equal-font:active .b-font:before,
.less-equal-font.active .b-font:before {
content: "\e761";
color: #3f8ce8;
}
.less-equal-font.disabled .b-font:before { .less-equal-font.disabled .b-font:before {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;

36
dist/fineui.js vendored

@ -106,35 +106,7 @@ window.console = window.console || (function () {
}; };
return c; return c;
})(); })();
if (!Function.prototype.bind) { /*
Function.prototype.bind = function(oThis) {
if (typeof this !== 'function') {
// closest thing possible to the ECMAScript 5
// internal IsCallable function
throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
}
var aArgs = Array.prototype.slice.call(arguments, 1),
fToBind = this,
fNOP = function() {},
fBound = function() {
return fToBind.apply(this instanceof fNOP
? this
: oThis,
// 获取调用时(fBound)的传参.bind 返回的函数入参往往是这么传递的
aArgs.concat(Array.prototype.slice.call(arguments)));
};
// 维护原型关系
if (this.prototype) {
// Function.prototype doesn't have a prototype property
fNOP.prototype = this.prototype;
}
fBound.prototype = new fNOP();
return fBound;
};
}/*
* 前端缓存 * 前端缓存
*/ */
window.localStorage || (window.localStorage = { window.localStorage || (window.localStorage = {
@ -35353,11 +35325,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, },
set: function reactiveSetter(newVal) { set: function reactiveSetter(newVal) {
var value = childOb ? childOb.model : val; var value = childOb ? childOb.model : val;
if (newVal === value || newVal !== newVal && value !== value) { if (newVal === value || (newVal !== newVal && value !== value)) {
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps;
}
obj[key] = childOb ? childOb.model : newVal; obj[key] = childOb ? childOb.model : newVal;
notify(model.__ob__, key, dep); notify(model.__ob__, key, dep);
} }

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

46
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/fix/fix.js vendored

@ -563,11 +563,15 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
}, },
set: function reactiveSetter(newVal) { set: function reactiveSetter(newVal) {
var value = childOb ? childOb.model : val; var value = childOb ? childOb.model : val;
if (newVal === value || newVal !== newVal && value !== value) { if (newVal === value || (newVal !== newVal && value !== value)) {
return; return;
} }
val = newVal; val = newVal;
childOb = !shallow && observe(newVal, observer, key); childOb = !shallow && observe(newVal, observer, key);
if (childOb && value && value.__ob__) {
childOb._scopeDeps = value.__ob__._scopeDeps;
childOb._deps = value.__ob__._deps;
}
obj[key] = childOb ? childOb.model : newVal; obj[key] = childOb ? childOb.model : newVal;
notify(model.__ob__, key, dep); notify(model.__ob__, key, dep);
} }

30
dist/polyfill.js vendored

@ -106,35 +106,7 @@ window.console = window.console || (function () {
}; };
return c; return c;
})(); })();
if (!Function.prototype.bind) { /*
Function.prototype.bind = function(oThis) {
if (typeof this !== 'function') {
// closest thing possible to the ECMAScript 5
// internal IsCallable function
throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
}
var aArgs = Array.prototype.slice.call(arguments, 1),
fToBind = this,
fNOP = function() {},
fBound = function() {
return fToBind.apply(this instanceof fNOP
? this
: oThis,
// 获取调用时(fBound)的传参.bind 返回的函数入参往往是这么传递的
aArgs.concat(Array.prototype.slice.call(arguments)));
};
// 维护原型关系
if (this.prototype) {
// Function.prototype doesn't have a prototype property
fNOP.prototype = this.prototype;
}
fBound.prototype = new fNOP();
return fBound;
};
}/*
* 前端缓存 * 前端缓存
*/ */
window.localStorage || (window.localStorage = { window.localStorage || (window.localStorage = {

20
dist/resource.css vendored

@ -1035,16 +1035,6 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
} }
.less-font:hover .b-font:before,
.less-font.hover .b-font:before {
content: "\e75e";
color: inherit;
}
.less-font:active .b-font:before,
.less-font.active .b-font:before {
content: "\e75e";
color: #3f8ce8;
}
.less-font.disabled .b-font:before { .less-font.disabled .b-font:before {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
@ -1056,16 +1046,6 @@ textarea::-webkit-scrollbar-thumb:hover {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;
} }
.less-equal-font:hover .b-font:before,
.less-equal-font.hover .b-font:before {
content: "\e761";
color: inherit;
}
.less-equal-font:active .b-font:before,
.less-equal-font.active .b-font:before {
content: "\e761";
color: #3f8ce8;
}
.less-equal-font.disabled .b-font:before { .less-equal-font.disabled .b-font:before {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;

6
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

20
public/css/font.css

@ -699,16 +699,6 @@
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
} }
.less-font:hover .b-font:before,
.less-font.hover .b-font:before {
content: "\e75e";
color: inherit;
}
.less-font:active .b-font:before,
.less-font.active .b-font:before {
content: "\e75e";
color: #3f8ce8;
}
.less-font.disabled .b-font:before { .less-font.disabled .b-font:before {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
@ -720,16 +710,6 @@
content: "\e761"; content: "\e761";
color: inherit; color: inherit;
} }
.less-equal-font:hover .b-font:before,
.less-equal-font.hover .b-font:before {
content: "\e761";
color: inherit;
}
.less-equal-font:active .b-font:before,
.less-equal-font.active .b-font:before {
content: "\e761";
color: #3f8ce8;
}
.less-equal-font.disabled .b-font:before { .less-equal-font.disabled .b-font:before {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;

20
src/css/resource/font.css

@ -699,16 +699,6 @@
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
} }
.less-font:hover .b-font:before,
.less-font.hover .b-font:before {
content: "\e75e";
color: inherit;
}
.less-font:active .b-font:before,
.less-font.active .b-font:before {
content: "\e75e";
color: #3f8ce8;
}
.less-font.disabled .b-font:before { .less-font.disabled .b-font:before {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
@ -720,16 +710,6 @@
content: "\e761"; content: "\e761";
color: inherit; color: inherit;
} }
.less-equal-font:hover .b-font:before,
.less-equal-font.hover .b-font:before {
content: "\e761";
color: inherit;
}
.less-equal-font:active .b-font:before,
.less-equal-font.active .b-font:before {
content: "\e761";
color: #3f8ce8;
}
.less-equal-font.disabled .b-font:before { .less-equal-font.disabled .b-font:before {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;

4
src/less/resource/font.less

@ -93,8 +93,8 @@
.font(drag-tag-font, @font-cross, @color-bi-text-redmark); .font(drag-tag-font, @font-cross, @color-bi-text-redmark);
//数值区间 //数值区间
.font-hover-active(less-font, @font-less); .font(less-font, @font-less);
.font-hover-active(less-equal-font, @font-less-equal); .font(less-equal-font, @font-less-equal);
//文本控件 //文本控件
.font(text-bold-font, @font-bold); .font(text-bold-font, @font-bold);

29
src/polyfill/function.js

@ -1,29 +0,0 @@
if (!Function.prototype.bind) {
Function.prototype.bind = function(oThis) {
if (typeof this !== 'function') {
// closest thing possible to the ECMAScript 5
// internal IsCallable function
throw new TypeError('Function.prototype.bind - what is trying to be bound is not callable');
}
var aArgs = Array.prototype.slice.call(arguments, 1),
fToBind = this,
fNOP = function() {},
fBound = function() {
return fToBind.apply(this instanceof fNOP
? this
: oThis,
// 获取调用时(fBound)的传参.bind 返回的函数入参往往是这么传递的
aArgs.concat(Array.prototype.slice.call(arguments)));
};
// 维护原型关系
if (this.prototype) {
// Function.prototype doesn't have a prototype property
fNOP.prototype = this.prototype;
}
fBound.prototype = new fNOP();
return fBound;
};
}

20
ui/css/font.css

@ -699,16 +699,6 @@
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
} }
.less-font:hover .b-font:before,
.less-font.hover .b-font:before {
content: "\e75e";
color: inherit;
}
.less-font:active .b-font:before,
.less-font.active .b-font:before {
content: "\e75e";
color: #3f8ce8;
}
.less-font.disabled .b-font:before { .less-font.disabled .b-font:before {
content: "\e75e"; content: "\e75e";
color: inherit; color: inherit;
@ -720,16 +710,6 @@
content: "\e761"; content: "\e761";
color: inherit; color: inherit;
} }
.less-equal-font:hover .b-font:before,
.less-equal-font.hover .b-font:before {
content: "\e761";
color: inherit;
}
.less-equal-font:active .b-font:before,
.less-equal-font.active .b-font:before {
content: "\e761";
color: #3f8ce8;
}
.less-equal-font.disabled .b-font:before { .less-equal-font.disabled .b-font:before {
content: "\e761"; content: "\e761";
color: inherit; color: inherit;

Loading…
Cancel
Save