Merge pull request 'feature:适配fix，实现简单版的button_group' (#3) from guy/open-fineui-swing:10.0 into 10.0

Reviewed-on: #3

src/main/java/com/tptj/tool/hg/fineui/swing/FineUIEngine.java

@@ -64,6 +64,8 @@ public class FineUIEngine {
                         "com/fr/fineui/core/constant/events.js",
                         "com/fr/fineui/core/constant/var.js",
 
+                        "com/fr/fineui/core/controller/0.controller.js",
+
                         "com/fr/fineui/core/func/alias.js",
                         "com/fr/fineui/core/func/array.js",
                         "com/fr/fineui/core/func/date.js",
@@ -109,8 +111,17 @@ public class FineUIEngine {
                         "com/fr/fineui/core/wrapper/layout/flex/flex.vertical.center.js",
                         "com/fr/fineui/core/wrapper/layout/flex/flex.leftrightvertical.center.js",
 
+                        // fix代码
+                        "com/fr/fineui/dist/fix/fix.proxy.js",
+                        "com/fr/fineui/dist/fix/fix.compact.js",
+
+                        // 通用组价
+                        "com/fr/fineui/base/combination/group.button.js",
+
+
                         //com/tptj/tool/hg/fineui/swing 下的都是适配swing的js代码
                         // 自定义布局
+                        "com/tptj/tool/hg/fineui/swing/core/wrapper/layout.service.js",
                         "com/tptj/tool/hg/fineui/swing/core/wrapper/layout.static.js",
                         "com/tptj/tool/hg/fineui/swing/core/wrapper/layout.horizontal.js",
                         "com/tptj/tool/hg/fineui/swing/core/wrapper/layout.vertical.js",
@@ -129,6 +140,8 @@ public class FineUIEngine {
                         //自定义的基础控件，最基本的控件需要由swing实现后，映射到fineui中，高级的组件就可以
                         //由开发者按照fineui的组件继承方式进行组合创建新的组件了
                         "com/tptj/tool/hg/fineui/swing/base/single/label.js",
+                        "com/tptj/tool/hg/fineui/swing/base/single/button.js",
+                        "com/tptj/tool/hg/fineui/swing/base/single/group.button.js",
                         "com/tptj/tool/hg/fineui/swing/widget/editor/editor.text.js"
 
                 );
@@ -228,7 +241,8 @@ public class FineUIEngine {
 //                    .importJs("com/tptj/tool/hg/fineui/swing/demo/layout.tape.js");
 //                    .importJs("com/tptj/tool/hg/fineui/swing/demo/layout.grid.js");
 //                    .importJs("com/tptj/tool/hg/fineui/swing/demo/layout.window.js");
-                    .importJs("com/tptj/tool/hg/fineui/swing/demo/layout.horizontal.js");
+//                    .importJs("com/tptj/tool/hg/fineui/swing/demo/layout.horizontal.js");
+                    .importJs("com/tptj/tool/hg/fineui/swing/demo/group.button.js");
             return null;
         }).run();
 

src/main/java/com/tptj/tool/hg/fineui/swing/element/AbstractElement.java

@@ -1,5 +1,6 @@
 package com.tptj.tool.hg.fineui.swing.element;
 
+import com.eclipsesource.v8.V8Array;
 import com.eclipsesource.v8.V8Object;
 import com.fr.general.GeneralUtils;
 import com.fr.log.FineLoggerFactory;
@@ -20,7 +21,7 @@ import java.util.List;
  **/
 public abstract class AbstractElement<T extends JComponent> implements Element<T> {
 
-    private T component;
+    protected T component;
     private JComponent wrapper;
     private V8Object ref;
     private String type;
@@ -152,7 +153,8 @@ public abstract class AbstractElement<T extends JComponent> implements Element<T
 
     @Override
     public void destroy() {
-
+        component.removeAll();
+        children.clear();
     }
 
     @Override
@@ -182,7 +184,7 @@ public abstract class AbstractElement<T extends JComponent> implements Element<T
 
     @Override
     public void empty() {
-
+        children.clear();
     }
 
     @Override
@@ -263,6 +265,11 @@ public abstract class AbstractElement<T extends JComponent> implements Element<T
         return val;
     }
 
+    @Override
+    public void populate(V8Array items) {
+
+    }
+
     @Override
     public int getRectStyleAttr(String name, int max, int min) {
         Object val = css.get(name);

src/main/java/com/tptj/tool/hg/fineui/swing/element/AbstractSingleElement.java

@@ -0,0 +1,33 @@
+package com.tptj.tool.hg.fineui.swing.element;
+
+import javax.swing.*;
+import java.awt.*;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/10/29
+ **/
+public abstract class AbstractSingleElement<T extends JComponent> extends AbstractElement<T> {
+    protected AbstractSingleElement(T component) {
+        super(component);
+    }
+
+    @Override
+    public void css(String name, String val) {
+        super.css(name, val);
+        Dimension dim = getComponent().getPreferredSize();
+        if ("width".equals(name)) {
+            if (val.length() > 0) {
+                dim.width = Integer.parseInt(val);
+                getComponent().setPreferredSize(dim);
+            }
+        }
+        if ("height".equals(name)) {
+            if (val.length() > 0) {
+                dim.height = Integer.parseInt(val);
+                getComponent().setPreferredSize(dim);
+            }
+        }
+    }
+}

src/main/java/com/tptj/tool/hg/fineui/swing/element/ButtonElement.java

@@ -0,0 +1,52 @@
+package com.tptj.tool.hg.fineui.swing.element;
+
+import com.fr.general.GeneralUtils;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/10/29
+ **/
+public class ButtonElement extends AbstractSingleElement<JButton> {
+
+    public ButtonElement() {
+        super(new JButton());
+        getComponent().addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                callJsMethod("fireEvent", "EVENT_CHANGE", getComponent().getText());
+            }
+        });
+    }
+
+    @Override
+    public Object getVal() {
+        return getComponent().getText();
+    }
+
+    @Override
+    public void setVal(Object val) {
+        super.setVal(val);
+        getComponent().setText(GeneralUtils.objectToString(val));
+    }
+
+    @Override
+    public void css(String name, String val) {
+        super.css(name, val);
+        val = val.toUpperCase();
+        if ("text-align".equals(name)) {
+            if ("LEFT".equals(val)) {
+                getComponent().setHorizontalAlignment(SwingConstants.LEFT);
+            } else if ("CENTER".equals(val)) {
+                getComponent().setHorizontalAlignment(SwingConstants.CENTER);
+            } else if ("RIGHT".equals(val)) {
+                getComponent().setHorizontalAlignment(SwingConstants.RIGHT);
+            }
+        }
+    }
+}

