From dcf4409503747b4bc6be465a90b9c9dd9ed55ac3 Mon Sep 17 00:00:00 2001
From: guy <guy@finereport.com>
Date: Sat, 4 Sep 2021 17:30:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/dev.html           | 240 ++++++++++++++++++++++++------------
 examples/hooks.html         |  30 ++---
 examples/virtual-group.html |   2 +-
 src/core/4.widget.js        |   6 +-
 src/core/5.shortcut.js      |   2 +-
 5 files changed, 185 insertions(+), 95 deletions(-)
diff --git a/examples/dev.html b/examples/dev.html
index 3b11585b5..481d2620d 100644
--- a/examples/dev.html
+++ b/examples/dev.html
@@ -9,112 +9,200 @@
 <body>
 <div id="wrapper"></div>
 <script>
-    !(function () {
+    var Model = BI.inherit(Fix.Model, {
+        state: function () {
+            return {
+                expand: false,
+                showClearAll: false,
+                hasUndo: false,
+                hasRedo: false
+            };
+        },
 
-        var element2InstanceMap = new WeakMap();
+        computed: {
+            expandText: function () {
+                return this.model.expand ? "expand" : "not-expand";
+            },
+            clearAllText: function () {
+                return this.model.showClearAll ? "showClearAll" : "not-showClearAll";
+            },
+            undoText: function () {
+                return this.model.hasUndo ? "hasUndo" : "not-hasUndo";
+            },
+            redoText: function () {
+                return this.model.hasRedo ? "hasRedo" : "not-hasRedo";
+            }
+        },
 
-        BI.getInstanceByElement = function (element) {
-            return element2InstanceMap.get(element);
-        };
+        actions: {
+            setExpand: function () {
+                this.model.expand = !this.model.expand;
+            },
+            setClearAll: function () {
+                this.model.showClearAll = !this.model.showClearAll;
+            },
+            setUndo: function () {
+                this.model.hasUndo = !this.model.hasUndo;
+            },
+            setRedo: function () {
+                this.model.hasRedo = !this.model.hasRedo;
+            }
+        }
+    });
 
-        BI.Plugin.config(function (options) {
+    BI.model("demo.model", Model);
+
+    function useExpand () {
+        var button;
+        var store = BI.useStore();
+        BI.onBeforeMount(function () {
 
-        }, function (shortcut, instance) {
-            instance.element.attr("shortcut", shortcut);
-            if (instance.options.$testId) {
-                setIDAttribute(instance.element[0], instance.options.$testId);
-            }
-            element2InstanceMap.set(instance.element[0], instance);
         });
+        BI.onMounted(function () {
 
-        function setIDAttribute (element, id) {
-            if (element.id !== "") {
-                throw new Error("不能修改有默认id的元素");
-            }
-            element.setAttribute("id", id);
-        }
+        });
+        BI.onBeforeUnmount(function () {
 
-        function registerWidgetIdGenerator () {
+        });
+        BI.onUnmounted(function () {
 
-            const idSet = new Set();
+        });
+        BI.watch("expandText", function (val) {
+            button.setText(val);
+        });
+        return function () {
+            return {
+                type: "bi.button",
+                ref: function (_ref) {
+                    button = _ref;
+                },
+                text: store.model.expandText,
+                handler: function () {
+                    store.setExpand();
+                }
+            };
+        };
+    }
+
+    function useClearAll () {
+        var button;
+        var store = BI.useStore();
+        BI.onBeforeMount(function () {
+
+        });
+        BI.onMounted(function () {
+
+        });
+        BI.onBeforeUnmount(function () {
+
+        });
+        BI.onUnmounted(function () {
 
-            return function (shortcut, id) {
-                if (idSet.has(id)) {
-                    throw new Error("id重复了");
+        });
+        BI.watch("clearAllText", function (val) {
+            button.setText(val);
+        });
+        return function () {
+            return {
+                type: "bi.button",
+                ref: function (_ref) {
+                    button = _ref;
+                },
+                text: store.model.clearAllText,
+                handler: function () {
+                    store.setClearAll();
                 }
-                idSet.add(id);
-                BI.Plugin.registerObject(shortcut, function (widget) {
-                    setIDAttribute(widget.element[0], id);
-                });
             };
-        }
+        };
+    }
 
-        BI.registerWidgetId = registerWidgetIdGenerator();
-    }());
-</script>
-<script>
+    function useUndo () {
+        var button;
+        var store = BI.useStore();
+        BI.onBeforeMount(function () {
 
-    function setTestId (parentShortcut, childShortcut, testId) {
-        BI.Plugin.configRender(parentShortcut, function (rendered) {
-            var queue = BI.isArray(rendered) ? rendered : [rendered];// 广度遍历
-            while (queue.length > 0) {
-                var element = queue.shift();
-                BI.each(element, function (key, value) {
-                    if (BI.isArray(value)) {
-                        queue = queue.concat(value);
-                    } else if (BI.isPlainObject(value)) {
-                        queue.push(value);
-                    } else if ("type" === key && value === childShortcut) {
-                        element.$testId = testId;
-                    }
-                });
-            }
-            return rendered;
         });
+        BI.onMounted(function () {
+
+        });
+        BI.onBeforeUnmount(function () {
+
+        });
+        BI.onUnmounted(function () {
+
+        });
+        BI.watch("undoText", function (val) {
+            button.setText(val);
+        });
+        return function () {
+            return {
+                type: "bi.button",
+                ref: function (_ref) {
+                    button = _ref;
+                },
+                text: store.model.undoText,
+                handler: function () {
+                    store.setUndo();
+                }
+            };
+        };
     }
 
-    setTestId("demo.parent", "bi.button_group", "测试testId");
+    function useRedo () {
+        var button;
+        var store = BI.useStore();
+        BI.onBeforeMount(function () {
+
+        });
+        BI.onMounted(function () {
+
+        });
+        BI.onBeforeUnmount(function () {
+
+        });
+        BI.onUnmounted(function () {
+
+        });
+        BI.watch("redoText", function (val) {
+            button.setText(val);
+        });
+        return function () {
+            return {
+                type: "bi.button",
+                ref: function (_ref) {
+                    button = _ref;
+                },
+                text: store.model.redoText,
+                handler: function () {
+                    store.setRedo();
+                }
+            };
+        };
+    }
 
     var Widget = BI.inherit(BI.Widget, {
+        _store: function () {
+            return BI.Models.getModel("demo.model");
+        },
         setup: function () {
-            var list;
+            var expandComponent = useExpand();
+            var clearAllComponent = useClearAll();
+            var undoComponent = useUndo();
+            var redoComponent = useRedo();
             return function () {
                 return {
                     type: "bi.vertical",
-                    items: [{
-                        type: "bi.button_group",
-                        height: 100,
-                        ref: function (_ref) {
-                            list = _ref;
-                        },
-                        items: BI.range(10).map(function (i) {
-                            return {
-                                type: "bi.label",
-                                text: i,
-                                cls: "bi-border"
-                            };
-                        }),
-                        layouts: [{
-                            type: "bi.inline",
-                            tgap: 10,
-                            lgap: 10
-                        }]
-                    }, {
-                        type: "bi.button",
-                        text: "点击",
-                        handler: function () {
-                        }
-                    }]
+                    items: [expandComponent(), clearAllComponent(), undoComponent(), redoComponent()]
                 };
             };
         }
     });
-    BI.shortcut("demo.parent", Widget);
+    BI.shortcut("demo.hooks", Widget);
     BI.createWidget({
         type: "bi.absolute",
         items: [{
             el: {
-                type: "demo.parent"
+                type: "demo.hooks"
             },
             top: 100,
             left: 100
diff --git a/examples/hooks.html b/examples/hooks.html
index 80b9e880c..66afa9f83 100644
--- a/examples/hooks.html
+++ b/examples/hooks.html
@@ -51,9 +51,9 @@
 
     BI.model("demo.model", Model);
 
-    function expandFunction (storeCreator) {
+    function useExpand () {
         var button;
-        var store = BI.useStore(storeCreator);
+        var store = BI.useStore();
         BI.onBeforeMount(function () {
 
         });
@@ -83,9 +83,9 @@
         };
     }
 
-    function clearAllFunction (storeCreator) {
+    function useClearAll () {
         var button;
-        var store = BI.useStore(storeCreator);
+        var store = BI.useStore();
         BI.onBeforeMount(function () {
 
         });
@@ -115,9 +115,9 @@
         };
     }
 
-    function undoFunction (storeCreator) {
+    function useUndo () {
         var button;
-        var store = BI.useStore(storeCreator);
+        var store = BI.useStore();
         BI.onBeforeMount(function () {
 
         });
@@ -147,9 +147,9 @@
         };
     }
 
-    function redoFunction (storeCreator) {
+    function useRedo () {
         var button;
-        var store = BI.useStore(storeCreator);
+        var store = BI.useStore();
         BI.onBeforeMount(function () {
 
         });
@@ -180,14 +180,14 @@
     }
 
     var Widget = BI.inherit(BI.Widget, {
+        _store: function () {
+            return BI.Models.getModel("demo.model");
+        },
         setup: function () {
-            var storeCreator = function () {
-                return BI.Models.getModel("demo.model");
-            };
-            var expandComponent = expandFunction(storeCreator);
-            var clearAllComponent = clearAllFunction(storeCreator);
-            var undoComponent = undoFunction(storeCreator);
-            var redoComponent = redoFunction(storeCreator);
+            var expandComponent = useExpand();
+            var clearAllComponent = useClearAll();
+            var undoComponent = useUndo();
+            var redoComponent = useRedo();
             return function () {
                 return {
                     type: "bi.vertical",
diff --git a/examples/virtual-group.html b/examples/virtual-group.html
index cf311c310..a2e664ea4 100644
--- a/examples/virtual-group.html
+++ b/examples/virtual-group.html
@@ -11,7 +11,7 @@
 
     var Widget = BI.inherit(BI.Widget, {
         props: {
-            vdom: true
+            // vdom: true
         },
         watch: {
             text: function () {
diff --git a/src/core/4.widget.js b/src/core/4.widget.js
index be5f23f81..2a8f2e02d 100644
--- a/src/core/4.widget.js
+++ b/src/core/4.widget.js
@@ -701,6 +701,7 @@
             return current.$storeDelegate;
         }
         if (current) {
+            var currentStore = current._store;
             var delegate = {}, origin;
             if (_global.Proxy) {
                 var proxy = new Proxy(delegate, {
@@ -712,13 +713,14 @@
                     }
                 });
                 current._store = function () {
-                    origin = _store.apply(this, arguments);
+                    origin = (_store || currentStore).apply(this, arguments);
+                    delegate.$delegate = origin;
                     return origin;
                 };
                 return current.$storeDelegate = proxy;
             }
             current._store = function () {
-                var st = _store.apply(this, arguments);
+                var st = (_store || currentStore).apply(this, arguments);
                 BI.extend(delegate, st);
                 return st;
             };
diff --git a/src/core/5.shortcut.js b/src/core/5.shortcut.js
index b209c16e5..95e488214 100644
--- a/src/core/5.shortcut.js
+++ b/src/core/5.shortcut.js
@@ -25,8 +25,8 @@
             BI.Widget.pushContext(context);
         }
         widget._initProps(config);
-        widget._constructed();
         widget._initRoot();
+        widget._constructed();
         // if (!lazy || config.element || config.root) {
         widget._lazyConstructor();
         // }
