@nocobase/client 0.7.0-alpha.29 → 0.7.0-alpha.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nocobase/client",
-  "version": "0.7.0-alpha.29",
+  "version": "0.7.0-alpha.30",
   "license": "Apache-2.0",
   "licenses": [
     {
@@ -26,10 +26,10 @@
     "@dnd-kit/core": "^5.0.1",
     "@dnd-kit/sortable": "^6.0.0",
     "@emotion/css": "^11.7.1",
-    "@formily/antd": "^2.0.15",
-    "@formily/core": "^2.0.15",
-    "@formily/react": "^2.0.15",
-    "@nocobase/utils": "0.7.0-alpha.29",
+    "@formily/antd": "2.0.20",
+    "@formily/core": "2.0.20",
+    "@formily/react": "2.0.20",
+    "@nocobase/utils": "0.7.0-alpha.30",
     "ahooks": "^3.0.5",
     "antd": "~4.19.5",
     "axios": "^0.24.0",
@@ -66,5 +66,5 @@
     "@types/marked": "^4.0.1",
     "axios-mock-adapter": "^1.20.0"
   },
-  "gitHead": "46e660b10d1cf94ecb808a9a45edb5e8d40398dc"
+  "gitHead": "781fb0a999854341cd8c353d31ae5a11ecbbe775"
 }

package/src/locale/en_US.ts

@@ -286,6 +286,6 @@ export default {
   'Execution History': 'History',
   'Parallel branch': 'Branch',
 
-  'Confirm': 'Confirm',
-  'Form value changed tip': 'Are you sure to exit that Data unsaved',
+  'Unsaved changes': 'Unsaved changes',
+  'Are you sure you don\'t want to save?': 'Are you sure you don\'t want to save?',
 }

package/src/schema-component/antd/action/Action.Drawer.tsx

@@ -1,6 +1,6 @@
 import { css } from '@emotion/css';
 import { observer, RecursionField, useField, useFieldSchema } from '@formily/react';
-import { Drawer, Modal as AntdModal } from 'antd';
+import { Drawer } from 'antd';
 import classNames from 'classnames';
 import React from 'react';
 import { createPortal } from 'react-dom';
@@ -11,7 +11,7 @@ import { ComposedActionDrawer } from './types';
 export const ActionDrawer: ComposedActionDrawer = observer((props) => {
   const { footerNodeName = 'Action.Drawer.Footer', ...others } = props;
   const { t } = useTranslation();
-  const { visible, setVisible, formValueChanged, setFormValueChanged } = useActionContext();
+  const { visible, setVisible } = useActionContext();
   const schema = useFieldSchema();
   const field = useField();
   const footerSchema = schema.reduceProperties((buf, s) => {
@@ -22,18 +22,7 @@ export const ActionDrawer: ComposedActionDrawer = observer((props) => {
   });
 
   const closeHandler = () => {
-    if (!formValueChanged) {
-      setVisible(false);
-      return;
-    }
-    AntdModal.confirm({
-      title: t('Unsaved changes'),
-      content: t("Are you sure you don't want to save?"),
-      async onOk() {
-        setFormValueChanged(false);
-        setVisible(false);
-      },
-    });
+    setVisible(false);
   };
   return (
     <>

package/src/schema-component/antd/action/hooks.ts

@@ -1,5 +1,7 @@
 import { useForm } from '@formily/react';
+import { Modal as AntdModal } from 'antd';
 import { useContext } from 'react';
+import { useTranslation } from 'react-i18next';
 import { ActionContext } from './context';
 
 export const useA = () => {
@@ -10,12 +12,28 @@ export const useA = () => {
 
 export const useActionContext = () => {
   const ctx = useContext(ActionContext);
+  const { t } = useTranslation();
 
   return {
     ...ctx,
     setVisible(visible: boolean) {
       if (ctx?.openMode !== 'page') {
-        ctx?.setVisible?.(visible);
+        if (!visible) {
+          if (ctx.formValueChanged) {
+            AntdModal.confirm({
+              title: t('Unsaved changes'),
+              content: t("Are you sure you don't want to save?"),
+              async onOk() {
+                ctx.setFormValueChanged(false);
+                ctx.setVisible(false);
+              },
+            });
+          } else {
+            ctx.setVisible(false);
+          }
+        } else {
+          ctx?.setVisible?.(visible);
+        }
       }
     },
   };

package/src/schema-component/antd/form-v2/Form.tsx

@@ -62,7 +62,7 @@ const WithForm = (props) => {
     const id = uid();
     form.addEffects(id, () => {
       onFormInputChange((form) => {
-        setFormValueChanged(true);
+        setFormValueChanged?.(true);
       });
     });
     return () => {