From f4e782e2cb404c3842a5310dfbda30f77c9a9758 Mon Sep 17 00:00:00 2001 From: dailer Date: Mon, 8 Nov 2021 19:44:14 +0800 Subject: [PATCH 1/5] =?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 f3ac04ab4fded89016689d6fcb91401330a1b8ed Mon Sep 17 00:00:00 2001 From: dailer Date: Tue, 9 Nov 2021 09:21:35 +0800 Subject: [PATCH 2/5] =?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 c136d0faaa78621c2e921e4e695523d8efebd6fb Mon Sep 17 00:00:00 2001 From: iapyang Date: Tue, 9 Nov 2021 09:59:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?REPORT-56512=20feat:=20=E6=96=87=E6=9C=AC?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/single/editor/editor.multifile.js | 4 ++++ src/base/single/input/file.js | 4 ++++ typescript/widget/editor/editor.multifile.ts | 11 ++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/base/single/editor/editor.multifile.js b/src/base/single/editor/editor.multifile.js index d917a4762..68b5bcc2e 100644 --- a/src/base/single/editor/editor.multifile.js +++ b/src/base/single/editor/editor.multifile.js @@ -78,6 +78,10 @@ BI.MultifileEditor = BI.inherit(BI.Widget, { this.file.select(); }, + getQueue: function () { + return this.file.getQueue(); + }, + getValue: function () { return this.file.getValue(); }, diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index bf4e207b9..fa589681b 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -671,6 +671,10 @@ return this.wrap ? this.wrap.attach_array : []; }, + getQueue: function () { + return this.wrap.files; + }, + reset: function () { if (this.wrap) { this.wrap.attach_array = []; diff --git a/typescript/widget/editor/editor.multifile.ts b/typescript/widget/editor/editor.multifile.ts index f55abaf81..3a29e0960 100644 --- a/typescript/widget/editor/editor.multifile.ts +++ b/typescript/widget/editor/editor.multifile.ts @@ -19,6 +19,15 @@ export declare class MultifileEditor extends Widget { }[]; upload(): void; - + reset(): void; + + getQueue(): { + fileName: string; + lastModified: number; + lastModifiedDate: Date; + name: string; + size: number; + type: string; + }[]; } From 3d08dd1293c3de149da1b9d5b5fe95c6078f1cd5 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 9 Nov 2021 10:01:57 +0800 Subject: [PATCH 4/5] 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", From 3d26bea115e4f34630bc9ee127a2baf373a14299 Mon Sep 17 00:00:00 2001 From: data Date: Tue, 9 Nov 2021 10:12:36 +0800 Subject: [PATCH 5/5] auto upgrade version to 2.0.20211109101231 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3fdb3b623..57a0888b3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211109100152", + "version": "2.0.20211109101231", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",