@ditari/bsui 1.0.56 → 1.0.58

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

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

@@ -11,6 +11,10 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, () => 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;
@@ -24,11 +28,16 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
 }, {
     title: string;
     visible: boolean;
     width: number;
+    destroyOnClose: boolean;
 }>;
 export default _default;

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

@@ -11,6 +11,10 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, () => 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;
@@ -24,11 +28,16 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
 }, {
     title: string;
     visible: boolean;
     width: number;
+    destroyOnClose: boolean;
 }>>;
 export default DModal;

package/dist/cjs/components/select/Select.vue.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),D=require("../../store/modules/DataDictionary.cjs.js"),_={name:"DSelect"},L=e.defineComponent({..._,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"},include:{default:[]}},emits:["update:value","change","select"],setup(u,{emit:o}){const t=u,{getDicByKey:f}=D.useDataDicStore(),{modelValue:r,data:v,onSearch:h,onSelect:p,onChange:S}=g();function g(){const s=[...f(t.name)],n=e.ref([]),a=e.ref(t.value);e.watch(()=>t.include,()=>{i(a.value)}),e.watch(()=>t.value,l=>{a.value=l}),i(a.value);const d=l=>{i(l)};function i(l){n.value=s.filter(c=>c.value.toLowerCase().indexOf(l.toLowerCase())!==-1||c.label.toLowerCase().includes(l.toLowerCase())).splice(0,10),n.value.length===0&&(n.value=[...s].splice(0,10))}const C=l=>{o("update:value",l),b()},m=()=>{o("update:value",a.value),o("change",a.value)};function b(){const c=f(t.name).find(w=>w.value===a.value);o("select",c)}return{data:n,modelValue:a,onSearch:d,onSelect:C,onChange:m}}return(s,n)=>{const a=e.resolveComponent("a-select");return e.openBlock(),e.createBlock(a,{value:e.unref(r),"onUpdate:value":n[0]||(n[0]=d=>e.isRef(r)?r.value=d:null),"allow-clear":"","show-search":"","filter-option":!1,options:e.unref(v),placeholder:u.placeholder,disabled:u.disabled,onSelect:e.unref(p),onSearch:e.unref(h),onChange:e.unref(S)},null,8,["value","options","placeholder","disabled","onSelect","onSearch","onChange"])}}});exports.default=L;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),_=require("../../store/modules/DataDictionary.cjs.js"),L={name:"DSelect"},w=e.defineComponent({...L,props:{value:{default:null},name:{default:""},disabled:{type:Boolean,default:!1},placeholder:{default:"请填写默认占位符啊！老铁"},include:{default:[]}},emits:["update:value","change","select"],setup(u,{emit:o}){const t=u,{getDicByKey:f}=_.useDataDicStore(),{modelValue:r,data:v,onSearch:h,onSelect:p,onChange:S}=g();function g(){const s=[...f(t.name)],n=e.ref([]),l=e.ref(t.value);e.watch(()=>t.include,()=>{i(l.value)}),e.watch(()=>t.value,a=>{l.value=a}),i(l.value);const d=a=>{i(a)};function i(a){a=a??"",n.value=s.filter(c=>c.value.toLowerCase().indexOf(a.toLowerCase())!==-1||c.label.toLowerCase().includes(a.toLowerCase())).splice(0,10),n.value.length===0&&(n.value=[...s].splice(0,10))}const C=a=>{o("update:value",a),b()},m=()=>{o("update:value",l.value),o("change",l.value)};function b(){const c=f(t.name).find(D=>D.value===l.value);o("select",c)}return{data:n,modelValue:l,onSearch:d,onSelect:C,onChange:m}}return(s,n)=>{const l=e.resolveComponent("a-select");return e.openBlock(),e.createBlock(l,{value:e.unref(r),"onUpdate:value":n[0]||(n[0]=d=>e.isRef(r)?r.value=d:null),"allow-clear":"","show-search":"","filter-option":!1,options:e.unref(v),placeholder:u.placeholder,disabled:u.disabled,onSelect:e.unref(p),onSearch:e.unref(h),onChange:e.unref(S)},null,8,["value","options","placeholder","disabled","onSelect","onSearch","onChange"])}}});exports.default=w;

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

@@ -11,6 +11,10 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, () => 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;
@@ -24,11 +28,16 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
 }, {
     title: string;
     visible: boolean;
     width: number;
+    destroyOnClose: boolean;
 }>;
 export default _default;

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

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

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

@@ -11,6 +11,10 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, () => 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;
@@ -24,11 +28,16 @@ export declare const DModal: import("../../utils/install").SFCWithInstall<import
         type: NumberConstructor;
         default: () => number;
     };
+    destroyOnClose: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     "onUpdate:visible"?: ((...args: any[]) => any) | undefined;
 }, {
     title: string;
     visible: boolean;
     width: number;
+    destroyOnClose: boolean;
 }>>;
 export default DModal;

package/dist/esm/components/select/Select.vue.esm.js

