diff --git a/src/assets/images/chart/decorates/flow-circle.png b/src/assets/images/chart/decorates/flow-circle.png
new file mode 100644
index 00000000..81e010d7
Binary files /dev/null and b/src/assets/images/chart/decorates/flow-circle.png differ
diff --git a/src/assets/images/chart/decorates/flow-zhexian.png b/src/assets/images/chart/decorates/flow-zhexian.png
new file mode 100644
index 00000000..6b72e9c2
Binary files /dev/null and b/src/assets/images/chart/decorates/flow-zhexian.png differ
diff --git a/src/assets/images/chart/informations/inputs_input.png b/src/assets/images/chart/informations/inputs_input.png
new file mode 100644
index 00000000..f3778af3
Binary files /dev/null and b/src/assets/images/chart/informations/inputs_input.png differ
diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts
index 8eb47d90..3976dc5d 100644
--- a/src/hooks/useChartDataFetch.hook.ts
+++ b/src/hooks/useChartDataFetch.hook.ts
@@ -107,8 +107,6 @@ export const useChartDataFetch = (
// 开启轮询
if (time) {
fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
- } else {
- fetchFn()
}
}
// eslint-disable-next-line no-empty
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/FlowChartLine/config.vue b/src/packages/components/Decorates/FlowChart/FlowChartLine/config.vue
new file mode 100644
index 00000000..1595aea1
--- /dev/null
+++ b/src/packages/components/Decorates/FlowChart/FlowChartLine/config.vue
@@ -0,0 +1,37 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/Decorates/FlowChart/FlowChartLine/index.ts b/src/packages/components/Decorates/FlowChart/FlowChartLine/index.ts
new file mode 100644
index 00000000..1fcd9923
--- /dev/null
+++ b/src/packages/components/Decorates/FlowChart/FlowChartLine/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
+
+export const FlowChartLineConfig: ConfigType = {
+ key: 'FlowChartLine',
+ chartKey: 'VFlowChartLine',
+ conKey: 'VCFlowChartLine',
+ title: '流程线',
+ category: ChatCategoryEnum.FlowChart,
+ categoryName: ChatCategoryEnumName.FlowChart,
+ package: PackagesCategoryEnum.DECORATES,
+ chartFrame: ChartFrameEnum.STATIC,
+ image: 'flow-zhexian.png'
+}
diff --git a/src/packages/components/Decorates/FlowChart/FlowChartLine/index.vue b/src/packages/components/Decorates/FlowChart/FlowChartLine/index.vue
new file mode 100644
index 00000000..015523e6
--- /dev/null
+++ b/src/packages/components/Decorates/FlowChart/FlowChartLine/index.vue
@@ -0,0 +1,93 @@
+
+
+
+
+
+
+
diff --git a/src/packages/components/Decorates/FlowChart/index.ts b/src/packages/components/Decorates/FlowChart/index.ts
new file mode 100644
index 00000000..f96b146a
--- /dev/null
+++ b/src/packages/components/Decorates/FlowChart/index.ts
@@ -0,0 +1,3 @@
+import { FlowChartLineConfig } from './FlowChartLine/index'
+
+export default [FlowChartLineConfig]
diff --git a/src/packages/components/Decorates/Mores/CirclePoint/config.ts b/src/packages/components/Decorates/Mores/CirclePoint/config.ts
new file mode 100644
index 00000000..a319e802
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/CirclePoint/config.ts
@@ -0,0 +1,20 @@
+import { PublicConfigClass } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { CirclePointConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+import { chartInitConfig } from '@/settings/designSetting'
+
+export const option = {
+ outCircle: 15,
+ inCircle: 5,
+ outCircleColor: '#3f5261',
+ inCircleColor: '#fff',
+ outCircleWidth: 2
+}
+
+export default class Config extends PublicConfigClass implements CreateComponentType {
+ public key = CirclePointConfig.key
+ public attr = { ...chartInitConfig, w: 97, h: 97, zIndex: 1 }
+ public chartConfig = cloneDeep(CirclePointConfig)
+ public option = cloneDeep(option)
+}
diff --git a/src/packages/components/Decorates/Mores/CirclePoint/config.vue b/src/packages/components/Decorates/Mores/CirclePoint/config.vue
new file mode 100644
index 00000000..7b7c6b7a
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/CirclePoint/config.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/Decorates/Mores/CirclePoint/index.ts b/src/packages/components/Decorates/Mores/CirclePoint/index.ts
new file mode 100644
index 00000000..bcc83d8d
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/CirclePoint/index.ts
@@ -0,0 +1,14 @@
+import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d'
+import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d'
+
+export const CirclePointConfig: ConfigType = {
+ key: 'CirclePoint',
+ chartKey: 'VCirclePoint',
+ conKey: 'VCCirclePoint',
+ title: '圆点光环',
+ category: ChatCategoryEnum.MORE,
+ categoryName: ChatCategoryEnumName.MORE,
+ package: PackagesCategoryEnum.DECORATES,
+ chartFrame: ChartFrameEnum.STATIC,
+ image: 'flow-circle.png'
+}
diff --git a/src/packages/components/Decorates/Mores/CirclePoint/index.vue b/src/packages/components/Decorates/Mores/CirclePoint/index.vue
new file mode 100644
index 00000000..45674650
--- /dev/null
+++ b/src/packages/components/Decorates/Mores/CirclePoint/index.vue
@@ -0,0 +1,28 @@
+
+
+
+
+
+
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
]
diff --git a/src/packages/components/Decorates/index.d.ts b/src/packages/components/Decorates/index.d.ts
index d20047eb..5a7e8c14 100644
--- a/src/packages/components/Decorates/index.d.ts
+++ b/src/packages/components/Decorates/index.d.ts
@@ -1,6 +1,7 @@
export enum ChatCategoryEnum {
BORDER = 'Borders',
DECORATE = 'Decorates',
+ FlowChart = 'FlowChart',
THREE = 'Three',
MORE = 'Mores'
}
@@ -8,6 +9,7 @@ export enum ChatCategoryEnum {
export enum ChatCategoryEnumName {
BORDER = '边框',
DECORATE = '装饰',
+ FlowChart = '流程',
THREE = '三维',
MORE = '更多'
-}
\ No newline at end of file
+}
diff --git a/src/packages/components/Decorates/index.ts b/src/packages/components/Decorates/index.ts
index 17b64130..75f20813 100644
--- a/src/packages/components/Decorates/index.ts
+++ b/src/packages/components/Decorates/index.ts
@@ -1,6 +1,7 @@
import Borders from './Borders'
import Decorates from './Decorates'
+import FlowChart from './FlowChart'
import Three from './Three'
import Mores from './Mores'
-export const DecorateList = [...Borders, ...Decorates, ...Three, ...Mores]
+export const DecorateList = [...Borders, ...Decorates,...FlowChart, ...Three, ...Mores]
diff --git a/src/packages/components/Informations/Inputs/InputsInput/index.ts b/src/packages/components/Informations/Inputs/InputsInput/index.ts
index 0828ea35..ac3ab47e 100644
--- a/src/packages/components/Informations/Inputs/InputsInput/index.ts
+++ b/src/packages/components/Informations/Inputs/InputsInput/index.ts
@@ -10,5 +10,5 @@ export const InputsInputConfig: ConfigType = {
categoryName: ChatCategoryEnumName.INPUTS,
package: PackagesCategoryEnum.INFORMATIONS,
chartFrame: ChartFrameEnum.STATIC,
- image: 'inputs_select.png'
+ image: 'inputs_input.png'
}
\ No newline at end of file
diff --git a/src/views/chart/ContentEdit/components/EditRange/index.vue b/src/views/chart/ContentEdit/components/EditRange/index.vue
index d3be9d95..81944bd6 100644
--- a/src/views/chart/ContentEdit/components/EditRange/index.vue
+++ b/src/views/chart/ContentEdit/components/EditRange/index.vue
@@ -55,7 +55,6 @@ const rangeModelStyle = computed(() => {
position: relative;
transform-origin: left top;
background-size: cover;
- border-radius: 10px;
overflow: hidden;
@include fetch-border-color('hover-border-color');
@include fetch-bg-color('background-color2');
diff --git a/src/views/chart/ContentEdit/components/EditSelect/index.vue b/src/views/chart/ContentEdit/components/EditSelect/index.vue
index 90fc086b..5526e8ed 100644
--- a/src/views/chart/ContentEdit/components/EditSelect/index.vue
+++ b/src/views/chart/ContentEdit/components/EditSelect/index.vue
@@ -93,21 +93,20 @@ watch(
position: absolute;
width: 100%;
height: 100%;
- border-radius: 5px;
overflow: hidden;
}
.select-border {
left: 0;
top: 0;
- opacity: 0.5;
- border-width: 2px;
+ opacity: 1;
+ border-width: 1px;
border-style: solid;
border-color: v-bind('themeColor');
}
.select-background {
top: 2px;
left: 2px;
- opacity: 0.2;
+ opacity: 0.08;
background-color: v-bind('themeColor');
}
}
diff --git a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
index babd1211..e42c5e23 100644
--- a/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
+++ b/src/views/chart/ContentEdit/components/EditShapeBox/index.vue
@@ -139,7 +139,7 @@ const hide = computed(() => {
position: absolute;
width: 100%;
height: 100%;
- border-radius: 10px;
+ border-radius: 4px;
}
.shape-modal-select {
diff --git a/src/views/chart/ContentEdit/components/EditTools/index.vue b/src/views/chart/ContentEdit/components/EditTools/index.vue
index 3f7ada41..a1fcc9b5 100644
--- a/src/views/chart/ContentEdit/components/EditTools/index.vue
+++ b/src/views/chart/ContentEdit/components/EditTools/index.vue
@@ -182,13 +182,13 @@ const btnList: BtnListType[] = [
key: 'import',
type: TypeEnum.IMPORTUPLOAD,
name: '导入',
- icon: ShareIcon
+ icon: DownloadIcon
},
{
key: 'export',
type: TypeEnum.BUTTON,
name: '导出',
- icon: DownloadIcon,
+ icon: ShareIcon,
handle: exportHandle
},
{
@@ -231,6 +231,8 @@ $asideBottom: 70px;
border: 1px solid;
@include fetch-border-color('hover-border-color-shallow');
&.aside {
+ display: flex;
+ justify-content: center;
flex-direction: column-reverse;
height: auto;
right: 20px;
diff --git a/src/views/chart/ContentEdit/index.vue b/src/views/chart/ContentEdit/index.vue
index 60de3a08..bc53c3d7 100644
--- a/src/views/chart/ContentEdit/index.vue
+++ b/src/views/chart/ContentEdit/index.vue
@@ -209,7 +209,6 @@ onMounted(() => {
@include background-image('background-point');
@include goId('chart-edit-content') {
- border-radius: 10px;
overflow: hidden;
@extend .go-transition;
@include fetch-theme('box-shadow');
diff --git a/src/views/project/templateMarket/index.vue b/src/views/project/templateMarket/index.vue
index fffc9e1b..9c3ec468 100644
--- a/src/views/project/templateMarket/index.vue
+++ b/src/views/project/templateMarket/index.vue
@@ -1,19 +1,41 @@
-
-
- 暂时还没有东西呢
-
+
+
+
+
+
+ 前往 GoViewPro 查看 👆
+
+
+
-
+