@dt-frames/ui 2.0.2 → 2.0.4

package/es/components/modal/index.js

@@ -1,8 +1,12 @@
 import { useApp, isFunction, isObject, error, useTimeoutFn, useSlots, useI18n, off, on, windowResizeFn, dispatchResize, isArray, deepMerge } from "@dt-frames/core";
+import { reactive, ref, getCurrentInstance, watchEffect, unref, nextTick, onUnmounted, toRaw, toRefs, useAttrs, createVNode, isVNode, defineComponent, computed, openBlock, createElementBlock, normalizeClass, Fragment, createBlock, withCtx, createElementVNode, createCommentVNode, inject, h, provide, onMounted, onBeforeUnmount, normalizeStyle, resolveDynamicComponent, renderSlot, mergeProps, watch, resolveDirective, normalizeProps, renderList, withDirectives, createTextVNode, toDisplayString, createSlots, guardReactiveProps } from "vue";
 import { Tooltip, Button, FormItem, Col, Spin } from "ant-design-vue/es";
-import { createVNode, isVNode, defineComponent as defineComponent$1, openBlock, createElementBlock, normalizeClass, unref as unref$1, Fragment, createBlock, withCtx, createElementVNode, createCommentVNode, getCurrentInstance as getCurrentInstance$1, ref as ref$1, inject, computed as computed$1, onUnmounted as onUnmounted$1, h as h$1, normalizeStyle, resolveDynamicComponent, renderSlot, mergeProps, resolveDirective, normalizeProps, renderList, withDirectives, createTextVNode, toDisplayString, createSlots, guardReactiveProps } from "vue";
+import "ant-design-vue/es/spin/style";
 import { omit } from "lodash-es";
-import { Modal as Modal$1 } from "ant-design-vue";
+import { Modal } from "ant-design-vue";
+import "ant-design-vue/es/modal/style";
+import "ant-design-vue/es/tooltip/style";
+import "ant-design-vue/es/col/style";
 import "ant-design-vue/es/form/style";
 import "ant-design-vue/es/button/style";
 const orgDialogProp = reactive({});
@@ -119,8 +123,6 @@ function useModal(props, setModalData) {
   };
   return [register, methods];
 }
