xrk-components 0.4.2-beta.4 → 0.4.2-beta.5

package/lib/index.esm.js

@@ -20446,7 +20446,7 @@ const inputEmits = {
 
 const _hoisted_1$y = ["role"];
 const _hoisted_2$m = ["id", "type", "disabled", "formatter", "parser", "readonly", "autocomplete", "tabindex", "aria-label", "placeholder", "form"];
-const _hoisted_3$b = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
+const _hoisted_3$a = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
 const __default__$Q = defineComponent({
   name: "ElInput",
   inheritAttrs: false
@@ -20839,7 +20839,7 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
             onBlur: handleBlur,
             onChange: handleChange,
             onKeydown: handleKeydown
-          }), null, 16, _hoisted_3$b),
+          }), null, 16, _hoisted_3$a),
           unref(isWordLimitVisible) ? (openBlock(), createElementBlock("span", {
             key: 0,
             style: normalizeStyle(countStyle.value),
@@ -25940,7 +25940,7 @@ const useCheckbox = (props, slots) => {
 
 const _hoisted_1$t = ["tabindex", "role", "aria-checked"];
 const _hoisted_2$i = ["id", "aria-hidden", "name", "tabindex", "disabled", "true-value", "false-value"];
-const _hoisted_3$a = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
+const _hoisted_3$9 = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
 const __default__$E = defineComponent({
   name: "ElCheckbox"
 });
@@ -26020,7 +26020,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
               onChange: _cache[5] || (_cache[5] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
               onFocus: _cache[6] || (_cache[6] = ($event) => isFocused.value = true),
               onBlur: _cache[7] || (_cache[7] = ($event) => isFocused.value = false)
-            }, null, 42, _hoisted_3$a)), [
+            }, null, 42, _hoisted_3$9)), [
               [vModelCheckbox, unref(model)]
             ]),
             createElementVNode("span", {
@@ -26877,7 +26877,7 @@ const _hoisted_2$g = {
   key: 0,
   scope: "col"
 };
-const _hoisted_3$9 = ["aria-label"];
+const _hoisted_3$8 = ["aria-label"];
 const _hoisted_4$5 = ["aria-current", "aria-selected", "tabindex"];
 const _sfc_main$m = /* @__PURE__ */ defineComponent({
   __name: "basic-date-table",
@@ -27195,7 +27195,7 @@ const _sfc_main$m = /* @__PURE__ */ defineComponent({
                 key,
                 scope: "col",
                 "aria-label": unref(t)("el.datepicker.weeksFull." + week)
-              }, toDisplayString(unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$9);
+              }, toDisplayString(unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$8);
             }), 128))
           ]),
           (openBlock(true), createElementBlock(Fragment, null, renderList(unref(rows), (row, rowKey) => {
@@ -27233,7 +27233,7 @@ const basicMonthTableProps = buildProps({
 
 const _hoisted_1$n = ["aria-label"];
 const _hoisted_2$f = ["aria-selected", "aria-label", "tabindex", "onKeydown"];
-const _hoisted_3$8 = { class: "cell" };
+const _hoisted_3$7 = { class: "cell" };
 const _sfc_main$l = /* @__PURE__ */ defineComponent({
   __name: "basic-month-table",
   props: basicMonthTableProps,
@@ -27416,7 +27416,7 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
                   ]
                 }, [
                   createElementVNode("div", null, [
-                    createElementVNode("span", _hoisted_3$8, toDisplayString(unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
+                    createElementVNode("span", _hoisted_3$7, toDisplayString(unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
                   ])
                 ], 42, _hoisted_2$f);
               }), 128))
@@ -27438,7 +27438,7 @@ const basicYearTableProps = buildProps({
 
 const _hoisted_1$m = ["aria-label"];
 const _hoisted_2$e = ["aria-selected", "tabindex", "onKeydown"];
-const _hoisted_3$7 = { class: "cell" };
+const _hoisted_3$6 = { class: "cell" };
 const _hoisted_4$4 = { key: 1 };
 const _sfc_main$k = /* @__PURE__ */ defineComponent({
   __name: "basic-year-table",
@@ -27523,7 +27523,7 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
                       withKeys(withModifiers(handleYearTableClick, ["prevent", "stop"]), ["enter"])
                     ]
                   }, [
-                    createElementVNode("span", _hoisted_3$7, toDisplayString(unref(startYear) + i * 4 + j), 1)
+                    createElementVNode("span", _hoisted_3$6, toDisplayString(unref(startYear) + i * 4 + j), 1)
                   ], 42, _hoisted_2$e)) : (openBlock(), createElementBlock("td", _hoisted_4$4))
                 ], 64);
               }), 64))
