fix: onOK关闭逻辑优化.issue #578

frontend/src/app/hooks/useStateModal.tsx

@@ -18,6 +18,7 @@
 
 import { Form, Modal } from 'antd';
 import { useRef } from 'react';
+import { isPromise } from 'utils/object';
 
 export interface IStateModalContentProps {
   onChange: (o: any) => void;
@@ -57,7 +58,11 @@ function useStateModal({ initState }: { initState?: any }) {
             Object.keys(stateRef.current || {}).length > 0
               ? stateRef.current
               : [];
-          okCallbackRef.current?.call(Object.create(null), ...spreadParmas);
+          const okCBResult = okCallbackRef.current?.call(
+            Object.create(null),
+            ...spreadParmas,
+          );
+          if (isPromise(okCBResult)) return okCBResult;
         } catch (e) {
           console.error('useStateModal | exception message ---> ', e);
         }

frontend/src/app/pages/ChartWorkbenchPage/components/ChartOperationPanel/components/ChartDataViewPanel/ChartDataViewPanel.tsx

@@ -70,7 +70,7 @@ const ChartDataViewPanel: FC<{
     originId?: string,
   ) => {
     if (!field) {
-      return;
+      return Promise.reject('field is empty');
     }
 
     let validComputedField = true;
@@ -85,7 +85,7 @@ const ChartDataViewPanel: FC<{
 
     if (!validComputedField) {
       message.error('validate function computed field failed');
-      return;
+      return Promise.reject('validate function computed field failed');
     }
     const otherComputedFields = dataView?.computedFields?.filter(
       f => f.id !== originId,
@@ -95,7 +95,9 @@ const ChartDataViewPanel: FC<{
       message.error(
         'The computed field has already been exist, please choose anohter one!',
       );
-      return;
+      return Promise.reject(
+        'The computed field has already been exist, please choose anohter one!',
+      );
     }
 
     const currentFieldIndex = (dataView?.computedFields || []).findIndex(

frontend/src/utils/object.ts

@@ -261,3 +261,14 @@ export function isEmptyArray(value?) {
 
   return Array.isArray(value) && !value?.length;
 }
+
+export function isPromise(obj?) {
+  if (isEmpty(obj)) {
+    return false;
+  }
+
+  return (
+    (typeof obj === 'object' || typeof obj === 'function') &&
+    typeof obj.then === 'function'
+  );
+}