@ditari/bsui 1.0.30 → 1.0.31

package/dist/cjs/components/menu/Menu.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),N=require("pinia"),S=require("../../store/modules/Menu.cjs.js"),h=require("../../store/modules/Settings.cjs.js");function V(o){return typeof o=="function"||Object.prototype.toString.call(o)==="[object Object]"&&!e.isVNode(o)}const y=e.defineComponent({name:"DMenu",setup(){const{componentName:o,prop:C}=e.inject("menuIcon"),{list:i}=S.useMenuStore(),a=h.useSettingsStore(),{getCollapsed:d}=N.storeToRefs(a),l=e.ref([]),c=e.ref([]),p=({item:t,key:n,keyPath:r})=>{console.log(t,n,r),l.value=r,c.value=[n]},v=t=>e.createVNode(e.Fragment,null,[e.createVNode(e.resolveComponent("a-menu-item"),{key:t.url},{icon:()=>s(t),default:()=>t.title})]),m=["anticon","anticon-menu","ant-menu-item-icon"],s=t=>e.createVNode(e.Fragment,null,[t.icon?f(t.icon):e.withDirectives(e.createVNode("div",{className:m},[t.title.substring(0,1)]),[[e.vShow,d.value]])]),f=t=>o==="nativeHtml"?e.createVNode("span",{innerHTML:t},null):e.h(e.resolveComponent(o),{prop:t}),u=t=>e.createVNode(e.Fragment,null,[e.createVNode(e.resolveComponent("a-sub-menu"),{key:t.url},{title:()=>t.title,icon:()=>s(t),default:()=>t.children.map(n=>!n.children||n.children.length===0?g(n):u(n))})]),g=t=>e.createVNode(e.Fragment,null,[e.createVNode(e.resolveComponent("a-menu-item"),{key:t.url},{default:()=>t.title})]);return()=>{let t;return e.createVNode(e.resolveComponent("a-menu"),{mode:"inline",theme:"dark",openKeys:l.value,"onUpdate:openKeys":n=>l.value=n,selectedKeys:c.value,"onUpdate:selectedKeys":n=>c.value=n,onClick:p},V(t=i.map(n=>{var r;return!n.children||((r=n.children)==null?void 0:r.length)===0?v(n):u(n)}))?t:{default:()=>[t]})}}});exports.default=y;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),S=require("vue-router"),V=require("pinia"),C=require("../../store/modules/Menu.cjs.js"),b=require("../../store/modules/Settings.cjs.js");function y(o){return typeof o=="function"||Object.prototype.toString.call(o)==="[object Object]"&&!e.isVNode(o)}const M=e.defineComponent({name:"DMenu",setup(){const o=S.useRouter(),{componentName:s,prop:K}=e.inject("menuIcon"),{list:d}=C.useMenuStore(),p=b.useSettingsStore(),{getCollapsed:v}=V.storeToRefs(p),l=e.ref([]),c=e.ref([]),m=({item:t,key:n,keyPath:r})=>{console.log(t,n,r),l.value=r,c.value=[n],o.push(n).then(a=>a?console.warn(a):null)},f=t=>e.createVNode(e.Fragment,null,[e.createVNode(e.resolveComponent("a-menu-item"),{key:t.url},{icon:()=>u(t),default:()=>t.title})]),g=["anticon","anticon-menu","ant-menu-item-icon"],u=t=>e.createVNode(e.Fragment,null,[t.icon?h(t.icon):e.withDirectives(e.createVNode("div",{className:g},[t.title.substring(0,1)]),[[e.vShow,v.value]])]),h=t=>s==="nativeHtml"?e.createVNode("span",{innerHTML:t},null):e.h(e.resolveComponent(s),{prop:t}),i=t=>e.createVNode(e.Fragment,null,[e.createVNode(e.resolveComponent("a-sub-menu"),{key:t.url},{title:()=>t.title,icon:()=>u(t),default:()=>t.children.map(n=>!n.children||n.children.length===0?N(n):i(n))})]),N=t=>e.createVNode(e.Fragment,null,[e.createVNode(e.resolveComponent("a-menu-item"),{key:t.url},{default:()=>t.title})]);return()=>{let t;return e.createVNode(e.resolveComponent("a-menu"),{mode:"inline",theme:"dark",openKeys:l.value,"onUpdate:openKeys":n=>l.value=n,selectedKeys:c.value,"onUpdate:selectedKeys":n=>c.value=n,onClick:m},y(t=d.map(n=>{var r;return!n.children||((r=n.children)==null?void 0:r.length)===0?f(n):i(n)}))?t:{default:()=>[t]})}}});exports.default=M;

