@ditari/bsui 1.0.18 → 1.0.20

package/dist/cjs/components/modal/Modal.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("@vueuse/core"),d=require("ant-design-vue"),c=require("../theme/index.cjs.js"),f=`${c.prefixName}-modal`,s=e.defineComponent({name:"DModal",props:{title:{type:String,default:""},visible:{type:Boolean,default:()=>!1},width:{type:Number,default:()=>800}},setup(l,{slots:t}){const u=e.ref(!0),r=e.ref(0);e.watchEffect(()=>{u.value=l.visible});const n=e.ref(void 0);i.useResizeObserver(document.body,()=>{const{height:a}=i.useWindowSize();r.value=a.value<200?a.value:a.value-200,n.value={"max-height":r.value+"px"}});const o=()=>t.footer?t.footer&&(t==null?void 0:t.footer()):null;return()=>e.createVNode(e.Fragment,null,[e.createVNode(d.Modal,{visible:u.value,"onUpdate:visible":a=>u.value=a,title:l.title,centered:!0,"mask-closable":!1,wrapClassName:f,width:l.width,footer:o()},{default:()=>e.createVNode("div",{class:["content"],style:n.value},[t.default&&t.default(r.value)])})])}});exports.default=s;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),o=require("@vueuse/core"),s=require("ant-design-vue"),v=require("../theme/index.cjs.js"),f=`${v.prefixName}-modal`,m=e.defineComponent({name:"DModal",props:{title:{type:String,default:""},visible:{type:Boolean,default:()=>!1},width:{type:Number,default:()=>800}},emits:["update:visible"],setup(u,{slots:t,emit:r}){const l=e.ref(!0),n=e.ref(0);e.watchEffect(()=>{l.value=u.visible,document.body.style.width=""});const i=e.ref(void 0);o.useResizeObserver(document.body,()=>{const{height:a}=o.useWindowSize();n.value=a.value<200?a.value:a.value-200,i.value={"max-height":n.value+"px"}});const d=()=>t.footer?t.footer&&(t==null?void 0:t.footer()):null,c=()=>{r("update:visible",l.value)};return()=>e.createVNode(e.Fragment,null,[e.createVNode(s.Modal,{visible:l.value,"onUpdate:visible":a=>l.value=a,title:u.title,centered:!0,"mask-closable":!1,wrapClassName:f,width:u.width,footer:d(),onCancel:c},{default:()=>e.createVNode("div",{class:["content"],style:i.value},[t.default&&t.default(n.value)])})])}});exports.default=m;

package/dist/cjs/components/modal/Modal.d.ts

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:visible"[], "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: {
         type: StringConstructor;
         default: string;
@@ -24,7 +24,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
-}>>, {
+}>> & {
+    "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+}, {
     title: string;
     visible: boolean;
     width: number;

package/dist/cjs/components/modal/index.d.ts

@@ -11,7 +11,7 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:visible"[], "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: {
         type: StringConstructor;
         default: string;
@@ -24,7 +24,9 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
-}>>, {
+}>> & {
+    "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+}, {
     title: string;
     visible: boolean;
     width: number;

package/dist/esm/components/modal/Modal.d.ts

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:visible"[], "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: {
         type: StringConstructor;
         default: string;
@@ -24,7 +24,9 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
-}>>, {
+}>> & {
+    "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+}, {
     title: string;
     visible: boolean;
     width: number;

package/dist/esm/components/modal/Modal.esm.js

@@ -1,8 +1,8 @@
-import { defineComponent as d, ref as i, watchEffect as f, createVNode as r, Fragment as m } from "vue";
-import { useResizeObserver as v, useWindowSize as c } from "@vueuse/core";
-import { Modal as s } from "ant-design-vue";
-import { prefixName as p } from "../theme/index.esm.js";
-const b = `${p}-modal`, x = /* @__PURE__ */ d({
+import { defineComponent as m, ref as i, watchEffect as c, createVNode as n, Fragment as v } from "vue";
+import { useResizeObserver as s, useWindowSize as p } from "@vueuse/core";
+import { Modal as b } from "ant-design-vue";
+import { prefixName as h } from "../theme/index.esm.js";
+const y = `${h}-modal`, N = /* @__PURE__ */ m({
   name: "DModal",
   props: {
     title: {
@@ -18,34 +18,39 @@ const b = `${p}-modal`, x = /* @__PURE__ */ d({
       default: () => 800
     }
   },
-  setup(a, {
-    slots: e
+  emits: ["update:visible"],
+  setup(l, {
+    slots: e,
+    emit: d
   }) {
-    const l = i(!0), o = i(0);
-    f(() => {
-      l.value = a.visible;
+    const a = i(!0), o = i(0);
+    c(() => {
+      a.value = l.visible, document.body.style.width = "";
     });
     const u = i(void 0);
-    v(document.body, () => {
+    s(document.body, () => {
       const {
         height: t
-      } = c();
+      } = p();
       o.value = t.value < 200 ? t.value : t.value - 200, u.value = {
         "max-height": o.value + "px"
       };
     });
-    const n = () => e.footer ? e.footer && (e == null ? void 0 : e.footer()) : null;
-    return () => r(m, null, [r(s, {
-      visible: l.value,
-      "onUpdate:visible": (t) => l.value = t,
-      title: a.title,
+    const r = () => e.footer ? e.footer && (e == null ? void 0 : e.footer()) : null, f = () => {
+      d("update:visible", a.value);
+    };
+    return () => n(v, null, [n(b, {
+      visible: a.value,
+      "onUpdate:visible": (t) => a.value = t,
+      title: l.title,
       centered: !0,
       "mask-closable": !1,
-      wrapClassName: b,
-      width: a.width,
-      footer: n()
+      wrapClassName: y,
+      width: l.width,
+      footer: r(),
+      onCancel: f
     }, {
-      default: () => r("div", {
+      default: () => n("div", {
         class: ["content"],
         style: u.value
       }, [e.default && e.default(o.value)])
@@ -53,5 +58,5 @@ const b = `${p}-modal`, x = /* @__PURE__ */ d({
   }
 });
 export {
-  x as default
+  N as default
 };

package/dist/esm/components/modal/index.d.ts

@@ -11,7 +11,7 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:visible"[], "update:visible", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: {
         type: StringConstructor;
         default: string;
@@ -24,7 +24,9 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
-}>>, {
+}>> & {
+    "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
+}, {
     title: string;
     visible: boolean;
     width: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "files": [
     "dist/**",
     "src"

package/src/components/modal/Modal.tsx

@@ -22,11 +22,14 @@ export default defineComponent({
       default: () => 800
     }
   },
-  setup(props, { slots }) {
+  emits: ["update:visible"],
+  setup(props, { slots, emit }) {
     const modalVisible = ref(true);
     const maxHeight = ref(0);
     watchEffect(() => {
       modalVisible.value = props.visible;
+      // modal显示的时候 会自动添加宽度 禁止掉
+      document.body.style.width = "";
     });
 
     const contentStyle = ref<any>(undefined);
@@ -42,6 +45,10 @@ export default defineComponent({
       return slots.footer ? slots.footer && slots?.footer() : null;
     };
 
+    const onCancel = () => {
+      emit("update:visible", modalVisible.value);
+    };
+
     return () => (
       <>
         <Modal
@@ -52,6 +59,7 @@ export default defineComponent({
           wrapClassName={baseClassName}
           width={props.width}
           footer={renderFooter()}
+          onCancel={onCancel}
         >
           {{
             default: () => (