From b6afaadf0a9b1a4809c93917a31345eb2759ecf1 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 24 Jun 2022 11:32:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=20tab=E7=9A=84showIndex=20?=
 =?UTF-8?q?=E5=93=8D=E5=BA=94=E5=BC=8F=E4=B9=9F=E6=94=AF=E6=8C=81false?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E8=BF=9B=E8=A1=8C=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/base/combination/tab.js | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/base/combination/tab.js b/src/base/combination/tab.js
index 893513721..90a788a17 100644
--- a/src/base/combination/tab.js
+++ b/src/base/combination/tab.js
@@ -86,15 +86,18 @@ BI.Tab = BI.inherit(BI.Widget, {
 
     created: function () {
         var self = this, o = this.options;
-        if (o.showIndex !== false) {
-            if (BI.isFunction(o.showIndex)) {
-                var v = this.__watch(o.showIndex, function (context, newValue) {
-                    self.setSelect(newValue);
-                });
-                this.setSelect(v);
-            } else {
-                this.setSelect(o.showIndex);
-            }
+
+        var showIndex;
+        if (BI.isFunction(o.showIndex)) {
+            showIndex = this.__watch(o.showIndex, function (context, newValue) {
+                self.setSelect(newValue);
+            });
+        } else {
+            showIndex = o.showIndex;
+        }
+
+        if (showIndex !== false) {
+            this.setSelect(showIndex);
         }
     },
 
@@ -135,7 +138,7 @@ BI.Tab = BI.inherit(BI.Widget, {
     getTab: function (v) {
         this._assertCard(v);
 
-return this.layout.getCardByName(v);
+        return this.layout.getCardByName(v);
     },
 
     setValue: function (v) {

From 100f90d51fba1a119c0c41c5442b16b927b875e3 Mon Sep 17 00:00:00 2001
From: zsmj <zsmj1994@gmail.com>
Date: Fri, 24 Jun 2022 11:33:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0jira=20=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 typescript/core/widget.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/typescript/core/widget.ts b/typescript/core/widget.ts
index 0a1b63246..4c1fc9d2f 100644
--- a/typescript/core/widget.ts
+++ b/typescript/core/widget.ts
@@ -42,8 +42,8 @@ export interface _Widget extends _OB {
     element: {
         width(): number;
         height(): number;
-        width(width: number | string): _Widget['element'];
-        height(height: number | string): _Widget['element'];
+        width(width: number | string): _Widget["element"];
+        height(height: number | string): _Widget["element"];
         [key: string]: any;
     };
 
@@ -110,7 +110,7 @@ export interface _Widget extends _OB {
     /**
      * 更新前
      */
-    shouldUpdate?(): void;
+    shouldUpdate?(...args: any[]): void;
 
     /**
      * 更新
@@ -449,8 +449,8 @@ export declare class Widget extends OB {
     element: {
         width(): number;
         height(): number;
-        width(width: number | string): Widget['element'];
-        height(height: number | string): Widget['element'];
+        width(width: number | string): Widget["element"];
+        height(height: number | string): Widget["element"];
         [key: string]: any;
     };
 
@@ -783,6 +783,11 @@ export declare class Widget extends OB {
      */
     _unMount(): void;
 
+    /**
+     * watch响应式数据
+     */
+    __watch<T extends (...args: any) => any>(getter: T, handler: Function, options?: Obj): ReturnType<T>
+
     /**
      * hang元素
      */