src/main/java/com/tptj/tool/hg/fineui/swing/element/Element.java

@@ -1,5 +1,6 @@
 package com.tptj.tool.hg.fineui.swing.element;
 
+import com.eclipsesource.v8.V8Array;
 import com.eclipsesource.v8.V8Object;
 
 import javax.swing.*;
@@ -60,4 +61,6 @@ public interface Element<T extends JComponent> {
 
     void setVal(Object val);
     Object getVal();
+
+    void populate(V8Array items);
 }

src/main/java/com/tptj/tool/hg/fineui/swing/element/LabelElement.java

@@ -11,7 +11,7 @@ import java.awt.*;
  * @version 10.0
  * Created by 秃破天际 on 2021/10/29
  **/
-public class LabelElement extends AbstractElement<UILabel> {
+public class LabelElement extends AbstractSingleElement<UILabel> {
 
     public LabelElement() {
         super(new UILabel());
@@ -41,18 +41,5 @@ public class LabelElement extends AbstractElement<UILabel> {
                 getComponent().setHorizontalAlignment(SwingConstants.RIGHT);
             }
         }
-        Dimension dim = getComponent().getPreferredSize();
-        if ("width".equals(name)) {
-            if (val.length() > 0) {
-                dim.width = Integer.parseInt(val);
-                getComponent().setPreferredSize(dim);
-            }
-        }
-        if ("height".equals(name)) {
-            if (val.length() > 0) {
-                dim.height = Integer.parseInt(val);
-                getComponent().setPreferredSize(dim);
-            }
-        }
     }
 }

