From a42398c669d3d11b069e12275f2fe98f33c77861 Mon Sep 17 00:00:00 2001
From: Free-sss <630042479@qq.com>
Date: Wed, 27 Aug 2025 10:01:26 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9Abug=20feat=EF=BC=9Anew=20border?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Charts/ConfinedSpace/Map/index.vue | 2 +-
.../ConfinedSpace/PieCircleCommen/config.ts | 39 +-
.../ConfinedSpace/PieCircleCommen/config.vue | 23 +-
.../ConfinedSpace/PieCircleCommen/data.json | 4 +-
.../ConfinedSpace/PieCircleCommen/index.ts | 2 +-
.../ConfinedSpace/PieCircleCommen/index.vue | 33 +-
.../MyComponents/SmallBorder01/config.ts | 17 +
.../MyComponents/SmallBorder01/config.vue | 54 +++
.../MyComponents/SmallBorder01/index.ts | 17 +
.../MyComponents/SmallBorder01/index.vue | 354 ++++++++++++++++++
.../components/Charts/MyComponents/index.ts | 4 +-
11 files changed, 492 insertions(+), 57 deletions(-)
create mode 100644 src/packages/components/Charts/MyComponents/SmallBorder01/config.ts
create mode 100644 src/packages/components/Charts/MyComponents/SmallBorder01/config.vue
create mode 100644 src/packages/components/Charts/MyComponents/SmallBorder01/index.ts
create mode 100644 src/packages/components/Charts/MyComponents/SmallBorder01/index.vue
diff --git a/src/packages/components/Charts/ConfinedSpace/Map/index.vue b/src/packages/components/Charts/ConfinedSpace/Map/index.vue
index 9b58c01..9363499 100644
--- a/src/packages/components/Charts/ConfinedSpace/Map/index.vue
+++ b/src/packages/components/Charts/ConfinedSpace/Map/index.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
index 6c1f7d9..f32b5de 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.ts
@@ -3,44 +3,18 @@ import { PieCircleCommenConfig } from './index'
import { CreateComponentType } from '@/packages/index.d'
import cloneDeep from 'lodash/cloneDeep'
import dataJson from './data.json'
-export const includes = []
+export const includes = ['legend']
+
-// dataJson:{
-// "dimensions": ["name", "value"],
-// "source": [
-// {
-// "name": "分类一",
-// "value": 94
-// },
-// {
-// "name": "分类二",
-// "value": 82
-// },
-// {
-// "name": "分类三",
-// "value": 78
-// },
-// {
-// "name": "分类四",
-// "value": 60
-// }
-// ]
-// }
const otherConfig = {
// 轮播动画
isCarousel: false,
+ color: ['#3B72E8', '#45B5E3', '#50D4A8', '#F8B55B'],
}
// ECharts配置
-const option = {
+export const option = {
...otherConfig,
- color: ['#3B72E8', '#45B5E3', '#50D4A8', '#F8B55B'],
-
- // 使用dataset关联数据
- dataset: {
- ...dataJson
- },
-
tooltip: {
trigger: 'item',
formatter: '{b}: {c} ({d}%)'
@@ -96,7 +70,7 @@ const option = {
series: [
{
- name: '总数',
+ // name: '总数',
type: 'pie',
radius: ['50%', '70%'],
center: ['30%', '50%'],
@@ -113,7 +87,8 @@ const option = {
show: false
}
}
- ]
+ ], // 使用dataset关联数据
+ dataset: { ...dataJson }
};
export default class Config extends PublicConfigClass implements CreateComponentType {
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.vue b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.vue
index c68d286..2f648c7 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.vue
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/config.vue
@@ -1,21 +1,26 @@
-
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json
index 5a730dc..b50b8a2 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/data.json
@@ -1,7 +1,9 @@
{
"dimensions": [
"name",
- "value"
+ "value",
+ "itemColor",
+ "borderColor"
],
"source": [
{
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.ts b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.ts
index 718d6a1..15b6f79 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.ts
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.ts
@@ -8,6 +8,6 @@ export const PieCircleCommenConfig: ConfigType = {
category: 'ConfinedSpace',
categoryName: '有限空间',
package: PackagesCategoryEnum.CHARTS,
- chartFrame: ChartFrameEnum.COMMON,
+ chartFrame: ChartFrameEnum.ECHARTS,
image: 'PieCircleCommen.png'
}
diff --git a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
index 5a31683..bc59265 100644
--- a/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
+++ b/src/packages/components/Charts/ConfinedSpace/PieCircleCommen/index.vue
@@ -1,5 +1,8 @@
-
+
+
+
+
+
+
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/config.ts b/src/packages/components/Charts/MyComponents/SmallBorder01/config.ts
new file mode 100644
index 0000000..58a9c85
--- /dev/null
+++ b/src/packages/components/Charts/MyComponents/SmallBorder01/config.ts
@@ -0,0 +1,17 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { SmallBorder01Config } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+
+export const option = {
+ colors: ['#1089ff', '#0000ff'],
+ backgroundColor: '#00000000'
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+ public key = SmallBorder01Config.key
+ public chartConfig = cloneDeep(SmallBorder01Config)
+ public option = cloneDeep(option)
+
+
+}
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/config.vue b/src/packages/components/Charts/MyComponents/SmallBorder01/config.vue
new file mode 100644
index 0000000..8c5b2c2
--- /dev/null
+++ b/src/packages/components/Charts/MyComponents/SmallBorder01/config.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/index.ts b/src/packages/components/Charts/MyComponents/SmallBorder01/index.ts
new file mode 100644
index 0000000..848ef78
--- /dev/null
+++ b/src/packages/components/Charts/MyComponents/SmallBorder01/index.ts
@@ -0,0 +1,17 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+// import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+// 曲线图
+export const SmallBorder01Config: ConfigType = {
+ key: 'SmallBorder01',
+ chartKey: 'VSmallBorder01',
+ conKey: 'VCSmallBorder01',
+ title: '带标题小边框+',
+ category: 'MyComponents',
+ categoryName: '自定义组件',
+ package: 'Charts',
+ chartFrame: ChartFrameEnum.COMMON,
+ image: "SmallBorder.png",
+}
+
+// 默认导出配置对象
+// export default SmallBorder01Config
\ No newline at end of file
diff --git a/src/packages/components/Charts/MyComponents/SmallBorder01/index.vue b/src/packages/components/Charts/MyComponents/SmallBorder01/index.vue
new file mode 100644
index 0000000..20d5dd4
--- /dev/null
+++ b/src/packages/components/Charts/MyComponents/SmallBorder01/index.vue
@@ -0,0 +1,354 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Charts/MyComponents/index.ts b/src/packages/components/Charts/MyComponents/index.ts
index 3520cb0..d6ce6cd 100644
--- a/src/packages/components/Charts/MyComponents/index.ts
+++ b/src/packages/components/Charts/MyComponents/index.ts
@@ -10,6 +10,7 @@ import { LineGraph01 } from './LineGraph01/index'
import { LineGraph02Config } from './LineGraph02/index'
import { MaxTrimConfig } from './MaxTrim/index'
import { SmallBorderConfig } from './SmallBorder/index'
+import { SmallBorder01Config } from './SmallBorder01/index'
export default [
@@ -25,5 +26,6 @@ export default [
MaxTrimConfig,
LineGraph01,
LineGraph02Config,
- SmallBorderConfig
+ SmallBorderConfig,
+ SmallBorder01Config
]
\ No newline at end of file