@dovetail-v2/refine 0.3.34 → 0.3.35

package/dist/hooks/use409Retry.d.ts

@@ -1,4 +1,5 @@
 import { Unstructured } from 'k8s-api-provider';
+import { MutableRefObject, ReactNode } from 'react';
 export type Retry409MetaOptions = {
     /** 编辑表单打开时捕获的初始版本；通常由本 hook 自动捕获，外部一般不需要手动传入。 */
     initialResource?: Unstructured;
@@ -25,6 +26,25 @@ type Use409RetryResult = {
     /** 已合并 409 重试参数的 mutationMeta，应直接传给 refine useFormCore。 */
     mutationMeta: Record<string, unknown>;
 };
+type InitialResourceRef = MutableRefObject<Unstructured | undefined>;
+type Retry409ProviderProps = {
+    /** 需要共享同一份初始版本的表单内容，例如同一个编辑弹窗内的 FORM 和 YAML 模式。 */
+    children?: ReactNode;
+};
+/**
+ * 为同一个编辑弹窗内的多个表单模式共享 409 重试初始版本。
+ *
+ * 背景：FORM 模式保存失败后，如果用户切换到 YAML 模式，YAML 表单会重新挂载。
+ * 如果每个模式都维护自己的初始版本，YAML 可能捕获到已经变化的服务端版本，
+ * 导致 provider 误以为初始版本和服务端版本一致，从而允许覆盖保存。
+ *
+ * 用法：在表单弹窗层包裹一次，内部所有 `use409Retry` 会共用同一个 ref。
+ *
+ * @param props - Provider 属性。
+ * @param props.children - 需要共享初始版本的子节点。
+ * @returns 包裹后的 React 节点。
+ */
+export declare function Retry409Provider({ children, }: Retry409ProviderProps): import("react").FunctionComponentElement<import("react").ProviderProps<InitialResourceRef | null>>;
 /**
  * 为 D2 编辑表单接入 Kubernetes PUT 409 自动恢复能力。
  *

package/dist/refine.cjs

@@ -11053,6 +11053,19 @@ const useGlobalStore = (name2 = "default") => {
   const globalStores = React.useContext(GlobalStoreContext);
   return globalStores[name2];
 };
+const ResourceVersionConflictRetryContext = React.createContext(null);
+function Retry409Provider({
+  children
+}) {
+  const initialResourceRef = React.useRef();
+  return React.createElement(
+    ResourceVersionConflictRetryContext.Provider,
+    {
+      value: initialResourceRef
+    },
+    children
+  );
+}
 function use409Retry({
   action,
   dataProviderName,
@@ -11061,7 +11074,9 @@ function use409Retry({
 }) {
   const { t: t2 } = common.useTranslation();
   const globalStore = useGlobalStore(dataProviderName);
-  const initialResourceRef = React.useRef();
+  const sharedInitialResourceRef = React.useContext(ResourceVersionConflictRetryContext);
+  const localInitialResourceRef = React.useRef();
+  const initialResourceRef = sharedInitialResourceRef || localInitialResourceRef;
   const isEditAction = action === "edit" || !!id;
   const captureInitialResource = React.useCallback((resource) => {
     var _a;
@@ -11073,7 +11088,7 @@ function use409Retry({
       return;
     }
     initialResourceRef.current = lodashEs.cloneDeep(rawResource);
-  }, [globalStore, isEditAction]);
+  }, [globalStore, initialResourceRef, isEditAction]);
   const retryMutationMeta = React.useMemo(() => {
     const restMutationMeta = lodashEs.omit(mutationMeta, "resourceVersionConflictRetry");
     if (!isEditAction) {
@@ -11089,7 +11104,7 @@ function use409Retry({
         conflictMessage: t2("dovetail.resource_version_conflict")
       }
     };
-  }, [isEditAction, mutationMeta, t2]);
+  }, [initialResourceRef, isEditAction, mutationMeta, t2]);
   return {
     captureInitialResource,
     mutationMeta: retryMutationMeta
@@ -17451,37 +17466,39 @@ function FormModal(props) {
       setStep(nextStep);
     }
   }, [step]);
-  return /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.WizardDialog, {
-    style: {
-      "--max-modal-width": isYamlForm || !isDisabledChangeMode ? "1024px" : "648px"
-    },
-    title: /* @__PURE__ */ common.jsxRuntimeExports.jsxs("div", {
-      className: TitleWrapperStyle,
-      children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx("span", {
-        children: title
-      }), ((_b = resourceConfig.formConfig) == null ? void 0 : _b.formType) === FormType.FORM ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(FormModeSegmentControl, {
-        formConfig: resourceConfig.formConfig,
-        mode,
-        onChangeMode
-      }) : null]
-    }),
-    error: errorText,
-    steps,
-    step,
-    onStepChange: handleStepChange,
-    onOk,
-    okButtonProps: {
-      ...lodashEs.omit(saveButtonProps, "onClick"),
-      children: (_c = resourceConfig.formConfig) == null ? void 0 : _c.saveButtonText
-    },
-    okText: ((_d = resourceConfig.formConfig) == null ? void 0 : _d.saveButtonText) || okText,
-    destroyOnClose: true,
-    destroyOtherStep: true,
-    ...modalProps,
-    children: [desc ? /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
-      className: FormDescStyle,
-      children: desc
-    }) : void 0, formEle]
+  return /* @__PURE__ */ common.jsxRuntimeExports.jsx(Retry409Provider, {
+    children: /* @__PURE__ */ common.jsxRuntimeExports.jsxs(eagle.WizardDialog, {
+      style: {
+        "--max-modal-width": isYamlForm || !isDisabledChangeMode ? "1024px" : "648px"
+      },
+      title: /* @__PURE__ */ common.jsxRuntimeExports.jsxs("div", {
+        className: TitleWrapperStyle,
+        children: [/* @__PURE__ */ common.jsxRuntimeExports.jsx("span", {
+          children: title
+        }), ((_b = resourceConfig.formConfig) == null ? void 0 : _b.formType) === FormType.FORM ? /* @__PURE__ */ common.jsxRuntimeExports.jsx(FormModeSegmentControl, {
+          formConfig: resourceConfig.formConfig,
+          mode,
+          onChangeMode
+        }) : null]
+      }),
+      error: errorText,
+      steps,
+      step,
+      onStepChange: handleStepChange,
+      onOk,
+      okButtonProps: {
+        ...lodashEs.omit(saveButtonProps, "onClick"),
+        children: (_c = resourceConfig.formConfig) == null ? void 0 : _c.saveButtonText
+      },
+      okText: ((_d = resourceConfig.formConfig) == null ? void 0 : _d.saveButtonText) || okText,
+      destroyOnClose: true,
+      destroyOtherStep: true,
+      ...modalProps,
+      children: [desc ? /* @__PURE__ */ common.jsxRuntimeExports.jsx("div", {
+        className: FormDescStyle,
+        children: desc
+      }) : void 0, formEle]
+    })
   });
 }
 const RefineFormPage_1v0fhor = "";

