Skip to content

fix(model): fix several base model component bugs #1761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hexqi merged 15 commits into from
Feb 3, 2026
Merged

fix(model): fix several base model component bugs #1761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
a725ac3
Add files via upload
betterdancing Oct 29, 2025
55e464f
Delete docs/basic-features/ppreas.png
betterdancing Oct 29, 2025
967a971
Merge branch 'opentiny:develop' into develop
betterdancing Oct 31, 2025
c69689a
Merge branch 'opentiny:develop' into develop
betterdancing Nov 6, 2025
372ee1a
Merge branch 'opentiny:develop' into develop
betterdancing Dec 1, 2025
cb95ffb
Merge branch 'opentiny:develop' into develop
betterdancing Dec 9, 2025
aca95bb
Merge branch 'opentiny:develop' into develop
betterdancing Dec 18, 2025
5081684
Merge branch 'opentiny:develop' into develop
betterdancing Jan 15, 2026
96f221a
Merge branch 'opentiny:develop' into develop
betterdancing Jan 20, 2026
2bfbb1c
Merge branch 'opentiny:develop' into develop
betterdancing Jan 23, 2026
1c11943
Merge branch 'opentiny:develop' into develop
betterdancing Jan 29, 2026
a926b80
Merge branch 'opentiny:develop' into develop
betterdancing Jan 30, 2026
b8ca174
Merge branch 'opentiny:develop' into develop
betterdancing Feb 2, 2026
598691c
Merge branch 'opentiny:develop' into develop
betterdancing Feb 3, 2026
7cebff2
fix/model-driven-bugs
betterdancing Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/builtinComponent/src/components/BaseForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
return undefined
}
// 处理查询参数
const params = Object.fromEntries(pageModel.value.parameters.map((item) => [item.prop, null]))
const params = Object.fromEntries(formModel.value.parameters.map((item) => [item.prop, null]))
return getMetaApi(META_SERVICE.Http)
.post(apiInfo.url, {
currentPage: currentPage || 1,
Expand Down
6 changes: 3 additions & 3 deletions packages/builtinComponent/src/components/BasePage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ const updateApi = (data = addFormData.value) => {
})
}

const queryApi = ({ currentPage, pageSize, data } = {}) => {
const queryApi = (data = formData.value) => {
const apiInfo = props.modelApis.find((api) => api.nameEn === 'queryApi')
if (!apiInfo) {
return undefined
Expand All @@ -352,8 +352,8 @@ const queryApi = ({ currentPage, pageSize, data } = {}) => {
const params = Object.fromEntries(pageModel.value.parameters.map((item) => [item.prop, null]))
return getMetaApi(META_SERVICE.Http)
.post(apiInfo.url, {
currentPage: currentPage || 1,
pageSize: pageSize || 10,
currentPage: pagerState.currentPage || 1,
pageSize: pagerState.pageSize || 10,
nameEn: pageModel.value.nameEn,
nameCn: pageModel.value.nameCn,
params: {
Expand Down
12 changes: 5 additions & 7 deletions packages/builtinComponent/src/components/BaseTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<div class="placeholder-layer" v-if="!TableModel || !TableModel?.id">请选择表格模型</div>
<div class="placeholder-layer" v-if="!tableModel || !tableModel?.id">请选择表格模型</div>
<template v-else>
<tiny-grid ref="gridRef" :data="tableData" v-bind="gridState">
<tiny-grid-column v-if="gridState.selectedEnabled" type="selection" width="60"></tiny-grid-column>
Expand Down Expand Up @@ -102,7 +102,7 @@ const attrs = useAttrs()

const gridRef = ref()

const TableModel = computed(() => props.serviceModel)
const tableModel = computed(() => props.serviceModel)

const tableData = ref(props.modelValue)

Expand Down Expand Up @@ -194,9 +194,7 @@ const updateApi = (data) => {
})
}

const queryApi = (
{ currentPage, pageSize, data } = { currentPage: pagerState.currentPage, pageSize: pagerState.pageSize }
) => {
const queryApi = (data) => {
const apiInfo = props.modelApis.find((api) => api.nameEn === 'queryApi')
if (!apiInfo) {
return undefined
Expand All @@ -205,8 +203,8 @@ const queryApi = (
const params = Object.fromEntries(tableModel.value.parameters.map((item) => [item.prop, null]))
return getMetaApi(META_SERVICE.Http)
.post(apiInfo.url, {
currentPage: currentPage || 1,
pageSize: pageSize || 10,
currentPage: pagerState.currentPage || 1,
pageSize: pagerState.pageSize || 10,
nameEn: tableModel.value.nameEn,
nameCn: tableModel.value.nameCn,
params: {
Expand Down