From bbd8f3dc6b7c3569c0ec6b15bb7c3b97747f7434 Mon Sep 17 00:00:00 2001 From: Cano1997 <1978141412@qq.com> Date: Fri, 25 Jul 2025 15:53:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20drbar=E3=80=81drtab=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/drbar/drbar.tsx | 19 ++++++++++--------- src/control/drtab/drtab.tsx | 13 +++++++------ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/control/drbar/drbar.tsx b/src/control/drbar/drbar.tsx index 4e57ba425..4a987dc64 100644 --- a/src/control/drbar/drbar.tsx +++ b/src/control/drbar/drbar.tsx @@ -12,7 +12,7 @@ import { VNode, watch, } from 'vue'; -import { IDEDRBar, IDEDRCtrlItem } from '@ibiz/model-core'; +import { IDEDRBar } from '@ibiz/model-core'; import { useRoute, useRouter } from 'vue-router'; import { IControlProvider, IDRBarItemsState } from '@ibiz-template/runtime'; import { DRBarController } from './drbar.controller'; @@ -53,7 +53,9 @@ export const DRBarControl = defineComponent({ hideEditItem: { type: Boolean, default: undefined }, }, setup(props) { - const c = useControlController((...args) => new DRBarController(...args)); + const c: DRBarController = useControlController( + (...args) => new DRBarController(...args), + ); const ns = useNamespace(`control-${c.model.controlType!.toLowerCase()}`); const router = useRouter(); @@ -75,13 +77,12 @@ export const DRBarControl = defineComponent({ const handleSelect = (key: string): void => { c.handleSelectChange(key); - const drBarItem = c.model.dedrctrlItems?.find( - (item: IDEDRCtrlItem) => item.id === key, - ); - c.evt.emit('onTabChange', { - name: key, - item: drBarItem || c.state.drBarItems[0], - }); + const drBarItem = c.state.drBarItems.find(item => item.tag === key); + if (drBarItem) { + c.evt.emit('onTabChange', { + data: drBarItem, + }); + } }; const route = useRoute(); diff --git a/src/control/drtab/drtab.tsx b/src/control/drtab/drtab.tsx index ba231b474..67cd241f6 100644 --- a/src/control/drtab/drtab.tsx +++ b/src/control/drtab/drtab.tsx @@ -90,13 +90,14 @@ export const DRTabControl = defineComponent({ const emitChange = () => { const { activeName } = c.state; - const drBarItem = c.model.dedrtabPages?.find( - item => item.id === activeName, + const drTabItem = c.state.drTabPages.find( + item => item.tag === activeName, ); - c.evt.emit('onTabChange', { - name: activeName, - item: drBarItem || c.state.drTabPages[0], - }); + if (drTabItem) { + c.evt.emit('onTabChange', { + data: drTabItem, + }); + } }; const handleTabChange = (): void => { -- Gitee From 19e266889b7c7a93b9f19036eb74401d07f2540f Mon Sep 17 00:00:00 2001 From: Cano1997 <1978141412@qq.com> Date: Fri, 25 Jul 2025 15:54:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F=E5=88=9D=E6=AC=A1?= =?UTF-8?q?=E7=BB=98=E5=88=B6=E6=95=B0=E6=8D=AE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 5 +++++ src/common/map-chart/map-chart.tsx | 16 ++-------------- src/control/map/map.tsx | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30b54c237..9b7d052dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ ## [Unreleased] +### Added + +- drbar、drtab事件参数调整 + ### Changed - 日历事件项支持默认呈现背景色为主题色，未配置数据源背景色时，边框激活色改为黑色 @@ -24,6 +28,7 @@ - 修复日历周样式事件显示不全及头部事件项定位异常 - 修复日历时间轴样式在父容器存在高度时未出现滚动条 - 修复时间轴在内置导航中会一直重复触发load方法 +- 修复地图自定义样式初次绘制数据异常 ## [0.7.41-alpha.14] - 2025-07-23 diff --git a/src/common/map-chart/map-chart.tsx b/src/common/map-chart/map-chart.tsx index 258f90202..f9e09ccae 100644 --- a/src/common/map-chart/map-chart.tsx +++ b/src/common/map-chart/map-chart.tsx @@ -1,12 +1,5 @@ /* eslint-disable eqeqeq */ -import { - defineComponent, - onMounted, - PropType, - computed, - toRefs, - watch, -} from 'vue'; +import { defineComponent, onMounted, PropType, computed } from 'vue'; import { isNil, mergeDeepWithKey } from 'ramda'; import { useNamespace } from '@ibiz-template/vue3-util'; import { IMapData } from '@ibiz-template/runtime'; @@ -50,7 +43,7 @@ export const IBizMapChart = defineComponent({ } }; - const { chartRef, historyNames, changeMap, getCityName, goBack, refresh } = + const { chartRef, historyNames, changeMap, getCityName, goBack } = useMapManager( options, mapName => { @@ -207,11 +200,6 @@ export const IBizMapChart = defineComponent({ changeMap(options.value.defaultAreaCode, true); }); - const { areaData, pointData } = toRefs(props); - watch([areaData, pointData], () => { - refresh(); - }); - return { ns, chartRef, historyNames, goBack }; }, render() { diff --git a/src/control/map/map.tsx b/src/control/map/map.tsx index 96dc5cc45..78e4566c4 100644 --- a/src/control/map/map.tsx +++ b/src/control/map/map.tsx @@ -69,7 +69,7 @@ const MapControl = defineComponent({ }, render() { const { state } = this.c; - if (!state.isCreated) return; + if (!state.isCreated || !state.isLoaded) return; return ( -- Gitee