From c40fde28f865e7c9218392ebf4bc391938de4771 Mon Sep 17 00:00:00 2001 From: iapyang Date: Fri, 22 Oct 2021 19:02:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20beforeRender=E5=92=8CbeforeMount?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=AD=98=E5=9C=A8=E6=97=B6=E4=B8=8D=E8=A7=A6?= =?UTF-8?q?=E5=8F=91beforeMount?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/4.widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/4.widget.js b/src/core/4.widget.js index f9f18c253..0677212d7 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -126,10 +126,10 @@ _global.console && console.error("组件： 请检查beforeRender内部的写法，callback只能执行一次"); return; } + self.__async = false; renderCallbackCalled = true; self._render(); self.__afterRender(); - self.__async = false; } if (self.options.beforeRender || self.beforeRender) { From 272e3198a462037563c8f3f3a76ef4e16bbaae2e Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 27 Oct 2021 18:56:03 +0800 Subject: [PATCH 2/5] =?UTF-8?q?REPORT-59272=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=B7=B2=E9=80=89=E9=9D=A2=E6=9D=BF=E5=9B=BD?= =?UTF-8?q?=E9=99=85=E5=8C=96=E7=8E=AF=E5=A2=83=E4=B8=8B=E6=94=BE=E4=B8=8D?= =?UTF-8?q?=E4=B8=8B=E6=8D=A2=E8=A1=8C=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/check/multiselect.check.pane.js | 9 +++++++-- src/widget/multitree/check/multi.tree.check.pane.js | 10 ++++++---- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/widget/multiselect/check/multiselect.check.pane.js b/src/widget/multiselect/check/multiselect.check.pane.js index d9b2b8b9c..ea9f1a769 100644 --- a/src/widget/multiselect/check/multiselect.check.pane.js +++ b/src/widget/multiselect/check/multiselect.check.pane.js @@ -39,6 +39,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { callback({ items: BI.map(self.storeValue.value, function (i, v) { var txt = opts.valueFormatter(v) || v; + return { text: txt, value: v, @@ -46,6 +47,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { }; }) }); + return; } opts.itemsCreator(op, callback); @@ -54,6 +56,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { this.continueSelect = BI.createWidget({ type: "bi.text_button", + title: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"), cls: "multi-select-check-selected bi-high-light" }); @@ -69,18 +72,20 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { height: this.constants.height, el: { type: "bi.vertical_adapt", + columnSize: ['fill', 'auto'], cls: "multi-select-continue-select", items: [ { el: { type: "bi.label", + title: BI.i18nText("BI-Selected_Data"), text: BI.i18nText("BI-Selected_Data") }, lgap: this.constants.lgap }, { el: this.continueSelect, - lgap: this.constants.lgap + hgap: this.constants.lgap }] }, tgap: this.constants.tgap @@ -105,4 +110,4 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { } }); -BI.shortcut("bi.multi_select_check_pane", BI.MultiSelectCheckPane); \ No newline at end of file +BI.shortcut("bi.multi_select_check_pane", BI.MultiSelectCheckPane); diff --git a/src/widget/multitree/check/multi.tree.check.pane.js b/src/widget/multitree/check/multi.tree.check.pane.js index b73f8d1ec..3fa3af9aa 100644 --- a/src/widget/multitree/check/multi.tree.check.pane.js +++ b/src/widget/multitree/check/multi.tree.check.pane.js @@ -30,6 +30,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { var continueSelect = BI.createWidget({ type: "bi.text_button", + title: BI.i18nText("BI-Continue_Select"), text: BI.i18nText("BI-Continue_Select"), cls: "multi-tree-check-selected" }); @@ -41,12 +42,14 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { }); var backToPopup = BI.createWidget({ - type: "bi.left", + type: "bi.vertical_adapt", + columnSize: ['fill', 'auto'], cls: "multi-tree-continue-select", items: [ { el: { type: "bi.label", + title: BI.i18nText("BI-Selected_Data"), text: BI.i18nText("BI-Selected_Data") }, lgap: this.constants.lgap, @@ -54,7 +57,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { }, { el: continueSelect, - lgap: this.constants.lgap, + hgap: this.constants.lgap, tgap: this.constants.tgap }] }); @@ -92,7 +95,6 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { el: this.display }] }); - }, empty: function () { @@ -116,4 +118,4 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { BI.MultiTreeCheckPane.EVENT_CONTINUE_CLICK = "EVENT_CONTINUE_CLICK"; -BI.shortcut("bi.multi_tree_check_pane", BI.MultiTreeCheckPane); \ No newline at end of file +BI.shortcut("bi.multi_tree_check_pane", BI.MultiTreeCheckPane); From 06abedca05620f57cdb116e6599fbe3da58fc58a Mon Sep 17 00:00:00 2001 From: iapyang Date: Wed, 27 Oct 2021 18:56:38 +0800 Subject: [PATCH 3/5] =?UTF-8?q?Revert=20"fix:=20beforeRender=E5=92=8Cbefor?= =?UTF-8?q?eMount=E5=90=8C=E6=97=B6=E5=AD=98=E5=9C=A8=E6=97=B6=E4=B8=8D?= =?UTF-8?q?=E8=A7=A6=E5=8F=91beforeMount"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit c40fde28f865e7c9218392ebf4bc391938de4771. --- src/core/4.widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/4.widget.js b/src/core/4.widget.js index 0677212d7..f9f18c253 100644 --- a/src/core/4.widget.js +++ b/src/core/4.widget.js @@ -126,10 +126,10 @@ _global.console && console.error("组件： 请检查beforeRender内部的写法，callback只能执行一次"); return; } - self.__async = false; renderCallbackCalled = true; self._render(); self.__afterRender(); + self.__async = false; } if (self.options.beforeRender || self.beforeRender) { From 6af513575f94b58c8d4f51c52cf669239cb762ca Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 28 Oct 2021 09:32:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?REPORT-59272=20fix:=20=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=94=B9=E4=B8=BAauto?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/widget/multiselect/check/multiselect.check.pane.js | 2 +- src/widget/multitree/check/multi.tree.check.pane.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/widget/multiselect/check/multiselect.check.pane.js b/src/widget/multiselect/check/multiselect.check.pane.js index ea9f1a769..543b615e4 100644 --- a/src/widget/multiselect/check/multiselect.check.pane.js +++ b/src/widget/multiselect/check/multiselect.check.pane.js @@ -72,7 +72,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { height: this.constants.height, el: { type: "bi.vertical_adapt", - columnSize: ['fill', 'auto'], + columnSize: ['auto', 'auto'], cls: "multi-select-continue-select", items: [ { diff --git a/src/widget/multitree/check/multi.tree.check.pane.js b/src/widget/multitree/check/multi.tree.check.pane.js index 3fa3af9aa..ebe87f2ff 100644 --- a/src/widget/multitree/check/multi.tree.check.pane.js +++ b/src/widget/multitree/check/multi.tree.check.pane.js @@ -43,7 +43,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { var backToPopup = BI.createWidget({ type: "bi.vertical_adapt", - columnSize: ['fill', 'auto'], + columnSize: ['auto', 'auto'], cls: "multi-tree-continue-select", items: [ { From 3048ec0c8366cf2aaf07be581170c2ac4881db53 Mon Sep 17 00:00:00 2001 From: iapyang Date: Thu, 28 Oct 2021 10:29:21 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E5=8F=8C=E5=BC=95=E5=8F=B7esli?= =?UTF-8?q?nt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc | 2 ++ src/widget/multiselect/check/multiselect.check.pane.js | 2 +- src/widget/multitree/check/multi.tree.check.pane.js | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.eslintrc b/.eslintrc index 56c26d0b0..c435e6b66 100644 --- a/.eslintrc +++ b/.eslintrc @@ -29,6 +29,8 @@ "files": ["src/*.js","src/**/*.js", "demo/*.js", "demo/**/*.js", "i18n/**/*.js", "i18n/*.js", "test/**/*.js", "test/*.js"], "extends": "plugin:@fui/es5", "rules": { + "no-param-reassign": "off", + "quotes": [2, "double"], "comma-dangle": ["error", "never"] // 多行对象字面量中要求拖尾逗号 } }, { diff --git a/src/widget/multiselect/check/multiselect.check.pane.js b/src/widget/multiselect/check/multiselect.check.pane.js index 543b615e4..958375876 100644 --- a/src/widget/multiselect/check/multiselect.check.pane.js +++ b/src/widget/multiselect/check/multiselect.check.pane.js @@ -72,7 +72,7 @@ BI.MultiSelectCheckPane = BI.inherit(BI.Widget, { height: this.constants.height, el: { type: "bi.vertical_adapt", - columnSize: ['auto', 'auto'], + columnSize: ["auto", "auto"], cls: "multi-select-continue-select", items: [ { diff --git a/src/widget/multitree/check/multi.tree.check.pane.js b/src/widget/multitree/check/multi.tree.check.pane.js index ebe87f2ff..598a19f21 100644 --- a/src/widget/multitree/check/multi.tree.check.pane.js +++ b/src/widget/multitree/check/multi.tree.check.pane.js @@ -43,7 +43,7 @@ BI.MultiTreeCheckPane = BI.inherit(BI.Pane, { var backToPopup = BI.createWidget({ type: "bi.vertical_adapt", - columnSize: ['auto', 'auto'], + columnSize: ["auto", "auto"], cls: "multi-tree-continue-select", items: [ {