opentiny
/
tiny-engine
0
0
Fork 9
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

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

This commit is contained in:
betterdancing 2026-02-03 19:43:02 +08:00 committed by GitHub
parent 13864061ca
commit e23d199b2d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builtinComponent/src/components/BaseForm.vue
View File

@ -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,

6
packages/builtinComponent/src/components/BasePage.vue
View File

@ -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
@ -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: {

12
packages/builtinComponent/src/components/BaseTable.vue
View File

@ -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>
@ -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)
@ -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
@ -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: {