diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 00000000..f06ff216 Binary files /dev/null and b/public/logo.png differ diff --git a/src/assets/logo.png b/src/assets/logo.png new file mode 100644 index 00000000..f06ff216 Binary files /dev/null and b/src/assets/logo.png differ diff --git a/src/packages/components/Informations/Mores/Image/config.ts b/src/packages/components/Informations/Mores/Image/config.ts index 453bbe5a..ec2bd666 100644 --- a/src/packages/components/Informations/Mores/Image/config.ts +++ b/src/packages/components/Informations/Mores/Image/config.ts @@ -2,8 +2,15 @@ import { publicConfig } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' import { ImageConfig } from './index' import cloneDeep from 'lodash/cloneDeep' +import logo from '@/../public/logo.png' export const option = { + // 图片路径 + dataset: logo, + // 适应方式 + fit: 'contain', + // 圆角 + borderRadius: 10 } export default class Config extends publicConfig implements CreateComponentType diff --git a/src/packages/components/Informations/Mores/Image/config.vue b/src/packages/components/Informations/Mores/Image/config.vue index 44a7bc22..58c0a42b 100644 --- a/src/packages/components/Informations/Mores/Image/config.vue +++ b/src/packages/components/Informations/Mores/Image/config.vue @@ -1,6 +1,67 @@ diff --git a/src/packages/components/Informations/Mores/Image/index.vue b/src/packages/components/Informations/Mores/Image/index.vue index 56830a1a..85311a89 100644 --- a/src/packages/components/Informations/Mores/Image/index.vue +++ b/src/packages/components/Informations/Mores/Image/index.vue @@ -1,13 +1,42 @@ \ No newline at end of file diff --git a/src/packages/components/Informations/Texts/TextCommon/config.ts b/src/packages/components/Informations/Texts/TextCommon/config.ts index 8b8fcf25..5f99adef 100644 --- a/src/packages/components/Informations/Texts/TextCommon/config.ts +++ b/src/packages/components/Informations/Texts/TextCommon/config.ts @@ -14,14 +14,19 @@ export const WritingModeObject = { } export const option = { - dataset: '我是一个文本', + dataset: '我是文本', fontSize: 20, - fontColor: '#ffffffff', + fontColor: '#ffffff', paddingX: 10, paddingY: 10, + + // 边框 + borderWidth: 0, + borderColor: '#ffffff', + borderRadius: 5, + // 字间距 letterSpacing: 5, - borderRadius: 5, writingMode: 'horizontal-tb', backgroundColor: '#00000000', } diff --git a/src/packages/components/Informations/Texts/TextCommon/config.vue b/src/packages/components/Informations/Texts/TextCommon/config.vue index 812cb42f..4988e9c4 100644 --- a/src/packages/components/Informations/Texts/TextCommon/config.vue +++ b/src/packages/components/Informations/Texts/TextCommon/config.vue @@ -1,50 +1,64 @@