From 43b9e7ca662660e1a54bc680b83bdc400608d3b0 Mon Sep 17 00:00:00 2001
From: winixt <haizekuo@gmail.com>
Date: Thu, 23 Jun 2022 19:48:00 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9B=B4=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../templates/app/pc/src/app.jsx              |  4 ++--
 .../{PageLoading.vue => pageLoading.vue}      |  9 ++++-----
 .../{UserCenter.vue => userCenter.vue}        |  6 +++---
 packages/fes-template-vite/src/app.jsx        |  4 ++--
 .../src/components/pageLoading.vue}           |  9 ++++-----
 .../src/components/userCenter.vue}            |  2 +-
 packages/fes-template/src/app.js              |  4 ++--
 .../src/components/pageLoading.vue}           |  9 ++++-----
 .../src/components/userCenter.vue}            |  6 +++---
 yarn.lock                                     | 20 ++++++++++---------
 11 files changed, 37 insertions(+), 38 deletions(-)
 rename packages/create-fes-app/templates/app/pc/src/components/{PageLoading.vue => pageLoading.vue} (86%)
 rename packages/create-fes-app/templates/app/pc/src/components/{UserCenter.vue => userCenter.vue} (75%)
 rename packages/{fes-template/src/components/PageLoading.vue => fes-template-vite/src/components/pageLoading.vue} (86%)
 rename packages/{fes-template/src/components/UserCenter.vue => fes-template-vite/src/components/userCenter.vue} (93%)
 rename packages/{fes-template-vite/src/components/PageLoading.vue => fes-template/src/components/pageLoading.vue} (86%)
 rename packages/{fes-template-vite/src/components/UserCenter.vue => fes-template/src/components/userCenter.vue} (73%)

diff --git a/package.json b/package.json
index af9f28ed..b77573a7 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@vuepress/plugin-docsearch": "^2.0.0-beta.37",
     "@vuepress/plugin-pwa": "^2.0.0-beta.37",
     "@vuepress/plugin-pwa-popup": "^2.0.0-beta.37",
-    "@webank/eslint-config-webank": "^1.2.0",
+    "@webank/eslint-config-webank": "^1.2.3",
     "chokidar": "^3.5.2",
     "commitizen": "^4.2.1",
     "cz-conventional-changelog": "^3.3.0",
diff --git a/packages/create-fes-app/templates/app/pc/src/app.jsx b/packages/create-fes-app/templates/app/pc/src/app.jsx
index fddc4f9e..4c95b9f9 100644
--- a/packages/create-fes-app/templates/app/pc/src/app.jsx
+++ b/packages/create-fes-app/templates/app/pc/src/app.jsx
@@ -1,6 +1,6 @@
 import { access } from '@fesjs/fes';
-import PageLoading from '@/components/PageLoading.vue';
-import UserCenter from '@/components/UserCenter.vue';
+import PageLoading from '@/components/pageLoading.vue';
+import UserCenter from '@/components/userCenter.vue';
 
 export const beforeRender = {
     loading: <PageLoading />,
diff --git a/packages/create-fes-app/templates/app/pc/src/components/PageLoading.vue b/packages/create-fes-app/templates/app/pc/src/components/pageLoading.vue
similarity index 86%
rename from packages/create-fes-app/templates/app/pc/src/components/PageLoading.vue
rename to packages/create-fes-app/templates/app/pc/src/components/pageLoading.vue
index e544021a..3d5c1cf1 100644
--- a/packages/create-fes-app/templates/app/pc/src/components/PageLoading.vue
+++ b/packages/create-fes-app/templates/app/pc/src/components/pageLoading.vue
@@ -8,16 +8,15 @@ import { FSpin } from '@fesjs/fes-design';
 
 export default {
     components: {
-        FSpin
+        FSpin,
     },
     setup() {
-        return {
-        };
-    }
+        return {};
+    },
 };
 </script>
 <style>
