Browse Source

1、表格分页修复,发布版本为:204

main
likunming 10 months ago
parent
commit
ca423d29c3
  1. 2
      io.sc.platform.core.frontend/package.json
  2. 12
      io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue

2
io.sc.platform.core.frontend/package.json

@ -1,6 +1,6 @@
{
"name": "platform-core",
"version": "8.1.202",
"version": "8.1.204",
"description": "前端核心包,用于快速构建前端的脚手架",
"//main": "库的主文件",
"main": "dist/platform-core.js",

12
io.sc.platform.core.frontend/src/platform/components/grid/WGrid.vue

@ -20,7 +20,7 @@
:table-style="tableHeightComputed"
:row-key="rowKey_"
:visible-columns="visibleColumnsComputed"
:hide-bottom="pageable ? false : true"
:hide-bottom="pageable && !tree ? false : true"
@request="onRequest"
@fullscreen="tableFullscreenFun"
>
@ -285,6 +285,7 @@ const props = defineProps({
treeRelationship: { type: String, default: 'parent' }, // parent, childrenparentchildren
primaryKey: { type: String, default: 'id' }, // APIRestCrudControllerupdate
foreignKey: { type: String, default: 'parent' }, //
orderBy: { type: String, default: 'order' }, //
sortBy: {
// ['userName', '-lastModifyDate']-
type: Array,
@ -545,6 +546,7 @@ const toolbarButtonsComputed = computed(() => {
});
const table = reactive({
dragRecords: [],
tickedField: props.tickedField,
selectedField: props.selectedField,
spaceHeight: 4,
@ -1471,7 +1473,7 @@ const onRequest = async (ops: any) => {
state.pagination.rowsNumber = responseData.length;
} else if (typeof responseData === 'object' && responseData.content) {
if (props.pageable) {
state.pagination.page = state.pagination.reqPageStart === 0 && responseData.number === 0 ? responseData.number + 1 : responseData.number;
state.pagination.page = state.pagination.reqPageStart === 0 ? responseData.number + 1 : responseData.number;
state.pagination.rowsPerPage = responseData.size || state.pagination.rowsPerPage;
}
state.pagination.rowsNumber = responseData.totalElements;
@ -1515,7 +1517,6 @@ const addRowKey = (rows: []) => {
if (rows && rows.length > 0) {
rows.forEach((item: any, index) => {
item[rowKey_] = Tools.uuid();
item['_index_'] = index;
item[table.tickedField] = item[table.tickedField] || false;
item[table.selectedField] = item[table.selectedField] || false;
if (props.tree) {
@ -2415,6 +2416,10 @@ const cleanTicked = (arr = table.rows) => {
});
};
const getElement = () => {
return tableRef?.value?.$el;
};
defineExpose({
getSelectedRow,
getSelectedRows,
@ -2442,6 +2447,7 @@ defineExpose({
cleanSelected,
cleanTicked,
view,
getElement,
});
const instance = getCurrentInstance();

Loading…
Cancel
Save