From 72d8b98f62fc2c600298f9163461064ff217d735 Mon Sep 17 00:00:00 2001 From: wangailin Date: Mon, 14 Mar 2022 15:27:14 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fixed:=20=E5=AD=90=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=A1=B5=E9=9D=A2=E6=97=B6=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/table/index.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx index 44071b1..044dc70 100644 --- a/src/steps/table/index.tsx +++ b/src/steps/table/index.tsx @@ -750,6 +750,9 @@ export default class TableStep extends Step { const { operation } = this.state operation.enable = false operation.visible = false + if ((operationCallback && operationCallback === true) || Boolean(operationCallback)) { + onUnmount(true) + } this.setState({ operation }) } }) -- Gitee From 45043c11f6e97b60309d957afda7cc7fc19b6663 Mon Sep 17 00:00:00 2001 From: wangailin Date: Tue, 15 Mar 2022 15:26:19 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E5=85=B3=E9=97=AD=E5=92=8C?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=B6=E5=8D=95=E7=8B=AC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=94=E5=9B=9E=EF=BC=9B=E9=81=BF=E5=85=8D?= =?UTF-8?q?=E6=89=80=E6=9C=89=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E6=97=B6?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/table/index.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx index 044dc70..f84fa03 100644 --- a/src/steps/table/index.tsx +++ b/src/steps/table/index.tsx @@ -517,7 +517,8 @@ export default class TableStep extends Step { visible: operationVisible, config: operationConfig, data: operationData, - callback: operationCallback + callback: operationCallback, + cancelCallback: cancelCallback }, pageAuth } = this.state @@ -750,7 +751,7 @@ export default class TableStep extends Step { const { operation } = this.state operation.enable = false operation.visible = false - if ((operationCallback && operationCallback === true) || Boolean(operationCallback)) { + if ((cancelCallback && cancelCallback === true) || Boolean(cancelCallback)) { onUnmount(true) } this.setState({ operation }) -- Gitee From d325ffb6f6d31124a50b7428f8b8dc4be2b500c4 Mon Sep 17 00:00:00 2001 From: wangailin Date: Tue, 15 Mar 2022 15:28:45 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=85=B3?= =?UTF-8?q?=E9=97=AD=E5=92=8C=E5=8F=96=E6=B6=88=E6=97=B6=E7=9A=84=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E9=85=8D=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/table/index.tsx | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx index f84fa03..3a06aa1 100644 --- a/src/steps/table/index.tsx +++ b/src/steps/table/index.tsx @@ -68,6 +68,7 @@ export interface TableCCMSOperationConfig { data: { [key: string]: ParamConfig } params?: { field: string, data: ParamConfig }[] callback?: boolean + cancelCallback?: boolean debug?: boolean } @@ -222,6 +223,8 @@ interface TableState { config: CCMSConfig data: any callback?: boolean + cancelCallback?: boolean + } pageAuth: { [page: string]: boolean } } @@ -241,7 +244,7 @@ export default class TableStep extends Step { /* 服务端分页情况下页码溢出标识：页码溢出时退回重新请求，此标识符用于防止死循环判断 */ pageOverflow: boolean = false - constructor(props: StepProps) { + constructor (props: StepProps) { super(props) this.state = { @@ -253,7 +256,8 @@ export default class TableStep extends Step { visible: false, config: {}, data: {}, - callback: false + callback: false, + cancelCallback: false }, pageAuth: {} } @@ -492,7 +496,7 @@ export default class TableStep extends Step { document.body.appendChild(mask) } - render() { + render () { const { config: { field, @@ -518,7 +522,7 @@ export default class TableStep extends Step { config: operationConfig, data: operationData, callback: operationCallback, - cancelCallback: cancelCallback + cancelCallback: operationCancelCallback }, pageAuth } = this.state @@ -751,7 +755,7 @@ export default class TableStep extends Step { const { operation } = this.state operation.enable = false operation.visible = false - if ((cancelCallback && cancelCallback === true) || Boolean(cancelCallback)) { + if ((operationCancelCallback && operationCancelCallback === true) || Boolean(operationCancelCallback)) { onUnmount(true) } this.setState({ operation }) -- Gitee From 3bd87e7a4ab4f8b82c2eefb1f3ce76a43bb48889 Mon Sep 17 00:00:00 2001 From: wangailin Date: Tue, 15 Mar 2022 15:56:28 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E4=BF=9D=E5=AD=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/table/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx index 3a06aa1..27c7a55 100644 --- a/src/steps/table/index.tsx +++ b/src/steps/table/index.tsx @@ -336,7 +336,8 @@ export default class TableStep extends Step { visible: true, config: operationConfig, data: params, - callback: operation.handle.callback + callback: operation.handle.callback, + cancelCallback: operation.handle.cancelCallback } }) } else if (operation.handle.target === 'page') { -- Gitee From 2def59c63be98be109bc09866bc609289ddea37b Mon Sep 17 00:00:00 2001 From: wangailin Date: Thu, 17 Mar 2022 17:56:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/steps/table/index.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/steps/table/index.tsx b/src/steps/table/index.tsx index 27c7a55..4b17cbe 100644 --- a/src/steps/table/index.tsx +++ b/src/steps/table/index.tsx @@ -68,7 +68,7 @@ export interface TableCCMSOperationConfig { data: { [key: string]: ParamConfig } params?: { field: string, data: ParamConfig }[] callback?: boolean - cancelCallback?: boolean + closeCallback?: boolean debug?: boolean } @@ -223,7 +223,7 @@ interface TableState { config: CCMSConfig data: any callback?: boolean - cancelCallback?: boolean + closeCallback?: boolean } pageAuth: { [page: string]: boolean } @@ -257,7 +257,7 @@ export default class TableStep extends Step { config: {}, data: {}, callback: false, - cancelCallback: false + closeCallback: false }, pageAuth: {} } @@ -337,7 +337,7 @@ export default class TableStep extends Step { config: operationConfig, data: params, callback: operation.handle.callback, - cancelCallback: operation.handle.cancelCallback + closeCallback: operation.handle.closeCallback } }) } else if (operation.handle.target === 'page') { @@ -523,7 +523,7 @@ export default class TableStep extends Step { config: operationConfig, data: operationData, callback: operationCallback, - cancelCallback: operationCancelCallback + closeCallback: operationcloseCallback }, pageAuth } = this.state @@ -756,7 +756,7 @@ export default class TableStep extends Step { const { operation } = this.state operation.enable = false operation.visible = false - if ((operationCancelCallback && operationCancelCallback === true) || Boolean(operationCancelCallback)) { + if ((operationcloseCallback && operationcloseCallback === true) || Boolean(operationcloseCallback)) { onUnmount(true) } this.setState({ operation }) -- Gitee