From 182a250c4f5a965a20616c6ac96cb68ef62d507b Mon Sep 17 00:00:00 2001 From: jian Date: Tue, 19 Dec 2023 16:40:41 +0800 Subject: [PATCH 1/5] =?UTF-8?q?KERNEL-16950=20fix:=20=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/core/4.widget.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/fineui/src/core/4.widget.js b/packages/fineui/src/core/4.widget.js index df12ef774..8fe60098a 100644 --- a/packages/fineui/src/core/4.widget.js +++ b/packages/fineui/src/core/4.widget.js @@ -240,8 +240,11 @@ export class Widget extends OB { ).call(this, render); if (beforeRenderResult instanceof Promise) { beforeRenderResult.then(render).catch((e) => { - _global.console && console.error(e); - !this.isDestroyed() && render(); // 异步render，改组件此时可能已经被销毁 + if (!this.isDestroyed()) { + render(); // 异步render，组件此时可能已经被销毁 + } else { + _global.console && console.error(e, 'Async render error! Widget has been destroyed!'); + } }); } } else { @@ -257,8 +260,11 @@ export class Widget extends OB { ).call(this, init); if (beforeInitResult instanceof Promise) { beforeInitResult.then(init).catch((e) => { - _global.console && console.error(e); - !this.isDestroyed() && init(); // 异步render，改组件此时可能已经被销毁 + if (!this.isDestroyed()) { + init(); // 异步init，组件此时可能已经被销毁 + } else { + _global.console && console.error(e, 'Async init error! Widget has been destroyed!'); + } }); } } else { @@ -874,7 +880,7 @@ export class Widget extends OB { this._assetMounted(); this.__destroy(); this.fireEvent(Events.UNMOUNT); - // this._purgeRef(); // 子组件unmount ref置为null了，父组件拿不到ref，导致报错 + this._purgeRef(); // 子组件unmount ref置为null了，父组件拿不到ref，导致报错 this.purgeListeners(); } From 9a2f3fd2e3f9c324a1ee1296707dab5942811d2c Mon Sep 17 00:00:00 2001 From: jian Date: Tue, 19 Dec 2023 16:45:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?KERNEL-16950=20fix:=20=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=BA=9Blog?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/core/4.widget.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/packages/fineui/src/core/4.widget.js b/packages/fineui/src/core/4.widget.js index 8fe60098a..9bf69e4a3 100644 --- a/packages/fineui/src/core/4.widget.js +++ b/packages/fineui/src/core/4.widget.js @@ -240,11 +240,9 @@ export class Widget extends OB { ).call(this, render); if (beforeRenderResult instanceof Promise) { beforeRenderResult.then(render).catch((e) => { - if (!this.isDestroyed()) { - render(); // 异步render，组件此时可能已经被销毁 - } else { - _global.console && console.error(e, 'Async render error! Widget has been destroyed!'); - } + _global.console && console.error(e); + // 异步render，组件此时可能已经被销毁 + !this.isDestroyed() ? render() : _global.console && console.error('Async render error! Widget has been destroyed!'); }); } } else { @@ -260,11 +258,9 @@ export class Widget extends OB { ).call(this, init); if (beforeInitResult instanceof Promise) { beforeInitResult.then(init).catch((e) => { - if (!this.isDestroyed()) { - init(); // 异步init，组件此时可能已经被销毁 - } else { - _global.console && console.error(e, 'Async init error! Widget has been destroyed!'); - } + _global.console && console.error(e); + // 异步init，组件此时可能已经被销毁 + !this.isDestroyed() ? init() : _global.console && console.error('Async init error! Widget has been destroyed!'); }); } } else { From 876ab205441f1db42fe25b3d2d5ffac2968cee3d Mon Sep 17 00:00:00 2001 From: jian Date: Wed, 20 Dec 2023 08:59:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20=E5=A4=9A?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/core/4.widget.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fineui/src/core/4.widget.js b/packages/fineui/src/core/4.widget.js index 9bf69e4a3..7ddf3b320 100644 --- a/packages/fineui/src/core/4.widget.js +++ b/packages/fineui/src/core/4.widget.js @@ -876,7 +876,7 @@ export class Widget extends OB { this._assetMounted(); this.__destroy(); this.fireEvent(Events.UNMOUNT); - this._purgeRef(); // 子组件unmount ref置为null了，父组件拿不到ref，导致报错 + // this._purgeRef(); // 子组件unmount ref置为null了，父组件拿不到ref，导致报错 this.purgeListeners(); } From bc3a1372a86c10daace0208c191c42c01449d44d Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Thu, 21 Dec 2023 14:57:16 +0800 Subject: [PATCH 4/5] =?UTF-8?q?JSY-35428=20feat:=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=80=89=E8=89=B2=E6=8E=A7=E4=BB=B6=E4=BC=A0=E9=80=92=E5=8F=AF?= =?UTF-8?q?=E9=80=89=E9=A2=9C=E8=89=B2=E8=89=B2=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/colorchooser/colorchooser.js | 2 ++ .../fineui/src/case/colorchooser/colorchooser.popup.hex.js | 2 ++ packages/fineui/typescript/case/colorchooser/colorchooser.ts | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/packages/fineui/src/case/colorchooser/colorchooser.js b/packages/fineui/src/case/colorchooser/colorchooser.js index 7b075eae0..ac884db07 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.js @@ -24,6 +24,7 @@ export class ColorChooser extends Widget { height: 24, el: {}, simple: false, + colorItems: null, }); } @@ -62,6 +63,7 @@ export class ColorChooser extends Widget { el: extend( { type: HexColorChooserPopup.xtype, + colorItems: o.colorItems, recommendColorsGetter: o.recommendColorsGetter, ref: _ref => { this.colorPicker = _ref; diff --git a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js index afde53a6a..14dec6a24 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js @@ -47,6 +47,7 @@ export class HexColorChooserPopup extends Widget { width: 300, recommendColorsGetter: emptyFn, // 推荐色获取接口 simple: false, // 简单模式, popup中没有自动和透明 + colorItems: null, }; render() { @@ -167,6 +168,7 @@ export class HexColorChooserPopup extends Widget { type: HexColorPicker.xtype, space: true, value: o.value, + items: o.colorItems, listeners: [ { eventName: ColorPicker.EVENT_CHANGE, diff --git a/packages/fineui/typescript/case/colorchooser/colorchooser.ts b/packages/fineui/typescript/case/colorchooser/colorchooser.ts index b58869e37..7787d78f2 100644 --- a/packages/fineui/typescript/case/colorchooser/colorchooser.ts +++ b/packages/fineui/typescript/case/colorchooser/colorchooser.ts @@ -5,6 +5,10 @@ export declare class ColorChooser extends Widget { static EVENT_CHANGE: string; static EVENT_AFTER_POPUPVIEW: string; + props: { + colorItems?: { value: string }[][]; + }; + isViewVisible(): boolean; hideView(): void; From 78dcc8ad5fbcfafe4db8163fca0c82bedb2201e8 Mon Sep 17 00:00:00 2001 From: Claire <1119518763@qq.com> Date: Thu, 21 Dec 2023 16:46:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?JSY-35428=20feat:=E9=80=89=E8=89=B2?= =?UTF-8?q?=E6=9D=BF=E6=94=AF=E6=8C=81=E9=AB=98=E5=BA=A6props=E4=BC=A0?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fineui/src/case/colorchooser/colorchooser.js | 2 ++ .../fineui/src/case/colorchooser/colorchooser.popup.hex.js | 3 ++- packages/fineui/typescript/case/colorchooser/colorchooser.ts | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/fineui/src/case/colorchooser/colorchooser.js b/packages/fineui/src/case/colorchooser/colorchooser.js index ac884db07..81d0594ea 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.js @@ -25,6 +25,7 @@ export class ColorChooser extends Widget { el: {}, simple: false, colorItems: null, + colorBoardHeight: 80, }); } @@ -64,6 +65,7 @@ export class ColorChooser extends Widget { { type: HexColorChooserPopup.xtype, colorItems: o.colorItems, + colorBoardHeight: o.colorBoardHeight, recommendColorsGetter: o.recommendColorsGetter, ref: _ref => { this.colorPicker = _ref; diff --git a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js index 14dec6a24..d653de37a 100644 --- a/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js +++ b/packages/fineui/src/case/colorchooser/colorchooser.popup.hex.js @@ -48,6 +48,7 @@ export class HexColorChooserPopup extends Widget { recommendColorsGetter: emptyFn, // 推荐色获取接口 simple: false, // 简单模式, popup中没有自动和透明 colorItems: null, + colorBoardHeight: 80, }; render() { @@ -189,7 +190,7 @@ export class HexColorChooserPopup extends Widget { bottom: 1, } ], - height: 80, + height: o.colorBoardHeight, } ], }, diff --git a/packages/fineui/typescript/case/colorchooser/colorchooser.ts b/packages/fineui/typescript/case/colorchooser/colorchooser.ts index 7787d78f2..ac429ef46 100644 --- a/packages/fineui/typescript/case/colorchooser/colorchooser.ts +++ b/packages/fineui/typescript/case/colorchooser/colorchooser.ts @@ -1,3 +1,4 @@ +import { Single } from 'typescript/base/single/single'; import { Widget } from '../../core/widget'; export declare class ColorChooser extends Widget { @@ -6,8 +7,10 @@ export declare class ColorChooser extends Widget { static EVENT_AFTER_POPUPVIEW: string; props: { + stopEvent?: boolean; + colorBoardHeight?: number; colorItems?: { value: string }[][]; - }; + } & Single["props"]; isViewVisible(): boolean;