From d61fbad26f4b02989a3fef7c2f4192c178d73a18 Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 29 Jun 2022 17:06:53 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20node=E7=8E=AF=E5=A2=83=E4=B8=8B?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/conflict.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/conflict.js b/src/core/conflict.js index e478c567d..dba9b8b6f 100644 --- a/src/core/conflict.js +++ b/src/core/conflict.js @@ -1,7 +1,7 @@ -if (!window.$ && !window.jQuery) { - window.jQuery = window.$ = BI.jQuery; +if (!_global.$ && !_global.jQuery) { + _global.jQuery = _global.$ = BI.jQuery; } -if (!window._) { - window._ = BI._; +if (!_global._) { + _global._ = BI._; } From c76190b2a07cbce68f6be5263b637e3557258157 Mon Sep 17 00:00:00 2001 From: "Cauchy.Ke" Date: Wed, 29 Jun 2022 17:15:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?chore:=20=E7=BB=99bi.file=E5=8A=A0=E4=B8=AA?= =?UTF-8?q?setUrl=E6=96=B9=E6=B3=95?= 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 | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/src/base/single/editor/editor.multifile.js b/src/base/single/editor/editor.multifile.js index 7aec220f0..ae0d5e0a9 100644 --- a/src/base/single/editor/editor.multifile.js +++ b/src/base/single/editor/editor.multifile.js @@ -71,6 +71,10 @@ BI.MultifileEditor = BI.inherit(BI.Widget, { this.file.reset(); }, + setUrl: function (v) { + this.file.setUrl(v); + }, + setMaxFileLength: function (v) { this.file.setMaxFileLength(v); }, diff --git a/src/base/single/input/file.js b/src/base/single/input/file.js index b86963f41..ff211e6f1 100644 --- a/src/base/single/input/file.js +++ b/src/base/single/input/file.js @@ -655,6 +655,13 @@ }); }, + setUrl: function(v) { + this.options.url = v; + if (this.wrap) { + this.wrap.url = v; + } + }, + setMaxFileLength: function (v) { this.options.maxLength = v; if (this.wrap) { From a9b3b85cec03d36cfa9455638f8ea64adbb661d8 Mon Sep 17 00:00:00 2001 From: data Date: Wed, 29 Jun 2022 17:45:49 +0800 Subject: [PATCH 3/4] auto upgrade version to 2.0.20220629174537 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 68de9c0b0..0020b3af3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220628214344", + "version": "2.0.20220629174537", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From b3809a21d6f57d0959e483c27b7634bd2606391b Mon Sep 17 00:00:00 2001 From: data Date: Thu, 30 Jun 2022 11:16:15 +0800 Subject: [PATCH 4/4] auto upgrade version to 2.0.20220630111602 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0020b3af3..526e205b1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20220629174537", + "version": "2.0.20220630111602", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",