Merge branch 'master' of ssh://code.fineres.com:7999/~zhenfei.li/fineui

.npmignore

@@ -36,6 +36,7 @@
 !dist/font/**/*
 !dist/images/*
 !dist/images/**/*
+!dist/router.js
 !babel.config.js
 !babel.config.ie8.js
 !.eslintrc

dist/2.0/fineui.js

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

dist/core.js

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

dist/demo.js

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

dist/fineui.js

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

dist/fineui.proxy.js

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

dist/fineui_without_jquery_polyfill.js

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

dist/router.js

@@ -3123,20 +3123,29 @@
 
 
   var $router, cbs = [];
-  var RouterWidget = BI.inherit(BI.Widget, {
+  BI.RouterWidget = BI.inherit(BI.Widget, {
     init: function () {
       this.$router = this._router = BI.Router.$router = $router = new VueRouter({
         routes: this.options.routes
       });
+      this.$router.beforeEach(function (to, from, next) {
+        if (to.matched.length === 0) {
+          //如果上级也未匹配到路由则跳转主页面，如果上级能匹配到则转上级路由
+          from.path ? next({ path: from.path }) : next('/');
+        } else {
+          //如果匹配到正确跳转
+          next();
+        }
+      });
       this.$router.afterEach(function () {
         cbs.forEach(function (cb) {cb();});
       });
       this.$router.init(this);
     }
   });
-  BI.shortcut("bi.router", RouterWidget);
+  BI.shortcut("bi.router", BI.RouterWidget);
 
-  var RouterView = BI.inherit(BI.Widget, {
+  BI.RouterView = BI.inherit(BI.Widget, {
     props: {
       deps: 0
     },
@@ -3167,7 +3176,7 @@
       BI.remove(cbs, this._callbackListener);
     }
   });
-  BI.shortcut("bi.router_view", RouterView);
+  BI.shortcut("bi.router_view", BI.RouterView);
 
   BI.Router = BI.Router || VueRouter;
   BI.Router.isSameRoute = isSameRoute;

dist/utils.js

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

package.json

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