diff --git a/CHANGELOG.md b/CHANGELOG.md index 1b0c1f421d5c845c506c9acafb2afaa978bbeb85..d6aec8bc9ed3500a5d851bc921cc769dda485f11 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 f0befe80abb7457a031734b5d6f4fb30db6f311b..170094aa7be39f32a57db775cc6014e79537b762 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, diff --git a/src/control/grid/grid/grid.tsx b/src/control/grid/grid/grid.tsx index cb469404dfd635507fb6ea74be9ffaf5c628955e..8cb36615890b47cd99be92f44c3a26780b260c1c 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, diff --git a/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx b/src/editor/data-picker/ibiz-mpicker/ibiz-mpicker.tsx index f02911361f09b314bb6ae73f7b9755e9806b8f9a..2abf2c4b985d85462d184c05e3ef31da285d0537 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(','); }); 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 2d6c1fcccd7ca42805872a4ed2b2938350ad64bf..1d703730bdba617ed4a1e032389d72bed3472261 100644 --- a/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx +++ b/src/editor/radio-button-list/ibiz-radio/ibiz-radio.tsx @@ -72,13 +72,13 @@ export const IBizRadio = defineComponent({ ) : ( {this.items.map((_item, index: number) => ( {_item.text}