From 84dae193cbfb2359371ceea487533f13fdb790f5 Mon Sep 17 00:00:00 2001 From: jian Date: Thu, 1 Jun 2023 11:28:11 +0800 Subject: [PATCH 1/7] fix order demo --- examples/watch-order.html | 138 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) create mode 100644 examples/watch-order.html diff --git a/examples/watch-order.html b/examples/watch-order.html new file mode 100644 index 000000000..3f437939d --- /dev/null +++ b/examples/watch-order.html @@ -0,0 +1,138 @@ + + + + + + + + + +
+ + + From 419d31cb446f6c1be8e102ab3c8901ce25eba232 Mon Sep 17 00:00:00 2001 From: jian Date: Thu, 1 Jun 2023 11:31:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/watch-order.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/examples/watch-order.html b/examples/watch-order.html index 3f437939d..74c632a1e 100644 --- a/examples/watch-order.html +++ b/examples/watch-order.html @@ -43,7 +43,10 @@ bgap: 10, items: [{ type: 'bi.label', - text: '不应该在watch一个属性后再去修改属性，应该一次性改好，或者同步watch去做' + text: '父组件watch widget.**, 子组件watch了widget.arr, 修改widget中arr和dims的先后顺序不一样，会导致watch顺序不一样。' + }, { + type: 'bi.label', + text: '不应该在修改属性，watch到修改后，还修改配置，或者使用同步watch把配置修改全' }, { type: 'demo.child' }], From 23c8c021020ff3cb376674192dd7fffee55d2c54 Mon Sep 17 00:00:00 2001 From: jian Date: Thu, 1 Jun 2023 11:44:26 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- examples/watch-order.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/watch-order.html b/examples/watch-order.html index 74c632a1e..7f85acdd6 100644 --- a/examples/watch-order.html +++ b/examples/watch-order.html @@ -16,7 +16,7 @@ widget: { name: "触发arr和dims变化", arr: [], - dims: {}, + dims: [], } }; }, @@ -84,11 +84,12 @@ addArrFirst: function () { // 修改arr在前，先触发arr的watch 再触发widget.**的监听 this.model.widget.arr.push(BI.UUID()); - Fix.set(this.model.widget.dims, BI.UUID(), {}); + this.model.widget.dims.push(BI.UUID()); + }, addDimFirst: function () { // 修改dim在前先执行 widget.** 再出发arr的watch - Fix.set(this.model.widget.dims, BI.UUID(), {}); + this.model.widget.dims.push(BI.UUID()); this.model.widget.arr.push(BI.UUID()); } } From aaf2acb606047d5de0842a08b9ec9164690f18d4 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 2 Jun 2023 10:05:32 +0800 Subject: [PATCH 4/7] auto upgrade version to 2.0.20230602100526 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1ef884760..cf9b9a1ed 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230529165448", + "version": "2.0.20230602100526", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts", From 0ae51ec2dcd23738c0a911b19d27adf6fe71452d Mon Sep 17 00:00:00 2001 From: jian Date: Fri, 2 Jun 2023 10:30:19 +0800 Subject: [PATCH 5/7] =?UTF-8?q?BI-127456=20fix:=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/segment/segment.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js index 2c1dda918..a35e8080a 100644 --- a/src/case/segment/segment.js +++ b/src/case/segment/segment.js @@ -18,11 +18,11 @@ BI.Segment = BI.inherit(BI.Widget, { var self = this, o = this.options; this.buttonGroup = BI.createWidget({ element: this, + height: BI.toPix(o.height), type: "bi.button_group", value: o.value, items: [BI.createItems(o.items, { type: "bi.segment_button", - height: BI.toPix(o.height, 2), whiteSpace: o.whiteSpace, })], layouts: [{ @@ -63,7 +63,6 @@ BI.Segment = BI.inherit(BI.Widget, { var o = this.options; this.buttonGroup.populate([BI.createItems(buttons, { type: "bi.segment_button", - height: BI.toPix(o.height, 2), whiteSpace: o.whiteSpace, })]); }, From 9955e0bf74feacd607c5231fa96f8d26d99e393a Mon Sep 17 00:00:00 2001 From: jian Date: Fri, 2 Jun 2023 10:40:59 +0800 Subject: [PATCH 6/7] =?UTF-8?q?BI-127456=20fix:=20=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/case/segment/segment.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/case/segment/segment.js b/src/case/segment/segment.js index a35e8080a..c66460a9d 100644 --- a/src/case/segment/segment.js +++ b/src/case/segment/segment.js @@ -18,7 +18,6 @@ BI.Segment = BI.inherit(BI.Widget, { var self = this, o = this.options; this.buttonGroup = BI.createWidget({ element: this, - height: BI.toPix(o.height), type: "bi.button_group", value: o.value, items: [BI.createItems(o.items, { From 2e337a62c2c23b6a0ed537a1ea75a6a821ab4b49 Mon Sep 17 00:00:00 2001 From: data Date: Fri, 2 Jun 2023 10:54:08 +0800 Subject: [PATCH 7/7] auto upgrade version to 2.0.20230602105401 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index cf9b9a1ed..631762a4e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "fineui", - "version": "2.0.20230602100526", + "version": "2.0.20230602105401", "description": "fineui", "main": "dist/fineui_without_conflict.min.js", "types": "dist/lib/index.d.ts",