@@ -27538,7 +27538,7 @@ var YearTable = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__file", "/home/runn
 
 const _hoisted_1$l = ["onClick"];
 const _hoisted_2$d = ["aria-label"];
-const _hoisted_3$6 = ["aria-label"];
+const _hoisted_3$5 = ["aria-label"];
 const _hoisted_4$3 = ["aria-label"];
 const _hoisted_5$3 = ["aria-label"];
 const _sfc_main$j = /* @__PURE__ */ defineComponent({
@@ -28026,7 +28026,7 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   })
-                ], 10, _hoisted_3$6), [
+                ], 10, _hoisted_3$5), [
                   [vShow, currentView.value === "date"]
                 ])
               ], 2),
@@ -28265,7 +28265,7 @@ const useRangePicker = (props, {
 
 const _hoisted_1$k = ["onClick"];
 const _hoisted_2$c = ["disabled"];
-const _hoisted_3$5 = ["disabled"];
+const _hoisted_3$4 = ["disabled"];
 const _hoisted_4$2 = ["disabled"];
 const _hoisted_5$2 = ["disabled"];
 const unit$1 = "month";
@@ -28781,7 +28781,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   })
-                ], 10, _hoisted_3$5)) : createCommentVNode("v-if", true),
+                ], 10, _hoisted_3$4)) : createCommentVNode("v-if", true),
                 createElementVNode("div", null, toDisplayString(unref(leftLabel)), 1)
               ], 2),
               createVNode(DateTable, {
@@ -28965,7 +28965,7 @@ const useMonthRangeHeader = ({
 
 const _hoisted_1$j = ["onClick"];
 const _hoisted_2$b = ["disabled"];
-const _hoisted_3$4 = ["disabled"];
+const _hoisted_3$3 = ["disabled"];
 const unit = "year";
 const __default__$x = defineComponent({
   name: "DatePickerMonthRange"
@@ -29143,7 +29143,7 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   })
-                ], 10, _hoisted_3$4)) : createCommentVNode("v-if", true),
+                ], 10, _hoisted_3$3)) : createCommentVNode("v-if", true),
                 createElementVNode("button", {
                   type: "button",
                   class: normalizeClass([unref(ppNs).e("icon-btn"), "d-arrow-right"]),
@@ -33722,7 +33722,7 @@ const paginationPagerProps = buildProps({
 
 const _hoisted_1$a = ["onKeyup"];
 const _hoisted_2$6 = ["aria-current", "tabindex"];
-const _hoisted_3$3 = ["tabindex"];
+const _hoisted_3$2 = ["tabindex"];
 const _hoisted_4$1 = ["aria-current", "tabindex"];
 const _hoisted_5$1 = ["tabindex"];
 const _hoisted_6 = ["aria-current", "tabindex"];
@@ -33879,7 +33879,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           onBlur: _cache[3] || (_cache[3] = ($event) => quickPrevFocus.value = false)
         }, [
           quickPrevHover.value || quickPrevFocus.value ? (openBlock(), createBlock(unref(d_arrow_left_default), { key: 0 })) : (openBlock(), createBlock(unref(more_filled_default), { key: 1 }))
-        ], 42, _hoisted_3$3)) : createCommentVNode("v-if", true),
+        ], 42, _hoisted_3$2)) : createCommentVNode("v-if", true),
         (openBlock(true), createElementBlock(Fragment, null, renderList(unref(pagers), (pager) => {
           return openBlock(), createElementBlock("li", {
             key: pager,
@@ -34265,7 +34265,7 @@ const switchEmits = {
 
 const _hoisted_1$9 = ["onClick"];
 const _hoisted_2$5 = ["id", "aria-checked", "aria-disabled", "name", "true-value", "false-value", "disabled", "tabindex", "onKeydown"];
-const _hoisted_3$2 = ["aria-hidden"];
+const _hoisted_3$1 = ["aria-hidden"];
 const _hoisted_4 = ["aria-hidden"];
 const _hoisted_5 = ["aria-hidden"];
 const COMPONENT_NAME = "ElSwitch";
@@ -34426,7 +34426,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           !_ctx.inactiveIcon && _ctx.inactiveText ? (openBlock(), createElementBlock("span", {
             key: 1,
             "aria-hidden": unref(checked)
-          }, toDisplayString(_ctx.inactiveText), 9, _hoisted_3$2)) : createCommentVNode("v-if", true)
+          }, toDisplayString(_ctx.inactiveText), 9, _hoisted_3$1)) : createCommentVNode("v-if", true)
         ], 2)) : createCommentVNode("v-if", true),
         createElementVNode("span", {
           ref_key: "core",
@@ -36262,7 +36262,7 @@ const _sfc_main$1 = defineComponent({
 });
 const _hoisted_1$8 = { key: 0 };
 const _hoisted_2$4 = ["disabled"];
-const _hoisted_3$1 = ["label", "onClick"];
+const _hoisted_3 = ["label", "onClick"];
 function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
   const _component_el_checkbox = resolveComponent("el-checkbox");
   const _component_el_checkbox_group = resolveComponent("el-checkbox-group");
@@ -36351,7 +36351,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
             class: normalizeClass([_ctx.ns.e("list-item"), _ctx.ns.is("active", _ctx.isActive(filter))]),
             label: filter.value,
             onClick: ($event) => _ctx.handleSelect(filter.value)
-          }, toDisplayString(filter.text), 11, _hoisted_3$1);
+          }, toDisplayString(filter.text), 11, _hoisted_3);
         }), 128))
       ], 2))
     ]),
