From 3f7c656354c510989e6caea19e3f66bd58744485 Mon Sep 17 00:00:00 2001 From: dailer Date: Mon, 8 Nov 2021 14:02:45 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=97=A0JIRA=20fix:=20nextSibling=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/wrapper/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/wrapper/layout.js b/src/core/wrapper/layout.js index bc48cd3f4..04ffa4fa4 100644 --- a/src/core/wrapper/layout.js +++ b/src/core/wrapper/layout.js @@ -241,7 +241,7 @@ BI.Layout = BI.inherit(BI.Widget, { // 需要有个地方临时存一下新建的组件，否则如果直接使用newIndex的话，newIndex位置的元素可能会被用到 this._children[this._getChildName(newIndex) + "-temp"] = w; var nextSibling = del.element.next(); - if (nextSibling) { + if (nextSibling.length > 0) { BI.Widget._renderEngine.createElement(nextSibling).before(w.element); } else { w.element.appendTo(this._getWrapper()); From 7d66fb9ae8250a1ba5d86789fb103b664ea6a570 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 8 Nov 2021 15:31:52 +0800 Subject: [PATCH 2/9] auto upgrade version to 2.0.20211108153147 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 13ede08ac..0d3cd947b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211107204304", + "version": "2.0.20211108153147", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 22778d8eef349f0a04613419b6ccda6e4d4017f5 Mon Sep 17 00:00:00 2001 From: Kira Date: Mon, 8 Nov 2021 15:52:24 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20refactor:?= =?UTF-8?q?=20=E8=A1=A5=E5=85=85=E5=A3=B0=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/base/single/button/listitem/icontextitem.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/typescript/base/single/button/listitem/icontextitem.ts b/typescript/base/single/button/listitem/icontextitem.ts index cde508fe8..5e3f3d6e9 100644 --- a/typescript/base/single/button/listitem/icontextitem.ts +++ b/typescript/base/single/button/listitem/icontextitem.ts @@ -10,6 +10,7 @@ export declare class IconTextItem extends BasicButton { dynamic: boolean; }; iconWrapperWidth?: number; + iconCls?: string; iconHeight?: number; iconWidth?: number; textHgap?: number; From 5eac89921342234d06bb14f27de4e343b95cee96 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 8 Nov 2021 16:34:42 +0800 Subject: [PATCH 4/9] auto upgrade version to 2.0.20211108163432 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d3cd947b..2306f4d20 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211108153147", + "version": "2.0.20211108163432", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 416ab1edd32820ec34a2ba86de93b6e44317b537 Mon Sep 17 00:00:00 2001 From: data Date: Mon, 8 Nov 2021 19:14:04 +0800 Subject: [PATCH 5/9] auto upgrade version to 2.0.20211108191350 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 2306f4d20..1b7fe5515 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211108163432", + "version": "2.0.20211108191350", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From f4e782e2cb404c3842a5310dfbda30f77c9a9758 Mon Sep 17 00:00:00 2001 From: dailer Date: Mon, 8 Nov 2021 19:44:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20BI.Pane?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0shortcut=E5=92=8Cloading=20props?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/1.pane.js | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/base/1.pane.js b/src/base/1.pane.js index 5bbecf5da..e5890d14b 100644 --- a/src/base/1.pane.js +++ b/src/base/1.pane.js @@ -15,10 +15,16 @@ BI.Pane = BI.inherit(BI.Widget, { loadingText: "", loadingSize: "small", overlap: true, - onLoaded: BI.emptyFn + onLoaded: BI.emptyFn, + loading: false }); }, + _init: function () { + BI.Pane.superclass._init.apply(this, arguments); + this.options.loading && this.loading(); + }, + _assertTip: function () { var self = this, o = this.options; if (!this._tipText) { @@ -40,6 +46,7 @@ BI.Pane = BI.inherit(BI.Widget, { loading: function () { var self = this, o = this.options; + o.loading = true; var isIE = BI.isIE(); var loadingAnimation = BI.createWidget({ type: "bi.horizontal", @@ -118,6 +125,7 @@ BI.Pane = BI.inherit(BI.Widget, { loaded: function () { var self = this, o = this.options; + o.loading = false; BI.Layers.remove(self.getName() + "-loading"); this._loading && this._loading.destroy(); o.onLoaded(); @@ -150,3 +158,5 @@ BI.Pane = BI.inherit(BI.Widget, { }); BI.Pane.EVENT_LOADED = "EVENT_LOADED"; BI.Pane.EVENT_LOADING = "EVENT_LOADING"; + +BI.shortcut("bi.pane", BI.Pane); From 06e2ac133a4009e2bfb09b8c9244f8811b1f7552 Mon Sep 17 00:00:00 2001 From: guy Date: Tue, 9 Nov 2021 00:42:27 +0800 Subject: [PATCH 7/9] =?UTF-8?q?basic=5Fbutton=E6=94=AF=E6=8C=81el?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/button/button.basic.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/base/single/button/button.basic.js b/src/base/single/button/button.basic.js index 4a5d68a0c..de0ec5ebe 100644 --- a/src/base/single/button/button.basic.js +++ b/src/base/single/button/button.basic.js @@ -10,6 +10,7 @@ BI.BasicButton = BI.inherit(BI.Single, { var conf = BI.BasicButton.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { _baseCls: (conf._baseCls || "") + " bi-basic-button" + (conf.invalid ? "" : " cursor-pointer") + ((BI.isIE() && BI.getIEVersion() < 10) ? " hack" : ""), + // el: {} // 可以通过el来创建button元素 value: "", stopEvent: false, stopPropagation: false, @@ -26,6 +27,7 @@ BI.BasicButton = BI.inherit(BI.Single, { bubble: null }); }, + _init: function () { BI.BasicButton.superclass._init.apply(this, arguments); var opts = this.options; @@ -44,6 +46,11 @@ BI.BasicButton = BI.inherit(BI.Single, { } }, + // 默认render方法 + render: function () { + return this.options.el; + }, + _createShadow: function () { var self = this, o = this.options; From f3ac04ab4fded89016689d6fcb91401330a1b8ed Mon Sep 17 00:00:00 2001 From: dailer Date: Tue, 9 Nov 2021 09:21:35 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20BI.Pane?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0shortcut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/1.pane.js | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/base/1.pane.js b/src/base/1.pane.js index e5890d14b..630d7cddb 100644 --- a/src/base/1.pane.js +++ b/src/base/1.pane.js @@ -15,16 +15,10 @@ BI.Pane = BI.inherit(BI.Widget, { loadingText: "", loadingSize: "small", overlap: true, - onLoaded: BI.emptyFn, - loading: false + onLoaded: BI.emptyFn }); }, - _init: function () { - BI.Pane.superclass._init.apply(this, arguments); - this.options.loading && this.loading(); - }, - _assertTip: function () { var self = this, o = this.options; if (!this._tipText) { @@ -46,7 +40,6 @@ BI.Pane = BI.inherit(BI.Widget, { loading: function () { var self = this, o = this.options; - o.loading = true; var isIE = BI.isIE(); var loadingAnimation = BI.createWidget({ type: "bi.horizontal", @@ -125,7 +118,6 @@ BI.Pane = BI.inherit(BI.Widget, { loaded: function () { var self = this, o = this.options; - o.loading = false; BI.Layers.remove(self.getName() + "-loading"); this._loading && this._loading.destroy(); o.onLoaded(); From 3d08dd1293c3de149da1b9d5b5fe95c6078f1cd5 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 9 Nov 2021 10:01:57 +0800 Subject: [PATCH 9/9] auto upgrade version to 2.0.20211109100152 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1b7fe5515..3fdb3b623 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211108191350", + "version": "2.0.20211109100152", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",