diff --git a/src/assets/images/chart/decorates/flow-pingxing.png b/src/assets/images/chart/decorates/flow-pingxing.png
deleted file mode 100644
index da3a8b09..00000000
Binary files a/src/assets/images/chart/decorates/flow-pingxing.png and /dev/null differ
diff --git a/src/assets/images/chart/decorates/flow-wubianxing.png b/src/assets/images/chart/decorates/flow-wubianxing.png
deleted file mode 100644
index bfcb7ead..00000000
Binary files a/src/assets/images/chart/decorates/flow-wubianxing.png and /dev/null differ
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart01/config.ts b/src/packages/components/Decorates/FlowChart/FlowChart01/config.ts
deleted file mode 100644
index 5148038c..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart01/config.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { FlowChart01Config } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
- endWidth: 15,
- lineLength: 150,//水平层级距离
- lineWidth:2,//线条粗细
- lineNum:2,//向下数量
- lineNumUp:2,//向上数量
- lineColLength:50,//纵向层级距离
- backgroundCol:'#303a4c',//线条背景
- animateCol:'#3788ea'//流动动画背景
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
- public key = FlowChart01Config.key
- public chartConfig = cloneDeep(FlowChart01Config)
- public option = cloneDeep(option)
-}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart01/index.vue b/src/packages/components/Decorates/FlowChart/FlowChart01/index.vue
deleted file mode 100644
index 47f99d60..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart01/index.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart02/config.ts b/src/packages/components/Decorates/FlowChart/FlowChart02/config.ts
deleted file mode 100644
index 9a88960b..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart02/config.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { FlowChart02Config } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-
-export const option = {
- boxWidth:100,
- boxHeight:200,
- cornerTip:30,
- startColor:'#3cb1e4',
- endColor:'#144b6b',
- strokeWidth:3
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
- public key = FlowChart02Config.key
- public chartConfig = cloneDeep(FlowChart02Config)
- public option = cloneDeep(option)
-}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart02/config.vue b/src/packages/components/Decorates/FlowChart/FlowChart02/config.vue
deleted file mode 100644
index f92d10be..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart02/config.vue
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart02/index.ts b/src/packages/components/Decorates/FlowChart/FlowChart02/index.ts
deleted file mode 100644
index 7b4a6ed0..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart02/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-
-export const FlowChart02Config: ConfigType = {
- key: 'FlowChart02',
- chartKey: 'VFlowChart02',
- conKey: 'VCFlowChart02',
- title: '流程-五边形',
- category: ChatCategoryEnum.FlowChart,
- categoryName: ChatCategoryEnumName.FlowChart,
- package: PackagesCategoryEnum.DECORATES,
- chartFrame: ChartFrameEnum.STATIC,
- image: 'flow-wubianxing.png'
-}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart02/index.vue b/src/packages/components/Decorates/FlowChart/FlowChart02/index.vue
deleted file mode 100644
index 80d0da5e..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart02/index.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart03/config.ts b/src/packages/components/Decorates/FlowChart/FlowChart03/config.ts
deleted file mode 100644
index 5e4f2768..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart03/config.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { PublicConfigClass } from '@/packages/public'
-import { CreateComponentType } from '@/packages/index.d'
-import { FlowChart03Config } from './index'
-import cloneDeep from 'lodash/cloneDeep'
-import { chartInitConfig } from '@/settings/designSetting'
-
-export const option = {
- boxWidth: 300,
- boxHeight: 100,
- outBorderColor: '#045da2',
- inBorderColor: '#045da2',
- startColor: '#025596',
- endColor: '#052339',
- borderWidth: 3
-}
-
-export default class Config extends PublicConfigClass implements CreateComponentType {
- public key = FlowChart03Config.key
- public attr = { ...chartInitConfig, w: 390, h: 120, zIndex: 1 }
- public chartConfig = cloneDeep(FlowChart03Config)
- public option = cloneDeep(option)
-}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart03/config.vue b/src/packages/components/Decorates/FlowChart/FlowChart03/config.vue
deleted file mode 100644
index 67a2220c..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart03/config.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart03/index.ts b/src/packages/components/Decorates/FlowChart/FlowChart03/index.ts
deleted file mode 100644
index 763c52fe..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart03/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
-import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-
-export const FlowChart03Config: ConfigType = {
- key: 'FlowChart03',
- chartKey: 'VFlowChart03',
- conKey: 'VCFlowChart03',
- title: '平行四边形',
- category: ChatCategoryEnum.FlowChart,
- categoryName: ChatCategoryEnumName.FlowChart,
- package: PackagesCategoryEnum.DECORATES,
- chartFrame: ChartFrameEnum.STATIC,
- image: 'flow-pingxing.png'
-}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart03/index.vue b/src/packages/components/Decorates/FlowChart/FlowChart03/index.vue
deleted file mode 100644
index 46fed921..00000000
--- a/src/packages/components/Decorates/FlowChart/FlowChart03/index.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
diff --git a/src/packages/components/Decorates/FlowChart/FlowChartLine/config.ts b/src/packages/components/Decorates/FlowChart/FlowChartLine/config.ts
new file mode 100644
index 00000000..db010cbc
--- /dev/null
+++ b/src/packages/components/Decorates/FlowChart/FlowChartLine/config.ts
@@ -0,0 +1,19 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { FlowChartLineConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+
+export const option = {
+ endWidth: 15,
+ lineWidth: 2, //线条粗细
+ lineNum: 2, //向下数量
+ lineNumUp: 2, //向上数量
+ backgroundCol: '#303a4c', //线条背景
+ animateCol: '#3788ea' //流动动画背景
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+ public key = FlowChartLineConfig.key
+ public chartConfig = cloneDeep(FlowChartLineConfig)
+ public option = cloneDeep(option)
+}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart01/config.vue b/src/packages/components/Decorates/FlowChart/FlowChartLine/config.vue
similarity index 51%
rename from src/packages/components/Decorates/FlowChart/FlowChart01/config.vue
rename to src/packages/components/Decorates/FlowChart/FlowChartLine/config.vue
index 619c3f68..1595aea1 100644
--- a/src/packages/components/Decorates/FlowChart/FlowChart01/config.vue
+++ b/src/packages/components/Decorates/FlowChart/FlowChartLine/config.vue
@@ -1,41 +1,17 @@
-
-
-
-
-
-
-
-
-
-
+
-
+
-
+
@@ -44,18 +20,12 @@
-
-
+
+
diff --git a/src/packages/components/Decorates/FlowChart/index.ts b/src/packages/components/Decorates/FlowChart/index.ts
index a2cfcc9c..f96b146a 100644
--- a/src/packages/components/Decorates/FlowChart/index.ts
+++ b/src/packages/components/Decorates/FlowChart/index.ts
@@ -1,6 +1,3 @@
-import { FlowChart01Config } from './FlowChart01/index'
-import { FlowChart02Config } from './FlowChart02/index'
-import { FlowChart03Config } from './FlowChart03/index'
-import { FlowChart04Config } from './FlowChart04/index'
+import { FlowChartLineConfig } from './FlowChartLine/index'
-export default [FlowChart01Config, FlowChart02Config, FlowChart03Config, FlowChart04Config]
+export default [FlowChartLineConfig]
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart04/config.ts b/src/packages/components/Decorates/Mores/CirclePoint/config.ts
similarity index 80%
rename from src/packages/components/Decorates/FlowChart/FlowChart04/config.ts
rename to src/packages/components/Decorates/Mores/CirclePoint/config.ts
index e3f6bf43..a319e802 100644
--- a/src/packages/components/Decorates/FlowChart/FlowChart04/config.ts
+++ b/src/packages/components/Decorates/Mores/CirclePoint/config.ts
@@ -1,6 +1,6 @@
import { PublicConfigClass } from '@/packages/public'
import { CreateComponentType } from '@/packages/index.d'
-import { FlowChart04Config } from './index'
+import { CirclePointConfig } from './index'
import cloneDeep from 'lodash/cloneDeep'
import { chartInitConfig } from '@/settings/designSetting'
@@ -13,8 +13,8 @@ export const option = {
}
export default class Config extends PublicConfigClass implements CreateComponentType {
- public key = FlowChart04Config.key
+ public key = CirclePointConfig.key
public attr = { ...chartInitConfig, w: 97, h: 97, zIndex: 1 }
- public chartConfig = cloneDeep(FlowChart04Config)
+ public chartConfig = cloneDeep(CirclePointConfig)
public option = cloneDeep(option)
}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart04/config.vue b/src/packages/components/Decorates/Mores/CirclePoint/config.vue
similarity index 100%
rename from src/packages/components/Decorates/FlowChart/FlowChart04/config.vue
rename to src/packages/components/Decorates/Mores/CirclePoint/config.vue
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart04/index.ts b/src/packages/components/Decorates/Mores/CirclePoint/index.ts
similarity index 57%
rename from src/packages/components/Decorates/FlowChart/FlowChart04/index.ts
rename to src/packages/components/Decorates/Mores/CirclePoint/index.ts
index aa8ec3d4..bcc83d8d 100644
--- a/src/packages/components/Decorates/FlowChart/FlowChart04/index.ts
+++ b/src/packages/components/Decorates/Mores/CirclePoint/index.ts
@@ -1,13 +1,13 @@
import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
-export const FlowChart04Config: ConfigType = {
- key: 'FlowChart04',
- chartKey: 'VFlowChart04',
- conKey: 'VCFlowChart04',
+export const CirclePointConfig: ConfigType = {
+ key: 'CirclePoint',
+ chartKey: 'VCirclePoint',
+ conKey: 'VCCirclePoint',
title: '圆点光环',
- category: ChatCategoryEnum.FlowChart,
- categoryName: ChatCategoryEnumName.FlowChart,
+ category: ChatCategoryEnum.MORE,
+ categoryName: ChatCategoryEnumName.MORE,
package: PackagesCategoryEnum.DECORATES,
chartFrame: ChartFrameEnum.STATIC,
image: 'flow-circle.png'
diff --git a/src/packages/components/Decorates/FlowChart/FlowChart04/index.vue b/src/packages/components/Decorates/Mores/CirclePoint/index.vue
similarity index 100%
rename from src/packages/components/Decorates/FlowChart/FlowChart04/index.vue
rename to src/packages/components/Decorates/Mores/CirclePoint/index.vue
diff --git a/src/packages/components/Decorates/Mores/index.ts b/src/packages/components/Decorates/Mores/index.ts
index 489b9c5c..95f26040 100644
--- a/src/packages/components/Decorates/Mores/index.ts
+++ b/src/packages/components/Decorates/Mores/index.ts
@@ -6,6 +6,7 @@ import { CountDownConfig } from './CountDown/index'
import { FlipperNumberConfig } from './FlipperNumber'
import { PipelineHConfig } from './PipelineH/index'
import { PipelineVConfig } from './PipelineV/index'
+import { CirclePointConfig } from './CirclePoint/index'
export default [
NumberConfig,
@@ -15,5 +16,6 @@ export default [
ClockConfig,
FullScreenConfig,
PipelineHConfig,
- PipelineVConfig
+ PipelineVConfig,
+ CirclePointConfig
]