package/dist/refine.js

@@ -11034,6 +11034,19 @@ const useGlobalStore = (name2 = "default") => {
   const globalStores = useContext(GlobalStoreContext);
   return globalStores[name2];
 };
+const ResourceVersionConflictRetryContext = createContext(null);
+function Retry409Provider({
+  children
+}) {
+  const initialResourceRef = useRef();
+  return createElement(
+    ResourceVersionConflictRetryContext.Provider,
+    {
+      value: initialResourceRef
+    },
+    children
+  );
+}
 function use409Retry({
   action,
   dataProviderName,
@@ -11042,7 +11055,9 @@ function use409Retry({
 }) {
   const { t: t2 } = useTranslation();
   const globalStore = useGlobalStore(dataProviderName);
-  const initialResourceRef = useRef();
+  const sharedInitialResourceRef = useContext(ResourceVersionConflictRetryContext);
+  const localInitialResourceRef = useRef();
+  const initialResourceRef = sharedInitialResourceRef || localInitialResourceRef;
   const isEditAction = action === "edit" || !!id;
   const captureInitialResource = useCallback((resource) => {
     var _a;
@@ -11054,7 +11069,7 @@ function use409Retry({
       return;
     }
     initialResourceRef.current = cloneDeep(rawResource);
-  }, [globalStore, isEditAction]);
+  }, [globalStore, initialResourceRef, isEditAction]);
   const retryMutationMeta = useMemo(() => {
     const restMutationMeta = omit$1(mutationMeta, "resourceVersionConflictRetry");
     if (!isEditAction) {
@@ -11070,7 +11085,7 @@ function use409Retry({
         conflictMessage: t2("dovetail.resource_version_conflict")
       }
     };
-  }, [isEditAction, mutationMeta, t2]);
+  }, [initialResourceRef, isEditAction, mutationMeta, t2]);
   return {
     captureInitialResource,
     mutationMeta: retryMutationMeta
@@ -17432,37 +17447,39 @@ function FormModal(props) {
       setStep(nextStep);
     }
   }, [step]);
