diff --git a/src/assets/images/chart/charts/bar_x.png b/src/assets/images/chart/charts/bar_x.png
index 331f4c33..8d53cece 100644
Binary files a/src/assets/images/chart/charts/bar_x.png and b/src/assets/images/chart/charts/bar_x.png differ
diff --git a/src/assets/images/chart/charts/bar_y.png b/src/assets/images/chart/charts/bar_y.png
index cdf3d9e3..ebdaa51b 100644
Binary files a/src/assets/images/chart/charts/bar_y.png and b/src/assets/images/chart/charts/bar_y.png differ
diff --git a/src/assets/images/chart/decorates/border_first.png b/src/assets/images/chart/decorates/border_first.png
new file mode 100644
index 00000000..11609f3c
Binary files /dev/null and b/src/assets/images/chart/decorates/border_first.png differ
diff --git a/src/assets/images/chart/decorates/border_thirteenth.png b/src/assets/images/chart/decorates/border_thirteenth.png
new file mode 100644
index 00000000..8f8ee46e
Binary files /dev/null and b/src/assets/images/chart/decorates/border_thirteenth.png differ
diff --git a/src/packages/components/Decorates/Borders/borderCommon/config.ts b/src/packages/components/Decorates/Borders/BorderFirst/config.ts
similarity index 61%
rename from src/packages/components/Decorates/Borders/borderCommon/config.ts
rename to src/packages/components/Decorates/Borders/BorderFirst/config.ts
index 6c4277de..d11fe35b 100644
--- a/src/packages/components/Decorates/Borders/borderCommon/config.ts
+++ b/src/packages/components/Decorates/Borders/BorderFirst/config.ts
@@ -1,14 +1,15 @@
import { publicConfig } from '@/packages/public'
import { CreateComponentType } from '@/packages/index.d'
-import {BorderCommonConfig} from './index'
+import {BorderFirstConfig} from './index'
import cloneDeep from 'lodash/cloneDeep'
export const option = {
- colors: ['#6586ec', '#2cf7fe']
+ dur: 0.5,
+ colors: ['#4fd2dd', '#235fa7']
}
export default class Config extends publicConfig implements CreateComponentType {
- public key = BorderCommonConfig.key
- public chartConfig = cloneDeep(BorderCommonConfig)
+ public key = BorderFirstConfig.key
+ public chartConfig = cloneDeep(BorderFirstConfig)
public option = option
}
diff --git a/src/packages/components/Decorates/Borders/BorderFirst/config.vue b/src/packages/components/Decorates/Borders/BorderFirst/config.vue
new file mode 100644
index 00000000..6e946469
--- /dev/null
+++ b/src/packages/components/Decorates/Borders/BorderFirst/config.vue
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+ 恢复默认
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/packages/components/Decorates/Borders/borderCommon/index.ts b/src/packages/components/Decorates/Borders/BorderFirst/index.ts
similarity index 56%
rename from src/packages/components/Decorates/Borders/borderCommon/index.ts
rename to src/packages/components/Decorates/Borders/BorderFirst/index.ts
index 15264ade..c6963a91 100644
--- a/src/packages/components/Decorates/Borders/borderCommon/index.ts
+++ b/src/packages/components/Decorates/Borders/BorderFirst/index.ts
@@ -1,12 +1,12 @@
-import image from '@/assets/images/chart/decorates/border.png'
+import image from '@/assets/images/chart/decorates/border_first.png'
import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
-export const BorderCommonConfig: ConfigType = {
- key: 'BorderCommon',
- chartKey: 'VBorderCommon',
- conKey: 'VCBorderCommon',
- title: '边框',
+export const BorderFirstConfig: ConfigType = {
+ key: 'BorderFirst',
+ chartKey: 'VBorderFirst',
+ conKey: 'VCBorderFirst',
+ title: '边框-01',
category: ChatCategoryEnum.BORDER,
categoryName: ChatCategoryEnumName.BORDER,
package: PackagesCategoryEnum.DECORATES,
diff --git a/src/packages/components/Decorates/Borders/BorderFirst/index.vue b/src/packages/components/Decorates/Borders/BorderFirst/index.vue
new file mode 100644
index 00000000..bcfb310b
--- /dev/null
+++ b/src/packages/components/Decorates/Borders/BorderFirst/index.vue
@@ -0,0 +1,106 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/packages/components/Decorates/Borders/BorderThirteenth/config.ts b/src/packages/components/Decorates/Borders/BorderThirteenth/config.ts
new file mode 100644
index 00000000..8445baec
--- /dev/null
+++ b/src/packages/components/Decorates/Borders/BorderThirteenth/config.ts
@@ -0,0 +1,15 @@
+import { publicConfig } from '@/packages/public'
+import { CreateComponentType } from '@/packages/index.d'
+import { BorderThirteenthConfig } from './index'
+import cloneDeep from 'lodash/cloneDeep'
+
+export const option = {
+ colors: ['#6586ec', '#2cf7fe']
+}
+
+export default class Config extends publicConfig
+ implements CreateComponentType {
+ public key = BorderThirteenthConfig.key
+ public chartConfig = cloneDeep(BorderThirteenthConfig)
+ public option = option
+}
diff --git a/src/packages/components/Decorates/Borders/borderCommon/config.vue b/src/packages/components/Decorates/Borders/BorderThirteenth/config.vue
similarity index 96%
rename from src/packages/components/Decorates/Borders/borderCommon/config.vue
rename to src/packages/components/Decorates/Borders/BorderThirteenth/config.vue
index 2b2b8bf9..5657b6a0 100644
--- a/src/packages/components/Decorates/Borders/borderCommon/config.vue
+++ b/src/packages/components/Decorates/Borders/BorderThirteenth/config.vue
@@ -39,5 +39,4 @@ const props = defineProps({
required: true
}
})
-console.log(props.optionData)
diff --git a/src/packages/components/Decorates/Borders/BorderThirteenth/index.ts b/src/packages/components/Decorates/Borders/BorderThirteenth/index.ts
new file mode 100644
index 00000000..62fe19fe
--- /dev/null
+++ b/src/packages/components/Decorates/Borders/BorderThirteenth/index.ts
@@ -0,0 +1,14 @@
+import image from '@/assets/images/chart/decorates/border_thirteenth.png'
+import { ConfigType, PackagesCategoryEnum } from '@/packages/index.d'
+import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d'
+
+export const BorderThirteenthConfig: ConfigType = {
+ key: 'BorderThirteenth',
+ chartKey: 'VBorderThirteenth',
+ conKey: 'VCBorderThirteenth',
+ title: '边框-13',
+ category: ChatCategoryEnum.BORDER,
+ categoryName: ChatCategoryEnumName.BORDER,
+ package: PackagesCategoryEnum.DECORATES,
+ image
+}
diff --git a/src/packages/components/Decorates/Borders/borderCommon/index.vue b/src/packages/components/Decorates/Borders/BorderThirteenth/index.vue
similarity index 91%
rename from src/packages/components/Decorates/Borders/borderCommon/index.vue
rename to src/packages/components/Decorates/Borders/BorderThirteenth/index.vue
index 15f4faff..5ae6ff1e 100644
--- a/src/packages/components/Decorates/Borders/borderCommon/index.vue
+++ b/src/packages/components/Decorates/Borders/BorderThirteenth/index.vue
@@ -50,6 +50,10 @@ const props = defineProps({
const { w, h } = toRefs(props.chartConfig.attr)
const colors = computed(() => {
- return props.chartConfig.option?.colors
+ return props.chartConfig.option.colors
})
+
+
\ No newline at end of file
diff --git a/src/packages/components/Decorates/Borders/index.ts b/src/packages/components/Decorates/Borders/index.ts
index 1a05dd61..1ec98c3c 100644
--- a/src/packages/components/Decorates/Borders/index.ts
+++ b/src/packages/components/Decorates/Borders/index.ts
@@ -1,3 +1,4 @@
-import { BorderCommonConfig } from './BorderCommon/index'
+import { BorderThirteenthConfig } from './BorderThirteenth/index'
+import { BorderFirstConfig } from './BorderFirst/index'
-export default [BorderCommonConfig]
+export default [BorderFirstConfig, BorderThirteenthConfig]