@@ -41897,7 +41897,6 @@ var XrkTable = script$1;
 
 var _hoisted_1 = { key: 1 };
 var _hoisted_2 = { key: 1 };
-var _hoisted_3 = { key: 1 };
 var __default__ = {
     name: 'base-dialog'
 };
@@ -42028,42 +42027,44 @@ var script = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__), {
                             key: 0,
                             render: __props.titleRender
                         }, null, 8 /* PROPS */, ["render"]))
-                        : (__props.title)
-                            ? (openBlock(), createElementBlock("span", _hoisted_1, toDisplayString(__props.title), 1 /* TEXT */))
-                            : renderSlot(_ctx.$slots, "header", { key: 2 })
+                        : renderSlot(_ctx.$slots, "header", { key: 1 }, function () { return [
+                            createTextVNode(toDisplayString(__props.title), 1 /* TEXT */)
+                        ]; })
                 ]; }),
                 footer: withCtx(function () { return [
-                    (__props.footerRender)
-                        ? (openBlock(), createBlock(unref(BaseDialogRender), {
-                            key: 0,
-                            render: __props.footerRender
-                        }, null, 8 /* PROPS */, ["render"]))
-                        : (__props.showFooter)
-                            ? (openBlock(), createElementBlock("div", _hoisted_3, [
-                                (__props.cancelBtnConfig.show)
-                                    ? (openBlock(), createBlock(unref(BaseButton), mergeProps({
-                                        key: 0,
-                                        size: "large"
-                                    }, __props.cancelBtnConfig, { click: handleCancelClick }), {
-                                        default: withCtx(function () { return [
-                                            createTextVNode(toDisplayString(__props.cancelBtnConfig.content), 1 /* TEXT */)
-                                        ]; }),
-                                        _: 1 /* STABLE */
-                                    }, 16 /* FULL_PROPS */))
-                                    : createCommentVNode("v-if", true),
-                                (__props.confirmBtnConfig.show)
-                                    ? (openBlock(), createBlock(unref(BaseButton), mergeProps({
-                                        key: 1,
-                                        size: "large"
-                                    }, __props.confirmBtnConfig, { click: handleConfirmClick }), {
-                                        default: withCtx(function () { return [
-                                            createTextVNode(toDisplayString(__props.confirmBtnConfig.content), 1 /* TEXT */)
-                                        ]; }),
-                                        _: 1 /* STABLE */
-                                    }, 16 /* FULL_PROPS */))
-                                    : createCommentVNode("v-if", true)
-                            ]))
-                            : createCommentVNode("v-if", true)
+                    renderSlot(_ctx.$slots, "footer", {}, function () { return [
+                        (__props.footerRender)
+                            ? (openBlock(), createBlock(unref(BaseDialogRender), {
+                                key: 0,
+                                render: __props.footerRender
+                            }, null, 8 /* PROPS */, ["render"]))
+                            : (__props.showFooter)
+                                ? (openBlock(), createElementBlock("div", _hoisted_2, [
+                                    (__props.cancelBtnConfig.show)
+                                        ? (openBlock(), createBlock(unref(BaseButton), mergeProps({
+                                            key: 0,
+                                            size: "large"
+                                        }, __props.cancelBtnConfig, { click: handleCancelClick }), {
+                                            default: withCtx(function () { return [
+                                                createTextVNode(toDisplayString(__props.cancelBtnConfig.content), 1 /* TEXT */)
+                                            ]; }),
+                                            _: 1 /* STABLE */
+                                        }, 16 /* FULL_PROPS */))
+                                        : createCommentVNode("v-if", true),
+                                    (__props.confirmBtnConfig.show)
+                                        ? (openBlock(), createBlock(unref(BaseButton), mergeProps({
+                                            key: 1,
+                                            size: "large"
+                                        }, __props.confirmBtnConfig, { click: handleConfirmClick }), {
+                                            default: withCtx(function () { return [
+                                                createTextVNode(toDisplayString(__props.confirmBtnConfig.content), 1 /* TEXT */)
+                                            ]; }),
+                                            _: 1 /* STABLE */
+                                        }, 16 /* FULL_PROPS */))
+                                        : createCommentVNode("v-if", true)
+                                ]))
+                                : createCommentVNode("v-if", true)
+                    ]; })
                 ]; }),
                 default: withCtx(function () { return [
                     (__props.contentRender)
@@ -42072,7 +42073,7 @@ var script = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__), {
                             render: __props.contentRender
                         }, null, 8 /* PROPS */, ["render"]))
                         : (__props.content)
