From efebc47b4832563899a45482bb52d45f1b74cd4d Mon Sep 17 00:00:00 2001 From: iapyang Date: Tue, 2 Mar 2021 14:53:43 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"feat:=20=E6=96=B0=E5=A2=9E=E4=B8=80?= =?UTF-8?q?=E4=B8=AAbasic=20button=E8=A3=85=E9=A5=B0=E5=99=A8"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0f3e94688dd803dcb1e44616a2e303b0a7ee22da. --- .../basic.button.wrapper.ts | 19 --------------- typescript/core/decorator/decorator.ts | 24 ------------------- typescript/index.ts | 4 ---- 3 files changed, 47 deletions(-) delete mode 100644 typescript/component/basicbuttonwrapper/basic.button.wrapper.ts diff --git a/typescript/component/basicbuttonwrapper/basic.button.wrapper.ts b/typescript/component/basicbuttonwrapper/basic.button.wrapper.ts deleted file mode 100644 index 4b5f70b573..0000000000 --- a/typescript/component/basicbuttonwrapper/basic.button.wrapper.ts +++ /dev/null @@ -1,19 +0,0 @@ -import { shortcut } from "../../core/decorator/decorator"; - -@shortcut() -export class BasicButtonWrapper extends BI.BasicButton { - public static xtype = 'bi.component.basic_button_wrapper'; - - public props: { - render(): any; - doClick(): void; - } - - public render() { - return this.options.render(); - } - - public doClick() { - this.options.doClick(); - } -} diff --git a/typescript/core/decorator/decorator.ts b/typescript/core/decorator/decorator.ts index 9b10d7a705..29ca97c55d 100644 --- a/typescript/core/decorator/decorator.ts +++ b/typescript/core/decorator/decorator.ts @@ -1,5 +1,3 @@ -import { BasicButtonWrapper } from "../../component/basicbuttonwrapper/basic.button.wrapper"; - export type Constructor = new(...args: any[]) => T; /** @@ -29,28 +27,6 @@ export function model() { }; } -/** - * 给控件render外包装basicButton - */ -export function click() { - return function (_target: any, _propertyKey: string, descriptor: PropertyDescriptor) { - const render = descriptor.value; - - descriptor.value = function(this:any, ...args: any[]) { - return { - type: BasicButtonWrapper.xtype, - cls: 'cursor-default', - render: () => render.apply(this, args), - doClick: () => { - this.fireEvent('click'); - }, - }; - }; - - return descriptor; - }; -} - /** * 类注册_store属性 * @param Model model类 diff --git a/typescript/index.ts b/typescript/index.ts index 2088805381..b35966288a 100644 --- a/typescript/index.ts +++ b/typescript/index.ts @@ -152,7 +152,6 @@ import { Tree, Node } from "./core/utils/tree"; import { TextNode } from "./base/single/button/node/textnode"; import { TextValueCheckComboPopup } from "./case/combo/textvaluecheckcombo/popup.textvaluecheck"; import { ImageButton } from './base/single/button/buttons/button.image'; -import { BasicButtonWrapper } from "./component/basicbuttonwrapper/basic.button.wrapper"; export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils { @@ -310,12 +309,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils { TextNode: typeof TextNode; TextValueCheckComboPopup: typeof TextValueCheckComboPopup; ImageButton: typeof ImageButton; - BasicButtonWrapper: typeof BasicButtonWrapper; } export default { Decorators: decorator, - BasicButtonWrapper, }; export { OB, @@ -471,5 +468,4 @@ export { TextNode, TextValueCheckComboPopup, ImageButton, - BasicButtonWrapper, };