package/dist/cjs/components/select/dic.worker.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const o="KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3NlbGYuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsZnVuY3Rpb24odCl7Y29uc3QgbD10LmRhdGEua2V5d29yZHM/PyIiO2xldCBlPUpTT04ucGFyc2UodC5kYXRhLmxpc3QpPz9bXTtjb25zdCBhPUpTT04ucGFyc2UodC5kYXRhLmluY2x1ZGUpO2EubGVuZ3RoPjAmJihlPWUuZmlsdGVyKHM9PmEuc29tZShpPT5pPT09cy52YWx1ZSkpKTtjb25zdCBvPWUuZmlsdGVyKHM9PnMudmFsdWUudG9Mb3dlckNhc2UoKS5pbmRleE9mKGwudG9Mb3dlckNhc2UoKSkhPT0tMXx8cy5sYWJlbC50b0xvd2VyQ2FzZSgpLmluY2x1ZGVzKGwudG9Mb3dlckNhc2UoKSkpO28ubGVuZ3RoPT09MD9zZWxmLnBvc3RNZXNzYWdlKGUuc3BsaWNlKDAsMTApKTpzZWxmLnBvc3RNZXNzYWdlKG8uc3BsaWNlKDAsMTApKX0sITEpfSkoKTsK",d=typeof window<"u"&&window.Blob&&new Blob([atob(o)],{type:"text/javascript;charset=utf-8"});function c(){const e=d&&(window.URL||window.webkitURL).createObjectURL(d);try{return e?new Worker(e):new Worker("data:application/javascript;base64,"+o)}finally{e&&(window.URL||window.webkitURL).revokeObjectURL(e)}}exports.default=c;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3NlbGYuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsZnVuY3Rpb24odCl7dmFyIGk7Y29uc3QgbD10LmRhdGEua2V5d29yZHM/PyIiO2xldCBlPUpTT04ucGFyc2UoKChpPXQuZGF0YSk9PW51bGw/dm9pZCAwOmkubGlzdCl8fFtdKT8/W107Y29uc3QgYT1KU09OLnBhcnNlKHQuZGF0YS5pbmNsdWRlKTthLmxlbmd0aD4wJiYoZT1lLmZpbHRlcihzPT5hLnNvbWUobj0+bj09PXMudmFsdWUpKSk7Y29uc3Qgbz1lLmZpbHRlcihzPT5zLnZhbHVlLnRvTG93ZXJDYXNlKCkuaW5kZXhPZihsLnRvTG93ZXJDYXNlKCkpIT09LTF8fHMubGFiZWwudG9Mb3dlckNhc2UoKS5pbmNsdWRlcyhsLnRvTG93ZXJDYXNlKCkpKTtvLmxlbmd0aD09PTA/c2VsZi5wb3N0TWVzc2FnZShlLnNwbGljZSgwLDEwKSk6c2VsZi5wb3N0TWVzc2FnZShvLnNwbGljZSgwLDEwKSl9LCExKX0pKCk7Cg==",b=typeof window<"u"&&window.Blob&&new Blob([atob(e)],{type:"text/javascript;charset=utf-8"});function n(){const l=b&&(window.URL||window.webkitURL).createObjectURL(b);try{return l?new Worker(l):new Worker("data:application/javascript;base64,"+e)}finally{l&&(window.URL||window.webkitURL).revokeObjectURL(l)}}exports.default=n;

package/dist/esm/components/menu/Menu.esm.js

