-
-
-
+
+
+
+
+
+
+
GoView
+
+
+
+
+
+
-
-
-
-
+
+
diff --git a/src/components/AppleControlBtn/index.vue b/src/components/AppleControlBtn/index.vue
index b377dda4..21d1063f 100644
--- a/src/components/AppleControlBtn/index.vue
+++ b/src/components/AppleControlBtn/index.vue
@@ -3,7 +3,7 @@
@@ -21,6 +21,12 @@ import { screenfullFn } from '@/utils'
const emit = defineEmits(['close', 'remove', 'resize', 'fullResize'])
const props = defineProps({
+ // mini 版本
+ mini: {
+ request: false,
+ type: Boolean,
+ default: false
+ },
// 禁用所有按钮
disabled: {
request: false,
@@ -55,26 +61,26 @@ const isFull = computed(() => {
})
const btnList: {
- title: string,
- key: "close" | "remove" | "resize" | "fullResize",
+ title: string
+ key: 'close' | 'remove' | 'resize' | 'fullResize'
icon: any
}[] = [
- {
- title: '关闭',
- key: 'close',
- icon: CloseIcon
- },
- {
- title: '缩小',
- key: 'remove',
- icon: RemoveIcon
- },
- {
- title: isFull ? '缩小' : '放大',
- key: props.narrow ? 'fullResize' : 'resize',
- icon: ResizeIcon
- }
- ]
+ {
+ title: '关闭',
+ key: 'close',
+ icon: CloseIcon
+ },
+ {
+ title: '缩小',
+ key: 'remove',
+ icon: RemoveIcon
+ },
+ {
+ title: isFull ? '缩小' : '放大',
+ key: props.narrow ? 'fullResize' : 'resize',
+ icon: ResizeIcon
+ }
+]
const handleClick = (key: 'close' | 'remove' | 'resize' | 'fullResize') => {
if (key === 'fullResize') screenfullFn()
@@ -85,7 +91,7 @@ const handleClick = (key: 'close' | 'remove' | 'resize' | 'fullResize') => {
\ No newline at end of file
diff --git a/src/packages/components/Chart/index.ts b/src/packages/components/Chart/index.ts
new file mode 100644
index 00000000..e0ef5df2
--- /dev/null
+++ b/src/packages/components/Chart/index.ts
@@ -0,0 +1,3 @@
+import { barCommonConfig } from './bar/barCommon/index'
+
+export const BarList = [barCommonConfig]
diff --git a/src/packages/components/Decorate/border/borderCommon/index.ts b/src/packages/components/Decorate/border/borderCommon/index.ts
new file mode 100644
index 00000000..bfb03a8f
--- /dev/null
+++ b/src/packages/components/Decorate/border/borderCommon/index.ts
@@ -0,0 +1,11 @@
+import BorderCommon from './index.vue'
+import barImg from '@/assets/images/chart/bar_y.png'
+import { ConfigType } from '@/packages/index.d'
+
+// 柱状图
+export const barCommonConfig: ConfigType = {
+ key: 'Border',
+ title: '柱状图',
+ node: BorderCommon,
+ coverGraph: barImg
+}
diff --git a/src/packages/components/Decorate/border/borderCommon/index.vue b/src/packages/components/Decorate/border/borderCommon/index.vue
new file mode 100644
index 00000000..f3abbb36
--- /dev/null
+++ b/src/packages/components/Decorate/border/borderCommon/index.vue
@@ -0,0 +1,13 @@
+
+
+ 柱状图组件渲染
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Decorate/index.ts b/src/packages/components/Decorate/index.ts
new file mode 100644
index 00000000..401a72ce
--- /dev/null
+++ b/src/packages/components/Decorate/index.ts
@@ -0,0 +1,3 @@
+import { barCommonConfig } from './border/borderCommon/index'
+
+export const BarList = [barCommonConfig]
diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts
new file mode 100644
index 00000000..dca310fd
--- /dev/null
+++ b/src/packages/index.d.ts
@@ -0,0 +1,14 @@
+import { Component } from '@/router/types'
+
+// import { ConfigType } from '@/packages/index.d'
+export type ConfigType = {
+ key: string
+ title: string
+ node: Component
+ image: string
+ [T: string]: unknown
+}
+
+export type PackagesType = {
+ Charts: ConfigType[]
+}
diff --git a/src/packages/index.ts b/src/packages/index.ts
index e69de29b..a26ebf5f 100644
--- a/src/packages/index.ts
+++ b/src/packages/index.ts
@@ -0,0 +1,9 @@
+import { PackagesType } from '@/packages/index.d'
+import { BarList } from '@/packages/components/Chart/index'
+
+// 所有图表
+let packagesList: PackagesType = {
+ Charts: BarList
+}
+
+export { packagesList }
diff --git a/src/store/modules/packagesStore/packagesStore.d.ts b/src/store/modules/packagesStore/packagesStore.d.ts
new file mode 100644
index 00000000..b5100701
--- /dev/null
+++ b/src/store/modules/packagesStore/packagesStore.d.ts
@@ -0,0 +1,7 @@
+import { PackagesType, ConfigType } from '@/packages/index.d'
+
+export { ConfigType }
+
+export interface PackagesStoreType {
+ packagesList: PackagesType
+}
diff --git a/src/store/modules/packagesStore/packagesStore.ts b/src/store/modules/packagesStore/packagesStore.ts
new file mode 100644
index 00000000..93fef87b
--- /dev/null
+++ b/src/store/modules/packagesStore/packagesStore.ts
@@ -0,0 +1,18 @@
+import { defineStore } from 'pinia'
+import { PackagesStoreType, ConfigType } from './packagesStore.d'
+import { packagesList } from '@/packages/index'
+
+export const usePackagesStore = defineStore({
+ id: 'usePackagesStore',
+ state: (): PackagesStoreType => ({
+ packagesList
+ }),
+ getters: {
+ getPackagesList(): ConfigType | {} {
+ if (this.packagesList && this.packagesList.charts) {
+ return this.packagesList.charts
+ }
+ return {}
+ }
+ }
+})
diff --git a/src/styles/common/var.scss b/src/styles/common/var.scss
index 13787d32..d08beb2e 100644
--- a/src/styles/common/var.scss
+++ b/src/styles/common/var.scss
@@ -21,7 +21,7 @@ $--color-light-bg-2: #f2f3f5;
$--color-light-bg-2-shallow: lighten($--color-light-bg-2, $--light-shalow);
$--color-light-bg-3: #e5e6eb;
$--color-light-bg-3-shallow: lighten($--color-light-bg-3, $--light-shalow);
-$--color-light-bg-4: #c9cdd4;
+$--color-light-bg-4: #e3e3e4;
$--color-light-bg-4-shallow: lighten($--color-light-bg-4, $--light-shalow);
$--color-light-bg-5: #bebebe;
$--color-light-bg-5-shallow: lighten($--color-light-bg-5, $--light-shalow);
diff --git a/src/views/chart/components/ContentCharts/components/ChartCommon/index.ts b/src/views/chart/components/ContentCharts/components/ChartCommon/index.ts
deleted file mode 100644
index 31fa457e..00000000
--- a/src/views/chart/components/ContentCharts/components/ChartCommon/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import ChartCommon from './index.vue'
-
-export { ChartCommon }
\ No newline at end of file
diff --git a/src/views/chart/components/ContentCharts/components/ChartCommon/index.vue b/src/views/chart/components/ContentCharts/components/ChartCommon/index.vue
deleted file mode 100644
index b4afcc42..00000000
--- a/src/views/chart/components/ContentCharts/components/ChartCommon/index.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/views/chart/components/ContentCharts/components/Charts/index.ts b/src/views/chart/components/ContentCharts/components/Charts/index.ts
new file mode 100644
index 00000000..9b34a4bc
--- /dev/null
+++ b/src/views/chart/components/ContentCharts/components/Charts/index.ts
@@ -0,0 +1,3 @@
+import Charts from './index.vue'
+
+export { Charts }
diff --git a/src/views/chart/components/ContentCharts/components/Charts/index.vue b/src/views/chart/components/ContentCharts/components/Charts/index.vue
new file mode 100644
index 00000000..4eaad232
--- /dev/null
+++ b/src/views/chart/components/ContentCharts/components/Charts/index.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
+
+
+
![]()
+
+
+
+