From d47e059831fa512aeb673a0d7340deae28afb690 Mon Sep 17 00:00:00 2001 From: fzh <1399952343@qq.com> Date: Wed, 13 Sep 2023 19:09:08 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E5=8D=95?= =?UTF-8?q?=E9=80=89=E7=BC=96=E8=BE=91=E5=99=A8=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=80=89=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx index 2d6c1fccc..5fe0809f8 100644 --- a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx +++ b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx @@ -6,6 +6,7 @@ import { useNamespace, } from '@ibiz-template/vue3-util'; import './ibiz-radio.scss'; +import { notNilEmpty } from 'qx-util'; import { RadioButtonListEditorController } from '../radio-button-list.controller'; export const IBizRadio = defineComponent({ @@ -72,13 +73,13 @@ export const IBizRadio = defineComponent({ ) : ( {this.items.map((_item, index: number) => ( {_item.text} -- Gitee From 11071c2ee1a40dab58b7b734705f9f2ab6925bc3 Mon Sep 17 00:00:00 2001 From: fzh <1399952343@qq.com> Date: Wed, 13 Sep 2023 19:09:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8Dmpicker=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=8F=AA=E8=AF=BB=E7=8A=B6=E6=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx index f02911361..2abf2c4b9 100644 --- a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx +++ b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx @@ -252,7 +252,7 @@ export const IBizMPicker = defineComponent({ const valueText = computed(() => { return selectItems.value .map(item => { - return item.srfmajortext; + return item[c.textName]; }) .join(','); }); -- Gitee From faf92684ce3b005e88c2baf38326e7cadecd414c Mon Sep 17 00:00:00 2001 From: fzh <1399952343@qq.com> Date: Wed, 13 Sep 2023 19:09:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E8=A1=A8?= =?UTF-8?q?=E6=A0=BC=E8=A1=8C=E8=B6=85=E5=87=BA=E5=90=8E=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?tooltip=E5=BC=82=E5=B8=B8=EF=BC=8C=E9=85=8D=E7=BD=AEtooltip?= =?UTF-8?q?=E8=83=8C=E6=99=AF=E4=B8=BAlight?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/control/grid/grid/grid.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/control/grid/grid/grid.tsx b/src/control/grid/grid/grid.tsx index cb469404d..8cb366158 100644 --- a/src/control/grid/grid/grid.tsx +++ b/src/control/grid/grid/grid.tsx @@ -306,6 +306,7 @@ export const GridControl = defineComponent({ onRowDblclick={this.onDbRowClick} onSelectionChange={this.onSelectionChange} onSortChange={this.onSortChange} + tooltip-effect={'light'} > {{ empty: this.renderNoData, -- Gitee From 94e07789d9d498774f784397bc70f88586ac442b Mon Sep 17 00:00:00 2001 From: fzh <1399952343@qq.com> Date: Wed, 13 Sep 2023 19:10:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A1=A8=E9=80=89=E6=8B=A9=E5=AD=90=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E9=A1=B9=E6=97=B6=E5=B1=95=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 7 +++++++ src/common/code-list/code-list.tsx | 27 +++++++++++++++++++++++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b0c1f421..d6aec8bc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,13 @@ - 面板容器下的 row 不出横向滚动条 - 导航上下文和视图参数转换，取值顺序改为data=>viewParams=>context - 路由打开视图，不再等待返回值。默认直接结束行为状态 + +### Fixed + +- 修复表格行超出后样式tooltip异常，配置tooltip背景为light +- 修复mpicker编辑只读状态数据展示不正常 +- 修复单选编辑器选中无法回显 +- 修复代码表选择子代码项时展示不正常 ## [0.1.23] - 2023-09-12 diff --git a/src/common/code-list/code-list.tsx b/src/common/code-list/code-list.tsx index f0befe80a..170094aa7 100644 --- a/src/common/code-list/code-list.tsx +++ b/src/common/code-list/code-list.tsx @@ -23,6 +23,28 @@ export const IBizCodeList = defineComponent({ const ns = useNamespace('code-list'); const items = ref([]); + const findCodeListItem = ( + codelist: CodeListItem[] | undefined, + value: string | number, + ) => { + if (codelist) { + // eslint-disable-next-line eqeqeq + const findItem = codelist.find(item => item.value == value); + if (findItem) { + return findItem; + } + for (let i = 0; i < codelist.length; i++) { + const childrenItem = findCodeListItem( + codelist[i].children, + value, + ) as CodeListItem; + if (childrenItem) { + return childrenItem; + } + } + } + }; + watch( () => props.value, (newVal, oldVal) => { @@ -39,10 +61,7 @@ export const IBizCodeList = defineComponent({ values = [newVal]; } items.value = values.map(val => { - const findItem = props.codeListItems?.find( - // eslint-disable-next-line eqeqeq - item => item.value == val, - ); + const findItem = findCodeListItem(props.codeListItems, val); return { text: findItem?.text || val, color: findItem?.color, -- Gitee