Browse Source

表格优化提交

main
likunming 10 months ago
parent
commit
c30cb41209
  1. 2
      io.sc.platform.core.frontend/package.json
  2. 15
      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", "name": "platform-core",
"version": "8.1.239", "version": "8.1.240",
"description": "前端核心包,用于快速构建前端的脚手架", "description": "前端核心包,用于快速构建前端的脚手架",
"//main": "库的主文件", "//main": "库的主文件",
"main": "dist/platform-core.js", "main": "dist/platform-core.js",

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

@ -1587,7 +1587,7 @@ const addData = (rowData) => {
} }
}; };
const updateData = (rowData) => { const updateData = (rowData) => {
rowData[rowKey_] = getSelectedRowsComputed.value[0][rowKey_]; rowData[props.primaryKey] = getSelectedRowsComputed.value[0][props.primaryKey];
if (getSelectedRowsComputed.value[0]['children']) { if (getSelectedRowsComputed.value[0]['children']) {
rowData['children'] = getSelectedRowsComputed.value[0]['children']; rowData['children'] = getSelectedRowsComputed.value[0]['children'];
} }
@ -1604,12 +1604,14 @@ const save = async () => {
dialogFormData[props.primaryKey] = getSelectedRowsComputed.value[0][props.primaryKey]; dialogFormData[props.primaryKey] = getSelectedRowsComputed.value[0][props.primaryKey];
} }
let submitFlag = true; let submitFlag = true;
emit('beforeEditorDataSubmit', dialogFormData, (handlerRequestParams: any | boolean) => { let closeDialog = true;
emit('beforeEditorDataSubmit', dialogFormData, (handlerRequestParams: any | boolean, closeFlag: boolean = true) => {
if (typeof handlerRequestParams === 'boolean' && handlerRequestParams === false) { if (typeof handlerRequestParams === 'boolean' && handlerRequestParams === false) {
submitFlag = false; submitFlag = false;
} else { } else {
dialogFormData = handlerRequestParams; dialogFormData = handlerRequestParams;
} }
closeDialog = closeFlag;
}); });
if (submitFlag) { if (submitFlag) {
if (formStatus === 'addTop') { if (formStatus === 'addTop') {
@ -1642,7 +1644,9 @@ const save = async () => {
dialog.dialogButtons[0].loading = false; dialog.dialogButtons[0].loading = false;
emit('afterEditorDataSubmit', resp.data); emit('afterEditorDataSubmit', resp.data);
NotifyManager.info(t('tip.operationSuccess')); NotifyManager.info(t('tip.operationSuccess'));
dialogRef.value.hide(); if (closeDialog) {
dialogRef.value.hide();
}
if (props.refreshData || !props.tree) { if (props.refreshData || !props.tree) {
onRequest({ pagination: state.pagination }); onRequest({ pagination: state.pagination });
} else if (resp.data && (formStatus === PageStatusEnum.新增 || formStatus === 'clone' || formStatus === 'addTop' || formStatus === 'addChild')) { } else if (resp.data && (formStatus === PageStatusEnum.新增 || formStatus === 'clone' || formStatus === 'addTop' || formStatus === 'addChild')) {
@ -1672,6 +1676,9 @@ const save = async () => {
}); });
} else { } else {
dialog.dialogButtons[0].loading = false; dialog.dialogButtons[0].loading = false;
if (closeDialog) {
dialogRef.value.hide();
}
} }
} else { } else {
dialog.dialogButtons[0].loading = false; dialog.dialogButtons[0].loading = false;
@ -1763,7 +1770,7 @@ const setLocalData = (rows: any) => {
const replaceRowHandler = (arr, row) => { const replaceRowHandler = (arr, row) => {
for (let i = 0; i < arr.length; i++) { for (let i = 0; i < arr.length; i++) {
if (row[rowKey_] === arr[i][rowKey_]) { if (row[props.primaryKey] === arr[i][props.primaryKey]) {
arr[i] = { ...arr[i], ...row }; arr[i] = { ...arr[i], ...row };
break; break;
} else if (props.tree && arr[i].children && arr[i].children.length > 0) { } else if (props.tree && arr[i].children && arr[i].children.length > 0) {

Loading…
Cancel
Save