From 0f3e94688dd803dcb1e44616a2e303b0a7ee22da Mon Sep 17 00:00:00 2001
From: iapyang <yklorse@gmail.com>
Date: Fri, 26 Feb 2021 11:41:58 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E4=B8=80=E4=B8=AAbas?=
 =?UTF-8?q?ic=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

---
 .../basic.button.wrapper.ts                   | 19 +++++++++++++++
 typescript/core/decorator/decorator.ts        | 24 +++++++++++++++++++
 typescript/index.ts                           |  4 ++++
 3 files changed, 47 insertions(+)
 create 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
new file mode 100644
index 000000000..4b5f70b57
--- /dev/null
+++ b/typescript/component/basicbuttonwrapper/basic.button.wrapper.ts
@@ -0,0 +1,19 @@
+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 29ca97c55..9b10d7a70 100644
--- a/typescript/core/decorator/decorator.ts
+++ b/typescript/core/decorator/decorator.ts
@@ -1,3 +1,5 @@
+import { BasicButtonWrapper } from "../../component/basicbuttonwrapper/basic.button.wrapper";
+
 export type Constructor<T> = new(...args: any[]) => T;
 
 /**
@@ -27,6 +29,28 @@ 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 b35966288..208880538 100644
--- a/typescript/index.ts
+++ b/typescript/index.ts
@@ -152,6 +152,7 @@ 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 {
@@ -309,10 +310,12 @@ 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,
@@ -468,4 +471,5 @@ export {
     TextNode,
     TextValueCheckComboPopup,
     ImageButton,
+    BasicButtonWrapper,
 };