@@ -1,47 +1,48 @@
-import { defineComponent as b, inject as C, ref as d, createVNode as n, resolveComponent as l, isVNode as K, Fragment as s, withDirectives as M, vShow as j, h as k } from "vue";
-import { storeToRefs as N } from "pinia";
-import { useMenuStore as w } from "../../store/modules/Menu.esm.js";
-import { useSettingsStore as I } from "../../store/modules/Settings.esm.js";
-function D(o) {
-  return typeof o == "function" || Object.prototype.toString.call(o) === "[object Object]" && !K(o);
+import { defineComponent as K, inject as M, ref as f, createVNode as n, resolveComponent as l, isVNode as j, Fragment as s, withDirectives as w, vShow as N, h as k } from "vue";
+import { useRouter as I } from "vue-router";
+import { storeToRefs as D } from "pinia";
+import { useMenuStore as H } from "../../store/modules/Menu.esm.js";
+import { useSettingsStore as O } from "../../store/modules/Settings.esm.js";
+function R(o) {
+  return typeof o == "function" || Object.prototype.toString.call(o) === "[object Object]" && !j(o);
 }
-const _ = /* @__PURE__ */ b({
+const L = /* @__PURE__ */ K({
   name: "DMenu",
   setup() {
-    const {
-      componentName: o,
-      prop: H
-    } = C("menuIcon"), {
-      list: p
-    } = w(), f = I(), {
-      getCollapsed: m
-    } = N(f), c = d([]), i = d([]), v = ({
+    const o = I(), {
+      componentName: i,
+      prop: T
+    } = M("menuIcon"), {
+      list: m
+    } = H(), h = O(), {
+      getCollapsed: v
+    } = D(h), c = f([]), u = f([]), S = ({
       item: e,
       key: t,
       keyPath: r
     }) => {
-      console.log(e, t, r), c.value = r, i.value = [t];
-    }, h = (e) => n(s, null, [n(l("a-menu-item"), {
+      console.log(e, t, r), c.value = r, u.value = [t], o.push(t).then((p) => p ? console.warn(p) : null);
+    }, g = (e) => n(s, null, [n(l("a-menu-item"), {
       key: e.url
     }, {
-      icon: () => u(e),
+      icon: () => a(e),
       default: () => e.title
-    })]), S = ["anticon", "anticon-menu", "ant-menu-item-icon"], u = (e) => n(s, null, [e.icon ? g(e.icon) : M(n("div", {
-      className: S
-    }, [e.title.substring(0, 1)]), [[j, m.value]])]), g = (e) => o === "nativeHtml" ? n("span", {
+    })]), y = ["anticon", "anticon-menu", "ant-menu-item-icon"], a = (e) => n(s, null, [e.icon ? b(e.icon) : w(n("div", {
+      className: y
+    }, [e.title.substring(0, 1)]), [[N, v.value]])]), b = (e) => i === "nativeHtml" ? n("span", {
       innerHTML: e
-    }, null) : k(l(o), {
+    }, null) : k(l(i), {
       prop: e
-    }), a = (e) => n(s, null, [n(l("a-sub-menu"), {
+    }), d = (e) => n(s, null, [n(l("a-sub-menu"), {
       key: e.url
     }, {
       title: () => e.title,
-      icon: () => u(e),
+      icon: () => a(e),
       default: () => e.children.map(
-        (t) => !t.children || t.children.length === 0 ? y(t) : a(t)
+        (t) => !t.children || t.children.length === 0 ? C(t) : d(t)
         // 递归调用
       )
-    })]), y = (e) => n(s, null, [n(l("a-menu-item"), {
+    })]), C = (e) => n(s, null, [n(l("a-menu-item"), {
       key: e.url
     }, {
       default: () => e.title
@@ -53,12 +54,12 @@ const _ = /* @__PURE__ */ b({
         theme: "dark",
         openKeys: c.value,
         "onUpdate:openKeys": (t) => c.value = t,
-        selectedKeys: i.value,
-        "onUpdate:selectedKeys": (t) => i.value = t,
-        onClick: v
-      }, D(e = p.map((t) => {
+        selectedKeys: u.value,
+        "onUpdate:selectedKeys": (t) => u.value = t,
+        onClick: S
+      }, R(e = m.map((t) => {
         var r;
-        return !t.children || ((r = t.children) == null ? void 0 : r.length) === 0 ? h(t) : a(t);
+        return !t.children || ((r = t.children) == null ? void 0 : r.length) === 0 ? g(t) : d(t);
       })) ? e : {
         default: () => [e]
       });
@@ -66,5 +67,5 @@ const _ = /* @__PURE__ */ b({
   }
 });
 export {
-  _ as default
+  L as default
 };

package/dist/esm/components/select/dic.worker.esm.js

@@ -1,12 +1,12 @@
-const o = "KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3NlbGYuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsZnVuY3Rpb24odCl7Y29uc3QgbD10LmRhdGEua2V5d29yZHM/PyIiO2xldCBlPUpTT04ucGFyc2UodC5kYXRhLmxpc3QpPz9bXTtjb25zdCBhPUpTT04ucGFyc2UodC5kYXRhLmluY2x1ZGUpO2EubGVuZ3RoPjAmJihlPWUuZmlsdGVyKHM9PmEuc29tZShpPT5pPT09cy52YWx1ZSkpKTtjb25zdCBvPWUuZmlsdGVyKHM9PnMudmFsdWUudG9Mb3dlckNhc2UoKS5pbmRleE9mKGwudG9Mb3dlckNhc2UoKSkhPT0tMXx8cy5sYWJlbC50b0xvd2VyQ2FzZSgpLmluY2x1ZGVzKGwudG9Mb3dlckNhc2UoKSkpO28ubGVuZ3RoPT09MD9zZWxmLnBvc3RNZXNzYWdlKGUuc3BsaWNlKDAsMTApKTpzZWxmLnBvc3RNZXNzYWdlKG8uc3BsaWNlKDAsMTApKX0sITEpfSkoKTsK", c = typeof window < "u" && window.Blob && new Blob([atob(o)], { type: "text/javascript;charset=utf-8" });
-function b() {
-  const d = c && (window.URL || window.webkitURL).createObjectURL(c);
+const l = "KGZ1bmN0aW9uKCl7InVzZSBzdHJpY3QiO3NlbGYuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsZnVuY3Rpb24odCl7dmFyIGk7Y29uc3QgbD10LmRhdGEua2V5d29yZHM/PyIiO2xldCBlPUpTT04ucGFyc2UoKChpPXQuZGF0YSk9PW51bGw/dm9pZCAwOmkubGlzdCl8fFtdKT8/W107Y29uc3QgYT1KU09OLnBhcnNlKHQuZGF0YS5pbmNsdWRlKTthLmxlbmd0aD4wJiYoZT1lLmZpbHRlcihzPT5hLnNvbWUobj0+bj09PXMudmFsdWUpKSk7Y29uc3Qgbz1lLmZpbHRlcihzPT5zLnZhbHVlLnRvTG93ZXJDYXNlKCkuaW5kZXhPZihsLnRvTG93ZXJDYXNlKCkpIT09LTF8fHMubGFiZWwudG9Mb3dlckNhc2UoKS5pbmNsdWRlcyhsLnRvTG93ZXJDYXNlKCkpKTtvLmxlbmd0aD09PTA/c2VsZi5wb3N0TWVzc2FnZShlLnNwbGljZSgwLDEwKSk6c2VsZi5wb3N0TWVzc2FnZShvLnNwbGljZSgwLDEwKSl9LCExKX0pKCk7Cg==", n = typeof window < "u" && window.Blob && new Blob([atob(l)], { type: "text/javascript;charset=utf-8" });
+function c() {
+  const b = n && (window.URL || window.webkitURL).createObjectURL(n);
   try {
-    return d ? new Worker(d) : new Worker("data:application/javascript;base64," + o);
+    return b ? new Worker(b) : new Worker("data:application/javascript;base64," + l);
   } finally {
-    d && (window.URL || window.webkitURL).revokeObjectURL(d);
+    b && (window.URL || window.webkitURL).revokeObjectURL(b);
   }
 }
 export {
-  b as default
+  c as default
 };

package/package.json

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

package/src/components/menu/Menu.jsx

@@ -1,4 +1,6 @@
 import { defineComponent, h, inject, ref, resolveComponent } from "vue";
+import { useRouter } from "vue-router";
+
 import { storeToRefs } from "pinia";
 
 import { useMenuStore } from "../../store/modules/Menu";
@@ -7,6 +9,7 @@ import { useSettingsStore } from "../../store/modules/Settings";
 export default defineComponent({
   name: "DMenu",
   setup() {
+    const router = useRouter();
     const { componentName, prop } = inject("menuIcon");
     const { list } = useMenuStore();
     const settingsStore = useSettingsStore();
@@ -27,6 +30,7 @@ export default defineComponent({
       console.log(item, key, keyPath);
       openKeys.value = keyPath;
       selectedKeys.value = [key];
+      router.push(key).then((r) => (r ? console.warn(r) : null));
     };
     /**
      * 监听菜单展开事件

package/src/components/select/dic.worker.ts

@@ -7,7 +7,7 @@ self.addEventListener(
   "message",
   function (e) {
     const keyword = e.data.keywords ?? "";
-    let dicList = JSON.parse(e.data.list) ?? [];
+    let dicList = JSON.parse(e.data?.list || []) ?? [];
     const include = JSON.parse(e.data.include);
     if (include.length > 0) {
       // 只过滤出来include包含的数据