From 662c2fd4dd02ef4533cb8261e21d390fb89c01c3 Mon Sep 17 00:00:00 2001
From: wuyuting1 <wuyuting1@gt.cn>
Date: Wed, 21 Sep 2022 17:27:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E5=AD=97=E7=BB=84=E4=BB=B6?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=BE=E6=8E=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Informations/Texts/TextCommon/config.ts | 1 +
.../Informations/Texts/TextCommon/config.vue | 19 ++++++++++---------
.../Informations/Texts/TextCommon/index.vue | 3 ++-
3 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/src/packages/components/Informations/Texts/TextCommon/config.ts b/src/packages/components/Informations/Texts/TextCommon/config.ts
index 3774e0ae..e71a8158 100644
--- a/src/packages/components/Informations/Texts/TextCommon/config.ts
+++ b/src/packages/components/Informations/Texts/TextCommon/config.ts
@@ -15,6 +15,7 @@ export const WritingModeObject = {
export const option = {
link:'',
+ linkHead:'http://',
dataset: '我是文本',
fontSize: 20,
fontColor: '#ffffff',
diff --git a/src/packages/components/Informations/Texts/TextCommon/config.vue b/src/packages/components/Informations/Texts/TextCommon/config.vue
index 25568621..2592f35a 100644
--- a/src/packages/components/Informations/Texts/TextCommon/config.vue
+++ b/src/packages/components/Informations/Texts/TextCommon/config.vue
@@ -7,7 +7,7 @@
</setting-item-box>
<setting-item-box name="链接" :alone="true">
<setting-item>
- <n-space><n-input v-model:value="optionData.link" size="small"></n-input><n-button secondary size="small" @click="handleLinkClick" >点击</n-button></n-space>
+ <n-input-group><n-select v-model:value="optionData.linkHead" size="small" :style="{ width: '33%' }" :options="linkHeadOptions" /><n-input v-model:value="optionData.link" size="small"></n-input><n-button :disabled="!optionData.link" secondary size="small" @click="handleLinkClick" >跳转</n-button></n-input-group>
</setting-item>
</setting-item-box>
</collapse-item>
@@ -74,7 +74,6 @@ import {
SettingItemBox,
SettingItem
} from '@/components/Pages/ChartItemSetting'
-import { useMessage } from 'naive-ui'
const props = defineProps({
optionData: {
type: Object as PropType<typeof option>,
@@ -89,13 +88,15 @@ const verticalOptions = [{
label: WritingModeEnum.VERTICAL,
value: WritingModeObject[WritingModeEnum.VERTICAL]
}]
-const message = useMessage()
const handleLinkClick = ()=>{
-
- if(props.optionData.link){
- window.open(props.optionData.link)
- }else{
- message.info("链接未输入")
- }
+ window.open(props.optionData.linkHead+props.optionData.link)
}
+const linkHeadOptions = [{
+ label: 'http://',
+ value: 'http://'
+ },
+ {
+ label: 'https://',
+ value: 'https://'
+ }]
</script>
diff --git a/src/packages/components/Informations/Texts/TextCommon/index.vue b/src/packages/components/Informations/Texts/TextCommon/index.vue
index 92418501..18990c70 100644
--- a/src/packages/components/Informations/Texts/TextCommon/index.vue
+++ b/src/packages/components/Informations/Texts/TextCommon/index.vue
@@ -38,6 +38,7 @@ const props = defineProps({
const { w, h } = toRefs(props.chartConfig.attr)
const {
+ linkHead,
link,
dataset,
fontColor,
@@ -75,7 +76,7 @@ useChartDataFetch(props.chartConfig, useChartEditStore, (newData: string) => {
//打开链接
const click = () => {
- window.open(link.value)
+ window.open(linkHead.value+link.value)
}
</script>