Merge branch 'vue3' of https://github.com/WeBankFinTech/fes.js into vue3

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.0",
+  "version": "independent",
   "changelog": {
     "repo": "WeBankFinTech/fes.js",
     "cacheDir": ".changelog",

packages/create-fes-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/create-fes-app",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "create a app base on fes.js",
   "main": "lib/index.js",
   "files": [

packages/create-fes-app/templates/app/pc/package.json

@@ -51,8 +51,8 @@
     "@fesjs/plugin-layout": "^2.0.0",
     "@fesjs/plugin-model": "^2.0.0",
     "@fesjs/plugin-enums": "^2.0.0",
-    "ant-design-vue": "^2.0.0",
+    "ant-design-vue": "^2.2.0",
-    "vue": "^3.0.5"
+    "vue": "^3.1.0"
   },
   "private": true
 }

packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue

@@ -1,5 +1,5 @@
 <template>
-    <div>{{initialState.userName}}</div>
+    <div class="right">{{initialState.userName}}</div>
 </template>
 <script>
 import { useModel } from '@fesjs/fes';
@@ -13,3 +13,9 @@ export default {
     }
 };
 </script>
+<style scope>
+.right {
+    text-align: right;
+    padding: 0 20px;
+}
+</style>

packages/fes-preset-built-in/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fesjs/preset-built-in",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "@fesjs/preset-built-in",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

packages/fes-preset-built-in/src/plugins/misc/route/template/routes.tpl

@@ -3,13 +3,6 @@ import { plugin } from '@@/core/coreExports';
 
 export function getRoutes() {
   const routes = {{{ routes }}};
-
-  plugin.applyPlugins({
-    key: 'patchRoutes',
-    type: ApplyPluginsType.event,
-    args: { routes },
-  });
-
   return routes;
 }
 
@@ -28,7 +21,13 @@ export const createRouter = (routes) => {
     },
     initialValue: {{{ CREATE_HISTORY }}},
   });
-  history = createHistory(ROUTER_BASE)
+  history = createHistory(ROUTER_BASE);
+  // 修改routes
+  plugin.applyPlugins({
+    key: 'patchRoutes',
+    type: ApplyPluginsType.event,
+    args: { routes },
+  });
   router = createVueRouter({
     history,
     routes

packages/fes/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@fesjs/fes",
-    "version": "2.0.0",
+    "version": "2.0.1",
     "description": "一个好用的前端管理台快速开发框架",
     "preferGlobal": true,
     "scripts": {
@@ -40,7 +40,7 @@
     ],
     "dependencies": {
         "@fesjs/compiler": "^2.0.0",
-        "@fesjs/preset-built-in": "^2.0.0",
+        "@fesjs/preset-built-in": "^2.0.1",
         "@fesjs/runtime": "^2.0.0",
         "@umijs/utils": "3.3.3",
         "resolve-cwd": "^3.0.0"