@silver-formily/element-plus 3.0.3 → 4.0.2

package/esm/editable/index.d.ts

@@ -1,10 +1,69 @@
 import { IFormItemProps } from "../form-item/types.js";
 import { ElPopover } from "element-plus";
+import * as _$vue from "vue";
 
 //#region src/editable/index.d.ts
 type EditableProps = IFormItemProps;
 type EditablePopoverProps = typeof ElPopover;
-declare const Editable: any;
+declare const Editable: {
+  new (...args: any[]): _$vue.CreateComponentPublicInstanceWithMixins<Readonly<IFormItemProps & {
+    editProps?: IFormItemProps;
+  }> & Readonly<{}>, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, _$vue.PublicProps, {
+    size: "small" | "default" | "large";
+    feedbackLayout: "loose" | "terse" | "popover";
+  }, true, {}, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, {}, any, _$vue.ComponentProvideOptions, {
+    P: {};
+    B: {};
+    D: {};
+    C: {};
+    M: {};
+    Defaults: {};
+  }, Readonly<IFormItemProps & {
+    editProps?: IFormItemProps;
+  }> & Readonly<{}>, {}, {}, {}, {}, {
+    size: "small" | "default" | "large";
+    feedbackLayout: "loose" | "terse" | "popover";
+  }>;
+  __isFragment?: never;
+  __isTeleport?: never;
+  __isSuspense?: never;
+} & _$vue.ComponentOptionsBase<Readonly<IFormItemProps & {
+  editProps?: IFormItemProps;
+}> & Readonly<{}>, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, {
+  size: "small" | "default" | "large";
+  feedbackLayout: "loose" | "terse" | "popover";
+}, {}, string, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, _$vue.ComponentProvideOptions> & _$vue.VNodeProps & _$vue.AllowedComponentProps & _$vue.ComponentCustomProps & (new () => {
+  $slots: {
+    default?: (props: {}) => any;
+  };
+}) & {
+  Popover: {
+    new (...args: any[]): _$vue.CreateComponentPublicInstanceWithMixins<Readonly<IFormItemProps> & Readonly<{}>, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, _$vue.PublicProps, {
+      size: "small" | "default" | "large";
+      feedbackLayout: "loose" | "terse" | "popover";
+    }, true, {}, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, {}, any, _$vue.ComponentProvideOptions, {
+      P: {};
+      B: {};
+      D: {};
+      C: {};
+      M: {};
+      Defaults: {};
+    }, Readonly<IFormItemProps> & Readonly<{}>, {}, {}, {}, {}, {
+      size: "small" | "default" | "large";
+      feedbackLayout: "loose" | "terse" | "popover";
+    }>;
+    __isFragment?: never;
+    __isTeleport?: never;
+    __isSuspense?: never;
+  } & _$vue.ComponentOptionsBase<Readonly<IFormItemProps> & Readonly<{}>, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, {
+    size: "small" | "default" | "large";
+    feedbackLayout: "loose" | "terse" | "popover";
+  }, {}, string, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, _$vue.ComponentProvideOptions> & _$vue.VNodeProps & _$vue.AllowedComponentProps & _$vue.ComponentCustomProps & (new () => {
+    $slots: {
+      default?: (props: {}) => any;
+    };
+  });
+};
 //#endregion
 export { Editable, EditablePopoverProps, EditableProps };
 //# sourceMappingURL=index.d.ts.map

package/esm/form-collapse/index.d.ts

@@ -11,7 +11,7 @@ declare const composeFormCollapse: {
       type: _$vue.PropType<IFormCollapse>;
     };
     activeKey: {
-      type: (NumberConstructor | StringConstructor)[];
+      type: (StringConstructor | NumberConstructor)[];
     };
   }>> & Readonly<{}>, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, _$vue.PublicProps, {}, true, {}, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, {}, any, _$vue.ComponentProvideOptions, {
     P: {};
@@ -25,7 +25,7 @@ declare const composeFormCollapse: {
       type: _$vue.PropType<IFormCollapse>;
     };
     activeKey: {
-      type: (NumberConstructor | StringConstructor)[];
+      type: (StringConstructor | NumberConstructor)[];
     };
   }>> & Readonly<{}>, {}, {}, {}, {}, {}>;
   __isFragment?: never;