src/main/java/com/tptj/tool/hg/fineui/swing/element/ListElement.java

@@ -0,0 +1,38 @@
+package com.tptj.tool.hg.fineui.swing.element;
+
+
+import com.eclipsesource.v8.V8Array;
+
+import javax.swing.*;
+import java.util.Vector;
+
+/**
+ * @author 秃破天际
+ * @version 10.0
+ * Created by 秃破天际 on 2021/10/29
+ **/
+public class ListElement extends AbstractSingleElement<JList> {
+
+    public ListElement() {
+        super(new JList());
+    }
+
+    @Override
+    public void populate(V8Array items) {
+        Vector<String> vector = new Vector<>();
+        for (int i = 0, len = items.length(); i < len; i++) {
+            vector.add(items.getString(i));
+        }
+        component.setModel(new DefaultComboBoxModel<>(vector));
+    }
+
+    @Override
+    public void setVal(Object val) {
+        super.setVal(val);
+    }
+
+    @Override
+    public void css(String name, String val) {
+        super.css(name, val);
+    }
+}

src/main/java/com/tptj/tool/hg/fineui/swing/element/TextElement.java

@@ -19,7 +19,7 @@ import java.awt.event.KeyListener;
  * @version 10.0
  * Created by 秃破天际 on 2021/11/2
  **/
