From f9c81b248e2b67a16742b2f45fa00e63a64fa1d4 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 1 Aug 2019 13:39:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89thumb=E7=9A=84=E5=AE=BD?= =?UTF-8?q?=E9=AB=98=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/2.0/fineui.css | 4 ---- dist/2.0/fineui.ie.js | 17 ++++++++++++++--- dist/2.0/fineui.js | 17 ++++++++++++++--- dist/bundle.css | 4 ---- dist/bundle.ie.js | 17 ++++++++++++++--- dist/bundle.js | 17 ++++++++++++++--- dist/case.js | 15 +++++++++++++-- dist/core.js | 2 +- dist/fineui.css | 4 ---- dist/fineui.ie.js | 17 ++++++++++++++--- dist/fineui.js | 17 ++++++++++++++--- dist/fineui_without_jquery_polyfill.js | 15 +++++++++++++-- dist/resource.css | 4 ---- public/css/app.css | 4 ---- src/css/resource/app.css | 4 ---- src/less/resource/app.less | 4 ---- ui/css/app.css | 4 ---- 17 files changed, 111 insertions(+), 55 deletions(-) diff --git a/dist/2.0/fineui.css b/dist/2.0/fineui.css index 1a0352fac..9a40926c7 100644 --- a/dist/2.0/fineui.css +++ b/dist/2.0/fineui.css @@ -4669,8 +4669,6 @@ textarea::-webkit-scrollbar { } div::-webkit-scrollbar-track, textarea::-webkit-scrollbar-track { - width: 10px; - height: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -4684,8 +4682,6 @@ textarea::-webkit-scrollbar-track:hover { } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; -webkit-border-radius: 10px; diff --git a/dist/2.0/fineui.ie.js b/dist/2.0/fineui.ie.js index 289c3cf31..cb41aa334 100644 --- a/dist/2.0/fineui.ie.js +++ b/dist/2.0/fineui.ie.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -56859,10 +56859,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -56897,6 +56903,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/2.0/fineui.js b/dist/2.0/fineui.js index fabeecfb1..1dd3e2a91 100644 --- a/dist/2.0/fineui.js +++ b/dist/2.0/fineui.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57263,10 +57263,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -57301,6 +57307,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/bundle.css b/dist/bundle.css index 1a0352fac..9a40926c7 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -4669,8 +4669,6 @@ textarea::-webkit-scrollbar { } div::-webkit-scrollbar-track, textarea::-webkit-scrollbar-track { - width: 10px; - height: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -4684,8 +4682,6 @@ textarea::-webkit-scrollbar-track:hover { } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; -webkit-border-radius: 10px; diff --git a/dist/bundle.ie.js b/dist/bundle.ie.js index 289c3cf31..cb41aa334 100644 --- a/dist/bundle.ie.js +++ b/dist/bundle.ie.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -56859,10 +56859,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -56897,6 +56903,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/bundle.js b/dist/bundle.js index fabeecfb1..1dd3e2a91 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57263,10 +57263,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -57301,6 +57307,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/case.js b/dist/case.js index 6d4b3ce86..94358bc51 100644 --- a/dist/case.js +++ b/dist/case.js @@ -4839,10 +4839,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -4877,6 +4883,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/core.js b/dist/core.js index 97efc08aa..286e4994c 100644 --- a/dist/core.js +++ b/dist/core.js @@ -21696,7 +21696,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; diff --git a/dist/fineui.css b/dist/fineui.css index 6e2f9eff3..6bed05fd1 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -4669,8 +4669,6 @@ textarea::-webkit-scrollbar { } div::-webkit-scrollbar-track, textarea::-webkit-scrollbar-track { - width: 10px; - height: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -4684,8 +4682,6 @@ textarea::-webkit-scrollbar-track:hover { } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; -webkit-border-radius: 10px; diff --git a/dist/fineui.ie.js b/dist/fineui.ie.js index 9e4c0261c..c59211d4e 100644 --- a/dist/fineui.ie.js +++ b/dist/fineui.ie.js @@ -21941,7 +21941,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57104,10 +57104,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -57142,6 +57148,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/fineui.js b/dist/fineui.js index 3d25a82e9..36d4e7f95 100644 --- a/dist/fineui.js +++ b/dist/fineui.js @@ -21941,7 +21941,7 @@ BI.prepares.push(function () { var addResizeListener = function (element, fn) { if (attachEvent) { element.attachEvent("onresize", fn); - fn(); + BI.nextTick(fn); } else { if (!element.__resizeTriggers__) { if (getComputedStyle(element).position === "static") element.style.position = "relative"; @@ -57508,10 +57508,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -57546,6 +57552,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/fineui_without_jquery_polyfill.js b/dist/fineui_without_jquery_polyfill.js index 4162749f3..1c47e36bf 100644 --- a/dist/fineui_without_jquery_polyfill.js +++ b/dist/fineui_without_jquery_polyfill.js @@ -40390,10 +40390,16 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { ref: function () { self.editor = this; }, - text: this._digest(o.value, o.items), + text: this._getText(), value: o.value, height: o.height, - tipText: "" + tipText: "", + listeners: [{ + eventName: BI.Events.MOUNT, + action: function () { + self.editor.setState(self._digest(o.value, o.items)); + } + }] }, popup: { type: "bi.search_text_value_combo_popup", @@ -40428,6 +40434,11 @@ BI.SearchTextValueTrigger = BI.inherit(BI.Trigger, { this.editor.setState(v); }, + _getText: function () { + var o = this.options; + return (BI.isKey(o.value) && o.text === this._digest(o.value, o.items)) ? "" : o.text; + }, + _digest: function(vals, items){ var o = this.options; vals = BI.isArray(vals) ? vals : [vals]; diff --git a/dist/resource.css b/dist/resource.css index 80e1c6151..24e6c4ada 100644 --- a/dist/resource.css +++ b/dist/resource.css @@ -35,8 +35,6 @@ textarea::-webkit-scrollbar { } div::-webkit-scrollbar-track, textarea::-webkit-scrollbar-track { - width: 10px; - height: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover { } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; -webkit-border-radius: 10px; diff --git a/public/css/app.css b/public/css/app.css index 38ac47e3b..59e5c4091 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -35,8 +35,6 @@ textarea::-webkit-scrollbar { } div::-webkit-scrollbar-track, textarea::-webkit-scrollbar-track { - width: 10px; - height: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover { } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; -webkit-border-radius: 10px; diff --git a/src/css/resource/app.css b/src/css/resource/app.css index 38ac47e3b..59e5c4091 100644 --- a/src/css/resource/app.css +++ b/src/css/resource/app.css @@ -35,8 +35,6 @@ textarea::-webkit-scrollbar { } div::-webkit-scrollbar-track, textarea::-webkit-scrollbar-track { - width: 10px; - height: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover { } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; -webkit-border-radius: 10px; diff --git a/src/less/resource/app.less b/src/less/resource/app.less index 94650acdc..1c759ab01 100644 --- a/src/less/resource/app.less +++ b/src/less/resource/app.less @@ -33,8 +33,6 @@ div, textarea { height: 10px; } &::-webkit-scrollbar-track { - width: 10px; - height: 10px; .border-radius(5px); .background-color(@scroll-color, 5%); &:hover { @@ -42,8 +40,6 @@ div, textarea { } } &::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; .border-radius(10px); diff --git a/ui/css/app.css b/ui/css/app.css index 38ac47e3b..59e5c4091 100644 --- a/ui/css/app.css +++ b/ui/css/app.css @@ -35,8 +35,6 @@ textarea::-webkit-scrollbar { } div::-webkit-scrollbar-track, textarea::-webkit-scrollbar-track { - width: 10px; - height: 10px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -50,8 +48,6 @@ textarea::-webkit-scrollbar-track:hover { } div::-webkit-scrollbar-thumb, textarea::-webkit-scrollbar-thumb { - width: 6px; - height: 6px; border: 2px solid transparent; background-clip: padding-box; -webkit-border-radius: 10px;