-  return /* @__PURE__ */ jsxRuntimeExports.jsxs(WizardDialog, {
-    style: {
-      "--max-modal-width": isYamlForm || !isDisabledChangeMode ? "1024px" : "648px"
-    },
-    title: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
-      className: TitleWrapperStyle,
-      children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
-        children: title
-      }), ((_b = resourceConfig.formConfig) == null ? void 0 : _b.formType) === FormType.FORM ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormModeSegmentControl, {
-        formConfig: resourceConfig.formConfig,
-        mode,
-        onChangeMode
-      }) : null]
-    }),
-    error: errorText,
-    steps,
-    step,
-    onStepChange: handleStepChange,
-    onOk,
-    okButtonProps: {
-      ...omit$1(saveButtonProps, "onClick"),
-      children: (_c = resourceConfig.formConfig) == null ? void 0 : _c.saveButtonText
-    },
-    okText: ((_d = resourceConfig.formConfig) == null ? void 0 : _d.saveButtonText) || okText,
-    destroyOnClose: true,
-    destroyOtherStep: true,
-    ...modalProps,
-    children: [desc ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
-      className: FormDescStyle,
-      children: desc
-    }) : void 0, formEle]
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(Retry409Provider, {
+    children: /* @__PURE__ */ jsxRuntimeExports.jsxs(WizardDialog, {
+      style: {
+        "--max-modal-width": isYamlForm || !isDisabledChangeMode ? "1024px" : "648px"
+      },
+      title: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", {
+        className: TitleWrapperStyle,
+        children: [/* @__PURE__ */ jsxRuntimeExports.jsx("span", {
+          children: title
+        }), ((_b = resourceConfig.formConfig) == null ? void 0 : _b.formType) === FormType.FORM ? /* @__PURE__ */ jsxRuntimeExports.jsx(FormModeSegmentControl, {
+          formConfig: resourceConfig.formConfig,
+          mode,
+          onChangeMode
+        }) : null]
+      }),
+      error: errorText,
+      steps,
+      step,
+      onStepChange: handleStepChange,
+      onOk,
+      okButtonProps: {
+        ...omit$1(saveButtonProps, "onClick"),
+        children: (_c = resourceConfig.formConfig) == null ? void 0 : _c.saveButtonText
+      },
+      okText: ((_d = resourceConfig.formConfig) == null ? void 0 : _d.saveButtonText) || okText,
+      destroyOnClose: true,
+      destroyOtherStep: true,
+      ...modalProps,
+      children: [desc ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", {
+        className: FormDescStyle,
+        children: desc
+      }) : void 0, formEle]
+    })
   });
 }
 const RefineFormPage_1v0fhor = "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dovetail-v2/refine",
-  "version": "0.3.34",
+  "version": "0.3.35",
   "type": "module",
   "files": [
     "dist",