-                            ? (openBlock(), createElementBlock("div", _hoisted_2, toDisplayString(__props.content), 1 /* TEXT */))
+                            ? (openBlock(), createElementBlock("div", _hoisted_1, toDisplayString(__props.content), 1 /* TEXT */))
                             : renderSlot(_ctx.$slots, "default", { key: 2 })
                 ]; }),
                 _: 3 /* FORWARDED */
@@ -42189,12 +42190,18 @@ var useCreateModal = function (component, options, app) {
     var _instance = null;
     var container = document.createElement('div');
     var remove = function () {
-        _instance = null;
         container.remove();
+        _instance = null;
     };
-    _instance = createVNode(component, __assign({ remove: remove, onRemove: function () {
+    _instance = createVNode(component, __assign({ remove: remove, close: remove, onRemove: function () {
+            remove();
+        }, 
+        // 兼容base-dialog
+        onClose: function () {
             remove();
-        } }, options));
+        }, 
+        // 兼容base-dialog，true会导致没有append到container容器中
+        appendToBody: false }, options));
     // inject 函数调用组件导致内部inject无法接收到，需要使用app.provide（全局）：  https://github.com/vuejs/core/issues/6220
     // context createApp需要use插件，内部才能使用插件\库相关API。可以直接修改上下文： https://github.com/vuejs/core/issues/2097
     if (app) {
@@ -42205,6 +42212,7 @@ var useCreateModal = function (component, options, app) {
     // 在组件添加一个 remove 方法用来销毁组件
     // 组件内调用 currentInstance.ctx.remove()
     _instance.component.ctx.remove = remove;
+    _instance.component.ctx.close = close;
     console.log(_instance, '组件_instance');
     // 更新props方法
     _instance.component.ctx.$updateProps = function (props) {

package/lib/index.umd.js

@@ -20449,7 +20449,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$y = ["role"];
   const _hoisted_2$m = ["id", "type", "disabled", "formatter", "parser", "readonly", "autocomplete", "tabindex", "aria-label", "placeholder", "form"];
-  const _hoisted_3$b = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
+  const _hoisted_3$a = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
   const __default__$Q = vue.defineComponent({
     name: "ElInput",
     inheritAttrs: false
@@ -20842,7 +20842,7 @@ usage: app.provide(ID_INJECTION_KEY, {
               onBlur: handleBlur,
               onChange: handleChange,
               onKeydown: handleKeydown
-            }), null, 16, _hoisted_3$b),
+            }), null, 16, _hoisted_3$a),
             vue.unref(isWordLimitVisible) ? (vue.openBlock(), vue.createElementBlock("span", {
               key: 0,
               style: vue.normalizeStyle(countStyle.value),
@@ -25943,7 +25943,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$t = ["tabindex", "role", "aria-checked"];
   const _hoisted_2$i = ["id", "aria-hidden", "name", "tabindex", "disabled", "true-value", "false-value"];
-  const _hoisted_3$a = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
+  const _hoisted_3$9 = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
   const __default__$E = vue.defineComponent({
     name: "ElCheckbox"
   });
@@ -26023,7 +26023,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                 onChange: _cache[5] || (_cache[5] = (...args) => vue.unref(handleChange) && vue.unref(handleChange)(...args)),
                 onFocus: _cache[6] || (_cache[6] = ($event) => isFocused.value = true),
                 onBlur: _cache[7] || (_cache[7] = ($event) => isFocused.value = false)
-              }, null, 42, _hoisted_3$a)), [
+              }, null, 42, _hoisted_3$9)), [
                 [vue.vModelCheckbox, vue.unref(model)]
               ]),
               vue.createElementVNode("span", {
@@ -26880,7 +26880,7 @@ usage: app.provide(ID_INJECTION_KEY, {
     key: 0,
     scope: "col"
   };
-  const _hoisted_3$9 = ["aria-label"];
+  const _hoisted_3$8 = ["aria-label"];
   const _hoisted_4$5 = ["aria-current", "aria-selected", "tabindex"];
   const _sfc_main$m = /* @__PURE__ */ vue.defineComponent({
     __name: "basic-date-table",
@@ -27198,7 +27198,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                   key,
                   scope: "col",
                   "aria-label": vue.unref(t)("el.datepicker.weeksFull." + week)
-                }, vue.toDisplayString(vue.unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$9);
+                }, vue.toDisplayString(vue.unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$8);
               }), 128))
             ]),
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(rows), (row, rowKey) => {
@@ -27236,7 +27236,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$n = ["aria-label"];
   const _hoisted_2$f = ["aria-selected", "aria-label", "tabindex", "onKeydown"];
-  const _hoisted_3$8 = { class: "cell" };
+  const _hoisted_3$7 = { class: "cell" };
   const _sfc_main$l = /* @__PURE__ */ vue.defineComponent({
     __name: "basic-month-table",
     props: basicMonthTableProps,
@@ -27419,7 +27419,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                     ]
                   }, [
                     vue.createElementVNode("div", null, [
-                      vue.createElementVNode("span", _hoisted_3$8, vue.toDisplayString(vue.unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
+                      vue.createElementVNode("span", _hoisted_3$7, vue.toDisplayString(vue.unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
                     ])
                   ], 42, _hoisted_2$f);
                 }), 128))
