From 17b98e0a3ee7939e3c64e73768ba72778944ea3b Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Mon, 29 May 2023 10:29:44 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix:=20=E8=AF=AD=E8=A8=80=E8=BD=AC?=
=?UTF-8?q?=E6=8D=A2=E4=B8=BA=E8=8B=B1=E6=96=87=E5=90=8E=EF=BC=8C=E5=88=9B?=
=?UTF-8?q?=E5=BB=BA=E6=8C=89=E9=92=AE=E7=9A=84=E8=8B=B1=E6=96=87=E6=8B=BC?=
=?UTF-8?q?=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/en/project.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/i18n/en/project.ts b/src/i18n/en/project.ts
index 3b7d367b..6695cd5e 100644
--- a/src/i18n/en/project.ts
+++ b/src/i18n/en/project.ts
@@ -1,5 +1,5 @@
export default {
- create_btn: 'Creat',
+ create_btn: 'Create',
create_tip: 'Please select a content for development',
project: 'Project',
my: 'My',
From 9384cd98a4eb77c3fe9bf624d48af9b6172d7719 Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Wed, 7 Jun 2023 15:00:06 +0800
Subject: [PATCH 02/12] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E4=BA=A4?=
=?UTF-8?q?=E4=BA=92=E7=BB=84=E4=BB=B6=E6=9B=B4=E6=96=B0=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/hooks/useChartDataFetch.hook.ts | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts
index c39cc34e..91271e8d 100644
--- a/src/hooks/useChartDataFetch.hook.ts
+++ b/src/hooks/useChartDataFetch.hook.ts
@@ -90,12 +90,12 @@ export const useChartDataFetch = (
// 普通初始化与组件交互处理监听
watch(
- () => targetComponent.request,
+ () => targetComponent.request.requestParams,
() => {
fetchFn()
},
{
- immediate: true,
+ immediate: false,
deep: true
}
)
@@ -105,7 +105,11 @@ export const useChartDataFetch = (
// 单位
const unit = targetInterval && targetInterval.value ? targetUnit.value : globalUnit.value
// 开启轮询
- if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
+ if (time) {
+ fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
+ } else {
+ fetchFn()
+ }
}
// eslint-disable-next-line no-empty
} catch (error) {
@@ -114,10 +118,11 @@ export const useChartDataFetch = (
}
if (isPreview()) {
- // 判断是否是数据池类型
targetComponent.request.requestDataType === RequestDataTypeEnum.Pond
? addGlobalDataInterface(targetComponent, useChartEditStore, updateCallback || echartsUpdateHandle)
: requestIntervalFn()
+ } else {
+ requestIntervalFn()
}
return { vChartRef }
}
From 9b0136b92a2eb2f8e86d7e1a93911c197f6092ea Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Wed, 7 Jun 2023 15:00:28 +0800
Subject: [PATCH 03/12] fix: declare module '@iconify/vue'
---
types/shims-vue.d.ts | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/types/shims-vue.d.ts b/types/shims-vue.d.ts
index fbfc8922..fa19c5db 100644
--- a/types/shims-vue.d.ts
+++ b/types/shims-vue.d.ts
@@ -5,4 +5,5 @@ declare module '*.vue' {
}
declare module 'lodash/*'
-declare module 'dom-helpers'
\ No newline at end of file
+declare module 'dom-helpers'
+declare module '@iconify/vue'
\ No newline at end of file
From 2a32f2ab720b23e426aa54926cd71e27799c9259 Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Wed, 7 Jun 2023 15:03:59 +0800
Subject: [PATCH 04/12] =?UTF-8?q?feat:=20=20=E6=9B=B4=E6=96=B0=E5=85=AC?=
=?UTF-8?q?=E5=85=B1api=E5=AF=B9=E7=BB=84=E4=BB=B6=E5=8A=A8=E6=80=81?=
=?UTF-8?q?=E7=BB=91=E5=AE=9A=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/hooks/useChartDataPondFetch.hook.ts | 39 +++++++++++++++++--------
1 file changed, 27 insertions(+), 12 deletions(-)
diff --git a/src/hooks/useChartDataPondFetch.hook.ts b/src/hooks/useChartDataPondFetch.hook.ts
index 24ac7660..a506f274 100644
--- a/src/hooks/useChartDataPondFetch.hook.ts
+++ b/src/hooks/useChartDataPondFetch.hook.ts
@@ -1,4 +1,4 @@
-import { toRaw } from 'vue'
+import { toRaw, watch, computed, ComputedRef } from 'vue'
import { customizeHttp } from '@/api/http'
import { CreateComponentType } from '@/packages/index.d'
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -20,7 +20,7 @@ const mittDataPondMap = new Map<string, DataPondMapType[]>()
// 创建单个数据项轮询接口
const newPondItemInterval = (
requestGlobalConfig: RequestGlobalConfigType,
- requestDataPondItem: RequestDataPondItemType,
+ requestDataPondItem: ComputedRef<RequestDataPondItemType>,
dataPondMapItem?: DataPondMapType[]
) => {
if (!dataPondMapItem) return
@@ -31,8 +31,7 @@ const newPondItemInterval = (
// 请求
const fetchFn = async () => {
try {
- const res = await customizeHttp(toRaw(requestDataPondItem.dataPondRequestConfig), toRaw(requestGlobalConfig))
-
+ const res = await customizeHttp(toRaw(requestDataPondItem.value.dataPondRequestConfig), toRaw(requestGlobalConfig))
if (res) {
try {
// 遍历更新回调函数
@@ -49,19 +48,32 @@ const newPondItemInterval = (
}
}
+ watch(
+ () => requestDataPondItem.value.dataPondRequestConfig.requestParams.Params,
+ () => {
+ fetchFn()
+ },
+ {
+ immediate: false,
+ deep: true
+ }
+ )
+
+
// 立即调用
fetchFn()
- const targetInterval = requestDataPondItem.dataPondRequestConfig.requestInterval
- const targetUnit = requestDataPondItem.dataPondRequestConfig.requestIntervalUnit
+
+ const targetInterval = requestDataPondItem.value.dataPondRequestConfig.requestInterval
+ const targetUnit = requestDataPondItem.value.dataPondRequestConfig.requestIntervalUnit
const globalRequestInterval = requestGlobalConfig.requestInterval
const globalUnit = requestGlobalConfig.requestIntervalUnit
// 定时时间
- const time = targetInterval ? targetInterval : globalRequestInterval
+ const time = targetInterval ? targetInterval : globalRequestInterval
// 单位
- const unit = targetInterval ? targetUnit : globalUnit
+ const unit = targetInterval ? targetUnit : globalUnit
// 开启轮询
if (time) fetchInterval = setInterval(fetchFn, intervalUnitHandle(time, unit))
}
@@ -96,13 +108,16 @@ export const useChartDataPondFetch = () => {
}
// 初始化数据池
- const initDataPond = (requestGlobalConfig: RequestGlobalConfigType) => {
- const { requestDataPond } = requestGlobalConfig
+ const initDataPond = (useChartEditStore: ChartEditStoreType) => {
+ const { requestGlobalConfig } = useChartEditStore()
+ const chartEditStore = useChartEditStore()
// 根据 mapId 查找对应的数据池配置
for (let pondKey of mittDataPondMap.keys()) {
- const requestDataPondItem = requestDataPond.find(item => item.dataPondId === pondKey)
+ const requestDataPondItem = computed(() => {
+ return requestGlobalConfig.requestDataPond.find(item => item.dataPondId === pondKey)
+ }) as ComputedRef<RequestDataPondItemType>
if (requestDataPondItem) {
- newPondItemInterval(requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
+ newPondItemInterval(chartEditStore.requestGlobalConfig, requestDataPondItem, mittDataPondMap.get(pondKey))
}
}
}
From 4b0b50ea3c262dfc59debbc31b75f6f81260d219 Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Wed, 7 Jun 2023 15:06:51 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=20=E6=94=AF=E6=8C=81=E5=AF=B9?=
=?UTF-8?q?=E5=85=AC=E5=85=B1api=E8=BF=9B=E8=A1=8C=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/hooks/useChartInteract.hook.ts | 43 +++++++++++++++++++++---------
1 file changed, 31 insertions(+), 12 deletions(-)
diff --git a/src/hooks/useChartInteract.hook.ts b/src/hooks/useChartInteract.hook.ts
index efa2ae73..aa0b1ed6 100644
--- a/src/hooks/useChartInteract.hook.ts
+++ b/src/hooks/useChartInteract.hook.ts
@@ -1,4 +1,5 @@
import { toRefs } from 'vue'
+import { isPreview } from '@/utils'
import { CreateComponentType } from '@/packages/index.d'
import { useChartEditStore } from '@/store/modules/chartEditStore/chartEditStore'
@@ -12,6 +13,7 @@ export const useChartInteract = (
param: { [T: string]: any },
interactEventOn: string
) => {
+ if (!isPreview()) return
const chartEditStore = useChartEditStore()
const { interactEvents } = chartConfig.events
const fnOnEvent = interactEvents.filter(item => {
@@ -20,20 +22,37 @@ export const useChartInteract = (
if (fnOnEvent.length === 0) return
fnOnEvent.forEach(item => {
- const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
- if (index === -1) return
- const { Params, Header } = toRefs(chartEditStore.componentList[index].request.requestParams)
- Object.keys(item.interactFn).forEach(key => {
- if (Params.value[key]) {
- Params.value[key] = param[item.interactFn[key]]
- }
- if (Header.value[key]) {
- Header.value[key] = param[item.interactFn[key]]
- }
- })
+
+ const globalConfigPindAprndex = chartEditStore.requestGlobalConfig.requestDataPond.findIndex(cItem =>
+ cItem.dataPondId === item.interactComponentId
+ )
+ if (globalConfigPindAprndex !== -1) {
+ const { Params, Header } = toRefs(chartEditStore.requestGlobalConfig.requestDataPond[globalConfigPindAprndex].dataPondRequestConfig.requestParams)
+
+ Object.keys(item.interactFn).forEach(key => {
+ if (Params.value[key]) {
+ Params.value[key] = param[item.interactFn[key]]
+ }
+ if (Header.value[key]) {
+ Header.value[key] = param[item.interactFn[key]]
+ }
+ })
+ } else {
+ const index = chartEditStore.fetchTargetIndex(item.interactComponentId)
+ if (index === -1) return
+ const { Params, Header } = toRefs(chartEditStore.componentList[index].request.requestParams)
+
+ Object.keys(item.interactFn).forEach(key => {
+ if (Params.value[key]) {
+ Params.value[key] = param[item.interactFn[key]]
+ }
+ if (Header.value[key]) {
+ Header.value[key] = param[item.interactFn[key]]
+ }
+ })
+ }
})
}
-
// 联动事件触发的 type 变更时，清除当前绑定内容
export const clearInteractEvent = (chartConfig: CreateComponentType) => {
From cd1f8e259afdf7c857aa6c1f2333e459e40976b2 Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Wed, 7 Jun 2023 15:08:52 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E5=88=9D?=
=?UTF-8?q?=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/preview/components/PreviewRenderList/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/preview/components/PreviewRenderList/index.vue b/src/views/preview/components/PreviewRenderList/index.vue
index f685f983..07675175 100644
--- a/src/views/preview/components/PreviewRenderList/index.vue
+++ b/src/views/preview/components/PreviewRenderList/index.vue
@@ -74,7 +74,7 @@ const themeColor = computed(() => {
// 组件渲染结束初始化数据池
clearMittDataPondMap()
onMounted(() => {
- initDataPond(chartEditStore.requestGlobalConfig)
+ initDataPond(useChartEditStore)
})
</script>
From 71acbc61883fb9cf5ea141f374692074818f1368 Mon Sep 17 00:00:00 2001
From: Ming <739803697@qq.com>
Date: Wed, 7 Jun 2023 15:13:48 +0800
Subject: [PATCH 07/12] =?UTF-8?q?feat:=20=E7=BB=84=E4=BB=B6=E4=BA=A4?=
=?UTF-8?q?=E4=BA=92=E5=AF=B9=E5=85=AC=E5=85=B1api=E6=94=AF=E6=8C=81?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ChartEventInteraction/index.vue | 31 +++++++++++++------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteraction/index.vue b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteraction/index.vue
index b5a74bd4..614b3d15 100644
--- a/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteraction/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartEvent/components/ChartEventInteraction/index.vue
@@ -58,7 +58,7 @@
<help-outline-icon></help-outline-icon>
</n-icon>
</template>
- <n-text>不支持「静态组件」</n-text>
+ <n-text>不支持「静态组件」支持「组件」「公共APi」</n-text>
</n-tooltip>
</template>
<n-select
@@ -89,7 +89,7 @@
</n-table>
</setting-item-box>
- <n-tag :bordered="false" type="primary"> 关联目标组件请求参数 </n-tag>
+ <n-tag :bordered="false" type="primary"> 关联目标请求参数 </n-tag>
<setting-item-box
:name="requestParamsItem"
@@ -125,7 +125,7 @@ import { VNodeChild, computed } from 'vue'
import { SelectOption, SelectGroupOption } from 'naive-ui'
import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
import { CreateComponentType, CreateComponentGroupType, ChartFrameEnum } from '@/packages/index.d'
-import { RequestParamsTypeEnum } from '@/enums/httpEnum'
+import { RequestParamsTypeEnum, RequestDataTypeEnum } from '@/enums/httpEnum'
import { InteractEventOn, COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum'
import { icon } from '@/plugins'
import noData from '@/assets/images/canvas/noData.png'
@@ -154,6 +154,11 @@ const option = computed(() => {
// 绑定组件数据 request
const fnGetRequest = (id: string | undefined, key: RequestParamsTypeEnum) => {
if (!id) return {}
+ const globalConfigPindApr = chartEditStore.requestGlobalConfig.requestDataPond.find(item => {
+ return item.dataPondId === id
+ })?.dataPondRequestConfig.requestParams
+
+ if (globalConfigPindApr) return globalConfigPindApr[key]
return chartEditStore.componentList[chartEditStore.fetchTargetIndex(id)]?.request.requestParams[key]
}
@@ -178,12 +183,10 @@ const fnEventsOptions = (): Array<SelectOption | SelectGroupOption> => {
iter: Array<CreateComponentType | CreateComponentGroupType>,
val: CreateComponentType | CreateComponentGroupType
) => {
- if (val.groupList && val.groupList.length > 0) {
- iter.push(val)
- } else {
+ if (!val.groupList && val.request.requestDataType === RequestDataTypeEnum.AJAX && val.request.requestUrl) {
iter.push(val)
}
- return val.groupList ? [...iter, ...fnFlattern(val.groupList)] : iter
+ return val.groupList && val.groupList.length > 0 ? [...iter, ...fnFlattern(val.groupList)] : iter
},
[]
)
@@ -203,18 +206,26 @@ const fnEventsOptions = (): Array<SelectOption | SelectGroupOption> => {
const mapOptionList = filterOptionList.map(item => ({
id: item.id,
title: item.chartConfig.title,
- disabled: false
+ disabled: false,
+ type: 'componentList'
}))
+ const requestDataPond = chartEditStore.requestGlobalConfig.requestDataPond.map(item => ({
+ id: item.dataPondId,
+ title: item.dataPondName,
+ disabled: false,
+ type: 'requestDataPond'
+ }))
+ const tarArr = requestDataPond.concat(mapOptionList)
targetData.value.events.interactEvents?.forEach(iaItem => {
- mapOptionList.forEach(optionItem => {
+ tarArr.forEach(optionItem => {
if (optionItem.id === iaItem.interactComponentId) {
optionItem.disabled = true
}
})
})
- return mapOptionList
+ return tarArr
}
// 新增模块
From f294d40769e077129a0d18be65f8d31c4ded6931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
<1262327911@qq.com>
Date: Thu, 8 Jun 2023 16:39:18 +0800
Subject: [PATCH 08/12] =?UTF-8?q?style:=20=E5=88=A0=E9=99=A4=E5=86=97?=
=?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/http.ts | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/api/http.ts b/src/api/http.ts
index 0588049d..5da44856 100644
--- a/src/api/http.ts
+++ b/src/api/http.ts
@@ -163,7 +163,6 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req
params = translateStr(params)
// form 类型处理
let formData: FormData = new FormData()
- formData.set('default', 'defaultData')
// 类型处理
switch (requestParamsBodyType) {
From 7fb65ff24c05abd4b0878d46fc50ad690753369a Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Tue, 13 Jun 2023 10:27:08 +0800
Subject: [PATCH 09/12] =?UTF-8?q?feat:=20=E7=8E=AF=E5=BD=A2=E9=A5=BC?=
=?UTF-8?q?=E5=9B=BE=E5=A2=9E=E5=8A=A0=E8=BD=A8=E9=81=93=E5=AE=BD=E5=BA=A6?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=B9=B6=E4=BC=98=E5=8C=96=E6=95=B0?=
=?UTF-8?q?=E5=AD=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Charts/Pies/PieCircle/config.vue | 45 ++++++++++++-------
.../Charts/Pies/PieCircle/index.vue | 4 +-
2 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/packages/components/Charts/Pies/PieCircle/config.vue b/src/packages/components/Charts/Pies/PieCircle/config.vue
index a3206946..38329dbc 100644
--- a/src/packages/components/Charts/Pies/PieCircle/config.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/config.vue
@@ -7,6 +7,22 @@
</n-input-number>
</SettingItem>
</SettingItemBox>
+ <!-- 中心标题 -->
+ <SettingItemBox v-if="config.title" name="标题">
+ <SettingItem name="颜色">
+ <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
+ </SettingItem>
+ <SettingItem name="字体大小">
+ <n-input-number
+ v-model:value="config.title.textStyle.fontSize"
+ :min="0"
+ :step="1"
+ size="small"
+ placeholder="字体大小"
+ >
+ </n-input-number>
+ </SettingItem>
+ </SettingItemBox>
<!-- Echarts 全局设置 -->
<SettingItemBox name="进度条">
<SettingItem name="颜色">
@@ -31,24 +47,8 @@
></n-color-picker>
</SettingItem>
</SettingItemBox>
- <!-- 中心标题 -->
- <SettingItemBox v-if="config.title" name="标题">
- <SettingItem name="颜色">
- <n-color-picker size="small" :modes="['hex']" v-model:value="config.title.textStyle.color"></n-color-picker>
- </SettingItem>
- <SettingItem name="字体大小">
- <n-input-number
- v-model:value="config.title.textStyle.fontSize"
- :min="0"
- :step="1"
- size="small"
- placeholder="字体大小"
- >
- </n-input-number>
- </SettingItem>
- </SettingItemBox>
<!-- 其他样式 -->
- <SettingItemBox name="轨道样式">
+ <SettingItemBox name="轨道">
<SettingItem name="颜色">
<n-color-picker size="small" :modes="['hex']" v-model:value="item.data[1].itemStyle.color"></n-color-picker>
</SettingItem>
@@ -69,6 +69,17 @@
v-model:value="item.data[1].itemStyle.shadowColor"
></n-color-picker>
</SettingItem>
+ <SettingItem name="轨道宽度">
+ <n-select
+ v-model:value="item.radius[0]"
+ :options="[
+ { label: '窄', value: '75%' },
+ { label: '中', value: '60%' },
+ { label: '宽', value: '45%' },
+ { label: '更宽', value: '30%' }
+ ]"
+ />
+ </SettingItem>
</SettingItemBox>
</CollapseItem>
</template>
diff --git a/src/packages/components/Charts/Pies/PieCircle/index.vue b/src/packages/components/Charts/Pies/PieCircle/index.vue
index 26bda2a7..bf6250cd 100644
--- a/src/packages/components/Charts/Pies/PieCircle/index.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/index.vue
@@ -41,7 +41,7 @@ const option = reactive({
const dataHandle = (newData: any) => {
const d = parseFloat(`${newData}`) * 100
let config = props.chartConfig.option
- config.title.text = d.toFixed(2) + '%'
+ config.title.text = `${+d.toFixed(2)}%`
config.series[0].data[0].value[0] = d
config.series[0].data[1].value[0] = 100 - d
option.value = mergeTheme(props.chartConfig.option, props.themeSetting, includes)
@@ -68,7 +68,7 @@ watch(
useChartDataFetch(props.chartConfig, useChartEditStore, (resData: number) => {
let d = parseFloat(`${resData}`) * 100
// @ts-ignore
- option.value.title.text = d.toFixed(2) + '%'
+ option.value.title.text = `${+d.toFixed(2)}%`
// @ts-ignore
option.value.series[0].data[0].value[0] = d
// @ts-ignore
From d018d6babca09b5e3e53f78b5abfc367eabc96ac Mon Sep 17 00:00:00 2001
From: tnt group <dodu@live.cn>
Date: Wed, 14 Jun 2023 07:54:36 +0800
Subject: [PATCH 10/12] =?UTF-8?q?chore:=20=E8=AE=BE=E7=BD=AE=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E6=A1=86size?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/packages/components/Charts/Pies/PieCircle/config.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/packages/components/Charts/Pies/PieCircle/config.vue b/src/packages/components/Charts/Pies/PieCircle/config.vue
index 38329dbc..f343aa23 100644
--- a/src/packages/components/Charts/Pies/PieCircle/config.vue
+++ b/src/packages/components/Charts/Pies/PieCircle/config.vue
@@ -72,6 +72,7 @@
<SettingItem name="轨道宽度">
<n-select
v-model:value="item.radius[0]"
+ size="small"
:options="[
{ label: '窄', value: '75%' },
{ label: '中', value: '60%' },
From d9264e5164fb46f5892eb05bee65ca8f857a4ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
<1262327911@qq.com>
Date: Thu, 15 Jun 2023 11:45:41 +0000
Subject: [PATCH 11/12] =?UTF-8?q?!171=20fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A7?=
=?UTF-8?q?=E7=89=88=E6=9C=AC=E6=B2=A1=E6=9C=89legend=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8A=A5settting=20color=E9=94=99=E8=AF=AF?=
=?UTF-8?q?=20Merge=20pull=20request=20!171=20from=20h5coder/h5coder-fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Pages/ChartItemSetting/GlobalSetting.vue | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/Pages/ChartItemSetting/GlobalSetting.vue b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
index 81f9d3d7..68e3fb00 100644
--- a/src/components/Pages/ChartItemSetting/GlobalSetting.vue
+++ b/src/components/Pages/ChartItemSetting/GlobalSetting.vue
@@ -391,8 +391,12 @@ const visualMap = computed(() => {
// 监听legend color颜色改变type = scroll的颜色
watch(() => legend.value && legend.value.textStyle.color, (newVal) => {
if (legend.value && newVal) {
- legend.value.pageTextStyle.color = newVal
- }
+ if (!legend.value.pageTextStyle) {
+ legend.value.pageTextStyle = { color: newVal }
+ } else {
+ legend.value.pageTextStyle.color = newVal
+ }
+ }
}, {
immediate: true,
deep: true,
From a672aab0b912cd2a16b57d01ef589e9fef48764b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
<1262327911@qq.com>
Date: Thu, 15 Jun 2023 11:49:54 +0000
Subject: [PATCH 12/12] =?UTF-8?q?!169=20feat:=E6=A0=87=E7=AD=BE=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E5=99=A8=E5=A2=9E=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?=
=?UTF-8?q?=E9=80=89=E9=A1=B9=20Merge=20pull=20request=20!169=20from=20h5c?=
=?UTF-8?q?oder/dev-h5coder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/Informations/Inputs/InputsTab/config.vue | 5 ++++-
.../components/Informations/Inputs/InputsTab/index.vue | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/packages/components/Informations/Inputs/InputsTab/config.vue b/src/packages/components/Informations/Inputs/InputsTab/config.vue
index 39d9cad5..c6e8c7c9 100644
--- a/src/packages/components/Informations/Inputs/InputsTab/config.vue
+++ b/src/packages/components/Informations/Inputs/InputsTab/config.vue
@@ -1,8 +1,11 @@
<template>
<collapse-item name="标签页配置" :expanded="true">
- <setting-item-box name="默认值" :alone="true">
+ <setting-item-box name="标签类型" :alone="true">
<n-select size="small" v-model:value="optionData.tabType" :options="tabTypeOptions" />
</setting-item-box>
+ <setting-item-box name="默认值" :alone="true">
+ <n-select size="small" v-model:value="optionData.tabLabel" value-field="label" :options="optionData.dataset" />
+ </setting-item-box>
</collapse-item>
</template>
diff --git a/src/packages/components/Informations/Inputs/InputsTab/index.vue b/src/packages/components/Informations/Inputs/InputsTab/index.vue
index d75bde97..a02900b9 100644
--- a/src/packages/components/Informations/Inputs/InputsTab/index.vue
+++ b/src/packages/components/Informations/Inputs/InputsTab/index.vue
@@ -1,5 +1,5 @@
<template>
- <n-tabs :type="option.value.tabType" @update:value="onChange">
+ <n-tabs :type="option.value.tabType" @update:value="onChange" :default-value="option.value.tabLabel">
<n-tab v-for="(item, index) in option.value.dataset" :name="item.label" :key="index"> {{ item.label }} </n-tab>
</n-tabs>
</template>