@@ -1,9 +1,9 @@
-import { defineComponent as _, ref as p, watch as v, resolveComponent as B, openBlock as x, createBlock as V, unref as o, isRef as k } from "vue";
-import { useDataDicStore as y } from "../../store/modules/DataDictionary.esm.js";
-const H = {
+import { defineComponent as w, ref as p, watch as v, resolveComponent as B, openBlock as x, createBlock as V, unref as o, isRef as H } from "vue";
+import { useDataDicStore as K } from "../../store/modules/DataDictionary.esm.js";
+const O = {
   name: "DSelect"
-}, R = /* @__PURE__ */ _({
-  ...H,
+}, W = /* @__PURE__ */ w({
+  ...O,
   props: {
     value: { default: null },
     name: { default: "" },
@@ -13,48 +13,48 @@ const H = {
   },
   emits: ["update:value", "change", "select"],
   setup(u, { emit: t }) {
-    const n = u, { getDicByKey: f } = y(), { modelValue: s, data: h, onSearch: S, onSelect: m, onChange: C } = g();
+    const n = u, { getDicByKey: f } = K(), { modelValue: s, data: h, onSearch: S, onSelect: m, onChange: C } = g();
     function g() {
-      const d = [...f(n.name)], l = p([]), e = p(n.value);
+      const d = [...f(n.name)], l = p([]), a = p(n.value);
       v(
         () => n.include,
         () => {
-          i(e.value);
+          i(a.value);
         }
       ), v(
         () => n.value,
-        (a) => {
-          e.value = a;
+        (e) => {
+          a.value = e;
         }
-      ), i(e.value);
-      const r = (a) => {
-        i(a);
+      ), i(a.value);
+      const r = (e) => {
+        i(e);
       };
-      function i(a) {
-        l.value = d.filter((c) => c.value.toLowerCase().indexOf(a.toLowerCase()) !== -1 || c.label.toLowerCase().includes(a.toLowerCase())).splice(0, 10), l.value.length === 0 && (l.value = [...d].splice(0, 10));
+      function i(e) {
+        e = e ?? "", l.value = d.filter((c) => c.value.toLowerCase().indexOf(e.toLowerCase()) !== -1 || c.label.toLowerCase().includes(e.toLowerCase())).splice(0, 10), l.value.length === 0 && (l.value = [...d].splice(0, 10));
       }
-      const w = (a) => {
-        t("update:value", a), b();
-      }, L = () => {
-        t("update:value", e.value), t("change", e.value);
+      const L = (e) => {
+        t("update:value", e), D();
+      }, b = () => {
+        t("update:value", a.value), t("change", a.value);
       };
-      function b() {
-        const c = f(n.name).find((D) => D.value === e.value);
+      function D() {
+        const c = f(n.name).find((_) => _.value === a.value);
         t("select", c);
       }
       return {
         data: l,
-        modelValue: e,
+        modelValue: a,
         onSearch: r,
-        onSelect: w,
-        onChange: L
+        onSelect: L,
+        onChange: b
       };
     }
     return (d, l) => {
-      const e = B("a-select");
-      return x(), V(e, {
+      const a = B("a-select");
+      return x(), V(a, {
         value: o(s),
-        "onUpdate:value": l[0] || (l[0] = (r) => k(s) ? s.value = r : null),
+        "onUpdate:value": l[0] || (l[0] = (r) => H(s) ? s.value = r : null),
         "allow-clear": "",
         "show-search": "",
         "filter-option": !1,
@@ -69,5 +69,5 @@ const H = {
   }
 });
 export {
-  R as default
+  W as default
 };

package/package.json

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

package/src/components/dic/DicReplace.tsx

@@ -3,10 +3,10 @@
  * 根据字典名字及对应的value替换成中文或者人能看懂的文字
  * @author 余春林
  */
-import { defineComponent, inject, ref, watchEffect } from "vue";
+import { defineComponent, ref, watchEffect } from "vue";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import DicWorker from "./replace.worker?worker&inline";
+// import DicWorker from "./replace.worker?worker&inline";
 import { useDataDicStore } from "../../store/modules/DataDictionary";
 
 export default defineComponent({

package/src/components/modal/Modal.tsx

@@ -20,6 +20,10 @@ export default defineComponent({
     width: {
       type: Number,
       default: () => 800
+    },
+    destroyOnClose: {
+      type: Boolean,
+      default: true
     }
   },
   emits: ["update:visible"],
@@ -58,6 +62,7 @@ export default defineComponent({
           mask-closable={false}
           wrapClassName={baseClassName}
           width={props.width}
+          destroyOnClose={props.destroyOnClose}
           footer={renderFooter()}
           onCancel={onCancel}
         >

package/src/components/select/Select.vue

@@ -92,6 +92,7 @@ function useSelect() {
     //   keywords: keywords,
     //   include: JSON.stringify(props.include ?? [])
     // });
+    keywords = keywords ?? "";
     data.value = dicData
       .filter((item: any) => {
         return (