@silver-formily/element-plus 4.0.1 → 4.0.3

package/esm/__builtins__/shared/utils.mjs

@@ -25,7 +25,10 @@ function isVueOptions(options) {
 	return options && typeof options !== "function" && (typeof options.template === "string" || typeof options.render === "function" || typeof options.setup === "function" || typeof options.__asyncLoader === "function" || typeof options.__name === "string");
 }
 function composeExport(s0, s1) {
-	return Object.assign(s0, s1);
+	const composed = Object.create(Object.getPrototypeOf(s0));
+	Object.defineProperties(composed, Object.getOwnPropertyDescriptors(s0));
+	Object.defineProperties(composed, Object.getOwnPropertyDescriptors(s1));
+	return composed;
 }
 /* istanbul ignore next -- @preserve */
 function isVnodeEmpty(vnodes) {

package/esm/__builtins__/shared/utils.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"utils.mjs","names":[],"sources":["../../../src/__builtins__/shared/utils.ts"],"sourcesContent":["import type { Component, ComputedRef, Slot, VNode } from 'vue'\nimport { isPlainObj } from '@formily/shared'\nimport { useAttrs, version } from 'element-plus'\nimport { omit } from 'lodash-es'\nimport { Comment, computed, Fragment, Text } from 'vue'\nimport { lt } from './simple-version-compare'\n\nexport function useCleanAttrs(removeAttrsList: string[] = []): {\n  props: ComputedRef<Record<string, any>>\n} {\n  const attrs = useAttrs()\n  const props = computed(() => {\n    const DEFAULT_REMOVE_ATTRS = ['value', 'onChange', 'attrs', 'on', 'readOnly']\n    if (isPlainObj(attrs.value.attrs)) {\n      return omit({ ...attrs.value, ...attrs.value.attrs }, DEFAULT_REMOVE_ATTRS.concat(removeAttrsList))\n    }\n    return omit(attrs.value, DEFAULT_REMOVE_ATTRS.concat(removeAttrsList))\n  })\n  return {\n    props,\n  }\n}\n\nexport function isVueOptions(options: any): options is Component {\n  return (\n    options\n    && typeof options !== 'function'\n    && (typeof options.template === 'string'\n      || typeof options.render === 'function'\n      || typeof options.setup === 'function'\n      || typeof options.__asyncLoader === 'function'\n      || typeof options.__name === 'string')\n  )\n}\n\nexport function composeExport<T0 extends object, T1 extends object>(\n  s0: T0,\n  s1: T1,\n): T0 & T1 {\n  return Object.assign(s0, s1)\n}\n\n// Adapted from https://github.com/vuejs/vue-next/blob/ca17162e377e0a0bf3fae9d92d0fdcb32084a9fe/packages/runtime-core/src/helpers/renderSlot.ts#L77\n/* istanbul ignore next -- @preserve */\nexport function isVnodeEmpty(vnodes: Array<VNode>) {\n  return vnodes.every((node: VNode) => {\n    if (node.type === Comment) {\n      return true\n    }\n\n    if (node.type === Text && typeof node.children === 'string' && !node.children.trim()) {\n      return true\n    }\n\n    if (\n      node.type === Fragment\n      && isVnodeEmpty(node.children as Array<VNode>)\n    ) {\n      return true\n    }\n\n    return false\n  })\n}\n\nexport function hasSlotContent(slot: Slot<any> | undefined) {\n  if (!slot) {\n    return false\n  }\n  return !isVnodeEmpty(slot())\n}\n\nexport function compatibleUnderlineProp() {\n  /* istanbul ignore next -- @preserve */\n  return lt(version, '2.9.9') ? false : 'never'\n}\n"],"mappings":";;;;;;AAOA,SAAgB,cAAc,kBAA4B,EAAE,EAE1D;CACA,MAAM,QAAQ,UAAU;AAQxB,QAAO,EACL,OARY,eAAe;EAC3B,MAAM,uBAAuB;GAAC;GAAS;GAAY;GAAS;GAAM;GAAW;AAC7E,MAAI,WAAW,MAAM,MAAM,MAAM,CAC/B,QAAO,KAAK;GAAE,GAAG,MAAM;GAAO,GAAG,MAAM,MAAM;GAAO,EAAE,qBAAqB,OAAO,gBAAgB,CAAC;AAErG,SAAO,KAAK,MAAM,OAAO,qBAAqB,OAAO,gBAAgB,CAAC;GACtE,EAGD;;AAGH,SAAgB,aAAa,SAAoC;AAC/D,QACE,WACG,OAAO,YAAY,eAClB,OAAO,QAAQ,aAAa,YAC3B,OAAO,QAAQ,WAAW,cAC1B,OAAO,QAAQ,UAAU,cACzB,OAAO,QAAQ,kBAAkB,cACjC,OAAO,QAAQ,WAAW;;AAInC,SAAgB,cACd,IACA,IACS;AACT,QAAO,OAAO,OAAO,IAAI,GAAG;;;AAK9B,SAAgB,aAAa,QAAsB;AACjD,QAAO,OAAO,OAAO,SAAgB;AACnC,MAAI,KAAK,SAAS,QAChB,QAAO;AAGT,MAAI,KAAK,SAAS,QAAQ,OAAO,KAAK,aAAa,YAAY,CAAC,KAAK,SAAS,MAAM,CAClF,QAAO;AAGT,MACE,KAAK,SAAS,YACX,aAAa,KAAK,SAAyB,CAE9C,QAAO;AAGT,SAAO;GACP;;AAGJ,SAAgB,eAAe,MAA6B;AAC1D,KAAI,CAAC,KACH,QAAO;AAET,QAAO,CAAC,aAAa,MAAM,CAAC;;AAG9B,SAAgB,0BAA0B;;AAExC,QAAO,GAAG,SAAS,QAAQ,GAAG,QAAQ"}
+{"version":3,"file":"utils.mjs","names":[],"sources":["../../../src/__builtins__/shared/utils.ts"],"sourcesContent":["import type { Component, ComputedRef, Slot, VNode } from 'vue'\nimport { isPlainObj } from '@formily/shared'\nimport { useAttrs, version } from 'element-plus'\nimport { omit } from 'lodash-es'\nimport { Comment, computed, Fragment, Text } from 'vue'\nimport { lt } from './simple-version-compare'\n\nexport function useCleanAttrs(removeAttrsList: string[] = []): {\n  props: ComputedRef<Record<string, any>>\n} {\n  const attrs = useAttrs()\n  const props = computed(() => {\n    const DEFAULT_REMOVE_ATTRS = ['value', 'onChange', 'attrs', 'on', 'readOnly']\n    if (isPlainObj(attrs.value.attrs)) {\n      return omit({ ...attrs.value, ...attrs.value.attrs }, DEFAULT_REMOVE_ATTRS.concat(removeAttrsList))\n    }\n    return omit(attrs.value, DEFAULT_REMOVE_ATTRS.concat(removeAttrsList))\n  })\n  return {\n    props,\n  }\n}\n\nexport function isVueOptions(options: any): options is Component {\n  return (\n    options\n    && typeof options !== 'function'\n    && (typeof options.template === 'string'\n      || typeof options.render === 'function'\n      || typeof options.setup === 'function'\n      || typeof options.__asyncLoader === 'function'\n      || typeof options.__name === 'string')\n  )\n}\n\nexport function composeExport<T0 extends object, T1 extends object>(\n  s0: T0,\n  s1: T1,\n): T0 & T1 {\n  const composed = Object.create(Object.getPrototypeOf(s0))\n  Object.defineProperties(composed, Object.getOwnPropertyDescriptors(s0))\n  Object.defineProperties(composed, Object.getOwnPropertyDescriptors(s1))\n  return composed\n}\n\n// Adapted from https://github.com/vuejs/vue-next/blob/ca17162e377e0a0bf3fae9d92d0fdcb32084a9fe/packages/runtime-core/src/helpers/renderSlot.ts#L77\n/* istanbul ignore next -- @preserve */\nexport function isVnodeEmpty(vnodes: Array<VNode>) {\n  return vnodes.every((node: VNode) => {\n    if (node.type === Comment) {\n      return true\n    }\n\n    if (node.type === Text && typeof node.children === 'string' && !node.children.trim()) {\n      return true\n    }\n\n    if (\n      node.type === Fragment\n      && isVnodeEmpty(node.children as Array<VNode>)\n    ) {\n      return true\n    }\n\n    return false\n  })\n}\n\nexport function hasSlotContent(slot: Slot<any> | undefined) {\n  if (!slot) {\n    return false\n  }\n  return !isVnodeEmpty(slot())\n}\n\nexport function compatibleUnderlineProp() {\n  /* istanbul ignore next -- @preserve */\n  return lt(version, '2.9.9') ? false : 'never'\n}\n"],"mappings":";;;;;;AAOA,SAAgB,cAAc,kBAA4B,EAAE,EAE1D;CACA,MAAM,QAAQ,UAAU;AAQxB,QAAO,EACL,OARY,eAAe;EAC3B,MAAM,uBAAuB;GAAC;GAAS;GAAY;GAAS;GAAM;GAAW;AAC7E,MAAI,WAAW,MAAM,MAAM,MAAM,CAC/B,QAAO,KAAK;GAAE,GAAG,MAAM;GAAO,GAAG,MAAM,MAAM;GAAO,EAAE,qBAAqB,OAAO,gBAAgB,CAAC;AAErG,SAAO,KAAK,MAAM,OAAO,qBAAqB,OAAO,gBAAgB,CAAC;GACtE,EAGD;;AAGH,SAAgB,aAAa,SAAoC;AAC/D,QACE,WACG,OAAO,YAAY,eAClB,OAAO,QAAQ,aAAa,YAC3B,OAAO,QAAQ,WAAW,cAC1B,OAAO,QAAQ,UAAU,cACzB,OAAO,QAAQ,kBAAkB,cACjC,OAAO,QAAQ,WAAW;;AAInC,SAAgB,cACd,IACA,IACS;CACT,MAAM,WAAW,OAAO,OAAO,OAAO,eAAe,GAAG,CAAC;AACzD,QAAO,iBAAiB,UAAU,OAAO,0BAA0B,GAAG,CAAC;AACvE,QAAO,iBAAiB,UAAU,OAAO,0BAA0B,GAAG,CAAC;AACvE,QAAO;;;AAKT,SAAgB,aAAa,QAAsB;AACjD,QAAO,OAAO,OAAO,SAAgB;AACnC,MAAI,KAAK,SAAS,QAChB,QAAO;AAGT,MAAI,KAAK,SAAS,QAAQ,OAAO,KAAK,aAAa,YAAY,CAAC,KAAK,SAAS,MAAM,CAClF,QAAO;AAGT,MACE,KAAK,SAAS,YACX,aAAa,KAAK,SAAyB,CAE9C,QAAO;AAGT,SAAO;GACP;;AAGJ,SAAgB,eAAe,MAA6B;AAC1D,KAAI,CAAC,KACH,QAAO;AAET,QAAO,CAAC,aAAa,MAAM,CAAC;;AAG9B,SAAgB,0BAA0B;;AAExC,QAAO,GAAG,SAAS,QAAQ,GAAG,QAAQ"}