@@ -27441,7 +27441,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$m = ["aria-label"];
   const _hoisted_2$e = ["aria-selected", "tabindex", "onKeydown"];
-  const _hoisted_3$7 = { class: "cell" };
+  const _hoisted_3$6 = { class: "cell" };
   const _hoisted_4$4 = { key: 1 };
   const _sfc_main$k = /* @__PURE__ */ vue.defineComponent({
     __name: "basic-year-table",
@@ -27526,7 +27526,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                         vue.withKeys(vue.withModifiers(handleYearTableClick, ["prevent", "stop"]), ["enter"])
                       ]
                     }, [
-                      vue.createElementVNode("span", _hoisted_3$7, vue.toDisplayString(vue.unref(startYear) + i * 4 + j), 1)
+                      vue.createElementVNode("span", _hoisted_3$6, vue.toDisplayString(vue.unref(startYear) + i * 4 + j), 1)
                     ], 42, _hoisted_2$e)) : (vue.openBlock(), vue.createElementBlock("td", _hoisted_4$4))
                   ], 64);
                 }), 64))
@@ -27541,7 +27541,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$l = ["onClick"];
   const _hoisted_2$d = ["aria-label"];
-  const _hoisted_3$6 = ["aria-label"];
+  const _hoisted_3$5 = ["aria-label"];
   const _hoisted_4$3 = ["aria-label"];
   const _hoisted_5$3 = ["aria-label"];
   const _sfc_main$j = /* @__PURE__ */ vue.defineComponent({
@@ -28029,7 +28029,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                       ]),
                       _: 1
                     })