-.page-loading{
+.page-loading {
     position: fixed;
     top: 0;
     left: 0;
diff --git a/packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue b/packages/create-fes-app/templates/app/pc/src/components/userCenter.vue
similarity index 75%
rename from packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue
rename to packages/create-fes-app/templates/app/pc/src/components/userCenter.vue
index 6cba6e3c..7dcde297 100644
--- a/packages/create-fes-app/templates/app/pc/src/components/UserCenter.vue
+++ b/packages/create-fes-app/templates/app/pc/src/components/userCenter.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="right">{{initialState.userName}}</div>
+    <div class="right">{{ initialState.userName }}</div>
 </template>
 <script>
 import { useModel } from '@fesjs/fes';
@@ -8,9 +8,9 @@ export default {
     setup() {
         const initialState = useModel('@@initialState');
         return {
-            initialState
+            initialState,
         };
-    }
+    },
 };
 </script>
 <style scope>
diff --git a/packages/fes-template-vite/src/app.jsx b/packages/fes-template-vite/src/app.jsx
index 436427a1..b9015267 100644
--- a/packages/fes-template-vite/src/app.jsx
+++ b/packages/fes-template-vite/src/app.jsx
@@ -1,6 +1,6 @@
 import { access as accessApi, pinia } from '@fesjs/fes';
-import PageLoading from '@/components/PageLoading.vue';
-import UserCenter from '@/components/UserCenter.vue';
+import PageLoading from '@/components/pageLoading.vue';
+import UserCenter from '@/components/userCenter.vue';
 import { useStore } from '@/store/main';
 
 export const beforeRender = {
diff --git a/packages/fes-template/src/components/PageLoading.vue b/packages/fes-template-vite/src/components/pageLoading.vue
similarity index 86%
rename from packages/fes-template/src/components/PageLoading.vue
rename to packages/fes-template-vite/src/components/pageLoading.vue
index e544021a..3d5c1cf1 100644
--- a/packages/fes-template/src/components/PageLoading.vue
+++ b/packages/fes-template-vite/src/components/pageLoading.vue
@@ -8,16 +8,15 @@ import { FSpin } from '@fesjs/fes-design';
 
 export default {
     components: {
-        FSpin
+        FSpin,
     },
     setup() {
-        return {
-        };
-    }
+        return {};
+    },
 };
 </script>
 <style>
-.page-loading{
+.page-loading {
     position: fixed;
     top: 0;
     left: 0;
diff --git a/packages/fes-template/src/components/UserCenter.vue b/packages/fes-template-vite/src/components/userCenter.vue
similarity index 93%
rename from packages/fes-template/src/components/UserCenter.vue
rename to packages/fes-template-vite/src/components/userCenter.vue
index 386f27f2..6bbb7563 100644
--- a/packages/fes-template/src/components/UserCenter.vue
+++ b/packages/fes-template-vite/src/components/userCenter.vue
@@ -15,6 +15,6 @@ export default {
 </script>
 <style lang="less">
 .user-center {
-    text-align: center;
+    text-align: right;
 }
 </style>
diff --git a/packages/fes-template/src/app.js b/packages/fes-template/src/app.js
index 78c1921a..a9d50b80 100644
--- a/packages/fes-template/src/app.js
+++ b/packages/fes-template/src/app.js
@@ -1,7 +1,7 @@
 import { access as accessApi, pinia, createWatermark } from '@fesjs/fes';
 import { ref, watch } from 'vue';
-import PageLoading from '@/components/PageLoading.vue';
-import UserCenter from '@/components/UserCenter.vue';
+import PageLoading from '@/components/pageLoading.vue';
+import UserCenter from '@/components/userCenter.vue';
 import { useStore } from '@/store/main';
 
 export const beforeRender = {
diff --git a/packages/fes-template-vite/src/components/PageLoading.vue b/packages/fes-template/src/components/pageLoading.vue
similarity index 86%
rename from packages/fes-template-vite/src/components/PageLoading.vue
rename to packages/fes-template/src/components/pageLoading.vue
index e544021a..3d5c1cf1 100644
--- a/packages/fes-template-vite/src/components/PageLoading.vue
+++ b/packages/fes-template/src/components/pageLoading.vue
@@ -8,16 +8,15 @@ import { FSpin } from '@fesjs/fes-design';
 
 export default {
     components: {
-        FSpin
+        FSpin,
     },
     setup() {
-        return {
-        };
-    }
+        return {};
+    },
 };
 </script>
 <style>
-.page-loading{
+.page-loading {
     position: fixed;
     top: 0;
     left: 0;
diff --git a/packages/fes-template-vite/src/components/UserCenter.vue b/packages/fes-template/src/components/userCenter.vue
similarity index 73%
rename from packages/fes-template-vite/src/components/UserCenter.vue
rename to packages/fes-template/src/components/userCenter.vue
index 8b0829a5..6bbb7563 100644
--- a/packages/fes-template-vite/src/components/UserCenter.vue
+++ b/packages/fes-template/src/components/userCenter.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="user-center">{{initialState.userName}}</div>
+    <div class="user-center">{{ initialState.userName }}</div>
 </template>
 <script>
 import { useModel } from '@fesjs/fes';
@@ -8,9 +8,9 @@ export default {
     setup() {
         const initialState = useModel('@@initialState');
         return {
-            initialState
+            initialState,
         };
-    }
+    },
 };
 </script>
 <style lang="less">
diff --git a/yarn.lock b/yarn.lock
index 8d02e1d9..30d76373 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2809,10 +2809,10 @@
   dependencies:
     vue-demi "*"
 
-"@webank/eslint-config-webank@^1.2.0":
-  version "1.2.0"
-  resolved "https://registry.npmmirror.com/@webank/eslint-config-webank/-/eslint-config-webank-1.2.0.tgz#7a466de0cfb2a619f9c85275d279a085ff76f65c"
-  integrity sha512-aO6XLEvwS5W31lOb56IR8rr3fsqiyVuexo0jfD4DENzJgTrPIfAF6eIQDYnw3BV1JWJsnzYd72bFfr3o4jNcEQ==
+"@webank/eslint-config-webank@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.npmmirror.com/@webank/eslint-config-webank/-/eslint-config-webank-1.2.3.tgz#1a14f771a3cb7a2936920edcb7a56b373d66e415"
+  integrity sha512-Q0K+1xp2AOeigFCvnGTzcfgdmF5gzQPSnrd0Al/T/OQu+k5WDexsyxXDBHw40iN88OAsdS6dReve9yqsrqw8qA==
   dependencies:
     "@babel/core" "^7.16.0"
     "@babel/eslint-parser" "^7.16.3"
@@ -2826,7 +2826,7 @@
     eslint-plugin-import "2.25.3"
     eslint-plugin-node "^11.1.0"
     eslint-plugin-prettier "^4.0.0"
-    eslint-plugin-vue "^8.1.1"
+    eslint-plugin-vue "^8.6.0"
     prettier "^2.5.0"
     vue-eslint-parser "^8.0.1"
 
@@ -5168,13 +5168,15 @@ eslint-plugin-prettier@^4.0.0:
   dependencies:
     prettier-linter-helpers "^1.0.0"
 
-eslint-plugin-vue@^8.1.1:
-  version "8.5.0"
-  resolved "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.5.0.tgz#65832bba43ca713fa5da16bdfcf55d0095677f6f"
-  integrity sha512-i1uHCTAKOoEj12RDvdtONWrGzjFm/djkzqfhmQ0d6M/W8KM81mhswd/z+iTZ0jCpdUedW3YRgcVfQ37/J4zoYQ==
+eslint-plugin-vue@^8.6.0:
+  version "8.7.1"
+  resolved "https://registry.npmmirror.com/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz#f13c53547a0c9d64588a675cc5ecc6ccaf63703f"
+  integrity sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==
   dependencies:
     eslint-utils "^3.0.0"
     natural-compare "^1.4.0"
+    nth-check "^2.0.1"
+    postcss-selector-parser "^6.0.9"
     semver "^7.3.5"
     vue-eslint-parser "^8.0.1"