package/esm/checkbox/index.d.ts

@@ -30,6 +30,16 @@ declare const Checkbox: {
     ariaLabel: {
       type: _$vue.PropType<string>;
     };
+    id: {
+      type: _$vue.PropType<string>;
+      default: undefined;
+    };
+    tabindex: {
+      type: _$vue.PropType<string | number>;
+    };
+    border: {
+      type: _$vue.PropType<boolean>;
+    };
     ariaControls: {
       type: _$vue.PropType<string>;
     };
@@ -59,16 +69,6 @@ declare const Checkbox: {
       type: _$vue.PropType<string | number>;
       default: undefined;
     };
-    id: {
-      type: _$vue.PropType<string>;
-      default: undefined;
-    };
-    border: {
-      type: _$vue.PropType<boolean>;
-    };
-    tabindex: {
-      type: _$vue.PropType<string | number>;
-    };
   }>> & {
     "onUpdate:modelValue"?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
     onChange?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
@@ -121,6 +121,16 @@ declare const Checkbox: {
     ariaLabel: {
       type: _$vue.PropType<string>;
     };
+    id: {
+      type: _$vue.PropType<string>;
+      default: undefined;
+    };
+    tabindex: {
+      type: _$vue.PropType<string | number>;
+    };
+    border: {
+      type: _$vue.PropType<boolean>;
+    };
     ariaControls: {
       type: _$vue.PropType<string>;
     };
@@ -150,16 +160,6 @@ declare const Checkbox: {
       type: _$vue.PropType<string | number>;
       default: undefined;
     };
-    id: {
-      type: _$vue.PropType<string>;
-      default: undefined;
-    };
-    border: {
-      type: _$vue.PropType<boolean>;
-    };
-    tabindex: {
-      type: _$vue.PropType<string | number>;
-    };
   }>> & {
     "onUpdate:modelValue"?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
     onChange?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
@@ -206,6 +206,16 @@ declare const Checkbox: {
   ariaLabel: {
     type: _$vue.PropType<string>;
   };
+  id: {
+    type: _$vue.PropType<string>;
+    default: undefined;
+  };
+  tabindex: {
+    type: _$vue.PropType<string | number>;
+  };
+  border: {
+    type: _$vue.PropType<boolean>;
+  };
   ariaControls: {
     type: _$vue.PropType<string>;
   };
@@ -235,16 +245,6 @@ declare const Checkbox: {
     type: _$vue.PropType<string | number>;
     default: undefined;
   };
-  id: {
-    type: _$vue.PropType<string>;
-    default: undefined;
-  };
-  border: {
-    type: _$vue.PropType<boolean>;
-  };
-  tabindex: {
-    type: _$vue.PropType<string | number>;
-  };
 }>> & {
   "onUpdate:modelValue"?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
   onChange?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
@@ -296,6 +296,16 @@ declare const Checkbox: {
       ariaLabel: {
         type: _$vue.PropType<string>;
       };
+      id: {
+        type: _$vue.PropType<string>;
+        default: undefined;
+      };
+      tabindex: {
+        type: _$vue.PropType<string | number>;
+      };
+      border: {
+        type: _$vue.PropType<boolean>;
+      };
       ariaControls: {
         type: _$vue.PropType<string>;
       };
@@ -325,16 +335,6 @@ declare const Checkbox: {
         type: _$vue.PropType<string | number>;
         default: undefined;
       };
-      id: {
-        type: _$vue.PropType<string>;
-        default: undefined;
-      };
-      border: {
-        type: _$vue.PropType<boolean>;
-      };
-      tabindex: {
-        type: _$vue.PropType<string | number>;
-      };
     }>> & {
       "onUpdate:modelValue"?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
       onChange?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
@@ -387,6 +387,16 @@ declare const Checkbox: {
       ariaLabel: {
         type: _$vue.PropType<string>;
       };
+      id: {
+        type: _$vue.PropType<string>;
+        default: undefined;
+      };
+      tabindex: {
+        type: _$vue.PropType<string | number>;
+      };
+      border: {
+        type: _$vue.PropType<boolean>;
+      };
       ariaControls: {
         type: _$vue.PropType<string>;
       };
@@ -416,16 +426,6 @@ declare const Checkbox: {
         type: _$vue.PropType<string | number>;
         default: undefined;
       };
-      id: {
-        type: _$vue.PropType<string>;
-        default: undefined;
-      };
-      border: {
-        type: _$vue.PropType<boolean>;
-      };
-      tabindex: {
-        type: _$vue.PropType<string | number>;
-      };
     }>> & {
       "onUpdate:modelValue"?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
       onChange?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
@@ -472,6 +472,16 @@ declare const Checkbox: {
     ariaLabel: {
       type: _$vue.PropType<string>;
     };
+    id: {
+      type: _$vue.PropType<string>;
+      default: undefined;
+    };
+    tabindex: {
+      type: _$vue.PropType<string | number>;
+    };
+    border: {
+      type: _$vue.PropType<boolean>;
+    };
     ariaControls: {
       type: _$vue.PropType<string>;
     };
@@ -501,16 +511,6 @@ declare const Checkbox: {
       type: _$vue.PropType<string | number>;
       default: undefined;
     };
-    id: {
-      type: _$vue.PropType<string>;
-      default: undefined;
-    };
-    border: {
-      type: _$vue.PropType<boolean>;
-    };
-    tabindex: {
-      type: _$vue.PropType<string | number>;
-    };
   }>> & {
     "onUpdate:modelValue"?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
     onChange?: ((val: _$element_plus0.CheckboxValueType) => any) | undefined;
@@ -536,6 +536,10 @@ declare const Checkbox: {
   });
   CheckboxGroup: {
     new (...args: any[]): _$vue.CreateComponentPublicInstanceWithMixins<Readonly<_$vue.ExtractPropTypes<{
+      modelValue: {
+        type: _$vue.PropType<_$element_plus0.CheckboxGroupValueType>;
+        default: () => never[];
+      };
       props: {
         type: _$vue.PropType<{
           value?: string;
@@ -548,27 +552,23 @@ declare const Checkbox: {
           disabled?: string;
         }>;
       };
-      fill: {
-        type: _$vue.PropType<string>;
-      };
-      modelValue: {
-        type: _$vue.PropType<_$element_plus0.CheckboxGroupValueType>;
-        default: () => never[];
-      };
       type: {
         type: _$vue.PropType<"button" | "checkbox">;
         default: string;
       };
+      fill: {
+        type: _$vue.PropType<string>;
+      };
       disabled: {
         type: _$vue.PropType<boolean>;
         default: undefined;
       };
-      options: {
-        type: _$vue.PropType<_$element_plus0.CheckboxOption[]>;
-      };
       size: {
         type: _$vue.PropType<"" | "default" | "small" | "large">;
       };
+      options: {
+        type: _$vue.PropType<_$element_plus0.CheckboxOption[]>;
+      };
       validateEvent: {
         type: _$vue.PropType<boolean>;
         default: boolean;
@@ -614,6 +614,10 @@ declare const Checkbox: {
       M: {};
       Defaults: {};
     }, Readonly<_$vue.ExtractPropTypes<{
+      modelValue: {
+        type: _$vue.PropType<_$element_plus0.CheckboxGroupValueType>;
+        default: () => never[];
+      };
       props: {
         type: _$vue.PropType<{
           value?: string;
@@ -626,27 +630,23 @@ declare const Checkbox: {
           disabled?: string;
         }>;
       };
-      fill: {
-        type: _$vue.PropType<string>;
-      };
-      modelValue: {
-        type: _$vue.PropType<_$element_plus0.CheckboxGroupValueType>;
-        default: () => never[];
-      };
       type: {
         type: _$vue.PropType<"button" | "checkbox">;
         default: string;
       };
+      fill: {
+        type: _$vue.PropType<string>;
+      };
       disabled: {
         type: _$vue.PropType<boolean>;
         default: undefined;
       };
-      options: {
-        type: _$vue.PropType<_$element_plus0.CheckboxOption[]>;
-      };
       size: {
         type: _$vue.PropType<"" | "default" | "small" | "large">;
       };
+      options: {
+        type: _$vue.PropType<_$element_plus0.CheckboxOption[]>;
+      };
       validateEvent: {
         type: _$vue.PropType<boolean>;
         default: boolean;
@@ -686,6 +686,10 @@ declare const Checkbox: {
     __isTeleport?: never;
     __isSuspense?: never;
   } & _$vue.ComponentOptionsBase<Readonly<_$vue.ExtractPropTypes<{
+    modelValue: {
+      type: _$vue.PropType<_$element_plus0.CheckboxGroupValueType>;
+      default: () => never[];
+    };
     props: {
       type: _$vue.PropType<{
         value?: string;
@@ -698,27 +702,23 @@ declare const Checkbox: {
         disabled?: string;
       }>;
     };
-    fill: {
-      type: _$vue.PropType<string>;
-    };
-    modelValue: {
-      type: _$vue.PropType<_$element_plus0.CheckboxGroupValueType>;
-      default: () => never[];
-    };
     type: {
       type: _$vue.PropType<"button" | "checkbox">;
       default: string;
     };
+    fill: {
+      type: _$vue.PropType<string>;
+    };
     disabled: {
       type: _$vue.PropType<boolean>;
       default: undefined;
     };
-    options: {
-      type: _$vue.PropType<_$element_plus0.CheckboxOption[]>;
-    };
     size: {
       type: _$vue.PropType<"" | "default" | "small" | "large">;
     };
+    options: {
+      type: _$vue.PropType<_$element_plus0.CheckboxOption[]>;
+    };
     validateEvent: {
       type: _$vue.PropType<boolean>;
       default: boolean;

package/esm/color-picker/index.d.ts

@@ -14,9 +14,6 @@ declare const ColorPicker: _$element_plus_es_utils_index_mjs0.SFCWithInstall<_$v
     type: _$vue.PropType<boolean>;
     default: undefined;
   };
-  size: {
-    type: _$vue.PropType<"" | "default" | "small" | "large">;
-  };
   popperClass: {
     type: _$vue.PropType<string | {
       [x: string]: boolean;
@@ -52,6 +49,9 @@ declare const ColorPicker: _$element_plus_es_utils_index_mjs0.SFCWithInstall<_$v
     type: _$vue.PropType<boolean>;
     default: true;
   };
+  size: {
+    type: _$vue.PropType<"" | "default" | "small" | "large">;
+  };
   clearable: {
     type: _$vue.PropType<boolean>;
     default: true;
@@ -77,16 +77,16 @@ declare const ColorPicker: _$element_plus_es_utils_index_mjs0.SFCWithInstall<_$v
   id: {
     type: _$vue.PropType<string>;
   };
-  tabindex: {
-    type: _$vue.PropType<string | number>;
-    default: 0;
-  };
   showAlpha: {
     type: _$vue.PropType<boolean>;
   };
   colorFormat: {
     type: _$vue.PropType<string>;
   };
+  tabindex: {
+    type: _$vue.PropType<string | number>;
+    default: 0;
+  };
   appendTo: {
     type: _$vue.PropType<string | HTMLElement>;
   };
@@ -115,9 +115,6 @@ declare const ColorPicker: _$element_plus_es_utils_index_mjs0.SFCWithInstall<_$v
     type: _$vue.PropType<boolean>;
     default: undefined;
   };
-  size: {
-    type: _$vue.PropType<"" | "default" | "small" | "large">;
-  };
   popperClass: {
     type: _$vue.PropType<string | {
       [x: string]: boolean;
@@ -153,6 +150,9 @@ declare const ColorPicker: _$element_plus_es_utils_index_mjs0.SFCWithInstall<_$v
     type: _$vue.PropType<boolean>;
     default: true;
   };
+  size: {
+    type: _$vue.PropType<"" | "default" | "small" | "large">;
+  };
   clearable: {
     type: _$vue.PropType<boolean>;
     default: true;
@@ -178,16 +178,16 @@ declare const ColorPicker: _$element_plus_es_utils_index_mjs0.SFCWithInstall<_$v
   id: {
     type: _$vue.PropType<string>;
   };
-  tabindex: {
-    type: _$vue.PropType<string | number>;
-    default: 0;
-  };
   showAlpha: {
     type: _$vue.PropType<boolean>;
   };
   colorFormat: {
     type: _$vue.PropType<string>;
   };
+  tabindex: {
+    type: _$vue.PropType<string | number>;
+    default: 0;
+  };
   appendTo: {
     type: _$vue.PropType<string | HTMLElement>;
   };

package/esm/color-picker-panel/index.d.ts

@@ -19,10 +19,6 @@ declare const ColorPickerPanel: _$element_plus_es_utils_index_mjs0.SFCWithInstal
       type: _$vue.PropType<boolean>;
       default: boolean;
     };
-    border: {
-      type: _$vue.PropType<boolean>;
-      default: boolean;
-    };
     showAlpha: {
       type: _$vue.PropType<boolean>;
     };
@@ -32,6 +28,10 @@ declare const ColorPickerPanel: _$element_plus_es_utils_index_mjs0.SFCWithInstal
     predefine: {
       type: _$vue.PropType<string[]>;
     };
+    border: {
+      type: _$vue.PropType<boolean>;
+      default: boolean;
+    };
   }>> & {
     "onUpdate:modelValue"?: ((val: string | null) => any) | undefined;
   }, {
@@ -63,10 +63,6 @@ declare const ColorPickerPanel: _$element_plus_es_utils_index_mjs0.SFCWithInstal
       type: _$vue.PropType<boolean>;
       default: boolean;
     };
-    border: {
-      type: _$vue.PropType<boolean>;
-      default: boolean;
-    };
     showAlpha: {
       type: _$vue.PropType<boolean>;
     };
@@ -76,6 +72,10 @@ declare const ColorPickerPanel: _$element_plus_es_utils_index_mjs0.SFCWithInstal
     predefine: {
       type: _$vue.PropType<string[]>;
     };
+    border: {
+      type: _$vue.PropType<boolean>;
+      default: boolean;
+    };
   }>> & {
     "onUpdate:modelValue"?: ((val: string | null) => any) | undefined;
   }, {
@@ -102,10 +102,6 @@ declare const ColorPickerPanel: _$element_plus_es_utils_index_mjs0.SFCWithInstal
     type: _$vue.PropType<boolean>;
     default: boolean;
   };
-  border: {
-    type: _$vue.PropType<boolean>;
-    default: boolean;
-  };
   showAlpha: {
     type: _$vue.PropType<boolean>;
   };
@@ -115,6 +111,10 @@ declare const ColorPickerPanel: _$element_plus_es_utils_index_mjs0.SFCWithInstal
   predefine: {
     type: _$vue.PropType<string[]>;
   };
+  border: {
+    type: _$vue.PropType<boolean>;
+    default: boolean;
+  };
 }>> & {
   "onUpdate:modelValue"?: ((val: string | null) => any) | undefined;
 }, {

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)