-                  ], 10, _hoisted_3$6), [
+                  ], 10, _hoisted_3$5), [
                     [vue.vShow, currentView.value === "date"]
                   ])
                 ], 2),
@@ -28268,7 +28268,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$k = ["onClick"];
   const _hoisted_2$c = ["disabled"];
-  const _hoisted_3$5 = ["disabled"];
+  const _hoisted_3$4 = ["disabled"];
   const _hoisted_4$2 = ["disabled"];
   const _hoisted_5$2 = ["disabled"];
   const unit$1 = "month";
@@ -28784,7 +28784,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                       ]),
                       _: 1
                     })
-                  ], 10, _hoisted_3$5)) : vue.createCommentVNode("v-if", true),
+                  ], 10, _hoisted_3$4)) : vue.createCommentVNode("v-if", true),
                   vue.createElementVNode("div", null, vue.toDisplayString(vue.unref(leftLabel)), 1)
                 ], 2),
                 vue.createVNode(DateTable, {
@@ -28968,7 +28968,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$j = ["onClick"];
   const _hoisted_2$b = ["disabled"];
-  const _hoisted_3$4 = ["disabled"];
+  const _hoisted_3$3 = ["disabled"];
   const unit = "year";
   const __default__$x = vue.defineComponent({
     name: "DatePickerMonthRange"
@@ -29146,7 +29146,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                       ]),
                       _: 1
                     })
-                  ], 10, _hoisted_3$4)) : vue.createCommentVNode("v-if", true),
+                  ], 10, _hoisted_3$3)) : vue.createCommentVNode("v-if", true),
                   vue.createElementVNode("button", {
                     type: "button",
                     class: vue.normalizeClass([vue.unref(ppNs).e("icon-btn"), "d-arrow-right"]),
@@ -33725,7 +33725,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$a = ["onKeyup"];
   const _hoisted_2$6 = ["aria-current", "tabindex"];
-  const _hoisted_3$3 = ["tabindex"];
+  const _hoisted_3$2 = ["tabindex"];
   const _hoisted_4$1 = ["aria-current", "tabindex"];
   const _hoisted_5$1 = ["tabindex"];
   const _hoisted_6 = ["aria-current", "tabindex"];
@@ -33882,7 +33882,7 @@ usage: app.provide(ID_INJECTION_KEY, {
             onBlur: _cache[3] || (_cache[3] = ($event) => quickPrevFocus.value = false)
           }, [
             quickPrevHover.value || quickPrevFocus.value ? (vue.openBlock(), vue.createBlock(vue.unref(d_arrow_left_default), { key: 0 })) : (vue.openBlock(), vue.createBlock(vue.unref(more_filled_default), { key: 1 }))
-          ], 42, _hoisted_3$3)) : vue.createCommentVNode("v-if", true),
+          ], 42, _hoisted_3$2)) : vue.createCommentVNode("v-if", true),
           (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(pagers), (pager) => {
             return vue.openBlock(), vue.createElementBlock("li", {
               key: pager,
@@ -34268,7 +34268,7 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   const _hoisted_1$9 = ["onClick"];
   const _hoisted_2$5 = ["id", "aria-checked", "aria-disabled", "name", "true-value", "false-value", "disabled", "tabindex", "onKeydown"];
-  const _hoisted_3$2 = ["aria-hidden"];
+  const _hoisted_3$1 = ["aria-hidden"];
   const _hoisted_4 = ["aria-hidden"];
   const _hoisted_5 = ["aria-hidden"];
   const COMPONENT_NAME = "ElSwitch";
@@ -34429,7 +34429,7 @@ usage: app.provide(ID_INJECTION_KEY, {
             !_ctx.inactiveIcon && _ctx.inactiveText ? (vue.openBlock(), vue.createElementBlock("span", {
               key: 1,
               "aria-hidden": vue.unref(checked)
-            }, vue.toDisplayString(_ctx.inactiveText), 9, _hoisted_3$2)) : vue.createCommentVNode("v-if", true)
+            }, vue.toDisplayString(_ctx.inactiveText), 9, _hoisted_3$1)) : vue.createCommentVNode("v-if", true)
           ], 2)) : vue.createCommentVNode("v-if", true),
           vue.createElementVNode("span", {
             ref_key: "core",
@@ -36265,7 +36265,7 @@ usage: app.provide(ID_INJECTION_KEY, {
   });
   const _hoisted_1$8 = { key: 0 };
   const _hoisted_2$4 = ["disabled"];
-  const _hoisted_3$1 = ["label", "onClick"];
+  const _hoisted_3 = ["label", "onClick"];
   function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_el_checkbox = vue.resolveComponent("el-checkbox");
     const _component_el_checkbox_group = vue.resolveComponent("el-checkbox-group");
@@ -36354,7 +36354,7 @@ usage: app.provide(ID_INJECTION_KEY, {
               class: vue.normalizeClass([_ctx.ns.e("list-item"), _ctx.ns.is("active", _ctx.isActive(filter))]),
               label: filter.value,
               onClick: ($event) => _ctx.handleSelect(filter.value)
-            }, vue.toDisplayString(filter.text), 11, _hoisted_3$1);
+            }, vue.toDisplayString(filter.text), 11, _hoisted_3);
           }), 128))
         ], 2))
       ]),
