wangxuefeng/low-code
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/new-sys' into 'master'

Browse Source 
fix: 预览接口新增类型传参

See merge request workbench/y-code!31
This commit is contained in:
姚晓琼 2024-10-29 12:08:46 +08:00
commit 7472f5b3dc
3 changed files with 62 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.production
View File

@ -2,6 +2,7 @@ VITE_NODE_ENV = prod
VITE_OA_BASEURL = https://oa.shiyuegame.com
VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com
# VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com
VITE_YCODE_BASEURL = https://custom-chart-api.shiyuegame.com:19998
VITE_YCODE_BASEURL_FRONT = https://custom-chart.shiyuegame.com

2
src/components/common/y-table.vue
View File

@ -125,7 +125,7 @@ const pageState = reactive({
watch(() => props.filterConfig, (newVal) => {
newVal.forEach((item) => {
// 给数值区间类型赋初始值，防止报错
if (item.type === 'number_range') {
if (item.type === 'number_range' && !filterData.value[item.name]) {
filterData.value[item.name] = {
min: undefined,
max: undefined,

51
src/views/view-all-manage/create-view/index.vue
View File

@ -88,6 +88,13 @@
@change="toFilt"
/>
<a-range-picker v-if="item.type === 'time'" class="date-item" v-model:value="previewData.filterData[item.name]" @change="toFilt" />
<a-range-picker v-else-if="item.type === 'date_time'" class="date-time-item" v-model:value="previewData.filterData[item.name]" show-time format="YYYY-MM-DD HH:mm" @change="toFilt" />
<!-- 数值区间 -->
<div v-else-if="item.type === 'number_range' && previewData.filterData[item.name]" class="number_range_box">
<a-input-number placeholder="最小值" style="width: 140px" v-model:value="previewData.filterData[item.name].min" @change="toFilt" />
<span class="divider"> - </span>
<a-input-number placeholder="最大值" style="width: 140px" v-model:value="previewData.filterData[item.name].max" @change="toFilt" />
</div>
</div>
<div v-if="previewData.isExport" class="filter-item"><a-button type="primary">导出</a-button></div>
</div>
@ -285,15 +292,36 @@ const toPreview = ({filter}) => {
return previewData.filterData[item.name] !== undefined && previewData.filterData[item.name] !== null;
})
.map((item) => {
return item.type === 'time' && previewData.filterData[item.name] ? {
if (item.type === 'time' && previewData.filterData[item.name]) {
// 日期类型的参数
return {
name: item.name,
type: item.type,
start_time: previewData.filterData[item.name][0].format('YYYY-MM-DD'),
end_time: previewData.filterData[item.name][1].format('YYYY-MM-DD'),
} : {
};
} else if (item.type === 'date_time' && previewData.filterData[item.name]) {
// 带时分的日期类型参数
return {
name: item.name,
type: item.type,
start_time: previewData.filterData[item.name][0].format('YYYY-MM-DD HH:mm') + ':00',
end_time: previewData.filterData[item.name][1].format('YYYY-MM-DD HH:mm') + ':59',
};
} else if (item.type === 'number_range') {
// 数值区间
return {
name: item.name,
type: item.type,
min: previewData.filterData[item.name].min ? String(previewData.filterData[item.name].min) : '',
max: previewData.filterData[item.name].max ? String(previewData.filterData[item.name].max) : '',
};
} else {
return {
name: item.name,
type: item.type,
value: previewData.filterData[item.name],
};
}
});
} else {
@ -316,9 +344,17 @@ const toPreview = ({filter}) => {
if (res.data.type === "table") {
previewData.filterConfig = res.data.filter;
previewData.filterConfig.forEach((item) => {
if (item.type === 'number_range' && !previewData.filterData[item.name]) {
previewData.filterData[item.name] = {
...item,
min: undefined,
max: undefined,
};
} else {
previewData.filterData[item.name] = previewData.filterData[item.name]
? previewData.filterData[item.name]
: undefined;
}
});
previewData.columnConfig = res.data.header;
previewData.dataList = res.data.data;
@ -427,6 +463,17 @@ const toFilt = () => {
.date-item {
width: 240px;
}
.date-time-item {
width: 300px;
}
.number_range_box {
display: inline-flex;
align-items: center;
.divider {
margin: 0 4px;
}
}
.y-table-content {
margin-top: 10px;
}