-public class TextElement extends AbstractElement<JTextField>{
+public class TextElement extends AbstractSingleElement<JTextField>{
     public TextElement() {
         super(new UITextField());
         init();
@@ -138,7 +138,6 @@ public class TextElement extends AbstractElement<JTextField>{
     @Override
     public void css(String name, String val){
         super.css(name, val);
-
     }
 
     @Override

src/main/java/com/tptj/tool/hg/fineui/swing/element/layout/CenterAdaptType.java

@@ -2,7 +2,6 @@ package com.tptj.tool.hg.fineui.swing.element.layout;
 
 import com.tptj.tool.hg.fineui.swing.element.Element;
 import com.tptj.tool.hg.fineui.swing.element.VerticalFlowLayout;
-import com.tptj.tool.hg.fineui.swing.element.layout.impl.HorizontalLayout;
 import com.tptj.tool.hg.fineui.swing.element.layout.impl.VerticalLayout;
 
 import javax.swing.*;
@@ -20,7 +19,7 @@ public class CenterAdaptType extends AbstractLayoutType {
     public LayoutManager init() {
         wrapComponent = new JPanel();
         wrapComponent.setOpaque(false);
-        wrapComponent.setLayout(new HorizontalLayout(element, FlowLayout.CENTER, 0, 0));
+        wrapComponent.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
         element.getComponent().add(wrapComponent);
         return new VerticalLayout(element, VerticalFlowLayout.CENTER, 0, 0, true);
     }

src/main/java/com/tptj/tool/hg/fineui/swing/element/layout/HorizontalAdaptType.java

@@ -27,7 +27,7 @@ public class HorizontalAdaptType extends AbstractLayoutType {
         if (w > 0) {
             JComponent wrapComponent = new JPanel();
             wrapComponent.setOpaque(false);
-            wrapComponent.setLayout(new HorizontalLayout(element, FlowLayout.CENTER, 0, 0));
+            wrapComponent.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 0));
             wrapComponent.add(child.getWrapper());
             element.getComponent().add(wrapComponent);
         } else {

src/main/java/com/tptj/tool/hg/fineui/swing/element/layout/VerticalAdaptType.java

@@ -17,7 +17,7 @@ public class VerticalAdaptType extends CenterAdaptType {
     public LayoutManager init() {
         wrapComponent = new JPanel();
         wrapComponent.setOpaque(false);
-        wrapComponent.setLayout(new HorizontalLayout(element, FlowLayout.LEFT, 0, 0));
+        wrapComponent.setLayout(new FlowLayout(FlowLayout.LEFT, 0, 0));
         element.getComponent().add(wrapComponent);
         return new VerticalLayout(element, VerticalFlowLayout.CENTER, 0, 0, true);
     }

src/main/resources/com/fr/fineui/dist/README.md

@@ -0,0 +1,31 @@
+#### fineui.js
+
+整个fineui打包文件，不包括配置文件
+
+#### fineui.css
+
+整个fineui打包文件，不包括资源文件
+
+#### config.js
+
+配置文件，这只是一个案例，集成进系统的时候需要进行配置
+
+#### resource.css
+
+app.css background.css icon.css font.css的合并文件，集成进系统的时候需要进行配置
+
+#### router.js
+
+#### 路由文件，使用fineui路由的时候才需要引入
+
+#### bundle.js bundle.css
+
+所有文件的合并文件， 主要给在线demo和文档用的
+
+#### core_without_normalize.css
+
+不带标准化的core.css文件，只引入通用css样式的时候才需要
+
+#### chart.js
+
+封装好的一层图表api

src/main/resources/com/fr/fineui/dist/fix/fix.compact.js

@@ -0,0 +1,199 @@
+;(function () {
+    function initWatch (vm, watch) {
+        vm._watchers || (vm._watchers = []);
+        for (var key in watch) {
+            var handler = watch[key];
+            if (BI.isArray(handler)) {
+                for (var i = 0; i < handler.length; i++) {
+                    vm._watchers.push(createWatcher(vm, key, handler[i]));
+                }
+            } else {
+                vm._watchers.push(createWatcher(vm, key, handler));
+            }
+        }
+        BI.each(vm.$watchDelayCallbacks, function (i, watchDelayCallback) {
+            var innerWatch = watchDelayCallback[0];
+            var innerHandler = watchDelayCallback[1];
+            if (BI.isKey(innerWatch)) {
+                var key = innerWatch;
+                innerWatch = {};
+                innerWatch[key] = innerHandler;
+            }
+            for (var key in innerWatch) {
+                var handler = innerWatch[key];
+                if (BI.isArray(handler)) {
+                    for (var i = 0; i < handler.length; i++) {
+                        vm._watchers.push(createWatcher(vm, key, handler[i]));
+                    }
+                } else {
+                    vm._watchers.push(createWatcher(vm, key, handler));
+                }
+            }
+        });
+    }
+
+    function createWatcher (vm, keyOrFn, cb, options) {
+        if (BI.isPlainObject(cb)) {
+            options = cb;
+            cb = cb.handler;
+        }
+        options = options || {};
+        return Fix.watch(vm.model, keyOrFn, _.bind(cb, vm), BI.extend(options, {
+            store: vm.store
+        }));
+    }
+
+    var target = null;
+    var targetStack = [];
+
+    function pushTarget (_target) {
+        if (target) targetStack.push(target);
+        Fix.Model.target = target = _target;
+    }
+
+    function popTarget () {
+        Fix.Model.target = target = targetStack.pop();
+    }
+
+    var oldWatch = Fix.watch;
+    Fix.watch = function (model, expOrFn, cb, options) {
+        if (BI.isPlainObject(cb)) {
+            options = cb;
+            cb = cb.handler;
+        }
+        if (typeof cb === "string") {
+            cb = model[cb];
+        }
+        return oldWatch.call(this, model, expOrFn, function () {
+            options && options.store && pushTarget(options.store);
+            try {
+                var res = cb.apply(this, arguments);
+            } catch (e) {
+                console.error(e);
+            }
+            options && options.store && popTarget();
+            return res;
+        }, options);
+    };
+
+    function findStore (widget) {
+        if (target != null) {
+            return target;
+        }
+        widget = widget || BI.Widget.context;
+        var p = widget;
+        while (p) {
+            if (p instanceof Fix.Model || p.store || p.__cacheStore) {
+                break;
+            }
+            p = p._parent || (p.options && p.options.element) || p._context;
+        }
+        if (p) {
+            if (p instanceof Fix.Model) {
+                return widget.__cacheStore = p;
+            }
+            widget.__cacheStore = p.store || p.__cacheStore;
+            return p.__cacheStore || p.store;
+        }
+    }
+
+    // _.each(["populate", "addItems", "prependItems"], function (name) {
+    //     var old = BI.Loader.prototype[name];
+    //     BI.Loader.prototype[name] = function () {
+    //         BI.Widget.pushContext(this);
+    //         try {
+    //             var result = old.apply(this, arguments);
+    //         } catch (e) {
+    //             console.error(e);
+    //         }
+    //         BI.Widget.popContext();
+    //         return result;
+    //     };
+    // });
+
+    function createStore () {
+        var needPop = false;
+        if (_global.Fix && this._store) {
+            var store = findStore(this.options.context || this._parent || this.options.element || this._context);
+            if (store) {
+                pushTarget(store);
+                needPop = true;
+            }
+            this.store = this._store();
+            this.store && (this.store._widget = this);
+            needPop && popTarget();
+            needPop = false;
+            pushTarget(this.store);
+            if (this.store instanceof Fix.Model) {
+                this.model = this.store.model;
+            } else {
+                this.model = this.store;
+            }
+            needPop = true;
+        }
+        return needPop;
+    }
+
+    var _init = BI.Widget.prototype._init;
+    BI.Widget.prototype._init = function () {
+        var self = this;
+        var needPop = createStore.call(this);
+        try {
+            _init.apply(this, arguments);
+        } catch (e) {
+            console.error(e);
+        }
+        needPop && popTarget();
+    };
+
+    var _render = BI.Widget.prototype._render;
+    BI.Widget.prototype._render = function () {
+        var needPop = false;
+        if (_global.Fix && this._store) {
+            needPop = true;
+            pushTarget(this.store);
+        }
+        _render.apply(this, arguments);
+        if (_global.Fix && this._store) {
+            initWatch(this, this.watch);
+        }
+        needPop && popTarget();
+    };
+
+    var unMount = BI.Widget.prototype.__d;
+    BI.Widget.prototype.__d = function () {
+        try {
+            unMount.apply(this, arguments);
+        } catch (e) {
+            console.error(e);
+        }
+        this.store && BI.isFunction(this.store.destroy) && this.store.destroy();
+        BI.each(this._watchers, function (i, unwatches) {
+            unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
+            BI.each(unwatches, function (j, unwatch) {
+                unwatch();
+            });
+        });
+        this._watchers && (this._watchers = []);
+        if (this.store) {
+            this.store._parent && (this.store._parent = null);
+            this.store._widget && (this.store._widget = null);
+            this.store = null;
+        }
+        delete this.__cacheStore;
+    };
+
+    _.each(["__afterRender", "_mount", "__afterMount"], function (name) {
+        var old = BI.Widget.prototype[name];
+        old && (BI.Widget.prototype[name] = function () {
+            this.store && pushTarget(this.store);
+            try {
+                var res = old.apply(this, arguments);
+            } catch (e) {
+                console.error(e);
+            }
+            this.store && popTarget();
+            return res;
+        });
+    });
+}());

src/main/resources/com/fr/fineui/dist/fix/worker.compact.js

@@ -0,0 +1,157 @@
+;(function () {
+    var contexts = {};
+
+    var WORKER;
+    BI.useWorker = function (wk) {
+        WORKER = wk;
+
+        var _init = BI.Widget.prototype._init;
+        BI.Widget.prototype._init = function () {
+            this.$destroyWorker = createWorker.call(this);
+            try {
+                _init.apply(this, arguments);
+            } catch (e) {
+                console.error(e);
+            }
+        };
+
+        var _initRender = BI.Widget.prototype._initRender;
+        var postMessage = function (data) {
+            switch (data.eventType) {
+                case "create":
+                    this.model = data.msg;
+                    _initRender.call(this);
+                    break;
+                case "watch":
+                    var watchArgs = data.args;
+                    this.watch[data.currentWatchType].apply(this, watchArgs);
+                    break;
+            }
+        };
+        BI.Widget.prototype._initRender = function () {
+            if (WORKER && this._worker) {
+                this.__asking = true;
+                this.__async = true;
+            } else {
+                _initRender.apply(this, arguments);
+            }
+        };
+
+        var unMount = BI.Widget.prototype.__d;
+        BI.Widget.prototype.__d = function () {
+            this.$destroyWorker && this.$destroyWorker();
+            try {
+                unMount.apply(this, arguments);
+            } catch (e) {
+                console.error(e);
+            }
+        };
+
+        if (WORKER) {
+            WORKER.addEventListener("message", function (e) {
+                var data = e.data;
+                postMessage.apply(contexts[data.name], [data]);
+            }, false);
+        }
+    };
+
+    function createWorker () {
+        var self = this;
+        if (this._worker) {
+            var name = this.getName();
+            var modelType = this._worker();
+            var options;
+            if (BI.isArray(modelType)) {
+                options = modelType[1];
+                modelType = modelType[0];
+            }
+            if (WORKER) {
+                contexts[name] = this;
+                WORKER.postMessage({
+                    type: modelType,
+                    name: name,
+                    eventType: "create",
+                    options: options,
+                    watches: BI.map(this.watch, function (key) {
+                        return key;
+                    })
+                });
+                var store = {};
+                this.store = new Proxy(store, {
+                    get: function (target, key) {
+                        return function () {
+                            WORKER.postMessage({
+                                type: modelType,
+                                name: name,
+                                eventType: "action",
+                                action: key,
+                                args: [].slice.call(arguments)
+                            });
+                        };
+                    },
+                    set: function (target, key, value) {
+                        return Reflect.set(target, key, value);
+                    }
+                });
+                return function () {
+                    delete contexts[name];
+                    WORKER.postMessage({
+                        type: modelType,
+                        name: name,
+                        eventType: "destroy"
+                    });
+                };
+            } else {
+                this.store = BI.Models.getModel(modelType, options);
+                this.store && (this.store._widget = this);
+                if (this.store instanceof Fix.Model) {
+                    this.model = this.store.model;
+                } else {
+                    this.model = this.store;
+                }
+                initWatch(this, this.watch);
+                return function () {
+                    this.store && BI.isFunction(this.store.destroy) && this.store.destroy();
+                    BI.each(this._watchers, function (i, unwatches) {
+                        unwatches = BI.isArray(unwatches) ? unwatches : [unwatches];
+                        BI.each(unwatches, function (j, unwatch) {
+                            unwatch();
+                        });
+                    });
+                    this._watchers && (this._watchers = []);
+                    if (this.store) {
+                        this.store._parent && (this.store._parent = null);
+                        this.store._widget && (this.store._widget = null);
+                        this.store = null;
+                    }
+                };
+            }
+
+        }
+    }
+
+    function initWatch (vm, watch) {
+        vm._watchers || (vm._watchers = []);
+        for (var key in watch) {
+            var handler = watch[key];
+            if (BI.isArray(handler)) {
+                for (var i = 0; i < handler.length; i++) {
+                    vm._watchers.push(createWatcher(vm, key, handler[i]));
+                }
+            } else {
+                vm._watchers.push(createWatcher(vm, key, handler));
+            }
+        }
+    }
+
+    function createWatcher (vm, keyOrFn, cb, options) {
+        if (BI.isPlainObject(cb)) {
+            options = cb;
+            cb = cb.handler;
+        }
+        options = options || {};
+        return Fix.watch(vm.model, keyOrFn, _.bind(cb, vm), BI.extend(options, {
+            store: vm.store
+        }));
+    }
+}());