@@ -41900,7 +41900,6 @@ usage: app.provide(ID_INJECTION_KEY, {
 
   var _hoisted_1 = { key: 1 };
   var _hoisted_2 = { key: 1 };
-  var _hoisted_3 = { key: 1 };
   var __default__ = {
       name: 'base-dialog'
   };
@@ -42031,42 +42030,44 @@ usage: app.provide(ID_INJECTION_KEY, {
                               key: 0,
                               render: __props.titleRender
                           }, null, 8 /* PROPS */, ["render"]))
-                          : (__props.title)
-                              ? (vue.openBlock(), vue.createElementBlock("span", _hoisted_1, vue.toDisplayString(__props.title), 1 /* TEXT */))
-                              : vue.renderSlot(_ctx.$slots, "header", { key: 2 })
+                          : vue.renderSlot(_ctx.$slots, "header", { key: 1 }, function () { return [
+                              vue.createTextVNode(vue.toDisplayString(__props.title), 1 /* TEXT */)
+                          ]; })
                   ]; }),
                   footer: vue.withCtx(function () { return [
-                      (__props.footerRender)
-                          ? (vue.openBlock(), vue.createBlock(vue.unref(BaseDialogRender), {
-                              key: 0,
-                              render: __props.footerRender
-                          }, null, 8 /* PROPS */, ["render"]))
-                          : (__props.showFooter)
-                              ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_3, [
-                                  (__props.cancelBtnConfig.show)
-                                      ? (vue.openBlock(), vue.createBlock(vue.unref(BaseButton), vue.mergeProps({
-                                          key: 0,
-                                          size: "large"
-                                      }, __props.cancelBtnConfig, { click: handleCancelClick }), {
-                                          default: vue.withCtx(function () { return [
-                                              vue.createTextVNode(vue.toDisplayString(__props.cancelBtnConfig.content), 1 /* TEXT */)
-                                          ]; }),
-                                          _: 1 /* STABLE */
-                                      }, 16 /* FULL_PROPS */))
-                                      : vue.createCommentVNode("v-if", true),
-                                  (__props.confirmBtnConfig.show)
-                                      ? (vue.openBlock(), vue.createBlock(vue.unref(BaseButton), vue.mergeProps({
-                                          key: 1,
-                                          size: "large"
-                                      }, __props.confirmBtnConfig, { click: handleConfirmClick }), {
-                                          default: vue.withCtx(function () { return [
-                                              vue.createTextVNode(vue.toDisplayString(__props.confirmBtnConfig.content), 1 /* TEXT */)
-                                          ]; }),
-                                          _: 1 /* STABLE */
-                                      }, 16 /* FULL_PROPS */))
-                                      : vue.createCommentVNode("v-if", true)
-                              ]))
-                              : vue.createCommentVNode("v-if", true)
+                      vue.renderSlot(_ctx.$slots, "footer", {}, function () { return [
+                          (__props.footerRender)
+                              ? (vue.openBlock(), vue.createBlock(vue.unref(BaseDialogRender), {
+                                  key: 0,
+                                  render: __props.footerRender
+                              }, null, 8 /* PROPS */, ["render"]))
+                              : (__props.showFooter)
+                                  ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
+                                      (__props.cancelBtnConfig.show)
+                                          ? (vue.openBlock(), vue.createBlock(vue.unref(BaseButton), vue.mergeProps({
+                                              key: 0,
+                                              size: "large"
+                                          }, __props.cancelBtnConfig, { click: handleCancelClick }), {
+                                              default: vue.withCtx(function () { return [
+                                                  vue.createTextVNode(vue.toDisplayString(__props.cancelBtnConfig.content), 1 /* TEXT */)
+                                              ]; }),
+                                              _: 1 /* STABLE */
+                                          }, 16 /* FULL_PROPS */))
+                                          : vue.createCommentVNode("v-if", true),
+                                      (__props.confirmBtnConfig.show)
+                                          ? (vue.openBlock(), vue.createBlock(vue.unref(BaseButton), vue.mergeProps({
+                                              key: 1,
+                                              size: "large"
+                                          }, __props.confirmBtnConfig, { click: handleConfirmClick }), {
+                                              default: vue.withCtx(function () { return [
+                                                  vue.createTextVNode(vue.toDisplayString(__props.confirmBtnConfig.content), 1 /* TEXT */)
+                                              ]; }),
+                                              _: 1 /* STABLE */
+                                          }, 16 /* FULL_PROPS */))
+                                          : vue.createCommentVNode("v-if", true)
+                                  ]))
+                                  : vue.createCommentVNode("v-if", true)
+                      ]; })
                   ]; }),
                   default: vue.withCtx(function () { return [
                       (__props.contentRender)
@@ -42075,7 +42076,7 @@ usage: app.provide(ID_INJECTION_KEY, {
                               render: __props.contentRender
                           }, null, 8 /* PROPS */, ["render"]))
                           : (__props.content)
-                              ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, vue.toDisplayString(__props.content), 1 /* TEXT */))
+                              ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1, vue.toDisplayString(__props.content), 1 /* TEXT */))
                               : vue.renderSlot(_ctx.$slots, "default", { key: 2 })
                   ]; }),
                   _: 3 /* FORWARDED */
