From eda87f041d5d87ae9612f369608e486a8e563f17 Mon Sep 17 00:00:00 2001
From: Soybean <2570172956@qq.com>
Date: Thu, 26 Aug 2021 18:49:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(projects):=20=E5=B8=83=E5=B1=80=E8=B0=83?=
=?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.cz-config.js | 21 ----------
package.json | 1 -
pnpm-lock.yaml | 6 ---
src/layouts/BasicContent.vue | 8 ----
src/layouts/BasicLayout.vue | 8 ----
src/layouts/BasicLayout/index.vue | 15 +++++++
src/layouts/index.ts | 2 +-
src/plugins/index.ts | 3 +-
src/plugins/naive.ts | 25 ++++++++++-
src/plugins/nprogress.ts | 10 -----
src/styles/css/nprogress.css | 60 ---------------------------
src/{typings => types}/shims-vue.d.ts | 0
src/{typings => types}/vite-env.d.ts | 0
src/{typings => types}/window.d.ts | 0
14 files changed, 40 insertions(+), 119 deletions(-)
delete mode 100644 src/layouts/BasicContent.vue
delete mode 100644 src/layouts/BasicLayout.vue
create mode 100644 src/layouts/BasicLayout/index.vue
delete mode 100644 src/plugins/nprogress.ts
delete mode 100644 src/styles/css/nprogress.css
rename src/{typings => types}/shims-vue.d.ts (100%)
rename src/{typings => types}/vite-env.d.ts (100%)
rename src/{typings => types}/window.d.ts (100%)
diff --git a/.cz-config.js b/.cz-config.js
index 67dd4078..d51aaae8 100644
--- a/.cz-config.js
+++ b/.cz-config.js
@@ -34,27 +34,6 @@ module.exports = {
}
}),
- // 是否允许自定义填写 scope，在 scope 选择的时候，会有 empty 和 custom 可以选择。
- // allowCustomScopes: true,
-
- // allowTicketNumber: false,
- // isTicketNumberRequired: false,
- // ticketNumberPrefix: 'TICKET-',
- // ticketNumberRegExp: '\\d{1,5}',
-
-
- // 针对每一个 type 去定义对应的 scopes，例如 fix
- /*
- scopeOverrides: {
- fix: [
- { name: 'merge' },
- { name: 'style' },
- { name: 'e2eTest' },
- { name: 'unitTest' }
- ]
- },
- */
-
// 交互提示信息
messages: {
type: '确保本次提交遵循 Angular 规范！\n选择你要提交的类型：',
diff --git a/package.json b/package.json
index 3a4b6e2f..fbdd2519 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,6 @@
"dayjs": "^1.10.6",
"form-data": "^4.0.0",
"naive-ui": "^2.16.6",
- "nprogress": "^0.2.0",
"pinia": "^2.0.0-rc.4",
"qs": "^6.10.1",
"smoothscroll-polyfill": "^0.4.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 19debb06..074b4d22 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -32,7 +32,6 @@ specifiers:
husky: ^7.0.2
lint-staged: ^11.1.2
naive-ui: ^2.16.6
- nprogress: ^0.2.0
patch-package: ^6.4.7
pinia: ^2.0.0-rc.4
postinstall-postinstall: ^2.1.0
@@ -59,7 +58,6 @@ dependencies:
dayjs: registry.nlark.com/dayjs/1.10.6
form-data: 4.0.0
naive-ui: registry.nlark.com/naive-ui/2.16.6_vue@3.2.4
- nprogress: 0.2.0
pinia: registry.nlark.com/pinia/2.0.0-rc.4_typescript@4.3.5+vue@3.2.4
qs: 6.10.1
smoothscroll-polyfill: registry.nlark.com/smoothscroll-polyfill/0.4.4
@@ -1296,10 +1294,6 @@ packages:
path-key: 3.1.1
dev: true
- /nprogress/0.2.0:
- resolution: {integrity: sha1-y480xTIT2JVyP8urkH6UIq28r7E=, tarball: nprogress/download/nprogress-0.2.0.tgz}
- dev: false
-
/object-assign/4.1.1:
resolution: {integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=, tarball: object-assign/download/object-assign-4.1.1.tgz}
engines: {node: '>=0.10.0'}
diff --git a/src/layouts/BasicContent.vue b/src/layouts/BasicContent.vue
deleted file mode 100644
index f3e96c4f..00000000
--- a/src/layouts/BasicContent.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue
deleted file mode 100644
index f3e96c4f..00000000
--- a/src/layouts/BasicLayout.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/src/layouts/BasicLayout/index.vue b/src/layouts/BasicLayout/index.vue
new file mode 100644
index 00000000..b480b910
--- /dev/null
+++ b/src/layouts/BasicLayout/index.vue
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layouts/index.ts b/src/layouts/index.ts
index 080b97e5..61bcbc9a 100644
--- a/src/layouts/index.ts
+++ b/src/layouts/index.ts
@@ -1,3 +1,3 @@
-import BasicLayout from './BasicLayout.vue';
+import BasicLayout from './BasicLayout/index.vue';
export { BasicLayout };
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 2af444dc..e0557b2e 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -1,5 +1,4 @@
import setupSmoothScroll from './smooth-scroll';
import setupNaive from './naive';
-import NProgress from './nprogress';
-export { setupSmoothScroll, setupNaive, NProgress };
+export { setupSmoothScroll, setupNaive };
diff --git a/src/plugins/naive.ts b/src/plugins/naive.ts
index 010e5348..a0d2b8da 100644
--- a/src/plugins/naive.ts
+++ b/src/plugins/naive.ts
@@ -1,9 +1,30 @@
-import { create, NSpace, NButton, NDatePicker, NInput } from 'naive-ui';
+import {
+ create,
+ NLayout,
+ NLayoutSider,
+ NLayoutHeader,
+ NLayoutContent,
+ NLayoutFooter,
+ NSpace,
+ NButton,
+ NDatePicker,
+ NInput
+} from 'naive-ui';
import type { App } from 'vue';
export default function setupNaive(app: App) {
const naive = create({
- components: [NSpace, NButton, NDatePicker, NInput]
+ components: [
+ NLayout,
+ NLayoutSider,
+ NLayoutHeader,
+ NLayoutContent,
+ NLayoutFooter,
+ NSpace,
+ NButton,
+ NDatePicker,
+ NInput
+ ]
});
app.use(naive);
}
diff --git a/src/plugins/nprogress.ts b/src/plugins/nprogress.ts
deleted file mode 100644
index 44851307..00000000
--- a/src/plugins/nprogress.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import NProgress from 'nprogress'; // 顶部进度条
-import '../styles/css/nprogress.css';
-
-NProgress.configure({
- easing: 'ease',
- speed: 500,
- trickleSpeed: 200,
- showSpinner: false
-});
-export default NProgress;
diff --git a/src/styles/css/nprogress.css b/src/styles/css/nprogress.css
deleted file mode 100644
index cab71dff..00000000
--- a/src/styles/css/nprogress.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Make clicks pass-through */
-#nprogress {
- pointer-events: none;
-}
-#nprogress .bar {
- position: fixed;
- z-index: 1031;
- top: 0;
- left: 0;
- width: 100%;
- height: 2px;
- background: #29d;
-}
-/* Fancy blur effect */
-#nprogress .peg {
- display: block;
- position: absolute;
- right: 0px;
- width: 100px;
- height: 100%;
- box-shadow: 0 0 10px #29d, 0 0 5px #29d;
- opacity: 1;
- transform: rotate(3deg) translate(0px, -4px);
-}
-
-/* Remove these to get rid of the spinner */
-#nprogress .spinner {
- position: fixed;
- top: 15px;
- right: 15px;
- display: block;
- z-index: 1031;
-}
-
-#nprogress .spinner-icon {
- width: 18px;
- height: 18px;
- box-sizing: border-box;
- border: solid 2px transparent;
- border-top-color: #29d;
- border-left-color: #29d;
- border-radius: 50%;
- animation: nprogress-spinner 400ms linear infinite;
-}
-.nprogress-custom-parent {
- position: relative;
- overflow: hidden;
-}
-.nprogress-custom-parent #nprogress .spinner,
-.nprogress-custom-parent #nprogress .bar {
- position: absolute;
-}
-@keyframes nprogress-spinner {
- 0% {
- transform: rotate(0deg);
- }
- 100% {
- transform: rotate(360deg);
- }
-}
diff --git a/src/typings/shims-vue.d.ts b/src/types/shims-vue.d.ts
similarity index 100%
rename from src/typings/shims-vue.d.ts
rename to src/types/shims-vue.d.ts
diff --git a/src/typings/vite-env.d.ts b/src/types/vite-env.d.ts
similarity index 100%
rename from src/typings/vite-env.d.ts
rename to src/types/vite-env.d.ts
diff --git a/src/typings/window.d.ts b/src/types/window.d.ts
similarity index 100%
rename from src/typings/window.d.ts
rename to src/types/window.d.ts