From 1002131d851446eb24c9af153070f3cc2081f495 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Wed, 1 Aug 2018 09:01:34 +0800 Subject: [PATCH] =?UTF-8?q?BI-24643=20=E4=B8=8B=E6=8B=89=E5=B0=8F=E4=B8=89?= =?UTF-8?q?=E8=A7=92=E8=A7=86=E8=A7=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/bundle.css | 20 -------------------- dist/fineui.css | 20 -------------------- dist/fineui.js | 30 +----------------------------- dist/polyfill.js | 30 +----------------------------- dist/resource.css | 20 -------------------- public/css/font.css | 20 -------------------- src/css/resource/font.css | 20 -------------------- src/less/resource/font.less | 4 ++-- src/polyfill/function.js | 29 ----------------------------- ui/css/font.css | 20 -------------------- 10 files changed, 4 insertions(+), 209 deletions(-) delete mode 100644 src/polyfill/function.js diff --git a/dist/bundle.css b/dist/bundle.css index ff343eb1e..eb6cd73f6 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -5597,16 +5597,6 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e75e"; 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 { content: "\e75e"; color: inherit; @@ -5618,16 +5608,6 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e761"; 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 { content: "\e761"; color: inherit; diff --git a/dist/fineui.css b/dist/fineui.css index fe5e9ec9d..69be45d6a 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -5597,16 +5597,6 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e75e"; 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 { content: "\e75e"; color: inherit; @@ -5618,16 +5608,6 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e761"; 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 { content: "\e761"; color: inherit; diff --git a/dist/fineui.js b/dist/fineui.js index ac91f5e3f..c314050e1 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -106,35 +106,7 @@ window.console = window.console || (function () { }; 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 = { diff --git a/dist/polyfill.js b/dist/polyfill.js index 873b2eaa9..5d0f5add7 100644 --- a/dist/polyfill.js +++ b/dist/polyfill.js @@ -106,35 +106,7 @@ window.console = window.console || (function () { }; 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 = { diff --git a/dist/resource.css b/dist/resource.css index 1621196c1..61373d513 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -1035,16 +1035,6 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e75e"; 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 { content: "\e75e"; color: inherit; @@ -1056,16 +1046,6 @@ textarea::-webkit-scrollbar-thumb:hover { content: "\e761"; 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 { content: "\e761"; color: inherit; diff --git a/public/css/font.css b/public/css/font.css index bd9918492..6756b550b 100644 --- a/public/css/font.css +++ b/public/css/font.css @@ -699,16 +699,6 @@ content: "\e75e"; 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 { content: "\e75e"; color: inherit; @@ -720,16 +710,6 @@ content: "\e761"; 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 { content: "\e761"; color: inherit; diff --git a/src/css/resource/font.css b/src/css/resource/font.css index 44359228b..11edc90a0 100644 --- a/src/css/resource/font.css +++ b/src/css/resource/font.css @@ -699,16 +699,6 @@ content: "\e75e"; 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 { content: "\e75e"; color: inherit; @@ -720,16 +710,6 @@ content: "\e761"; 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 { content: "\e761"; color: inherit; diff --git a/src/less/resource/font.less b/src/less/resource/font.less index fc1e23ad5..f7f944d41 100644 --- a/src/less/resource/font.less +++ b/src/less/resource/font.less @@ -93,8 +93,8 @@ .font(drag-tag-font, @font-cross, @color-bi-text-redmark); //数值区间 -.font-hover-active(less-font, @font-less); -.font-hover-active(less-equal-font, @font-less-equal); +.font(less-font, @font-less); +.font(less-equal-font, @font-less-equal); //文本控件 .font(text-bold-font, @font-bold); diff --git a/src/polyfill/function.js b/src/polyfill/function.js deleted file mode 100644 index 91570345a..000000000 --- a/src/polyfill/function.js +++ /dev/null @@ -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; - }; -} \ No newline at end of file diff --git a/ui/css/font.css b/ui/css/font.css index 24a690f96..59a0c2631 100644 --- a/ui/css/font.css +++ b/ui/css/font.css @@ -699,16 +699,6 @@ content: "\e75e"; 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 { content: "\e75e"; color: inherit; @@ -720,16 +710,6 @@ content: "\e761"; 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 { content: "\e761"; color: inherit;