@@ -42192,12 +42193,18 @@ usage: app.provide(ID_INJECTION_KEY, {
       var _instance = null;
       var container = document.createElement('div');
       var remove = function () {
-          _instance = null;
           container.remove();
+          _instance = null;
       };
-      _instance = vue.createVNode(component, __assign({ remove: remove, onRemove: function () {
+      _instance = vue.createVNode(component, __assign({ remove: remove, close: remove, onRemove: function () {
+              remove();
+          }, 
+          // 兼容base-dialog
+          onClose: function () {
               remove();
-          } }, options));
+          }, 
+          // 兼容base-dialog，true会导致没有append到container容器中
+          appendToBody: false }, options));
       // inject 函数调用组件导致内部inject无法接收到，需要使用app.provide（全局）：  https://github.com/vuejs/core/issues/6220
       // context createApp需要use插件，内部才能使用插件\库相关API。可以直接修改上下文： https://github.com/vuejs/core/issues/2097
       if (app) {
@@ -42208,6 +42215,7 @@ usage: app.provide(ID_INJECTION_KEY, {
       // 在组件添加一个 remove 方法用来销毁组件
       // 组件内调用 currentInstance.ctx.remove()
       _instance.component.ctx.remove = remove;
+      _instance.component.ctx.close = close;
       console.log(_instance, '组件_instance');
       // 更新props方法
       _instance.component.ctx.$updateProps = function (props) {

package/lib/packages/hooks/use-create-modal.d.ts

@@ -2,6 +2,7 @@ import { App, Component } from 'vue';
 declare type anyObj = Record<string, any>;
 interface ModalInstance {
     remove(): void;
+    close(): void;
     $updateProps(props: anyObj): void;
 }
 export declare const useCreateModal: (component: Component, options?: anyObj, app?: App) => ModalInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xrk-components",
-  "version": "0.4.2-beta.4",
+  "version": "0.4.2-beta.5",
   "description": "",
   "main": "lib/index.esm.js",
   "typings": "lib/packages/index.d.ts",