Merge branch 'master' of ssh://code.fineres.com:7999/~claire.tang/fineui

demo/app.js

@@ -23,7 +23,50 @@ BI.$(function () {
             return Promise.resolve({
                 type: "demo.router"
             });
-        }
+        },
+    }, {
+        name: "user",
+        path: "/user/:name",
+        component: function () {
+            return Promise.resolve({
+                type: "bi.vtape",
+                items: [{
+                    type: "bi.label",
+                    text: "user",
+                    height: 50
+                }, {
+                    type: "bi.router_view",
+                    deps: 1
+                }]
+            });
+        },
+        children: [{
+            path: '',
+            component: function () {
+                return Promise.resolve({
+                    type: "bi.label",
+                    text: 'home'
+                })
+            }
+        }, {
+            name: 'dashboard',
+            path: 'dashboard',
+            component: function () {
+                return Promise.resolve({
+                    type: "bi.label",
+                    text: 'dashboard'
+                })
+            }
+        }, {
+            name: 'tables',
+            path: 'tables/:id',
+            component: function () {
+                return Promise.resolve({
+                    type: "bi.label",
+                    text: 'tables'
+                })
+            }
+        }]
     }];
 
     // BI.Tree.traversal(tree, function (index, node) {

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-27 11:50:28 */
+/*! time: 2021-8-27 16:30:37 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -37657,7 +37657,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
             self.trigger.setValue(color);
         };
 
-        this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
+        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
             self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments);
         });
     },

dist/core.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-27 11:50:28 */
+/*! time: 2021-8-27 16:30:37 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -37657,7 +37657,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
             self.trigger.setValue(color);
         };
 
-        this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
+        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
             self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments);
         });
     },

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-27 11:50:28 */
+/*! time: 2021-8-27 16:30:37 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -37657,7 +37657,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
             self.trigger.setValue(color);
         };
 
-        this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
+        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
             self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments);
         });
     },
@@ -110047,7 +110047,50 @@ BI.$(function () {
             return Promise.resolve({
                 type: "demo.router"
             });
-        }
+        },
+    }, {
+        name: "user",
+        path: "/user/:name",
+        component: function () {
+            return Promise.resolve({
+                type: "bi.vtape",
+                items: [{
+                    type: "bi.label",
+                    text: "user",
+                    height: 50
+                }, {
+                    type: "bi.router_view",
+                    deps: 1
+                }]
+            });
+        },
+        children: [{
+            path: '',
+            component: function () {
+                return Promise.resolve({
+                    type: "bi.label",
+                    text: 'home'
+                })
+            }
+        }, {
+            name: 'dashboard',
+            path: 'dashboard',
+            component: function () {
+                return Promise.resolve({
+                    type: "bi.label",
+                    text: 'dashboard'
+                })
+            }
+        }, {
+            name: 'tables',
+            path: 'tables/:id',
+            component: function () {
+                return Promise.resolve({
+                    type: "bi.label",
+                    text: 'tables'
+                })
+            }
+        }]
     }];
 
     // BI.Tree.traversal(tree, function (index, node) {

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-27 11:50:28 */
+/*! time: 2021-8-27 16:30:37 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -37657,7 +37657,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
             self.trigger.setValue(color);
         };
 
-        this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
+        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
             self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments);
         });
     },

dist/fineui.proxy.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-27 11:50:28 */
+/*! time: 2021-8-27 16:30:37 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -35118,7 +35118,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
             self.trigger.setValue(color);
         };
 
-        this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
+        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
             self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments);
         });
     },

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-27 11:50:28 */
+/*! time: 2021-8-27 16:30:37 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -34733,7 +34733,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
             self.trigger.setValue(color);
         };
 
-        this.combo.on(BI.Combo.EVENT_AFTER_HIDEVIEW, function () {
+        this.combo.on(BI.Combo.EVENT_BEFORE_HIDEVIEW, function () {
             self.fireEvent(BI.ColorChooser.EVENT_CHANGE, arguments);
         });
     },

dist/router.js

@@ -3152,7 +3152,16 @@
     created: function () {
       var self = this, o = this.options;
       cbs.push(this._callbackListener = function () {
-        self.tab.setSelect($router.history.current.fullPath || "/");
+        var current = $router.history.current;
+        // 匹配的路径名(/component/:id)
+        var matchedPath = current.matched[o.deps] && current.matched[o.deps].path;
+        if (matchedPath) {
+          BI.each(current.params, function (key, value) {
+            // 把  :id  替换成具体的值(/component/demo.td)
+            matchedPath = matchedPath.replace(`:${key}`, value);
+          });
+        }
+        self.tab.setSelect(matchedPath || "/");
       });
     },
     render: function () {
@@ -3168,12 +3177,12 @@
         },
         showIndex: false,
         cardCreator: function (v) {
-            return $router.history.current.matched[o.deps].components.default;
+          return $router.history.current.matched[o.deps].components.default;
         }
       };
     },
     destroyed: function () {
-      BI.remove(cbs, this._callbackListener);
+      cbs.remove(this._callbackListener);
     }
   });
   BI.shortcut("bi.router_view", BI.RouterView);

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-8-27 11:50:28 */
+/*! time: 2021-8-27 16:30:37 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20210827115133",
+  "version": "2.0.20210827163148",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",