-const _default = "";
-const index$2 = "";
 const basicProps = {
   t: {
     type: String
@@ -277,7 +279,7 @@ function useDragMove(context) {
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
 }
-const Modal = defineComponent({
+const _sfc_main$8 = {
   name: "Modal",
   inheritAttrs: false,
   props: basicProps,
@@ -311,14 +313,13 @@ const Modal = defineComponent({
       };
       if (!propsData?.visible)
         return null;
-      return createVNode(Modal$1, propsData, _isSlot(_slot = extendSlots(slots)) ? _slot : {
+      return createVNode(Modal, propsData, _isSlot(_slot = extendSlots(slots)) ? _slot : {
         default: () => [_slot]
       });
     };
   }
-});
-const index$1 = "";
-const _sfc_main$7 = /* @__PURE__ */ defineComponent$1({
+};
+const _sfc_main$7 = /* @__PURE__ */ defineComponent({
   __name: "CloseIcon",
   props: {
     canFullscreen: { type: Boolean, default: true },
@@ -348,12 +349,12 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent$1({
     return (_ctx, _cache) => {
       const _component_ATooltip = Tooltip;
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass(["flex h-14 items-center justify-center", unref$1(getClass)])
+        class: normalizeClass(["flex h-14 items-center justify-center", unref(getClass)])
       }, [
         __props.canFullscreen ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
           __props.fullScreen ? (openBlock(), createBlock(_component_ATooltip, {
             key: 0,
-            title: unref$1(t)("EXIT_FULLSCREEN"),
+            title: unref(t)("EXIT_FULLSCREEN"),
             placement: "bottom"
           }, {
             default: withCtx(() => [
@@ -365,7 +366,7 @@ const _sfc_main$7 = /* @__PURE__ */ defineComponent$1({
             _: 1
           }, 8, ["title"])) : (openBlock(), createBlock(_component_ATooltip, {
             key: 1,
-            title: unref$1(t)("FULLSCREEN"),
+            title: unref(t)("FULLSCREEN"),
             placement: "bottom"
           }, {
             default: withCtx(() => [
@@ -445,7 +446,7 @@ function removeResizeListener(element, fn) {
     element.__ro__.disconnect();
   }
 }
-const Bar = defineComponent$1({
+const Bar = defineComponent({
   name: "Bar",
   props: {
     vertical: Boolean,
@@ -453,14 +454,14 @@ const Bar = defineComponent$1({
     move: Number
   },
   setup(props) {
-    const instance = getCurrentInstance$1();
-    const thumb = ref$1();
+    const instance = getCurrentInstance();
+    const thumb = ref();
     const wrap = inject("scroll-bar-wrap", {});
-    const bar = computed$1(() => {
+    const bar = computed(() => {
       return BAR_MAP[props.vertical ? "vertical" : "horizontal"];
     });
-    const barStore = ref$1({});
-    const cursorDown = ref$1();
+    const barStore = ref({});
+    const cursorDown = ref();
     const clickThumbHandler = (e) => {
       if (e.ctrlKey || e.button === 2) {
         return;
@@ -501,16 +502,16 @@ const Bar = defineComponent$1({
       off(document, "mousemove", mouseMoveDocumentHandler);
       document.onselectstart = null;
     }
-    onUnmounted$1(() => {
+    onUnmounted(() => {
       off(document, "mouseup", mouseUpDocumentHandler);
     });
-    return () => h$1(
+    return () => h(
       "div",
       {
         class: ["scrollbar__bar", "is-" + bar.value.key],
         onMousedown: clickTrackHandler
       },
-      h$1("div", {
+      h("div", {
         ref: thumb,
         class: "scrollbar__thumb",
         onMousedown: clickThumbHandler,
@@ -524,7 +525,7 @@ const Bar = defineComponent$1({
   }
 });
 const _hoisted_1$1 = { class: "scrollbar relative h-full overflow-hidden" };
-const _sfc_main$6 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   __name: "scroll-bar",
   props: {
     wrapClass: {
@@ -598,7 +599,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent$1({
           ref_key: "wrap",
           ref: wrap,
           class: normalizeClass([[__props.wrapClass, "scrollbar__wrap--hidden-default"], "h-full overflow-auto"]),
-          style: normalizeStyle(unref$1(style)),
+          style: normalizeStyle(unref(style)),
           onScroll: handleScroll
         }, [
           (openBlock(), createBlock(resolveDynamicComponent(__props.tag), {
@@ -613,20 +614,20 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent$1({
             _: 3
           }, 8, ["class", "style"]))
         ], 38),
-        createVNode(unref$1(Bar), {
-          move: unref$1(moveX),
-          size: unref$1(sizeWidth)
+        createVNode(unref(Bar), {
+          move: moveX.value,
+          size: sizeWidth.value
         }, null, 8, ["move", "size"]),
-        createVNode(unref$1(Bar), {
+        createVNode(unref(Bar), {
           vertical: "",
-          move: unref$1(moveY),
-          size: unref$1(sizeHeight)
+          move: moveY.value,
+          size: sizeHeight.value
         }, null, 8, ["move", "size"])
       ]);
     };
   }
 });
-const _sfc_main$5 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "scroll-container",
   setup(__props) {
     const scrollbarRef = ref(null);
@@ -643,8 +644,8 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent$1({
     };
   }
 });
-const _sfc_main$4 = defineComponent({
-  name: "slot-container",
+const _sfc_main$4 = /* @__PURE__ */ defineComponent({
+  __name: "slot-container",
   props: {
     template: {
       type: Function
@@ -653,9 +654,11 @@ const _sfc_main$4 = defineComponent({
       type: Object
     }
   },
-  setup(props) {
-    return () => {
-      return h("div", [props.template(props.data)]);
+  setup(__props) {
+    const props = __props;
+    const Container = h("div", [props.template(props.data)]);
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(Container));
     };
   }
 });
@@ -667,7 +670,7 @@ const withInstall = (comp) => {
 };
 const DtScrollContainer = withInstall(_sfc_main$5);
 withInstall(_sfc_main$4);
-const _sfc_main$3 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   __name: "ModalWrap",
   props: {
     useWrapper: { type: Boolean, default: true },
@@ -700,10 +703,10 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent$1({
       const wrapperRefDom = unref(wrapperRef);
       if (!wrapperRefDom)
         return;
-      const bodyDom = wrapperRefDom.$el.parentElement;
+      const bodyDom = wrapperRefDom.$el.parentElement.parentElement.parentElement;
       if (!bodyDom)
         return;
-      bodyDom.style.padding = "0";
+      bodyDom.style.padding = props.useWrapper ? "24px" : "0";
       await nextTick();
       const modalDom = bodyDom.parentElement && bodyDom.parentElement.parentElement;
       return modalDom;
@@ -755,7 +758,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent$1({
       }
     );
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(unref$1(DtScrollContainer), {
+      return openBlock(), createBlock(unref(DtScrollContainer), {
         ref_key: "wrapperRef",
         ref: wrapperRef
       }, {
@@ -763,7 +766,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent$1({
           createElementVNode("div", {
             ref_key: "wrapRef",
             ref: wrapRef,
-            style: normalizeStyle(unref$1(wrapStyle))
+            style: normalizeStyle(unref(wrapStyle))
           }, [
             renderSlot(_ctx.$slots, "default")
           ], 4)
@@ -773,7 +776,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent$1({
     };
   }
 });
-const index = "";
 const _hoisted_1 = {
   key: 0,
   className: "preIcon pr-1"
@@ -787,7 +789,7 @@ const _hoisted_4 = /* @__PURE__ */ createElementVNode("i", { class: "text-2xl i
 const _hoisted_5 = [
   _hoisted_4
 ];
-const _sfc_main$2 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "FormButtons",
   props: {
     mode: {
@@ -874,7 +876,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent$1({
       const _component_ACol = Col;
       const _directive_icon = resolveDirective("icon");
       const _directive_auth = resolveDirective("auth");
-      return __props.show ? (openBlock(), createBlock(_component_ACol, normalizeProps(mergeProps({ key: 0 }, unref$1(colOpt))), {
+      return __props.show ? (openBlock(), createBlock(_component_ACol, normalizeProps(mergeProps({ key: 0 }, unref(colOpt))), {
         default: withCtx(() => [
           createVNode(_component_AFormItem, {
             class: "dt-form-btns",
@@ -890,7 +892,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent$1({
                     class: normalizeClass(button.class),
                     loading: button.loading,
                     disabled: button.disabled,
-                    key: unref$1(key),
+                    key: unref(key),
                     onClick: ($event) => handleBtnClick(button)
                   }, {
                     icon: withCtx(() => [
@@ -899,7 +901,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent$1({
                       ]) : createCommentVNode("", true)
                     ]),
                     default: withCtx(() => [
-                      createTextVNode(" " + toDisplayString(unref$1(t)(button.name)) + " ", 1),
+                      createTextVNode(" " + toDisplayString(unref(t)(button.label)) + " ", 1),
                       button.postIcon ? withDirectives((openBlock(), createElementBlock("span", _hoisted_2, null, 512)), [
                         [_directive_icon, button.postIcon]
                       ]) : createCommentVNode("", true)
@@ -910,16 +912,16 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent$1({
                   ]) : createCommentVNode("", true)
                 ], 64);
               }), 256)),
-              unref$1(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
+              unref(showAdvanceRef) ? (openBlock(), createBlock(_component_AButton, {
                 key: 0,
                 type: "link",
                 class: "advanced",
                 onClick: toggleAdvanced
               }, {
                 default: withCtx(() => [
-                  createElementVNode("span", _hoisted_3, toDisplayString(unref$1(advancedRef) ? unref$1(t)("UI.ADVANCED") : unref$1(t)("UI.EXPAND")), 1),
+                  createElementVNode("span", _hoisted_3, toDisplayString(advancedRef.value ? unref(t)("UI.ADVANCED") : unref(t)("UI.EXPAND")), 1),
                   createElementVNode("span", {
-                    class: normalizeClass(unref$1(getAdvanceClass))
+                    class: normalizeClass(unref(getAdvanceClass))
                   }, _hoisted_5, 2)
                 ]),
                 _: 1
@@ -933,7 +935,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent$1({
     };
   }
 });
-const _sfc_main$1 = /* @__PURE__ */ defineComponent$1({
+const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "ModalFooter",
   props: {
     buttons: Object,
@@ -949,12 +951,12 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent$1({
   setup(__props, { emit: emits }) {
     const props = __props;
     const { t } = useI18n("UI");
-    const buttonList = computed$1(() => {
+    const buttonList = computed(() => {
       if (props.buttons && props.buttons.length)
         return props.buttons;
       let buttonActions = [
-        { t: "\u4FDD\u5B58", name: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" },
-        { t: "\u5173\u95ED", name: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" }
+        { t: "\u4FDD\u5B58", label: props.okText || t("SAVE"), preIcon: "mdi:content-save", type: "primary", flag: "OK" },
+        { t: "\u5173\u95ED", label: props.cancelText || t("CLOSE"), preIcon: "mdi:close", flag: "CANCEL" }
       ];
       if (!props.showSave)
         buttonActions = buttonActions.filter((btn) => btn.flag !== "OK");
@@ -977,7 +979,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent$1({
         renderSlot(_ctx.$slots, "appendFooter"),
         createVNode(_sfc_main$2, {
           mode: "dialog",
-          buttonList: unref$1(buttonList),
+          buttonList: unref(buttonList),
           onHandleMethod: _cache[0] || (_cache[0] = ($event) => handleMethod($event))
         }, null, 8, ["buttonList"])
       ], 64);
@@ -1002,7 +1004,7 @@ function useFullScreen(wrapClassName) {
     toggleFullScreen
   };
 }
-const _sfc_main = /* @__PURE__ */ defineComponent$1({
+const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: basicProps,
   emits: ["visible-change", "height-change", "cancel", "save", "register", "update:visible"],
@@ -1102,23 +1104,23 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
     });
     return (_ctx, _cache) => {
       const _component_ASpin = Spin;
-      return openBlock(), createBlock(unref$1(Modal), mergeProps(unref$1(getBindValue), { onCancel: handleCancel }), createSlots({
+      return openBlock(), createBlock(_sfc_main$8, mergeProps(unref(getBindValue), { onCancel: handleCancel }), createSlots({
         default: withCtx(() => [
           createVNode(_component_ASpin, {
-            spinning: unref$1(getBindValue).loading,
-            tip: unref$1(getBindValue).loadingTip
+            spinning: unref(getBindValue).loading,
+            tip: unref(getBindValue).loadingTip
           }, {
             default: withCtx(() => [
               createVNode(_sfc_main$3, mergeProps({
-                useWrapper: unref$1(getBindValue).useWrapper,
-                fullScreen: unref$1(fullScreenRef),
+                useWrapper: unref(getBindValue).useWrapper,
+                fullScreen: unref(fullScreenRef),
                 ref_key: "modalWrapperRef",
                 ref: modalWrapperRef,
-                minHeight: unref$1(getBindValue).minHeight,
-                height: unref$1(getWrapperHeight),
-                visible: unref$1(visibleRef),
-                modalFooterHeight: unref$1(modalFooterHeight)
-              }, unref$1(omit)(unref$1(getBindValue).wrapperProps, "visible", "height", "modalFooterHeight"), { onHeightChange: handleHeightChange }), {
+                minHeight: unref(getBindValue).minHeight,
+                height: unref(getWrapperHeight),
+                visible: visibleRef.value,
+                modalFooterHeight: unref(modalFooterHeight)
+              }, unref(omit)(unref(getBindValue).wrapperProps, "visible", "height", "modalFooterHeight"), { onHeightChange: handleHeightChange }), {
                 default: withCtx(() => [
                   renderSlot(_ctx.$slots, "default")
                 ]),
@@ -1134,10 +1136,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
           name: "closeIcon",
           fn: withCtx(() => [
             createVNode(_sfc_main$7, {
-              canFullscreen: unref$1(getBindValue).canFullscreen,
-              fullScreen: unref$1(fullScreenRef),
+              canFullscreen: unref(getBindValue).canFullscreen,
+              fullScreen: unref(fullScreenRef),
               onCancel: handleCancel,
-              onFullscreen: unref$1(toggleFullScreen)
+              onFullscreen: unref(toggleFullScreen)
             }, null, 8, ["canFullscreen", "fullScreen", "onFullscreen"])
           ]),
           key: "0"
@@ -1145,7 +1147,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
         !_ctx.$slots.title ? {
           name: "title",
           fn: withCtx(() => [
-            createTextVNode(toDisplayString(unref$1(getMergeProps).title), 1)
+            createTextVNode(toDisplayString(unref(getMergeProps).title), 1)
           ]),
           key: "1"
         } : void 0,
@@ -1153,11 +1155,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
           name: "footer",
           fn: withCtx(() => [
             createVNode(_sfc_main$1, {
-              buttons: unref$1(propsRef)?.footer,
-              showSave: unref$1(getBindValue).showOkBtn,
-              showCancel: unref$1(getBindValue).showCancelBtn,
-              okText: unref$1(getBindValue).okText,
-              cancelText: unref$1(getBindValue).cancelText,
+              buttons: propsRef.value?.footer,
+              showSave: unref(getBindValue).showOkBtn,
+              showCancel: unref(getBindValue).showCancelBtn,
+              okText: unref(getBindValue).okText,
+              cancelText: unref(getBindValue).cancelText,
               onHandleSave: handleSave,
               onHandleCancel: handleCancel
             }, createSlots({ _: 2 }, [
@@ -1173,7 +1175,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent$1({
           ]),
           key: "2"
         } : void 0,
-        renderList(Object.keys(unref$1(omit)(_ctx.$slots, "default")), (item) => {
+        renderList(Object.keys(unref(omit)(_ctx.$slots, "default")), (item) => {
           return {
             name: item,
             fn: withCtx((data) => [

package/es/components/modal/index.less

@@ -14,6 +14,16 @@
             height: 100%;
         }
     }
+
+    .ant-modal-content{
+        display: flex;
+        flex-direction: column;
+
+        .ant-modal-body{
+            flex: 1;
+            height: 0;
+        }
+    }
 }