From defb71569d7b7d32de96986ee2fb756f3d332b5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
<1262327911@qq.com>
Date: Thu, 14 Apr 2022 10:05:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E5=BB=BA=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 6 +++---
src/components/AppProvider/index.ts | 3 ---
src/components/ErrorComponent/index.ts | 3 ---
src/components/ErrorComponent/index.vue | 9 ---------
src/components/GoAppProvider/index.ts | 3 +++
.../AppProvider.vue => GoAppProvider/index.vue} | 6 +++---
src/components/GoDoc/index.ts | 3 ---
src/components/GoDoc/index.vue | 17 -----------------
src/components/GoLangSelect/index.ts | 3 +++
.../{LangSelect => GoLangSelect}/index.vue | 0
src/components/GoReload/index.ts | 3 +++
src/components/{Reload => GoReload}/index.vue | 0
src/components/GoThemeSelect/index.ts | 3 +++
.../{ThemeSelect => GoThemeSelect}/index.vue | 0
src/components/GoUserInfo/index.vue | 9 ---------
src/components/LangSelect/index.ts | 3 ---
.../ChartItemSetting/CollapseItem.vue | 0
.../ChartItemSetting/GlobalSetting.vue | 2 +-
.../ChartItemSetting/NameSetting.vue | 2 +-
.../ChartItemSetting/PositionSetting.vue | 2 +-
.../ChartItemSetting/SettingItem.vue | 0
.../ChartItemSetting/SettingItemBox.vue | 0
.../ChartItemSetting/SizeSetting.vue | 2 +-
.../ChartItemSetting/StylesSetting.vue | 2 +-
.../{ => Pages}/ChartItemSetting/index.ts | 0
.../ThemeColorSelect/components/ColorList.vue | 0
.../{ => Pages}/ThemeColorSelect/index.ts | 0
.../{ => Pages}/ThemeColorSelect/index.vue | 0
.../{ => Plugins}/DialogContent/index.ts | 0
.../{ => Plugins}/DialogContent/index.vue | 0
.../{ => Plugins}/LoadingContent/index.ts | 0
.../{ => Plugins}/LoadingContent/index.vue | 0
.../{ => Plugins}/MessageContent/index.ts | 0
.../{ => Plugins}/MessageContent/index.vue | 0
src/components/Reload/index.ts | 3 ---
src/components/ThemeSelect/index.ts | 3 ---
.../{ => Tips}/MacOsControlBtn/index.ts | 0
.../{ => Tips}/MacOsControlBtn/index.vue | 0
src/layout/components/LayoutHeader/index.vue | 10 +++++-----
src/main.ts | 6 +++---
.../components/Charts/Bars/BarCommon/config.vue | 2 +-
.../Charts/Bars/BarCrossrange/config.vue | 2 +-
.../Charts/Lines/LineCommon/config.vue | 2 +-
.../components/Charts/Pies/PieCommon/config.vue | 2 +-
.../Decorates/Borders/Border01/config.vue | 2 +-
.../Decorates/Borders/Border02/config.vue | 2 +-
.../Decorates/Borders/Border03/config.vue | 2 +-
.../Decorates/Borders/Border04/config.vue | 2 +-
.../Decorates/Borders/Border05/config.vue | 2 +-
.../Decorates/Borders/Border06/config.vue | 2 +-
.../Decorates/Borders/Border07/config.vue | 2 +-
.../Decorates/Borders/Border08/config.vue | 2 +-
.../Decorates/Borders/Border09/config.vue | 2 +-
.../Decorates/Borders/Border10/config.vue | 2 +-
.../Decorates/Borders/Border11/config.vue | 2 +-
.../Decorates/Borders/Border12/config.vue | 2 +-
.../Decorates/Borders/Border13/config.vue | 2 +-
.../Decorates/Decorates/Decorates01/config.vue | 2 +-
.../Decorates/Decorates/Decorates02/config.vue | 2 +-
.../Decorates/Decorates/Decorates03/config.vue | 2 +-
.../Decorates/Decorates/Decorates04/config.vue | 2 +-
.../Decorates/Decorates/Decorates05/config.vue | 2 +-
.../Decorates/Mores/Number/config.vue | 2 +-
.../Informations/Texts/TextCommon/config.vue | 2 +-
.../Tables/Tables/TableList/config.vue | 2 +-
src/router/base.ts | 4 ++--
.../ContentCharts/components/ItemBox/index.vue | 2 +-
.../components/ChartDataSetting/index.vue | 2 +-
.../components/ChartAnimation/index.vue | 2 +-
.../components/ChartDataAjax/index.vue | 2 +-
.../components/ChartData/index.vue | 2 +-
.../components/ChartSetting/index.vue | 2 +-
src/views/login/index.vue | 10 +++++-----
.../items/components/ProjectItemsCard/index.vue | 2 +-
.../components/ProjectItemsModalCard/index.vue | 2 +-
.../ProjectLayoutAsideFooter/index.vue | 10 +++++-----
76 files changed, 76 insertions(+), 117 deletions(-)
delete mode 100644 src/components/AppProvider/index.ts
delete mode 100644 src/components/ErrorComponent/index.ts
delete mode 100644 src/components/ErrorComponent/index.vue
create mode 100644 src/components/GoAppProvider/index.ts
rename src/components/{AppProvider/AppProvider.vue => GoAppProvider/index.vue} (72%)
delete mode 100644 src/components/GoDoc/index.ts
delete mode 100644 src/components/GoDoc/index.vue
create mode 100644 src/components/GoLangSelect/index.ts
rename src/components/{LangSelect => GoLangSelect}/index.vue (100%)
create mode 100644 src/components/GoReload/index.ts
rename src/components/{Reload => GoReload}/index.vue (100%)
create mode 100644 src/components/GoThemeSelect/index.ts
rename src/components/{ThemeSelect => GoThemeSelect}/index.vue (100%)
delete mode 100644 src/components/LangSelect/index.ts
rename src/components/{ => Pages}/ChartItemSetting/CollapseItem.vue (100%)
rename src/components/{ => Pages}/ChartItemSetting/GlobalSetting.vue (99%)
rename src/components/{ => Pages}/ChartItemSetting/NameSetting.vue (92%)
rename src/components/{ => Pages}/ChartItemSetting/PositionSetting.vue (97%)
rename src/components/{ => Pages}/ChartItemSetting/SettingItem.vue (100%)
rename src/components/{ => Pages}/ChartItemSetting/SettingItemBox.vue (100%)
rename src/components/{ => Pages}/ChartItemSetting/SizeSetting.vue (92%)
rename src/components/{ => Pages}/ChartItemSetting/StylesSetting.vue (93%)
rename src/components/{ => Pages}/ChartItemSetting/index.ts (100%)
rename src/components/{ => Pages}/ThemeColorSelect/components/ColorList.vue (100%)
rename src/components/{ => Pages}/ThemeColorSelect/index.ts (100%)
rename src/components/{ => Pages}/ThemeColorSelect/index.vue (100%)
rename src/components/{ => Plugins}/DialogContent/index.ts (100%)
rename src/components/{ => Plugins}/DialogContent/index.vue (100%)
rename src/components/{ => Plugins}/LoadingContent/index.ts (100%)
rename src/components/{ => Plugins}/LoadingContent/index.vue (100%)
rename src/components/{ => Plugins}/MessageContent/index.ts (100%)
rename src/components/{ => Plugins}/MessageContent/index.vue (100%)
delete mode 100644 src/components/Reload/index.ts
delete mode 100644 src/components/ThemeSelect/index.ts
rename src/components/{ => Tips}/MacOsControlBtn/index.ts (100%)
rename src/components/{ => Tips}/MacOsControlBtn/index.vue (100%)
diff --git a/src/App.vue b/src/App.vue
index f88d28f2..1865e459 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -6,16 +6,16 @@
:date-locale="dateZhCN"
:theme-overrides="overridesTheme"
>
-
+
-
+
-
-
diff --git a/src/components/GoAppProvider/index.ts b/src/components/GoAppProvider/index.ts
new file mode 100644
index 00000000..5032efbf
--- /dev/null
+++ b/src/components/GoAppProvider/index.ts
@@ -0,0 +1,3 @@
+import GoAppProvider from './index.vue';
+
+export { GoAppProvider };
diff --git a/src/components/AppProvider/AppProvider.vue b/src/components/GoAppProvider/index.vue
similarity index 72%
rename from src/components/AppProvider/AppProvider.vue
rename to src/components/GoAppProvider/index.vue
index 9f366da1..3c62adfe 100644
--- a/src/components/AppProvider/AppProvider.vue
+++ b/src/components/GoAppProvider/index.vue
@@ -21,8 +21,8 @@ import {
NLoadingBarProvider
} from 'naive-ui'
-import { MessageContent } from '@/components/MessageContent'
-import { DialogContent } from '@/components/DialogContent'
-import { LoadingContent } from '@/components/LoadingContent'
+import { MessageContent } from '@/components/Plugins/MessageContent'
+import { DialogContent } from '@/components/Plugins/DialogContent'
+import { LoadingContent } from '@/components/Plugins/LoadingContent'
diff --git a/src/components/GoDoc/index.ts b/src/components/GoDoc/index.ts
deleted file mode 100644
index 80098f1e..00000000
--- a/src/components/GoDoc/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import GoDoc from './index.vue';
-
-export { GoDoc };
diff --git a/src/components/GoDoc/index.vue b/src/components/GoDoc/index.vue
deleted file mode 100644
index 0392dc7d..00000000
--- a/src/components/GoDoc/index.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/components/GoLangSelect/index.ts b/src/components/GoLangSelect/index.ts
new file mode 100644
index 00000000..8c08c419
--- /dev/null
+++ b/src/components/GoLangSelect/index.ts
@@ -0,0 +1,3 @@
+import GoLangSelect from './index.vue';
+
+export { GoLangSelect };
diff --git a/src/components/LangSelect/index.vue b/src/components/GoLangSelect/index.vue
similarity index 100%
rename from src/components/LangSelect/index.vue
rename to src/components/GoLangSelect/index.vue
diff --git a/src/components/GoReload/index.ts b/src/components/GoReload/index.ts
new file mode 100644
index 00000000..abdf1946
--- /dev/null
+++ b/src/components/GoReload/index.ts
@@ -0,0 +1,3 @@
+import GoReload from './index.vue';
+
+export { GoReload };
diff --git a/src/components/Reload/index.vue b/src/components/GoReload/index.vue
similarity index 100%
rename from src/components/Reload/index.vue
rename to src/components/GoReload/index.vue
diff --git a/src/components/GoThemeSelect/index.ts b/src/components/GoThemeSelect/index.ts
new file mode 100644
index 00000000..46de3eed
--- /dev/null
+++ b/src/components/GoThemeSelect/index.ts
@@ -0,0 +1,3 @@
+import GoThemeSelect from './index.vue';
+
+export { GoThemeSelect };
diff --git a/src/components/ThemeSelect/index.vue b/src/components/GoThemeSelect/index.vue
similarity index 100%
rename from src/components/ThemeSelect/index.vue
rename to src/components/GoThemeSelect/index.vue
diff --git a/src/components/GoUserInfo/index.vue b/src/components/GoUserInfo/index.vue
index 913130db..4b3da73c 100644
--- a/src/components/GoUserInfo/index.vue
+++ b/src/components/GoUserInfo/index.vue
@@ -32,7 +32,6 @@ import Person from './person.png'
import { icon } from '@/plugins'
const {
- DocumentTextIcon,
ChatboxEllipsesIcon,
PersonIcon,
LogOutOutlineIcon,
@@ -78,11 +77,6 @@ const options = ref([
type: 'divider',
key: 'd1'
},
- {
- label: renderLang('global.doc'),
- key: 'doc',
- icon: renderIcon(DocumentTextIcon)
- },
{
label: renderLang('global.contact'),
key: 'contact',
@@ -116,9 +110,6 @@ const sysSetHandle = () => {
const handleSelect = (key: string) => {
switch (key) {
- case 'doc':
- openDoc()
- break
case 'contact':
openDoc()
break
diff --git a/src/components/LangSelect/index.ts b/src/components/LangSelect/index.ts
deleted file mode 100644
index 2c7b63cc..00000000
--- a/src/components/LangSelect/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import LangSelect from './index.vue';
-
-export { LangSelect };
diff --git a/src/components/ChartItemSetting/CollapseItem.vue b/src/components/Pages/ChartItemSetting/CollapseItem.vue
similarity index 100%
rename from src/components/ChartItemSetting/CollapseItem.vue
rename to src/components/Pages/ChartItemSetting/CollapseItem.vue
diff --git a/src/components/ChartItemSetting/GlobalSetting.vue b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
similarity index 99%
rename from src/components/ChartItemSetting/GlobalSetting.vue
rename to src/components/Pages/ChartItemSetting/GlobalSetting.vue
index dfca0cd0..8946fb6c 100644
--- a/src/components/ChartItemSetting/GlobalSetting.vue
+++ b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
@@ -287,7 +287,7 @@ import {
CollapseItem,
SettingItemBox,
SettingItem
-} from '@/components/ChartItemSetting/index'
+} from '@/components/Pages/ChartItemSetting'
const props = defineProps({
optionData: {
diff --git a/src/components/ChartItemSetting/NameSetting.vue b/src/components/Pages/ChartItemSetting/NameSetting.vue
similarity index 92%
rename from src/components/ChartItemSetting/NameSetting.vue
rename to src/components/Pages/ChartItemSetting/NameSetting.vue
index b05cf929..701d93c0 100644
--- a/src/components/ChartItemSetting/NameSetting.vue
+++ b/src/components/Pages/ChartItemSetting/NameSetting.vue
@@ -17,7 +17,7 @@