Browse Source

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

es6
Zhenfei.Li 3 years ago
parent
commit
00d5a8f7e3
  1. 1
      .npmignore
  2. 2
      dist/2.0/fineui.css
  3. 2
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.min.css
  6. 2
      dist/2.0/fineui.min.js
  7. 2
      dist/2.0/fineui_without_normalize.css
  8. 2
      dist/2.0/fineui_without_normalize.min.css
  9. 2
      dist/core.css
  10. 2
      dist/core.js
  11. 2
      dist/demo.css
  12. 2
      dist/demo.js
  13. 2
      dist/fineui.css
  14. 2
      dist/fineui.ie.min.js
  15. 2
      dist/fineui.js
  16. 2
      dist/fineui.min.css
  17. 2
      dist/fineui.min.js
  18. 2
      dist/fineui.proxy.css
  19. 2
      dist/fineui.proxy.js
  20. 2
      dist/fineui.proxy.min.css
  21. 2
      dist/fineui.proxy.min.js
  22. 2
      dist/fineui_without_jquery_polyfill.js
  23. 2
      dist/font.css
  24. 2
      dist/resource.css
  25. 17
      dist/router.js
  26. 2
      dist/utils.js
  27. 2
      dist/utils.min.js
  28. 2
      package.json

1
.npmignore

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

2
dist/2.0/fineui.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.js vendored

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

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.css vendored

File diff suppressed because one or more lines are too long

2
dist/core.js vendored

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

2
dist/demo.css vendored

File diff suppressed because one or more lines are too long

2
dist/demo.js vendored

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

2
dist/fineui.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

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

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.js vendored

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

2
dist/fineui.proxy.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored

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

2
dist/font.css vendored

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored

File diff suppressed because one or more lines are too long

17
dist/router.js vendored

@ -3123,20 +3123,29 @@
var $router, cbs = []; var $router, cbs = [];
var RouterWidget = BI.inherit(BI.Widget, { BI.RouterWidget = BI.inherit(BI.Widget, {
init: function () { init: function () {
this.$router = this._router = BI.Router.$router = $router = new VueRouter({ this.$router = this._router = BI.Router.$router = $router = new VueRouter({
routes: this.options.routes 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 () { this.$router.afterEach(function () {
cbs.forEach(function (cb) {cb();}); cbs.forEach(function (cb) {cb();});
}); });
this.$router.init(this); 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: { props: {
deps: 0 deps: 0
}, },
@ -3167,7 +3176,7 @@
BI.remove(cbs, this._callbackListener); 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 = BI.Router || VueRouter;
BI.Router.isSameRoute = isSameRoute; BI.Router.isSameRoute = isSameRoute;

2
dist/utils.js vendored

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

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
package.json

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

Loading…
Cancel
Save