From b6e2c6ed88296a82bc7334470d02fd43552f1e83 Mon Sep 17 00:00:00 2001 From: guy Date: Fri, 19 Nov 2021 11:23:15 +0800 Subject: [PATCH 1/9] =?UTF-8?q?buttonGroup=E7=9A=84layouts=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=B8=8D=E7=94=A8=E4=BC=A0=E6=95=B0=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/base/combination/group.button.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/base/combination/group.button.js b/src/base/combination/group.button.js index 622ede324..9f392411a 100644 --- a/src/base/combination/group.button.js +++ b/src/base/combination/group.button.js @@ -30,7 +30,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { }); this.behaviors = behaviors; this.populate(o.items); - if(BI.isKey(o.value) || BI.isNotEmptyArray(o.value)){ + if (BI.isKey(o.value) || BI.isNotEmptyArray(o.value)) { this.setValue(o.value); } }, @@ -77,11 +77,12 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { _packageBtns: function (btns) { var o = this.options; - for (var i = o.layouts.length - 1; i > 0; i--) { + var layouts = BI.isArray(o.layouts) ? o.layouts : [o.layouts]; + for (var i = layouts.length - 1; i > 0; i--) { btns = BI.map(btns, function (k, it) { - return BI.extend({}, o.layouts[i], { + return BI.extend({}, layouts[i], { items: [ - BI.extend({}, o.layouts[i].el, { + BI.extend({}, layouts[i].el, { el: it }) ] @@ -108,7 +109,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { }, _packageLayout: function (items) { - var o = this.options, layout = BI.deepClone(o.layouts[0]); + var o = this.options, layout = BI.deepClone(BI.isArray(o.layouts) ? o.layouts[0] : o.layouts); var lay = BI.formatEL(layout).el; while (lay && lay.items && !BI.isEmpty(lay.items)) { @@ -121,7 +122,7 @@ BI.ButtonGroup = BI.inherit(BI.Widget, { // 如果是一个简单的layout _isSimpleLayout: function () { var o = this.options; - return o.layouts.length === 1 && !BI.isArray(o.items[0]); + return BI.isArray(o.layouts) ? (o.layouts.length === 1 && !BI.isArray(o.items[0])) : true; }, doBehavior: function () { From b1a8898b6868c6a57345cb6c799d3be98a446a89 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 19 Nov 2021 17:31:51 +0800 Subject: [PATCH 2/9] auto upgrade version to 2.0.20211119173145 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e9a7853eb..3f5865f09 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211119161234", + "version": "2.0.20211119173145", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 2320ab7da9dbea5d25e9b5594c32f24623c8654d Mon Sep 17 00:00:00 2001 From: data Date: Fri, 19 Nov 2021 17:43:47 +0800 Subject: [PATCH 3/9] auto upgrade version to 2.0.20211119174324 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f5865f09..49f9670d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211119173145", + "version": "2.0.20211119174324", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From 5af432cd907c47a5d7e580d38897966221318e3b Mon Sep 17 00:00:00 2001 From: Guyi Date: Fri, 19 Nov 2021 20:32:41 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85cls=E5=92=8Ccss=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- typescript/shims-tsx.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/typescript/shims-tsx.ts b/typescript/shims-tsx.ts index aa76c2e9d..9b8abdb03 100644 --- a/typescript/shims-tsx.ts +++ b/typescript/shims-tsx.ts @@ -24,7 +24,7 @@ interface AdditionalProps { } interface ElementClassProps extends UIProps { - cls: string; + cls: string | (() => string); extraCls: string; ref: (ref: T) => void; listeners: { @@ -40,7 +40,7 @@ interface ElementClassProps extends UIProps { }; css: { [key: string]: any; - }; + } | (() => any); tagName: string; element: any; $testId: string; From f91c1c0cfa4b58a29cb9867bc794e03d19b3c7a2 Mon Sep 17 00:00:00 2001 From: guy Date: Sat, 20 Nov 2021 14:09:25 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/6.inject.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/core/6.inject.js b/src/core/6.inject.js index c9f77055b..e4ccbf665 100644 --- a/src/core/6.inject.js +++ b/src/core/6.inject.js @@ -31,6 +31,9 @@ } } moduleInjection[xtype] = cls; + return function () { + return BI.Modules.getModule(xtype); + }; }; var constantInjection = {}; @@ -41,7 +44,7 @@ constantInjection[xtype] = cls; return function () { return BI.Constants.getConstant(xtype); - } + }; }; var modelInjection = {}; @@ -50,7 +53,7 @@ _global.console && console.error("model: [" + xtype + "] 已经注册过了"); } modelInjection[xtype] = cls; - return function (xtype, config) { + return function (config) { return BI.Models.getModel(xtype, config); }; }; @@ -61,9 +64,9 @@ _global.console && console.error("store: [" + xtype + "] 已经注册过了"); } storeInjection[xtype] = cls; - return function (xtype, config) { + return function (config) { return BI.Stores.getStore(xtype, config); - } + }; }; var serviceInjection = {}; @@ -72,9 +75,9 @@ _global.console && console.error("service: [" + xtype + "] 已经注册过了"); } serviceInjection[xtype] = cls; - return function (xtype, config) { + return function (config) { return BI.Services.getService(xtype, config); - } + }; }; var providerInjection = {}; @@ -83,9 +86,9 @@ _global.console && console.error("provider: [" + xtype + "] 已经注册过了"); } providerInjection[xtype] = cls; - return function (xtype, config) { + return function (config) { return BI.Providers.getProvider(xtype, config); - } + }; }; var configFunctions = {}; From 0eb5a9be75a679528e11a3167923d1d225dd4aa5 Mon Sep 17 00:00:00 2001 From: data Date: Sat, 20 Nov 2021 14:22:36 +0800 Subject: [PATCH 6/9] auto upgrade version to 2.0.20211120142230 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 49f9670d6..38b7c4185 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211119174324", + "version": "2.0.20211120142230", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From e53ada1265d8905778e32aa09ada6907dfa99f7a Mon Sep 17 00:00:00 2001 From: guy Date: Sat, 20 Nov 2021 17:49:37 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/platform/web/config.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/platform/web/config.js b/src/core/platform/web/config.js index ccfd4fe8a..f6ce80dfb 100644 --- a/src/core/platform/web/config.js +++ b/src/core/platform/web/config.js @@ -141,7 +141,11 @@ BI.prepares.push(function () { scrolly: false }, ob, {type: "bi.flex_vertical"}); } - return BI.extend({}, ob, {type: "bi.vtape"}); + return BI.extend({}, ob, { + type: "bi.td", + items: BI.map(ob.items, function (i, item) { + return [item]; + })}); }); BI.Plugin.configWidget("bi.left_right_vertical_adapt", function (ob) { From 95a4b8bc02d482b68f700d39ed9d6cc4487d9014 Mon Sep 17 00:00:00 2001 From: data Date: Sat, 20 Nov 2021 18:04:41 +0800 Subject: [PATCH 8/9] auto upgrade version to 2.0.20211120180430 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38b7c4185..38bed7389 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211120142230", + "version": "2.0.20211120180430", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts", From c94934332f3ffb520874505edc7cacaa4f0f674a Mon Sep 17 00:00:00 2001 From: data Date: Mon, 22 Nov 2021 12:37:49 +0800 Subject: [PATCH 9/9] auto upgrade version to 2.0.20211122123727 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 38bed7389..d1c4f6758 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20211120180430", + "version": "2.0.20211122123727", "description": "fineui", "main": "dist/fineui.min.js", "types": "dist/lib/index.d.ts",