diff --git a/.gitignore b/.gitignore
index a547bf36..336fc631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,10 @@ dist-ssr
*.njsproj
*.sln
*.sw?
+
+/package-lock.json
+/lib
+.prettierrc
+/oms/dist/
+/project/*/index.js
+/project/*/dist
diff --git a/examples/App.vue b/examples/App.vue
index 7befda87..06f12770 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -44,7 +44,7 @@ export default {
return (this.apps || []).filter(e => !this.search || reg.test(e.name) || reg.test(e.label))
},
selectedApp() {
- return this.$route.name != "产品库"
+ return this.$route?.name != "产品库"
},
login() {
let url = '/auth/oauth/token';
diff --git a/main.js b/examples/main.js
similarity index 55%
rename from main.js
rename to examples/main.js
index 7fab6013..800da53a 100644
--- a/main.js
+++ b/examples/main.js
@@ -1,13 +1,13 @@
import Vue from 'vue';
-import App from './examples/App.vue';
+import App from './App.vue';
import ui from 'element-ui';
-import createRoute from './examples/router/router';
-import axios from './examples/router/axios';
-import utils from './examples/utils';
+import router from './router/router';
+import axios from './router/axios';
+import utils from './utils';
import vcUI from 'dvcp-ui';
import 'dvcp-ui/lib/styles/common.scss';
import 'dvcp-ui/lib/dvcp-ui.css';
-import store from './examples/store';
+import store from './store';
Vue.use(ui);
Vue.use(vcUI);
@@ -16,10 +16,8 @@ Vue.config.productionTip = false;
Vue.prototype.$axios = axios;
Vue.prototype.formatContent = (val) => val.replace(/(\r\n)|(\n)/g, '
');
Object.keys(utils).map((e) => (Vue.prototype[e] = utils[e]));
-createRoute.then(router => {
- new Vue({
- router,
- store,
- render: (h) => h(App)
- }).$mount('#app');
-})
+new Vue({
+ router,
+ store,
+ render: (h) => h(App)
+}).$mount('#app');
diff --git a/examples/router/autoRoutes.js b/examples/router/autoRoutes.js
index d96a6dd0..9db0f292 100644
--- a/examples/router/autoRoutes.js
+++ b/examples/router/autoRoutes.js
@@ -1,7 +1,7 @@
import store from "../store";
import appEntry from "../views/appEntry";
import {waiting} from "../utils";
-
+import router from "./router";
export default {
routes: [],
init() {
@@ -31,6 +31,7 @@ export default {
}
//命名规范入口文件必须以App开头
waiting.setContent(`加载${name}...`)
+ router.addRoute(addApp)
this.routes.push(addApp)
return store.commit("addApp", addApp)
})
diff --git a/examples/router/router.js b/examples/router/router.js
index 0f5ba1ab..9e83a5d2 100644
--- a/examples/router/router.js
+++ b/examples/router/router.js
@@ -1,22 +1,18 @@
-import Vue from 'vue'
import VueRouter from 'vue-router'
import autoRoutes from './autoRoutes'
+import Vue from "vue";
+autoRoutes.init()
Vue.use(VueRouter)
-
-export default autoRoutes.init().then(() => new VueRouter({
+export default new VueRouter({
mode: 'history',
hashbang: false,
- routes: [
- {path: "/", name: "产品库"},
- ...autoRoutes.routes
- ],
+ routes: [{path: "/", name: "产品库",component:import('../App')}],
scrollBehavior(to) {
- console.log(to)
if (to.hash) {
return {
selector: to.hash
}
}
}
-}))
+})
diff --git a/examples/utils/index.js b/examples/utils/index.js
index b026dc6c..0e36eddf 100644
--- a/examples/utils/index.js
+++ b/examples/utils/index.js
@@ -75,6 +75,8 @@ export const waiting = {
div.style.zIndex = '202204271710'
div.style.textAlign = 'center'
div.style.lineHeight = '100vh'
+ div.style.color = '#26f'
+ div.style.background = 'rgba(0,0,0,.8)'
document.body.appendChild(div)
} else if (count < 10) {
setTimeout(() => this.init(ops, ++count), 500)
diff --git a/index.html b/index.html
index 16eea6ff..e636a2ac 100644
--- a/index.html
+++ b/index.html
@@ -10,6 +10,6 @@
-
+