@@ -36,7 +36,7 @@ declare const composeFormCollapse: {
     type: _$vue.PropType<IFormCollapse>;
   };
   activeKey: {
-    type: (NumberConstructor | StringConstructor)[];
+    type: (StringConstructor | NumberConstructor)[];
   };
 }>> & Readonly<{}>, {}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, {}, {}, string, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, _$vue.ComponentProvideOptions> & _$vue.VNodeProps & _$vue.AllowedComponentProps & _$vue.ComponentCustomProps & {
   Item: _$vue.DefineComponent<{}, () => _$vue.VNode<_$vue.RendererNode, _$vue.RendererElement, {

package/esm/form-dialog/dialog-content.mjs

@@ -4,7 +4,7 @@ import { stylePrefix } from "../__builtins__/configs/index.mjs";
 import { useEnterSubmit } from "../__builtins__/shared/use-enter-submit.mjs";
 import { resolveDialogElement } from "../shared/overlay-elements.mjs";
 import { ElButton, ElConfigProvider, ElDialog } from "element-plus";
-import { Fragment, computed, createBlock, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeClass, normalizeProps, openBlock, ref, renderSlot, toDisplayString, unref, useSlots, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeClass, normalizeProps, openBlock, ref, renderSlot, toDisplayString, unref, useSlots, withCtx } from "vue";
 import { FormProvider } from "@silver-formily/vue";
 import { isFn } from "@formily/shared";
 import { omit } from "lodash-es";
@@ -68,7 +68,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 					if (unref(isFn)(props.dialogProps.beforeClose)) props.dialogProps.beforeClose(done);
 					else done();
 				}
-			}), createSlots({
+			}), {
+				header: withCtx(() => [slots.header ? renderSlot(_ctx.$slots, "header", {
+					key: 0,
+					resolve: __props.resolve,
+					reject: __props.reject,
+					form: __props.form
+				}) : createCommentVNode("v-if", true)]),
 				default: withCtx(() => [createVNode(unref(FormProvider), { form: props.form }, {
 					default: withCtx(() => [createVNode(unref(ElConfigProvider), normalizeProps(guardReactiveProps(unref(elConfig))), {
 						default: withCtx(() => [renderSlot(_ctx.$slots, "default", {
@@ -95,16 +101,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 					default: withCtx(() => [createTextVNode(toDisplayString(unref(_dialogProps).okText || "确定"), 1)]),
 					_: 1
 				}, 16, ["loading"])], 64))], 2)]),
-				_: 2
-			}, [slots.header ? {
-				name: "header",
-				fn: withCtx(() => [renderSlot(_ctx.$slots, "header", {
-					resolve: __props.resolve,
-					reject: __props.reject,
-					form: __props.form
-				})]),
-				key: "0"
-			} : void 0]), 1040, [
+				_: 3
+			}, 16, [
 				"z-index",
 				"model-value",
 				"before-close"

package/esm/form-dialog/dialog-content.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"dialog-content.mjs","names":[],"sources":["../../src/form-dialog/dialog-content.vue"],"sourcesContent":["<script setup lang=\"ts\">\nimport type { Form } from '@formily/core'\nimport type { ComponentPublicInstance, PropType } from 'vue'\nimport type { FormDialogSlots, IFormDialogProps } from './types'\nimport { isFn } from '@formily/shared'\nimport { FormProvider } from '@silver-formily/vue'\nimport { ElButton, ElConfigProvider, ElDialog } from 'element-plus'\nimport { omit } from 'lodash-es'\nimport { computed, ref } from 'vue'\nimport { loadElConfigProvider, stylePrefix, useDebonceSubmitting } from '../__builtins__'\nimport { useEnterSubmit } from '../__builtins__/shared/use-enter-submit'\nimport { resolveDialogElement } from '../shared/overlay-elements'\n\ndefineOptions({\n  name: 'FormDialogContent',\n})\nconst props = defineProps({\n  dialogProps: {\n    type: Object as PropType<IFormDialogProps>,\n    required: true,\n  },\n  visible: {\n    type: Boolean,\n    required: true,\n  },\n  form: {\n    type: Object as PropType<Form>,\n    required: true,\n  },\n  resolve: {\n    type: Function as PropType<(type?: string) => void>,\n    required: true,\n  },\n  reject: {\n    type: Function as PropType<() => void>,\n    required: true,\n  },\n})\n\nconst slots = defineSlots<FormDialogSlots>()\nconst prefixCls = `${stylePrefix}-form-dialog`\nconst elConfig = loadElConfigProvider()\nconst _dialogProps = omit(props.dialogProps, [\n  'modelValue',\n  'onUpdate:modelValue',\n  'beforeClose',\n  'enterSubmit',\n])\nconst { internalSubmitting } = useDebonceSubmitting(props.form)\nconst dialogRef = ref<ComponentPublicInstance | null>(null)\nconst enableEnterSubmit = computed(() => props.dialogProps.enterSubmit !== false)\n\nuseEnterSubmit({\n  visible: computed(() => props.visible),\n  resolve: () => props.resolve(),\n  submitting: internalSubmitting,\n  getContainer: () => resolveDialogElement(dialogRef.value),\n  enabled: enableEnterSubmit,\n})\n</script>\n\n<template>\n  <ElDialog\n    ref=\"dialogRef\"\n    :class=\"prefixCls\"\n    :z-index=\"elConfig.zIndex\"\n    v-bind=\"_dialogProps\"\n    :model-value=\"visible\"\n    :before-close=\"(done) => {\n      reject()\n      if (isFn(props.dialogProps.beforeClose)) {\n        props.dialogProps.beforeClose(done)\n      }\n      else {\n        done()\n      }\n    }\"\n  >\n    <template v-if=\"slots.header\" #header>\n      <slot name=\"header\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n    </template>\n\n    <template #default>\n      <FormProvider :form=\"props.form\">\n        <ElConfigProvider v-bind=\"elConfig\">\n          <slot :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </ElConfigProvider>\n      </FormProvider>\n    </template>\n\n    <template #footer>\n      <div :class=\"`${prefixCls}-footer`\">\n        <template v-if=\"slots.footer\">\n          <slot name=\"footer\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </template>\n        <template v-else>\n          <ElButton\n            v-bind=\"_dialogProps.cancelButtonProps\"\n            @click=\"props.reject()\"\n          >\n            {{ _dialogProps.cancelText || '取消' }}\n          </ElButton>\n          <ElButton\n            type=\"primary\"\n            v-bind=\"_dialogProps.okButtonProps\"\n            :loading=\"internalSubmitting\"\n            @click=\"props.resolve()\"\n          >\n            {{ _dialogProps.okText || '确定' }}\n          </ElButton>\n        </template>\n      </div>\n    </template>\n  </ElDialog>\n</template>\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgBA,MAAM,QAAQ;EAuBd,MAAM,QAAQ,UAAA;EACd,MAAM,YAAY,GAAG,YAAY;EACjC,MAAM,WAAW,sBAAqB;EACtC,MAAM,eAAe,KAAK,MAAM,aAAa;GAC3C;GACA;GACA;GACA;GACD,CAAA;EACD,MAAM,EAAE,uBAAuB,qBAAqB,MAAM,KAAI;EAC9D,MAAM,YAAY,IAAoC,KAAI;EAC1D,MAAM,oBAAoB,eAAe,MAAM,YAAY,gBAAgB,MAAK;AAEhF,iBAAe;GACb,SAAS,eAAe,MAAM,QAAQ;GACtC,eAAe,MAAM,SAAS;GAC9B,YAAY;GACZ,oBAAoB,qBAAqB,UAAU,MAAM;GACzD,SAAS;GACV,CAAA;;uBAIC,YAmDW,MAAA,SAAA,EAnDX,WAmDW;aAlDL;IAAJ,KAAI;IACH,OAAO;IACP,WAAS,MAAA,SAAQ,CAAC;MACX,MAAA,aAAY,EAAA;IACnB,eAAa,QAAA;IACb,iBAAe,SAAI;AAAa,aAAA,QAAM;SAAa,MAAA,KAAI,CAAC,MAAM,YAAY,YAAW,CAAa,OAAM,YAAY,YAAY,KAAI;SAA+B,OAAI;;;IAc7J,SAAO,cAKD,CAJf,YAIe,MAAA,aAAA,EAAA,EAJA,MAAM,MAAM,MAAA,EAAA;4BAGN,CAFnB,YAEmB,MAAA,iBAAA,EAAA,eAAA,mBAFO,MAAA,SAAQ,CAAA,CAAA,EAAA;6BACyB,CAAzD,WAAyD,KAAA,QAAA,WAAA;OAAlD,SAAS,QAAA;OAAU,QAAQ,QAAA;OAAS,MAAM,QAAA;;;;;;IAK5C,QAAM,cAqBT,CApBN,mBAoBM,OAAA,EApBA,OAAK,eAAA,GAAK,UAAS,SAAA,EAAA,EAAA,CACP,MAAM,SACpB,WAAuE,KAAA,QAAA,UAAA;;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA;uBAEjE,mBAeW,UAAA,EAAA,KAAA,GAAA,EAAA,CAdT,YAKW,MAAA,SAAA,EALX,WACU,MAIC,aAJW,CAAC,mBAAiB,EACrC,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,MAAM,QAAM,GAAA,CAAA,EAAA;4BAEiB,CAAA,gBAAA,gBAAlC,MAAA,aAAY,CAAC,cAAU,KAAA,EAAA,EAAA,CAAA,CAAA;;YAE5B,YAOW,MAAA,SAAA,EAPX,WAOW,EANT,MAAK,WAAS,EACN,MAAA,aAAY,CAAC,eAAa;KACjC,SAAS,MAAA,mBAAkB;KAC3B,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,MAAM,SAAO;;4BAEY,CAAA,gBAAA,gBAA9B,MAAA,aAAY,CAAC,UAAM,KAAA,EAAA,EAAA,CAAA,CAAA;;;;OA9Bd,MAAM,SAAA;UAAS;sBAC0C,CAAvE,WAAuE,KAAA,QAAA,UAAA;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA"}
+{"version":3,"file":"dialog-content.mjs","names":[],"sources":["../../src/form-dialog/dialog-content.vue"],"sourcesContent":["<script setup lang=\"ts\">\nimport type { Form } from '@formily/core'\nimport type { ComponentPublicInstance, PropType } from 'vue'\nimport type { FormDialogSlots, IFormDialogProps } from './types'\nimport { isFn } from '@formily/shared'\nimport { FormProvider } from '@silver-formily/vue'\nimport { ElButton, ElConfigProvider, ElDialog } from 'element-plus'\nimport { omit } from 'lodash-es'\nimport { computed, ref } from 'vue'\nimport { loadElConfigProvider, stylePrefix, useDebonceSubmitting } from '../__builtins__'\nimport { useEnterSubmit } from '../__builtins__/shared/use-enter-submit'\nimport { resolveDialogElement } from '../shared/overlay-elements'\n\ndefineOptions({\n  name: 'FormDialogContent',\n})\nconst props = defineProps({\n  dialogProps: {\n    type: Object as PropType<IFormDialogProps>,\n    required: true,\n  },\n  visible: {\n    type: Boolean,\n    required: true,\n  },\n  form: {\n    type: Object as PropType<Form>,\n    required: true,\n  },\n  resolve: {\n    type: Function as PropType<(type?: string) => void>,\n    required: true,\n  },\n  reject: {\n    type: Function as PropType<() => void>,\n    required: true,\n  },\n})\n\nconst slots = defineSlots<FormDialogSlots>()\nconst prefixCls = `${stylePrefix}-form-dialog`\nconst elConfig = loadElConfigProvider()\nconst _dialogProps = omit(props.dialogProps, [\n  'modelValue',\n  'onUpdate:modelValue',\n  'beforeClose',\n  'enterSubmit',\n])\nconst { internalSubmitting } = useDebonceSubmitting(props.form)\nconst dialogRef = ref<ComponentPublicInstance | null>(null)\nconst enableEnterSubmit = computed(() => props.dialogProps.enterSubmit !== false)\n\nuseEnterSubmit({\n  visible: computed(() => props.visible),\n  resolve: () => props.resolve(),\n  submitting: internalSubmitting,\n  getContainer: () => resolveDialogElement(dialogRef.value),\n  enabled: enableEnterSubmit,\n})\n</script>\n\n<template>\n  <ElDialog\n    ref=\"dialogRef\"\n    :class=\"prefixCls\"\n    :z-index=\"elConfig.zIndex\"\n    v-bind=\"_dialogProps\"\n    :model-value=\"visible\"\n    :before-close=\"(done) => {\n      reject()\n      if (isFn(props.dialogProps.beforeClose)) {\n        props.dialogProps.beforeClose(done)\n      }\n      else {\n        done()\n      }\n    }\"\n  >\n    <template #header>\n      <slot v-if=\"slots.header\" name=\"header\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n    </template>\n\n    <template #default>\n      <FormProvider :form=\"props.form\">\n        <ElConfigProvider v-bind=\"elConfig\">\n          <slot :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </ElConfigProvider>\n      </FormProvider>\n    </template>\n\n    <template #footer>\n      <div :class=\"`${prefixCls}-footer`\">\n        <template v-if=\"slots.footer\">\n          <slot name=\"footer\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </template>\n        <template v-else>\n          <ElButton\n            v-bind=\"_dialogProps.cancelButtonProps\"\n            @click=\"props.reject()\"\n          >\n            {{ _dialogProps.cancelText || '取消' }}\n          </ElButton>\n          <ElButton\n            type=\"primary\"\n            v-bind=\"_dialogProps.okButtonProps\"\n            :loading=\"internalSubmitting\"\n            @click=\"props.resolve()\"\n          >\n            {{ _dialogProps.okText || '确定' }}\n          </ElButton>\n        </template>\n      </div>\n    </template>\n  </ElDialog>\n</template>\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgBA,MAAM,QAAQ;EAuBd,MAAM,QAAQ,UAAA;EACd,MAAM,YAAY,GAAG,YAAY;EACjC,MAAM,WAAW,sBAAqB;EACtC,MAAM,eAAe,KAAK,MAAM,aAAa;GAC3C;GACA;GACA;GACA;GACD,CAAA;EACD,MAAM,EAAE,uBAAuB,qBAAqB,MAAM,KAAI;EAC9D,MAAM,YAAY,IAAoC,KAAI;EAC1D,MAAM,oBAAoB,eAAe,MAAM,YAAY,gBAAgB,MAAK;AAEhF,iBAAe;GACb,SAAS,eAAe,MAAM,QAAQ;GACtC,eAAe,MAAM,SAAS;GAC9B,YAAY;GACZ,oBAAoB,qBAAqB,UAAU,MAAM;GACzD,SAAS;GACV,CAAA;;uBAIC,YAmDW,MAAA,SAAA,EAnDX,WAmDW;aAlDL;IAAJ,KAAI;IACH,OAAO;IACP,WAAS,MAAA,SAAQ,CAAC;MACX,MAAA,aAAY,EAAA;IACnB,eAAa,QAAA;IACb,iBAAe,SAAI;AAAa,aAAA,QAAM;SAAa,MAAA,KAAI,CAAC,MAAM,YAAY,YAAW,CAAa,OAAM,YAAY,YAAY,KAAI;SAA+B,OAAI;;;IAU7J,QAAM,cAC4E,CAA/E,MAAM,SAAlB,WAA2F,KAAA,QAAA,UAAA;;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA;;IAG1E,SAAO,cAKD,CAJf,YAIe,MAAA,aAAA,EAAA,EAJA,MAAM,MAAM,MAAA,EAAA;4BAGN,CAFnB,YAEmB,MAAA,iBAAA,EAAA,eAAA,mBAFO,MAAA,SAAQ,CAAA,CAAA,EAAA;6BACyB,CAAzD,WAAyD,KAAA,QAAA,WAAA;OAAlD,SAAS,QAAA;OAAU,QAAQ,QAAA;OAAS,MAAM,QAAA;;;;;;IAK5C,QAAM,cAqBT,CApBN,mBAoBM,OAAA,EApBA,OAAK,eAAA,GAAK,UAAS,SAAA,EAAA,EAAA,CACP,MAAM,SACpB,WAAuE,KAAA,QAAA,UAAA;;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA;uBAEjE,mBAeW,UAAA,EAAA,KAAA,GAAA,EAAA,CAdT,YAKW,MAAA,SAAA,EALX,WACU,MAIC,aAJW,CAAC,mBAAiB,EACrC,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,MAAM,QAAM,GAAA,CAAA,EAAA;4BAEiB,CAAA,gBAAA,gBAAlC,MAAA,aAAY,CAAC,cAAU,KAAA,EAAA,EAAA,CAAA,CAAA;;YAE5B,YAOW,MAAA,SAAA,EAPX,WAOW,EANT,MAAK,WAAS,EACN,MAAA,aAAY,CAAC,eAAa;KACjC,SAAS,MAAA,mBAAkB;KAC3B,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,MAAM,SAAO;;4BAEY,CAAA,gBAAA,gBAA9B,MAAA,aAAY,CAAC,UAAM,KAAA,EAAA,EAAA,CAAA,CAAA"}

package/esm/form-dialog/index.mjs

@@ -1,6 +1,5 @@
 import { getTransitionDuration, loading } from "../__builtins__/shared/loading.mjs";
 import { isVueOptions } from "../__builtins__/shared/utils.mjs";
-import { onUrlChange } from "../shared/url-change-listener.mjs";
 import _sfc_main from "./dialog-content.mjs";
 import { observer } from "@silver-formily/reactive-vue";
 import { createApp, h, ref } from "vue";
@@ -16,7 +15,6 @@ function FormDialog(title, content, dynamicMiddlewareNames) {
 		promise: null,
 		app: null,
 		instance: null,
-		stopUrlChangeListener: void 0,
 		settled: false,
 		openMiddlewares: [],
 		confirmMiddlewares: [],
@@ -35,11 +33,7 @@ function FormDialog(title, content, dynamicMiddlewareNames) {
 		env[`${_middlewareName}Middlewares`] = [];
 	}
 	document.body.append(env.root);
-	const rawProps = isStr(title) ? { title } : title;
-	const props = {
-		...rawProps,
-		closeOnUrlChange: rawProps.closeOnUrlChange ?? true
-	};
+	const props = isStr(title) ? { title } : title;
 	function render(visible, resolve, reject) {
 		const _content = isVueOptions(content) ? { default: () => h(content) } : isFn(content) ? { default: content } : content;
 		if (!env.instance) {
@@ -59,8 +53,6 @@ function FormDialog(title, content, dynamicMiddlewareNames) {
 		env.instance.visible = visible;
 	}
 	function disposeDialog() {
-		env.stopUrlChangeListener?.();
-		env.stopUrlChangeListener = void 0;
 		const animationDuration = getTransitionDuration();
 		setTimeout(() => {
 			env.app?.unmount?.();
@@ -73,12 +65,26 @@ function FormDialog(title, content, dynamicMiddlewareNames) {
 	async function rejectDialog(reject) {
 		if (env.settled) return;
 		env.settled = true;
-		env.stopUrlChangeListener?.();
-		env.stopUrlChangeListener = void 0;
-		await loading(props.loadingText, () => applyMiddleware(env.form, env.cancelMiddlewares));
-		render(false);
-		disposeDialog();
-		reject?.();
+		try {
+			await loading(props.loadingText, () => applyMiddleware(env.form, env.cancelMiddlewares));
+			render(false);
+			disposeDialog();
+			reject?.();
+		} catch {
+			env.settled = false;
+		}
+	}
+	async function submitDialog(type, resolve, close) {
+		if (env.settled) return;
+		env.settled = true;
+		try {
+			await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares));
+			resolve(toJS(env.form.values));
+			close();
+			disposeDialog();
+		} catch {
+			env.settled = false;
+		}
 	}
 	const formDialog = {
 		forOpen: (middleware) => {
@@ -102,19 +108,9 @@ function FormDialog(title, content, dynamicMiddlewareNames) {
 					env.form = env.form || createForm(resPayload);
 					render(true, (type) => {
 						env.form.submit(async () => {
-							if (env.settled) return;
-							env.settled = true;
-							env.stopUrlChangeListener?.();
-							env.stopUrlChangeListener = void 0;
-							await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares));
-							res(toJS(env.form.values));
-							formDialog.close();
-							disposeDialog();
+							await submitDialog(type, res, formDialog.close);
 						}).catch(() => void 0);
 					}, () => rejectDialog(() => rej(/* @__PURE__ */ new Error("cancel"))));
-					if (props.closeOnUrlChange) env.stopUrlChangeListener = onUrlChange(() => {
-						rejectDialog(() => rej(/* @__PURE__ */ new Error("cancel")));
-					});
 				}).catch(
 					/* istanbul ignore next -- @preserve */
 					(error) => rej(error)

package/esm/form-dialog/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["DialogContent"],"sources":["../../src/form-dialog/index.ts"],"sourcesContent":["import type { Form, IFormProps } from '@formily/core'\r\nimport type { IMiddleware } from '@formily/shared'\r\nimport type { App, Component } from 'vue'\r\nimport type { FormDialogSlotContent, IFormDialog, IFormDialogProps } from './types'\r\nimport { createForm } from '@formily/core'\r\nimport { toJS } from '@formily/reactive'\r\nimport { applyMiddleware, isArr, isFn, isStr, isValid, pascalCase } from '@formily/shared'\r\nimport { observer } from '@silver-formily/reactive-vue'\nimport { camelCase } from 'lodash-es'\nimport { createApp, h, ref } from 'vue'\nimport { getTransitionDuration, isVueOptions, loading } from '../__builtins__'\nimport { onUrlChange } from '../shared/url-change-listener'\nimport DialogContent from './dialog-content.vue'\n\r\nexport function FormDialog<\n  T extends object = any,\n  const DynamicMiddlewareNames extends readonly string[] = [],\n>(\n  title: IFormDialogProps | string,\n  content?: Component | FormDialogSlotContent<T, DynamicMiddlewareNames[number]>,\n  dynamicMiddlewareNames?: DynamicMiddlewareNames,\n): IFormDialog<T, DynamicMiddlewareNames[number]> {\n  const env: {\r\n    root?: HTMLElement\r\n    form?: Form<T>\r\n    promise?: Promise<any>\r\n    instance?: any\n    app?: App<Element>\n    stopUrlChangeListener?: () => void\n    settled?: boolean\n    openMiddlewares: IMiddleware<IFormProps<T>>[]\n    confirmMiddlewares: IMiddleware<Form<T>>[]\r\n    cancelMiddlewares: IMiddleware<Form<T>>[]\r\n    [key: `${string}Middlewares`]: IMiddleware<Form<T>>[] | IMiddleware<IFormProps<T>>[] | undefined\r\n  } = {\r\n    root: document.createElement('div'),\r\n    form: null,\r\n    promise: null,\r\n    app: null,\n    instance: null,\n    stopUrlChangeListener: undefined,\n    settled: false,\n    openMiddlewares: [],\n    confirmMiddlewares: [],\r\n    cancelMiddlewares: [],\r\n  }\r\n\r\n  if (isArr(dynamicMiddlewareNames)) {\r\n    for (const middlewareName of dynamicMiddlewareNames) {\r\n      /* istanbul ignore if -- @preserve */\r\n      if (!isStr(middlewareName))\r\n        return\r\n      const _middlewareName = camelCase(middlewareName)\r\n      /* istanbul ignore if -- @preserve */\r\n      if (['open', 'cancel', 'confirm'].includes(_middlewareName)) {\r\n        throw new Error(`for${pascalCase(_middlewareName)} is presved`)\r\n      }\r\n      (env[`${_middlewareName}Middlewares`] = [])\r\n    }\r\n  }\r\n\r\n  document.body.append(env.root)\r\n\r\n  const rawProps = (isStr(title) ? { title } : title) as IFormDialogProps\n  const props = {\n    ...rawProps,\n    closeOnUrlChange: rawProps.closeOnUrlChange ?? true,\n  } as IFormDialogProps\n\n  function render(visible: boolean, resolve?: (type?: string) => any, reject?: () => any) {\n    const _content = isVueOptions(content)\n      ? { default: () => h(content) }\n      : isFn(content)\n        ? { default: content }\n        : content\n    if (!env.instance) {\r\n      const ComponentConstructor = observer({\r\n        setup(_, { expose }) {\r\n          const visible = ref(false)\r\n          expose({\r\n            visible,\r\n          })\r\n          return () => h(DialogContent, {\r\n            dialogProps: props,\r\n            form: env.form,\r\n            resolve,\r\n            reject,\r\n            visible: visible.value,\r\n          }, _content)\r\n        },\r\n      })\r\n      env.app = createApp(ComponentConstructor)\r\n      env.instance = env.app.mount(env.root)\r\n    }\r\n    env.instance.visible = visible\r\n  }\r\n\r\n  function disposeDialog() {\n    env.stopUrlChangeListener?.()\n    env.stopUrlChangeListener = undefined\n    const animationDuration = getTransitionDuration()\n    setTimeout(() => {\n      env.app?.unmount?.()\n      env.app = null\r\n      env.instance = null\r\n      env.root?.remove()\r\n      env.root = undefined\n    }, animationDuration)\n  }\n\n  async function rejectDialog(reject?: () => any) {\n    if (env.settled)\n      return\n\n    env.settled = true\n    env.stopUrlChangeListener?.()\n    env.stopUrlChangeListener = undefined\n    await loading(props.loadingText, () =>\n      applyMiddleware(env.form, env.cancelMiddlewares))\n    render(false)\n    disposeDialog()\n    reject?.()\n  }\n\r\n  const formDialog = {\r\n    forOpen: (middleware: IMiddleware<IFormProps<T>>) => {\r\n      isFn(middleware) && env.openMiddlewares.push(middleware)\r\n      return formDialog\r\n    },\r\n    forConfirm: (middleware: IMiddleware<Form<T>>) => {\r\n      isFn(middleware) && env.confirmMiddlewares.push(middleware)\r\n      return formDialog\r\n    },\r\n    forCancel: (middleware: IMiddleware<Form<T>>) => {\r\n      isFn(middleware) && env.cancelMiddlewares.push(middleware)\r\n      return formDialog\r\n    },\r\n    open: (payload: IFormProps<T>) => {\n      /* istanbul ignore if -- @preserve */\n      if (env.promise)\n        return env.promise\n\n      env.settled = false\n      env.promise = new Promise((res, rej) => {\n        loading(props.loadingText, () => applyMiddleware(payload, env.openMiddlewares))\n          .then((resPayload) => {\n            env.form = env.form || createForm(resPayload as IFormProps<T>)\n            render(true, (type: string) => {\n              env.form.submit(async () => {\n                if (env.settled)\n                  return\n\n                env.settled = true\n                env.stopUrlChangeListener?.()\n                env.stopUrlChangeListener = undefined\n                await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares))\n                res(toJS(env.form.values))\n                formDialog.close()\n                disposeDialog()\n              }).catch(() => undefined)\n            }, () => rejectDialog(() => rej(new Error('cancel'))))\n            if (props.closeOnUrlChange) {\n              env.stopUrlChangeListener = onUrlChange(() => {\n                void rejectDialog(() => rej(new Error('cancel')))\n              })\n            }\n          })\n          .catch(/* istanbul ignore next -- @preserve */ error => rej(error))\n      })\n      return env.promise\n    },\r\n    close: () => {\r\n      /* istanbul ignore if -- @preserve */\r\n      if (!env.root)\r\n        return\r\n      render(false)\r\n    },\r\n  }\r\n  if (isArr(dynamicMiddlewareNames)) {\r\n    for (const middlewareName of dynamicMiddlewareNames) {\r\n      const _middlewareName = camelCase(middlewareName)\r\n      formDialog[`for${pascalCase(_middlewareName)}`] = (middleware: IMiddleware<Form<T>>) => {\r\n        isFn(middleware) && env[`${_middlewareName}Middlewares`].push(middleware)\r\n        return formDialog\r\n      }\r\n    }\r\n  }\r\n\r\n  return formDialog as IFormDialog<T, DynamicMiddlewareNames[number]>\n}\n\r\nexport default FormDialog\r\n"],"mappings":"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"}
+{"version":3,"file":"index.mjs","names":["DialogContent"],"sources":["../../src/form-dialog/index.ts"],"sourcesContent":["import type { Form, IFormProps } from '@formily/core'\nimport type { IMiddleware } from '@formily/shared'\nimport type { App, Component } from 'vue'\nimport type { FormDialogSlotContent, IFormDialog, IFormDialogProps } from './types'\nimport { createForm } from '@formily/core'\nimport { toJS } from '@formily/reactive'\nimport { applyMiddleware, isArr, isFn, isStr, isValid, pascalCase } from '@formily/shared'\nimport { observer } from '@silver-formily/reactive-vue'\nimport { camelCase } from 'lodash-es'\nimport { createApp, h, ref } from 'vue'\nimport { getTransitionDuration, isVueOptions, loading } from '../__builtins__'\nimport DialogContent from './dialog-content.vue'\n\nexport function FormDialog<\n  T extends object = any,\n  const DynamicMiddlewareNames extends readonly string[] = [],\n>(\n  title: IFormDialogProps | string,\n  content?: Component | FormDialogSlotContent<T, DynamicMiddlewareNames[number]>,\n  dynamicMiddlewareNames?: DynamicMiddlewareNames,\n): IFormDialog<T, DynamicMiddlewareNames[number]> {\n  const env: {\n    root?: HTMLElement\n    form?: Form<T>\n    promise?: Promise<any>\n    instance?: any\n    app?: App<Element>\n    settled?: boolean\n    openMiddlewares: IMiddleware<IFormProps<T>>[]\n    confirmMiddlewares: IMiddleware<Form<T>>[]\n    cancelMiddlewares: IMiddleware<Form<T>>[]\n    [key: `${string}Middlewares`]: IMiddleware<Form<T>>[] | IMiddleware<IFormProps<T>>[] | undefined\n  } = {\n    root: document.createElement('div'),\n    form: null,\n    promise: null,\n    app: null,\n    instance: null,\n    settled: false,\n    openMiddlewares: [],\n    confirmMiddlewares: [],\n    cancelMiddlewares: [],\n  }\n\n  if (isArr(dynamicMiddlewareNames)) {\n    for (const middlewareName of dynamicMiddlewareNames) {\n      /* istanbul ignore if -- @preserve */\n      if (!isStr(middlewareName))\n        return\n      const _middlewareName = camelCase(middlewareName)\n      /* istanbul ignore if -- @preserve */\n      if (['open', 'cancel', 'confirm'].includes(_middlewareName)) {\n        throw new Error(`for${pascalCase(_middlewareName)} is presved`)\n      }\n      (env[`${_middlewareName}Middlewares`] = [])\n    }\n  }\n\n  document.body.append(env.root)\n\n  const props = (isStr(title) ? { title } : title) as IFormDialogProps\n\n  function render(visible: boolean, resolve?: (type?: string) => any, reject?: () => any) {\n    const _content = isVueOptions(content)\n      ? { default: () => h(content) }\n      : isFn(content)\n        ? { default: content }\n        : content\n    if (!env.instance) {\n      const ComponentConstructor = observer({\n        setup(_, { expose }) {\n          const visible = ref(false)\n          expose({\n            visible,\n          })\n          return () => h(DialogContent, {\n            dialogProps: props,\n            form: env.form,\n            resolve,\n            reject,\n            visible: visible.value,\n          }, _content)\n        },\n      })\n      env.app = createApp(ComponentConstructor)\n      env.instance = env.app.mount(env.root)\n    }\n    env.instance.visible = visible\n  }\n\n  function disposeDialog() {\n    const animationDuration = getTransitionDuration()\n    setTimeout(() => {\n      env.app?.unmount?.()\n      env.app = null\n      env.instance = null\n      env.root?.remove()\n      env.root = undefined\n    }, animationDuration)\n  }\n\n  async function rejectDialog(reject?: () => any) {\n    if (env.settled)\n      return\n\n    env.settled = true\n\n    try {\n      await loading(props.loadingText, () =>\n        applyMiddleware(env.form, env.cancelMiddlewares))\n      render(false)\n      disposeDialog()\n      reject?.()\n    }\n    catch {\n      env.settled = false\n    }\n  }\n\n  async function submitDialog(type: string | undefined, resolve: (payload: any) => void, close: () => void) {\n    if (env.settled)\n      return\n\n    env.settled = true\n\n    try {\n      await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares))\n      resolve(toJS(env.form.values))\n      close()\n      disposeDialog()\n    }\n    catch {\n      env.settled = false\n    }\n  }\n\n  const formDialog = {\n    forOpen: (middleware: IMiddleware<IFormProps<T>>) => {\n      isFn(middleware) && env.openMiddlewares.push(middleware)\n      return formDialog\n    },\n    forConfirm: (middleware: IMiddleware<Form<T>>) => {\n      isFn(middleware) && env.confirmMiddlewares.push(middleware)\n      return formDialog\n    },\n    forCancel: (middleware: IMiddleware<Form<T>>) => {\n      isFn(middleware) && env.cancelMiddlewares.push(middleware)\n      return formDialog\n    },\n    open: (payload: IFormProps<T>) => {\n      /* istanbul ignore if -- @preserve */\n      if (env.promise)\n        return env.promise\n\n      env.settled = false\n      env.promise = new Promise((res, rej) => {\n        loading(props.loadingText, () => applyMiddleware(payload, env.openMiddlewares))\n          .then((resPayload) => {\n            env.form = env.form || createForm(resPayload as IFormProps<T>)\n            render(true, (type: string) => {\n              env.form.submit(async () => {\n                await submitDialog(type, res, formDialog.close)\n              }).catch(() => undefined)\n            }, () => rejectDialog(() => rej(new Error('cancel'))))\n          })\n          .catch(/* istanbul ignore next -- @preserve */ error => rej(error))\n      })\n      return env.promise\n    },\n    close: () => {\n      /* istanbul ignore if -- @preserve */\n      if (!env.root)\n        return\n      render(false)\n    },\n  }\n  if (isArr(dynamicMiddlewareNames)) {\n    for (const middlewareName of dynamicMiddlewareNames) {\n      const _middlewareName = camelCase(middlewareName)\n      formDialog[`for${pascalCase(_middlewareName)}`] = (middleware: IMiddleware<Form<T>>) => {\n        isFn(middleware) && env[`${_middlewareName}Middlewares`].push(middleware)\n        return formDialog\n      }\n    }\n  }\n\n  return formDialog as IFormDialog<T, DynamicMiddlewareNames[number]>\n}\n\nexport default FormDialog\n"],"mappings":"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"}

package/esm/form-dialog/types.d.ts

@@ -11,7 +11,6 @@ type IFormDialogProps = Partial<DialogProps> & {
   okButtonProps?: ButtonProps;
   loadingText?: string;
   enterSubmit?: boolean;
-  closeOnUrlChange?: boolean;
 };
 interface FormDialogResolve {
   (type?: string): void;

package/esm/form-drawer/drawer-content.mjs

@@ -4,7 +4,7 @@ import { stylePrefix } from "../__builtins__/configs/index.mjs";
 import { useEnterSubmit } from "../__builtins__/shared/use-enter-submit.mjs";
 import { resolveDrawerElement } from "../shared/overlay-elements.mjs";
 import { ElButton, ElConfigProvider, ElDrawer } from "element-plus";
-import { Fragment, computed, createBlock, createElementBlock, createElementVNode, createSlots, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeClass, normalizeProps, openBlock, ref, renderSlot, toDisplayString, unref, useSlots, withCtx } from "vue";
+import { Fragment, computed, createBlock, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, guardReactiveProps, mergeProps, normalizeClass, normalizeProps, openBlock, ref, renderSlot, toDisplayString, unref, useSlots, withCtx } from "vue";
 import { FormProvider } from "@silver-formily/vue";
 import { isFn } from "@formily/shared";
 import { omit } from "lodash-es";
@@ -68,7 +68,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 					if (unref(isFn)(props.drawerProps.beforeClose)) props.drawerProps.beforeClose(done);
 					else done();
 				}
-			}), createSlots({
+			}), {
+				header: withCtx(() => [slots.header ? renderSlot(_ctx.$slots, "header", {
+					key: 0,
+					resolve: __props.resolve,
+					reject: __props.reject,
+					form: __props.form
+				}) : createCommentVNode("v-if", true)]),
 				default: withCtx(() => [createVNode(unref(FormProvider), { form: __props.form }, {
 					default: withCtx(() => [createVNode(unref(ElConfigProvider), normalizeProps(guardReactiveProps(unref(elConfig))), {
 						default: withCtx(() => [renderSlot(_ctx.$slots, "default", {
@@ -95,16 +101,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
 					default: withCtx(() => [createTextVNode(toDisplayString(unref(_drawerProps).okText || "确定"), 1)]),
 					_: 1
 				}, 16, ["loading"])], 64))], 2)]),
-				_: 2
-			}, [slots.header ? {
-				name: "header",
-				fn: withCtx(() => [renderSlot(_ctx.$slots, "header", {
-					resolve: __props.resolve,
-					reject: __props.reject,
-					form: __props.form
-				})]),
-				key: "0"
-			} : void 0]), 1040, [
+				_: 3
+			}, 16, [
 				"z-index",
 				"model-value",
 				"before-close"

package/esm/form-drawer/drawer-content.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"drawer-content.mjs","names":[],"sources":["../../src/form-drawer/drawer-content.vue"],"sourcesContent":["<script setup lang=\"ts\">\nimport type { Form } from '@formily/core'\nimport type { ComponentPublicInstance, PropType } from 'vue'\nimport type { FormDrawerSlots, IFormDrawerProps } from './types'\nimport { isFn } from '@formily/shared'\nimport { FormProvider } from '@silver-formily/vue'\nimport { ElButton, ElConfigProvider, ElDrawer } from 'element-plus'\nimport { omit } from 'lodash-es'\nimport { computed, ref } from 'vue'\nimport { loadElConfigProvider, stylePrefix, useDebonceSubmitting } from '../__builtins__'\nimport { useEnterSubmit } from '../__builtins__/shared/use-enter-submit'\nimport { resolveDrawerElement } from '../shared/overlay-elements'\n\ndefineOptions({\n  name: 'FormDrawerContent',\n})\n\nconst props = defineProps({\n  drawerProps: {\n    type: Object as PropType<IFormDrawerProps>,\n    required: true,\n  },\n  visible: {\n    type: Boolean,\n    required: true,\n  },\n  form: {\n    type: Object as PropType<Form>,\n    required: true,\n  },\n  resolve: {\n    type: Function as PropType<(type?: string) => void>,\n    required: true,\n  },\n  reject: {\n    type: Function as PropType<() => void>,\n    required: true,\n  },\n})\nconst slots = defineSlots<FormDrawerSlots>()\nconst prefixCls = `${stylePrefix}-form-drawer`\nconst elConfig = loadElConfigProvider()\n\nconst { internalSubmitting } = useDebonceSubmitting(props.form)\nconst _drawerProps = omit(props.drawerProps, ['modelValue', 'onUpdate:modelValue', 'beforeClose', 'enterSubmit'])\nconst drawerRef = ref<ComponentPublicInstance | null>(null)\nconst enableEnterSubmit = computed(() => props.drawerProps.enterSubmit !== false)\n\nuseEnterSubmit({\n  visible: computed(() => props.visible),\n  resolve: () => props.resolve(),\n  submitting: internalSubmitting,\n  getContainer: () => resolveDrawerElement(drawerRef.value),\n  enabled: enableEnterSubmit,\n})\n</script>\n\n<template>\n  <ElDrawer\n    ref=\"drawerRef\"\n    :class=\"prefixCls\"\n    :z-index=\"elConfig.zIndex\"\n    v-bind=\"_drawerProps\"\n    :model-value=\"visible\"\n    :before-close=\"(done) => {\n      reject()\n      if (isFn(props.drawerProps.beforeClose)) {\n        props.drawerProps.beforeClose(done)\n      }\n      else {\n        done()\n      }\n    }\"\n  >\n    <template v-if=\"slots.header\" #header>\n      <slot name=\"header\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n    </template>\n\n    <template #default>\n      <FormProvider :form=\"form\">\n        <ElConfigProvider v-bind=\"elConfig\">\n          <slot :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </ElConfigProvider>\n      </FormProvider>\n    </template>\n\n    <template #footer>\n      <div :class=\"`${prefixCls}-footer`\">\n        <template v-if=\"slots.footer\">\n          <slot name=\"footer\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </template>\n        <template v-else>\n          <ElButton\n            v-bind=\"_drawerProps.cancelButtonProps\"\n            @click=\"reject()\"\n          >\n            {{ _drawerProps.cancelText || '取消' }}\n          </ElButton>\n          <ElButton\n            type=\"primary\"\n            v-bind=\"_drawerProps.okButtonProps\"\n            :loading=\"internalSubmitting\"\n            @click=\"resolve()\"\n          >\n            {{ _drawerProps.okText || '确定' }}\n          </ElButton>\n        </template>\n      </div>\n    </template>\n  </ElDrawer>\n</template>\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBA,MAAM,QAAQ;EAsBd,MAAM,QAAQ,UAAA;EACd,MAAM,YAAY,GAAG,YAAY;EACjC,MAAM,WAAW,sBAAqB;EAEtC,MAAM,EAAE,uBAAuB,qBAAqB,MAAM,KAAI;EAC9D,MAAM,eAAe,KAAK,MAAM,aAAa;GAAC;GAAc;GAAuB;GAAe;GAAc,CAAA;EAChH,MAAM,YAAY,IAAoC,KAAI;EAC1D,MAAM,oBAAoB,eAAe,MAAM,YAAY,gBAAgB,MAAK;AAEhF,iBAAe;GACb,SAAS,eAAe,MAAM,QAAQ;GACtC,eAAe,MAAM,SAAS;GAC9B,YAAY;GACZ,oBAAoB,qBAAqB,UAAU,MAAM;GACzD,SAAS;GACV,CAAA;;uBAIC,YAmDW,MAAA,SAAA,EAnDX,WAmDW;aAlDL;IAAJ,KAAI;IACH,OAAO;IACP,WAAS,MAAA,SAAQ,CAAC;MACX,MAAA,aAAY,EAAA;IACnB,eAAa,QAAA;IACb,iBAAe,SAAI;AAAa,aAAA,QAAM;SAAa,MAAA,KAAI,CAAC,MAAM,YAAY,YAAW,CAAa,OAAM,YAAY,YAAY,KAAI;SAA+B,OAAI;;;IAc7J,SAAO,cAKD,CAJf,YAIe,MAAA,aAAA,EAAA,EAJA,MAAM,QAAA,MAAI,EAAA;4BAGJ,CAFnB,YAEmB,MAAA,iBAAA,EAAA,eAAA,mBAFO,MAAA,SAAQ,CAAA,CAAA,EAAA;6BACyB,CAAzD,WAAyD,KAAA,QAAA,WAAA;OAAlD,SAAS,QAAA;OAAU,QAAQ,QAAA;OAAS,MAAM,QAAA;;;;;;IAK5C,QAAM,cAqBT,CApBN,mBAoBM,OAAA,EApBA,OAAK,eAAA,GAAK,UAAS,SAAA,EAAA,EAAA,CACP,MAAM,SACpB,WAAuE,KAAA,QAAA,UAAA;;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA;uBAEjE,mBAeW,UAAA,EAAA,KAAA,GAAA,EAAA,CAdT,YAKW,MAAA,SAAA,EALX,WACU,MAIC,aAJW,CAAC,mBAAiB,EACrC,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,QAAA,QAAM,GAAA,CAAA,EAAA;4BAEuB,CAAA,gBAAA,gBAAlC,MAAA,aAAY,CAAC,cAAU,KAAA,EAAA,EAAA,CAAA,CAAA;;YAE5B,YAOW,MAAA,SAAA,EAPX,WAOW,EANT,MAAK,WAAS,EACN,MAAA,aAAY,CAAC,eAAa;KACjC,SAAS,MAAA,mBAAkB;KAC3B,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,QAAA,SAAO;;4BAEkB,CAAA,gBAAA,gBAA9B,MAAA,aAAY,CAAC,UAAM,KAAA,EAAA,EAAA,CAAA,CAAA;;;;OA9Bd,MAAM,SAAA;UAAS;sBAC0C,CAAvE,WAAuE,KAAA,QAAA,UAAA;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA"}
+{"version":3,"file":"drawer-content.mjs","names":[],"sources":["../../src/form-drawer/drawer-content.vue"],"sourcesContent":["<script setup lang=\"ts\">\nimport type { Form } from '@formily/core'\nimport type { ComponentPublicInstance, PropType } from 'vue'\nimport type { FormDrawerSlots, IFormDrawerProps } from './types'\nimport { isFn } from '@formily/shared'\nimport { FormProvider } from '@silver-formily/vue'\nimport { ElButton, ElConfigProvider, ElDrawer } from 'element-plus'\nimport { omit } from 'lodash-es'\nimport { computed, ref } from 'vue'\nimport { loadElConfigProvider, stylePrefix, useDebonceSubmitting } from '../__builtins__'\nimport { useEnterSubmit } from '../__builtins__/shared/use-enter-submit'\nimport { resolveDrawerElement } from '../shared/overlay-elements'\n\ndefineOptions({\n  name: 'FormDrawerContent',\n})\n\nconst props = defineProps({\n  drawerProps: {\n    type: Object as PropType<IFormDrawerProps>,\n    required: true,\n  },\n  visible: {\n    type: Boolean,\n    required: true,\n  },\n  form: {\n    type: Object as PropType<Form>,\n    required: true,\n  },\n  resolve: {\n    type: Function as PropType<(type?: string) => void>,\n    required: true,\n  },\n  reject: {\n    type: Function as PropType<() => void>,\n    required: true,\n  },\n})\nconst slots = defineSlots<FormDrawerSlots>()\nconst prefixCls = `${stylePrefix}-form-drawer`\nconst elConfig = loadElConfigProvider()\n\nconst { internalSubmitting } = useDebonceSubmitting(props.form)\nconst _drawerProps = omit(props.drawerProps, ['modelValue', 'onUpdate:modelValue', 'beforeClose', 'enterSubmit'])\nconst drawerRef = ref<ComponentPublicInstance | null>(null)\nconst enableEnterSubmit = computed(() => props.drawerProps.enterSubmit !== false)\n\nuseEnterSubmit({\n  visible: computed(() => props.visible),\n  resolve: () => props.resolve(),\n  submitting: internalSubmitting,\n  getContainer: () => resolveDrawerElement(drawerRef.value),\n  enabled: enableEnterSubmit,\n})\n</script>\n\n<template>\n  <ElDrawer\n    ref=\"drawerRef\"\n    :class=\"prefixCls\"\n    :z-index=\"elConfig.zIndex\"\n    v-bind=\"_drawerProps\"\n    :model-value=\"visible\"\n    :before-close=\"(done) => {\n      reject()\n      if (isFn(props.drawerProps.beforeClose)) {\n        props.drawerProps.beforeClose(done)\n      }\n      else {\n        done()\n      }\n    }\"\n  >\n    <template #header>\n      <slot v-if=\"slots.header\" name=\"header\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n    </template>\n\n    <template #default>\n      <FormProvider :form=\"form\">\n        <ElConfigProvider v-bind=\"elConfig\">\n          <slot :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </ElConfigProvider>\n      </FormProvider>\n    </template>\n\n    <template #footer>\n      <div :class=\"`${prefixCls}-footer`\">\n        <template v-if=\"slots.footer\">\n          <slot name=\"footer\" :resolve=\"resolve\" :reject=\"reject\" :form=\"form\" />\n        </template>\n        <template v-else>\n          <ElButton\n            v-bind=\"_drawerProps.cancelButtonProps\"\n            @click=\"reject()\"\n          >\n            {{ _drawerProps.cancelText || '取消' }}\n          </ElButton>\n          <ElButton\n            type=\"primary\"\n            v-bind=\"_drawerProps.okButtonProps\"\n            :loading=\"internalSubmitting\"\n            @click=\"resolve()\"\n          >\n            {{ _drawerProps.okText || '确定' }}\n          </ElButton>\n        </template>\n      </div>\n    </template>\n  </ElDrawer>\n</template>\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiBA,MAAM,QAAQ;EAsBd,MAAM,QAAQ,UAAA;EACd,MAAM,YAAY,GAAG,YAAY;EACjC,MAAM,WAAW,sBAAqB;EAEtC,MAAM,EAAE,uBAAuB,qBAAqB,MAAM,KAAI;EAC9D,MAAM,eAAe,KAAK,MAAM,aAAa;GAAC;GAAc;GAAuB;GAAe;GAAc,CAAA;EAChH,MAAM,YAAY,IAAoC,KAAI;EAC1D,MAAM,oBAAoB,eAAe,MAAM,YAAY,gBAAgB,MAAK;AAEhF,iBAAe;GACb,SAAS,eAAe,MAAM,QAAQ;GACtC,eAAe,MAAM,SAAS;GAC9B,YAAY;GACZ,oBAAoB,qBAAqB,UAAU,MAAM;GACzD,SAAS;GACV,CAAA;;uBAIC,YAmDW,MAAA,SAAA,EAnDX,WAmDW;aAlDL;IAAJ,KAAI;IACH,OAAO;IACP,WAAS,MAAA,SAAQ,CAAC;MACX,MAAA,aAAY,EAAA;IACnB,eAAa,QAAA;IACb,iBAAe,SAAI;AAAa,aAAA,QAAM;SAAa,MAAA,KAAI,CAAC,MAAM,YAAY,YAAW,CAAa,OAAM,YAAY,YAAY,KAAI;SAA+B,OAAI;;;IAU7J,QAAM,cAC4E,CAA/E,MAAM,SAAlB,WAA2F,KAAA,QAAA,UAAA;;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA;;IAG1E,SAAO,cAKD,CAJf,YAIe,MAAA,aAAA,EAAA,EAJA,MAAM,QAAA,MAAI,EAAA;4BAGJ,CAFnB,YAEmB,MAAA,iBAAA,EAAA,eAAA,mBAFO,MAAA,SAAQ,CAAA,CAAA,EAAA;6BACyB,CAAzD,WAAyD,KAAA,QAAA,WAAA;OAAlD,SAAS,QAAA;OAAU,QAAQ,QAAA;OAAS,MAAM,QAAA;;;;;;IAK5C,QAAM,cAqBT,CApBN,mBAoBM,OAAA,EApBA,OAAK,eAAA,GAAK,UAAS,SAAA,EAAA,EAAA,CACP,MAAM,SACpB,WAAuE,KAAA,QAAA,UAAA;;KAAlD,SAAS,QAAA;KAAU,QAAQ,QAAA;KAAS,MAAM,QAAA;uBAEjE,mBAeW,UAAA,EAAA,KAAA,GAAA,EAAA,CAdT,YAKW,MAAA,SAAA,EALX,WACU,MAIC,aAJW,CAAC,mBAAiB,EACrC,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,QAAA,QAAM,GAAA,CAAA,EAAA;4BAEuB,CAAA,gBAAA,gBAAlC,MAAA,aAAY,CAAC,cAAU,KAAA,EAAA,EAAA,CAAA,CAAA;;YAE5B,YAOW,MAAA,SAAA,EAPX,WAOW,EANT,MAAK,WAAS,EACN,MAAA,aAAY,CAAC,eAAa;KACjC,SAAS,MAAA,mBAAkB;KAC3B,SAAK,OAAA,OAAA,OAAA,MAAA,WAAE,QAAA,SAAO;;4BAEkB,CAAA,gBAAA,gBAA9B,MAAA,aAAY,CAAC,UAAM,KAAA,EAAA,EAAA,CAAA,CAAA"}

package/esm/form-drawer/index.mjs

@@ -1,6 +1,5 @@
 import { getTransitionDuration, loading } from "../__builtins__/shared/loading.mjs";
 import { isVueOptions } from "../__builtins__/shared/utils.mjs";
-import { onUrlChange } from "../shared/url-change-listener.mjs";
 import _sfc_main from "./drawer-content.mjs";
 import { observer } from "@silver-formily/reactive-vue";
 import { createApp, h, ref } from "vue";
@@ -16,7 +15,6 @@ function FormDrawer(title, content, dynamicMiddlewareNames) {
 		promise: null,
 		app: null,
 		instance: null,
-		stopUrlChangeListener: void 0,
 		settled: false,
 		openMiddlewares: [],
 		confirmMiddlewares: [],
@@ -35,11 +33,7 @@ function FormDrawer(title, content, dynamicMiddlewareNames) {
 		env[`${_middlewareName}Middlewares`] = [];
 	}
 	document.body.append(env.root);
-	const rawProps = isStr(title) ? { title } : title;
-	const props = {
-		...rawProps,
-		closeOnUrlChange: rawProps.closeOnUrlChange ?? true
-	};
+	const props = isStr(title) ? { title } : title;
 	function render(visible, resolve, reject) {
 		const _content = isVueOptions(content) ? { default: () => h(content) } : isFn(content) ? { default: content } : content;
 		if (!env.instance) {
@@ -59,8 +53,6 @@ function FormDrawer(title, content, dynamicMiddlewareNames) {
 		env.instance.visible = visible;
 	}
 	function disposeDrawer() {
-		env.stopUrlChangeListener?.();
-		env.stopUrlChangeListener = void 0;
 		const animationDuration = getTransitionDuration();
 		setTimeout(() => {
 			env.app?.unmount?.();
@@ -73,12 +65,26 @@ function FormDrawer(title, content, dynamicMiddlewareNames) {
 	async function rejectDrawer(reject) {
 		if (env.settled) return;
 		env.settled = true;
-		env.stopUrlChangeListener?.();
-		env.stopUrlChangeListener = void 0;
-		await loading(props.loadingText, () => applyMiddleware(env.form, env.cancelMiddlewares));
-		render(false);
-		disposeDrawer();
-		reject?.();
+		try {
+			await loading(props.loadingText, () => applyMiddleware(env.form, env.cancelMiddlewares));
+			render(false);
+			disposeDrawer();
+			reject?.();
+		} catch {
+			env.settled = false;
+		}
+	}
+	async function submitDrawer(type, resolve, close) {
+		if (env.settled) return;
+		env.settled = true;
+		try {
+			await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares));
+			resolve(toJS(env.form.values));
+			close();
+			disposeDrawer();
+		} catch {
+			env.settled = false;
+		}
 	}
 	const formDrawer = {
 		forOpen: (middleware) => {
@@ -102,19 +108,9 @@ function FormDrawer(title, content, dynamicMiddlewareNames) {
 					env.form = env.form || createForm(resPayload);
 					render(true, (type) => {
 						env.form.submit(async () => {
-							if (env.settled) return;
-							env.settled = true;
-							env.stopUrlChangeListener?.();
-							env.stopUrlChangeListener = void 0;
-							await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares));
-							res(toJS(env.form.values));
-							formDrawer.close();
-							disposeDrawer();
+							await submitDrawer(type, res, formDrawer.close);
 						}).catch(() => void 0);
 					}, () => rejectDrawer(() => rej(/* @__PURE__ */ new Error("cancel"))));
-					if (props.closeOnUrlChange) env.stopUrlChangeListener = onUrlChange(() => {
-						rejectDrawer(() => rej(/* @__PURE__ */ new Error("cancel")));
-					});
 				}).catch(
 					/* istanbul ignore next -- @preserve */
 					(error) => rej(error)

package/esm/form-drawer/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["DrawerContent"],"sources":["../../src/form-drawer/index.ts"],"sourcesContent":["import type { Form, IFormProps } from '@formily/core'\nimport type { IMiddleware } from '@formily/shared'\nimport type { App, Component } from 'vue'\nimport type { FormDrawerSlotContent, IFormDrawer, IFormDrawerProps } from './types'\nimport { createForm } from '@formily/core'\nimport { toJS } from '@formily/reactive'\nimport { applyMiddleware, isArr, isFn, isStr, isValid, pascalCase } from '@formily/shared'\nimport { observer } from '@silver-formily/reactive-vue'\nimport { camelCase } from 'lodash-es'\nimport { createApp, h, ref } from 'vue'\nimport { getTransitionDuration, isVueOptions, loading } from '../__builtins__'\nimport { onUrlChange } from '../shared/url-change-listener'\nimport DrawerContent from './drawer-content.vue'\n\nexport function FormDrawer<\n  T extends object = any,\n  const DynamicMiddlewareNames extends readonly string[] = [],\n>(\n  title: IFormDrawerProps | string,\n  content?: Component | FormDrawerSlotContent<T, DynamicMiddlewareNames[number]>,\n  dynamicMiddlewareNames?: DynamicMiddlewareNames,\n): IFormDrawer<T, DynamicMiddlewareNames[number]> {\n  const env: {\n    root?: HTMLElement\n    form?: Form<T>\n    promise?: Promise<any>\n    instance?: any\n    app?: App<Element>\n    stopUrlChangeListener?: () => void\n    settled?: boolean\n    openMiddlewares: IMiddleware<IFormProps<T>>[]\n    confirmMiddlewares: IMiddleware<Form<T>>[]\n    cancelMiddlewares: IMiddleware<Form<T>>[]\n    [key: `${string}Middlewares`]: IMiddleware<Form<T>>[] | IMiddleware<IFormProps<T>>[] | undefined\n  } = {\n    root: document.createElement('div'),\n    form: null,\n    promise: null,\n    app: null,\n    instance: null,\n    stopUrlChangeListener: undefined,\n    settled: false,\n    openMiddlewares: [],\n    confirmMiddlewares: [],\n    cancelMiddlewares: [],\n  }\n\n  if (isArr(dynamicMiddlewareNames)) {\n    for (const middlewareName of dynamicMiddlewareNames) {\n      /* istanbul ignore if -- @preserve */\n      if (!isStr(middlewareName))\n        return\n      const _middlewareName = camelCase(middlewareName)\n      /* istanbul ignore if -- @preserve */\n      if (['open', 'cancel', 'confirm'].includes(_middlewareName)) {\n        throw new Error(`for${pascalCase(_middlewareName)} is presved`)\n      }\n      (env[`${_middlewareName}Middlewares`] = [])\n    }\n  }\n\n  document.body.append(env.root)\n\n  const rawProps = (isStr(title) ? { title } : title) as IFormDrawerProps\n  const props = {\n    ...rawProps,\n    closeOnUrlChange: rawProps.closeOnUrlChange ?? true,\n  } as IFormDrawerProps\n\n  function render(visible: boolean, resolve?: (type?: string) => any, reject?: () => any) {\n    const _content = isVueOptions(content)\n      ? { default: () => h(content) }\n      : isFn(content)\n        ? { default: content }\n        : content\n    if (!env.instance) {\n      const ComponentConstructor = observer({\n        setup(_, { expose }) {\n          const visible = ref(false)\n          expose({\n            visible,\n          })\n          return () => h(DrawerContent, {\n            drawerProps: props,\n            form: env.form,\n            resolve,\n            reject,\n            visible: visible.value,\n          }, _content)\n        },\n      })\n      env.app = createApp(ComponentConstructor)\n      env.instance = env.app.mount(env.root)\n    }\n    env.instance.visible = visible\n  }\n\n  function disposeDrawer() {\n    env.stopUrlChangeListener?.()\n    env.stopUrlChangeListener = undefined\n    const animationDuration = getTransitionDuration()\n    setTimeout(() => {\n      env.app?.unmount?.()\n      env.app = null\n      env.instance = null\n      env.root?.remove()\n      env.root = undefined\n    }, animationDuration)\n  }\n\n  async function rejectDrawer(reject?: () => any) {\n    if (env.settled)\n      return\n\n    env.settled = true\n    env.stopUrlChangeListener?.()\n    env.stopUrlChangeListener = undefined\n    await loading(props.loadingText, () =>\n      applyMiddleware(env.form, env.cancelMiddlewares))\n    render(false)\n    disposeDrawer()\n    reject?.()\n  }\n\n  const formDrawer = {\n    forOpen: (middleware: IMiddleware<IFormProps<T>>) => {\n      isFn(middleware) && env.openMiddlewares.push(middleware)\n      return formDrawer\n    },\n    forConfirm: (middleware: IMiddleware<Form<T>>) => {\n      isFn(middleware) && env.confirmMiddlewares.push(middleware)\n      return formDrawer\n    },\n    forCancel: (middleware: IMiddleware<Form<T>>) => {\n      isFn(middleware) && env.cancelMiddlewares.push(middleware)\n      return formDrawer\n    },\n    open: (payload: IFormProps<T>) => {\n      /* istanbul ignore if -- @preserve */\n      if (env.promise)\n        return env.promise\n\n      env.settled = false\n      env.promise = new Promise((res, rej) => {\n        loading(props.loadingText, () => applyMiddleware(payload, env.openMiddlewares))\n          .then((resPayload) => {\n            env.form = env.form || createForm(resPayload as IFormProps<T>)\n            render(true, (type: string) => {\n              env.form.submit(async () => {\n                if (env.settled)\n                  return\n\n                env.settled = true\n                env.stopUrlChangeListener?.()\n                env.stopUrlChangeListener = undefined\n                await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares))\n                res(toJS(env.form.values))\n                formDrawer.close()\n                disposeDrawer()\n              }).catch(() => undefined)\n            }, () => rejectDrawer(() => rej(new Error('cancel'))))\n            if (props.closeOnUrlChange) {\n              env.stopUrlChangeListener = onUrlChange(() => {\n                void rejectDrawer(() => rej(new Error('cancel')))\n              })\n            }\n          })\n          .catch(/* istanbul ignore next -- @preserve */ error => rej(error))\n      })\n      return env.promise\n    },\n    close: () => {\n      /* istanbul ignore if -- @preserve */\n      if (!env.root)\n        return\n      render(false)\n    },\n  }\n\n  if (isArr(dynamicMiddlewareNames)) {\n    for (const middlewareName of dynamicMiddlewareNames) {\n      const _middlewareName = camelCase(middlewareName)\n      formDrawer[`for${pascalCase(_middlewareName)}`] = (middleware: IMiddleware<Form<T>>) => {\n        isFn(middleware) && env[`${_middlewareName}Middlewares`].push(middleware)\n        return formDrawer\n      }\n    }\n  }\n\n  return formDrawer as IFormDrawer<T, DynamicMiddlewareNames[number]>\n}\n\nexport default FormDrawer\n"],"mappings":";;;;;;;;;;;AAcA,SAAgB,WAId,OACA,SACA,wBACgD;CAChD,MAAM,MAYF;EACF,MAAM,SAAS,cAAc,MAAM;EACnC,MAAM;EACN,SAAS;EACT,KAAK;EACL,UAAU;EACV,uBAAuB,KAAA;EACvB,SAAS;EACT,iBAAiB,EAAE;EACnB,oBAAoB,EAAE;EACtB,mBAAmB,EAAE;EACtB;AAED,KAAI,MAAM,uBAAuB,CAC/B,MAAK,MAAM,kBAAkB,wBAAwB;;AAEnD,MAAI,CAAC,MAAM,eAAe,CACxB;EACF,MAAM,kBAAkB,UAAU,eAAe;;AAEjD,MAAI;GAAC;GAAQ;GAAU;GAAU,CAAC,SAAS,gBAAgB,CACzD,OAAM,IAAI,MAAM,MAAM,WAAW,gBAAgB,CAAC,aAAa;AAEhE,MAAI,GAAG,gBAAgB,gBAAgB,EAAE;;AAI9C,UAAS,KAAK,OAAO,IAAI,KAAK;CAE9B,MAAM,WAAY,MAAM,MAAM,GAAG,EAAE,OAAO,GAAG;CAC7C,MAAM,QAAQ;EACZ,GAAG;EACH,kBAAkB,SAAS,oBAAoB;EAChD;CAED,SAAS,OAAO,SAAkB,SAAkC,QAAoB;EACtF,MAAM,WAAW,aAAa,QAAQ,GAClC,EAAE,eAAe,EAAE,QAAQ,EAAE,GAC7B,KAAK,QAAQ,GACX,EAAE,SAAS,SAAS,GACpB;AACN,MAAI,CAAC,IAAI,UAAU;AAgBjB,OAAI,MAAM,UAfmB,SAAS,EACpC,MAAM,GAAG,EAAE,UAAU;IACnB,MAAM,UAAU,IAAI,MAAM;AAC1B,WAAO,EACL,SACD,CAAC;AACF,iBAAa,EAAEA,WAAe;KAC5B,aAAa;KACb,MAAM,IAAI;KACV;KACA;KACA,SAAS,QAAQ;KAClB,EAAE,SAAS;MAEf,CAAC,CACuC;AACzC,OAAI,WAAW,IAAI,IAAI,MAAM,IAAI,KAAK;;AAExC,MAAI,SAAS,UAAU;;CAGzB,SAAS,gBAAgB;AACvB,MAAI,yBAAyB;AAC7B,MAAI,wBAAwB,KAAA;EAC5B,MAAM,oBAAoB,uBAAuB;AACjD,mBAAiB;AACf,OAAI,KAAK,WAAW;AACpB,OAAI,MAAM;AACV,OAAI,WAAW;AACf,OAAI,MAAM,QAAQ;AAClB,OAAI,OAAO,KAAA;KACV,kBAAkB;;CAGvB,eAAe,aAAa,QAAoB;AAC9C,MAAI,IAAI,QACN;AAEF,MAAI,UAAU;AACd,MAAI,yBAAyB;AAC7B,MAAI,wBAAwB,KAAA;AAC5B,QAAM,QAAQ,MAAM,mBAClB,gBAAgB,IAAI,MAAM,IAAI,kBAAkB,CAAC;AACnD,SAAO,MAAM;AACb,iBAAe;AACf,YAAU;;CAGZ,MAAM,aAAa;EACjB,UAAU,eAA2C;AACnD,QAAK,WAAW,IAAI,IAAI,gBAAgB,KAAK,WAAW;AACxD,UAAO;;EAET,aAAa,eAAqC;AAChD,QAAK,WAAW,IAAI,IAAI,mBAAmB,KAAK,WAAW;AAC3D,UAAO;;EAET,YAAY,eAAqC;AAC/C,QAAK,WAAW,IAAI,IAAI,kBAAkB,KAAK,WAAW;AAC1D,UAAO;;EAET,OAAO,YAA2B;;AAEhC,OAAI,IAAI,QACN,QAAO,IAAI;AAEb,OAAI,UAAU;AACd,OAAI,UAAU,IAAI,SAAS,KAAK,QAAQ;AACtC,YAAQ,MAAM,mBAAmB,gBAAgB,SAAS,IAAI,gBAAgB,CAAC,CAC5E,MAAM,eAAe;AACpB,SAAI,OAAO,IAAI,QAAQ,WAAW,WAA4B;AAC9D,YAAO,OAAO,SAAiB;AAC7B,UAAI,KAAK,OAAO,YAAY;AAC1B,WAAI,IAAI,QACN;AAEF,WAAI,UAAU;AACd,WAAI,yBAAyB;AAC7B,WAAI,wBAAwB,KAAA;AAC5B,cAAO,QAAQ,KAAK,GAAG,gBAAgB,IAAI,MAAM,IAAI,GAAG,KAAK,cAAc,GAAG,gBAAgB,IAAI,MAAM,IAAI,mBAAmB;AAC/H,WAAI,KAAK,IAAI,KAAK,OAAO,CAAC;AAC1B,kBAAW,OAAO;AAClB,sBAAe;QACf,CAAC,YAAY,KAAA,EAAU;cAClB,mBAAmB,oBAAI,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC;AACtD,SAAI,MAAM,iBACR,KAAI,wBAAwB,kBAAkB;AACvC,yBAAmB,oBAAI,IAAI,MAAM,SAAS,CAAC,CAAC;OACjD;MAEJ,CACD;;MAA8C,UAAS,IAAI,MAAM;KAAC;KACrE;AACF,UAAO,IAAI;;EAEb,aAAa;;AAEX,OAAI,CAAC,IAAI,KACP;AACF,UAAO,MAAM;;EAEhB;AAED,KAAI,MAAM,uBAAuB,CAC/B,MAAK,MAAM,kBAAkB,wBAAwB;EACnD,MAAM,kBAAkB,UAAU,eAAe;AACjD,aAAW,MAAM,WAAW,gBAAgB,OAAO,eAAqC;AACtF,QAAK,WAAW,IAAI,IAAI,GAAG,gBAAgB,cAAc,KAAK,WAAW;AACzE,UAAO;;;AAKb,QAAO"}
+{"version":3,"file":"index.mjs","names":["DrawerContent"],"sources":["../../src/form-drawer/index.ts"],"sourcesContent":["import type { Form, IFormProps } from '@formily/core'\nimport type { IMiddleware } from '@formily/shared'\nimport type { App, Component } from 'vue'\nimport type { FormDrawerSlotContent, IFormDrawer, IFormDrawerProps } from './types'\nimport { createForm } from '@formily/core'\nimport { toJS } from '@formily/reactive'\nimport { applyMiddleware, isArr, isFn, isStr, isValid, pascalCase } from '@formily/shared'\nimport { observer } from '@silver-formily/reactive-vue'\nimport { camelCase } from 'lodash-es'\nimport { createApp, h, ref } from 'vue'\nimport { getTransitionDuration, isVueOptions, loading } from '../__builtins__'\nimport DrawerContent from './drawer-content.vue'\n\nexport function FormDrawer<\n  T extends object = any,\n  const DynamicMiddlewareNames extends readonly string[] = [],\n>(\n  title: IFormDrawerProps | string,\n  content?: Component | FormDrawerSlotContent<T, DynamicMiddlewareNames[number]>,\n  dynamicMiddlewareNames?: DynamicMiddlewareNames,\n): IFormDrawer<T, DynamicMiddlewareNames[number]> {\n  const env: {\n    root?: HTMLElement\n    form?: Form<T>\n    promise?: Promise<any>\n    instance?: any\n    app?: App<Element>\n    settled?: boolean\n    openMiddlewares: IMiddleware<IFormProps<T>>[]\n    confirmMiddlewares: IMiddleware<Form<T>>[]\n    cancelMiddlewares: IMiddleware<Form<T>>[]\n    [key: `${string}Middlewares`]: IMiddleware<Form<T>>[] | IMiddleware<IFormProps<T>>[] | undefined\n  } = {\n    root: document.createElement('div'),\n    form: null,\n    promise: null,\n    app: null,\n    instance: null,\n    settled: false,\n    openMiddlewares: [],\n    confirmMiddlewares: [],\n    cancelMiddlewares: [],\n  }\n\n  if (isArr(dynamicMiddlewareNames)) {\n    for (const middlewareName of dynamicMiddlewareNames) {\n      /* istanbul ignore if -- @preserve */\n      if (!isStr(middlewareName))\n        return\n      const _middlewareName = camelCase(middlewareName)\n      /* istanbul ignore if -- @preserve */\n      if (['open', 'cancel', 'confirm'].includes(_middlewareName)) {\n        throw new Error(`for${pascalCase(_middlewareName)} is presved`)\n      }\n      (env[`${_middlewareName}Middlewares`] = [])\n    }\n  }\n\n  document.body.append(env.root)\n\n  const props = (isStr(title) ? { title } : title) as IFormDrawerProps\n\n  function render(visible: boolean, resolve?: (type?: string) => any, reject?: () => any) {\n    const _content = isVueOptions(content)\n      ? { default: () => h(content) }\n      : isFn(content)\n        ? { default: content }\n        : content\n    if (!env.instance) {\n      const ComponentConstructor = observer({\n        setup(_, { expose }) {\n          const visible = ref(false)\n          expose({\n            visible,\n          })\n          return () => h(DrawerContent, {\n            drawerProps: props,\n            form: env.form,\n            resolve,\n            reject,\n            visible: visible.value,\n          }, _content)\n        },\n      })\n      env.app = createApp(ComponentConstructor)\n      env.instance = env.app.mount(env.root)\n    }\n    env.instance.visible = visible\n  }\n\n  function disposeDrawer() {\n    const animationDuration = getTransitionDuration()\n    setTimeout(() => {\n      env.app?.unmount?.()\n      env.app = null\n      env.instance = null\n      env.root?.remove()\n      env.root = undefined\n    }, animationDuration)\n  }\n\n  async function rejectDrawer(reject?: () => any) {\n    if (env.settled)\n      return\n\n    env.settled = true\n\n    try {\n      await loading(props.loadingText, () =>\n        applyMiddleware(env.form, env.cancelMiddlewares))\n      render(false)\n      disposeDrawer()\n      reject?.()\n    }\n    catch {\n      env.settled = false\n    }\n  }\n\n  async function submitDrawer(type: string | undefined, resolve: (payload: any) => void, close: () => void) {\n    if (env.settled)\n      return\n\n    env.settled = true\n\n    try {\n      await (isValid(type) ? applyMiddleware(env.form, env[`${type}Middlewares`]) : applyMiddleware(env.form, env.confirmMiddlewares))\n      resolve(toJS(env.form.values))\n      close()\n      disposeDrawer()\n    }\n    catch {\n      env.settled = false\n    }\n  }\n\n  const formDrawer = {\n    forOpen: (middleware: IMiddleware<IFormProps<T>>) => {\n      isFn(middleware) && env.openMiddlewares.push(middleware)\n      return formDrawer\n    },\n    forConfirm: (middleware: IMiddleware<Form<T>>) => {\n      isFn(middleware) && env.confirmMiddlewares.push(middleware)\n      return formDrawer\n    },\n    forCancel: (middleware: IMiddleware<Form<T>>) => {\n      isFn(middleware) && env.cancelMiddlewares.push(middleware)\n      return formDrawer\n    },\n    open: (payload: IFormProps<T>) => {\n      /* istanbul ignore if -- @preserve */\n      if (env.promise)\n        return env.promise\n\n      env.settled = false\n      env.promise = new Promise((res, rej) => {\n        loading(props.loadingText, () => applyMiddleware(payload, env.openMiddlewares))\n          .then((resPayload) => {\n            env.form = env.form || createForm(resPayload as IFormProps<T>)\n            render(true, (type: string) => {\n              env.form.submit(async () => {\n                await submitDrawer(type, res, formDrawer.close)\n              }).catch(() => undefined)\n            }, () => rejectDrawer(() => rej(new Error('cancel'))))\n          })\n          .catch(/* istanbul ignore next -- @preserve */ error => rej(error))\n      })\n      return env.promise\n    },\n    close: () => {\n      /* istanbul ignore if -- @preserve */\n      if (!env.root)\n        return\n      render(false)\n    },\n  }\n\n  if (isArr(dynamicMiddlewareNames)) {\n    for (const middlewareName of dynamicMiddlewareNames) {\n      const _middlewareName = camelCase(middlewareName)\n      formDrawer[`for${pascalCase(_middlewareName)}`] = (middleware: IMiddleware<Form<T>>) => {\n        isFn(middleware) && env[`${_middlewareName}Middlewares`].push(middleware)\n        return formDrawer\n      }\n    }\n  }\n\n  return formDrawer as IFormDrawer<T, DynamicMiddlewareNames[number]>\n}\n\nexport default FormDrawer\n"],"mappings":"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"}

package/esm/form-drawer/types.d.ts

@@ -11,7 +11,6 @@ type IFormDrawerProps = Partial<DrawerProps> & {
   okButtonProps?: ButtonProps;
   loadingText?: string;
   enterSubmit?: boolean;
-  closeOnUrlChange?: boolean;
 };
 interface FormDrawerResolve {
   (type?: string): void;

package/esm/form-item/index.d.ts

@@ -1,9 +1,91 @@
 import { IFormItemProps } from "./types.js";
 import { _default } from "./form-item.vue.js";
+import * as _$element_plus0 from "element-plus";
+import * as _$vue from "vue";
 
 //#region src/form-item/index.d.ts
 declare function fieldFeedbackMapper(props: any, field: any): any;
-declare const FormItem: any;
+declare const FormItem: {
+  new (...args: any[]): _$vue.CreateComponentPublicInstanceWithMixins<Readonly<IFormItemProps> & Readonly<{}>, {
+    feedbackTooltipRef: _$vue.Ref<_$element_plus0.TooltipInstance, _$element_plus0.TooltipInstance>;
+  }, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, _$vue.PublicProps, {
+    asterisk: boolean;
+    colon: boolean;
+    labelWrap: boolean;
+    fullness: boolean;
+  }, true, {}, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, {}, any, _$vue.ComponentProvideOptions, {
+    P: {};
+    B: {};
+    D: {};
+    C: {};
+    M: {};
+    Defaults: {};
+  }, Readonly<IFormItemProps> & Readonly<{}>, {
+    feedbackTooltipRef: _$vue.Ref<_$element_plus0.TooltipInstance, _$element_plus0.TooltipInstance>;
+  }, {}, {}, {}, {
+    asterisk: boolean;
+    colon: boolean;
+    labelWrap: boolean;
+    fullness: boolean;
+  }>;
+  __isFragment?: never;
+  __isTeleport?: never;
+  __isSuspense?: never;
+} & _$vue.ComponentOptionsBase<Readonly<IFormItemProps> & Readonly<{}>, {
+  feedbackTooltipRef: _$vue.Ref<_$element_plus0.TooltipInstance, _$element_plus0.TooltipInstance>;
+}, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, {
+  asterisk: boolean;
+  colon: boolean;
+  labelWrap: boolean;
+  fullness: boolean;
+}, {}, string, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, _$vue.ComponentProvideOptions> & _$vue.VNodeProps & _$vue.AllowedComponentProps & _$vue.ComponentCustomProps & (new () => {
+  $slots: {
+    default?: (props: {}) => any;
+  } & {
+    default?: (props: {}) => any;
+  };
+}) & {
+  BaseItem: {
+    new (...args: any[]): _$vue.CreateComponentPublicInstanceWithMixins<Readonly<IFormItemProps> & Readonly<{}>, {
+      feedbackTooltipRef: _$vue.Ref<_$element_plus0.TooltipInstance, _$element_plus0.TooltipInstance>;
+    }, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, _$vue.PublicProps, {
+      asterisk: boolean;
+      colon: boolean;
+      labelWrap: boolean;
+      fullness: boolean;
+    }, true, {}, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, {}, any, _$vue.ComponentProvideOptions, {
+      P: {};
+      B: {};
+      D: {};
+      C: {};
+      M: {};
+      Defaults: {};
+    }, Readonly<IFormItemProps> & Readonly<{}>, {
+      feedbackTooltipRef: _$vue.Ref<_$element_plus0.TooltipInstance, _$element_plus0.TooltipInstance>;
+    }, {}, {}, {}, {
+      asterisk: boolean;
+      colon: boolean;
+      labelWrap: boolean;
+      fullness: boolean;
+    }>;
+    __isFragment?: never;
+    __isTeleport?: never;
+    __isSuspense?: never;
+  } & _$vue.ComponentOptionsBase<Readonly<IFormItemProps> & Readonly<{}>, {
+    feedbackTooltipRef: _$vue.Ref<_$element_plus0.TooltipInstance, _$element_plus0.TooltipInstance>;
+  }, {}, {}, {}, _$vue.ComponentOptionsMixin, _$vue.ComponentOptionsMixin, {}, string, {
+    asterisk: boolean;
+    colon: boolean;
+    labelWrap: boolean;
+    fullness: boolean;
+  }, {}, string, {}, _$vue.GlobalComponents, _$vue.GlobalDirectives, string, _$vue.ComponentProvideOptions> & _$vue.VNodeProps & _$vue.AllowedComponentProps & _$vue.ComponentCustomProps & (new () => {
+    $slots: {
+      default?: (props: {}) => any;
+    } & {
+      default?: (props: {}) => any;
+    };
+  });
+};
 //#endregion
 export { FormItem, fieldFeedbackMapper };
 //# sourceMappingURL=index.d.ts.map