@ditari/bsui 1.0.65 → 1.0.67

package/dist/cjs/components/layout/Main.vue.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("@ant-design/icons-vue");require("../../store/modules/Breadcrumb.cjs.js");require("../../store/modules/DataDictionary.cjs.js");const y=require("../../store/modules/KeepAlive.cjs.js");require("../../store/modules/Menu.cjs.js");require("../../store/modules/NavTab.cjs.js");const g=require("../../store/modules/Settings.cjs.js");require("../../store/modules/User.cjs.js");const k=require("./NavTabs.vue.cjs.js"),h=require("./Breadcrumb.vue.cjs.js"),C=require("../menu/Menu.cjs.js"),N={class:"ditari-logo"},V={class:"ditari-menu"},b={class:"ditari-layout-header"},w={class:"ditari-layout-header-left"},S={class:"ditari-user-menu"},B={name:"DMainLayout"},q=e.defineComponent({...B,props:{showConfig:{default:{backBtn:"LeftOutlined"}},breadcrumbStatus:{type:Boolean}},setup(u){const c=u,d=y.useKeepAliveStore(),p=e.computed(()=>d.get),l=g.useSettingsStore(),{switchCollapsed:a}=l,t=e.computed(()=>l.getCollapsed);return e.provide("showConfig",c.showConfig),(n,r)=>{const _=e.resolveComponent("a-layout-sider"),f=e.resolveComponent("router-view"),m=e.resolveComponent("a-layout-content"),s=e.resolveComponent("a-layout"),v=e.resolveComponent("a-back-top");return e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(s,{class:"ditari-layout"},{default:e.withCtx(()=>[e.createVNode(_,{collapsed:e.unref(t),"onUpdate:collapsed":r[0]||(r[0]=o=>e.isRef(t)?t.value=o:null),trigger:null,collapsible:"",class:"ditari-layout-sider"},{default:e.withCtx(()=>[e.createElementVNode("div",N,[e.renderSlot(n.$slots,"logo")]),e.createElementVNode("div",V,[e.createVNode(e.unref(C.default))])]),_:3},8,["collapsed"]),e.createVNode(s,null,{default:e.withCtx(()=>[e.createElementVNode("div",{class:"ditari-top-layout",style:e.normalizeStyle({left:e.unref(t)?"80px":"200px"})},[e.createVNode(k.default),e.createElementVNode("div",b,[e.createElementVNode("div",w,[e.createElementVNode("div",{class:"ditari-side-collapsed",onClick:r[1]||(r[1]=(...o)=>e.unref(a)&&e.unref(a)(...o))},[e.unref(t)?(e.openBlock(),e.createBlock(e.unref(i.MenuUnfoldOutlined),{key:0,class:"trigger",style:{"font-size":"16px","font-weight":"bold",cursor:"pointer"}})):(e.openBlock(),e.createBlock(e.unref(i.MenuFoldOutlined),{key:1,style:{"font-size":"16px","font-weight":"bold",cursor:"pointer"}}))]),e.createVNode(h.default)]),e.createElementVNode("div",S,[e.renderSlot(n.$slots,"operation")])])],4),e.createVNode(m,{class:"ditari-layout-content",style:e.normalizeStyle({marginLeft:e.unref(t)?"80px":"200px"})},{default:e.withCtx(()=>[e.createVNode(f,null,{default:e.withCtx(({Component:o})=>[e.createVNode(e.Transition,{name:"main",mode:"out-in",appear:""},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.KeepAlive,{ref:"keepAliveRef",include:e.unref(p)},[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o),{key:n.$route.path}))],1032,["include"]))]),_:2},1024)]),_:1}),e.renderSlot(n.$slots,"micro")]),_:3},8,["style"])]),_:3})]),_:3}),e.createVNode(v,{class:"ditari-ant-back-top","visibility-height":50})],64)}}});exports.default=q;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("@ant-design/icons-vue");require("../../store/modules/Breadcrumb.cjs.js");require("../../store/modules/DataDictionary.cjs.js");const y=require("../../store/modules/KeepAlive.cjs.js");require("../../store/modules/Menu.cjs.js");require("../../store/modules/NavTab.cjs.js");const g=require("../../store/modules/Settings.cjs.js");require("../../store/modules/User.cjs.js");const k=require("./NavTabs.vue.cjs.js"),N=require("./Breadcrumb.vue.cjs.js"),h=require("../menu/Menu.cjs.js"),C={class:"ditari-logo"},V={class:"ditari-menu"},b={class:"ditari-layout-header"},w={class:"ditari-layout-header-left"},S={class:"ditari-user-menu"},B={name:"DMainLayout"},q=e.defineComponent({...B,props:{showConfig:{default:{backBtn:"LeftOutlined"}},breadcrumbStatus:{type:Boolean}},setup(u){const c=u,d=y.useKeepAliveStore(),p=e.computed(()=>d.get),r=g.useSettingsStore(),{switchCollapsed:a}=r,t=e.computed(()=>r.getCollapsed);return e.provide("showConfig",c.showConfig),(n,l)=>{const _=e.resolveComponent("a-layout-sider"),f=e.resolveComponent("router-view"),m=e.resolveComponent("a-layout-content"),s=e.resolveComponent("a-layout"),v=e.resolveComponent("a-back-top");return e.openBlock(),e.createElementBlock(e.Fragment,null,[e.createVNode(s,{class:"ditari-layout"},{default:e.withCtx(()=>[e.createVNode(_,{collapsed:e.unref(t),"onUpdate:collapsed":l[0]||(l[0]=o=>e.isRef(t)?t.value=o:null),trigger:null,collapsible:"",class:"ditari-layout-sider"},{default:e.withCtx(()=>[e.createElementVNode("div",null,[e.createElementVNode("div",C,[e.renderSlot(n.$slots,"logo")]),e.createElementVNode("div",V,[e.createVNode(e.unref(h.default))])])]),_:3},8,["collapsed"]),e.createVNode(s,null,{default:e.withCtx(()=>[e.createElementVNode("div",{class:"ditari-top-layout",style:e.normalizeStyle({left:e.unref(t)?"80px":"200px"})},[e.createVNode(k.default),e.createElementVNode("div",b,[e.createElementVNode("div",w,[e.createElementVNode("div",{class:"ditari-side-collapsed",onClick:l[1]||(l[1]=(...o)=>e.unref(a)&&e.unref(a)(...o))},[e.unref(t)?(e.openBlock(),e.createBlock(e.unref(i.MenuUnfoldOutlined),{key:0,class:"trigger",style:{"font-size":"16px","font-weight":"bold",cursor:"pointer"}})):(e.openBlock(),e.createBlock(e.unref(i.MenuFoldOutlined),{key:1,style:{"font-size":"16px","font-weight":"bold",cursor:"pointer"}}))]),e.createVNode(N.default)]),e.createElementVNode("div",S,[e.renderSlot(n.$slots,"operation")])])],4),e.createVNode(m,{class:"ditari-layout-content",style:e.normalizeStyle({marginLeft:e.unref(t)?"80px":"200px"})},{default:e.withCtx(()=>[e.createVNode(f,null,{default:e.withCtx(({Component:o})=>[e.createVNode(e.Transition,{name:"main",mode:"out-in",appear:""},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.KeepAlive,{ref:"keepAliveRef",include:e.unref(p)},[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o),{key:n.$route.path}))],1032,["include"]))]),_:2},1024)]),_:1}),e.renderSlot(n.$slots,"micro")]),_:3},8,["style"])]),_:3})]),_:3}),e.createVNode(v,{class:"ditari-ant-back-top","visibility-height":50})],64)}}});exports.default=q;

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

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

package/dist/css/index.css

@@ -1 +1 @@
-.ditari-bsui-grid{position:relative;display:grid}.ditari-bsui-grid .ditari-bsui-grid--item{border:1px solid #4e4e4e;margin-left:-1px;margin-top:-1px}.ditari-bsui-grid-form .ant-form-item{margin-bottom:0;height:100%}.ditari-bsui-grid-form .ant-form-item .ant-form-item-label{border-right:1px solid #4e4e4e}.ditari-bsui-grid-form .ant-form-item .ant-input,.ditari-bsui-grid-form .ant-form-item .ant-select-selector,.ditari-bsui-grid-form .ant-form-item .ant-input-number{border:0;border-radius:0}.ditari-bsui-grid-form .ant-form-item .ant-input:focus,.ditari-bsui-grid-form .ant-form-item .ant-select-selector:focus,.ditari-bsui-grid-form .ant-form-item .ant-input-number:focus{box-shadow:0 0 0 2px #1890ff}.ditari-bsui-grid-form .ant-form-item .ant-input .ant-input-number-input,.ditari-bsui-grid-form .ant-form-item .ant-select-selector .ant-input-number-input,.ditari-bsui-grid-form .ant-form-item .ant-input-number .ant-input-number-input{border:0;border-radius:0}.ditari-bsui-grid-form .ant-form-item .ant-input .ant-input-number-input:focus,.ditari-bsui-grid-form .ant-form-item .ant-select-selector .ant-input-number-input:focus,.ditari-bsui-grid-form .ant-form-item .ant-input-number .ant-input-number-input:focus{box-shadow:0 0 0 2px #1890ff}.ditari-bsui-grid-form .ant-form-item .ant-input[disabled]{color:#525252}.ditari-bsui-grid-form .ant-form-item-has-error .ant-form-item-explain{display:block}.ditari-bsui-grid-form .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector{box-shadow:0 0 0 2px #1890ff}.ditari-bsui-grid-form .ant-form-item-has-error :not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus{box-shadow:0 0 0px 2px red;border-radius:0}.ditari-bsui-grid-form .ant-form-item-has-error :not(.ant-input-disabled):not(.ant-input-borderless).ant-input{box-shadow:0 0 0px 2px #ff4d4f}.ditari-menu{height:calc(100vh - 240px - 0);overflow:scroll}.ditari-menu::-webkit-scrollbar{width:0 !important;display:none}.ditari-layout-sider{background-color:#162157}.ditari-layout-sider .ant-menu-dark{background-color:#162157}.ditari-layout-sider .ant-menu-dark .ant-menu-inline.ant-menu-sub{background-color:#101847}.ditari-bsui-breadcrumb .ant-breadcrumb-separator{display:none}.ditari-bsui-breadcrumb .breadcrumb{display:flex}.ditari-bsui-breadcrumb .breadcrumb .breadcrumb-item{color:#333}.ditari-bsui-breadcrumb .breadcrumb .breadcrumb-item:first-child .breadcrumb-link{border-radius:6px 0 0 6px;clip-path:polygon(0 0, calc(100% - 8px) 0, 100% 50%, calc(100% - 8px) 100%, 0 100%)}.ditari-bsui-breadcrumb .breadcrumb .breadcrumb-item:last-child:not(:first-child) .breadcrumb-link{border-radius:0 6px 6px 0;clip-path:polygon(0 0, 100% 0, 100% 100%, 0 100%, 8px 50%)}.ditari-bsui-breadcrumb .breadcrumb-link{display:block;padding:4px 12px;background:#f0f2f5;clip-path:polygon(0 0, calc(100% - 8px) 0, 100% 50%, calc(100% - 8px) 100%, 0 100%, 8px 50%)}.ditari-bsui-breadcrumb a.breadcrumb-link{color:#2589ff}.breadcrumb-enter-active{transition:all .25s}.breadcrumb-enter-from,.breadcrumb-leave-active{opacity:0;transform:translateX(30px) skewX(-50deg)}.ditari-list-layout{padding:20px;height:100%}.ditari-list-layout .wrapper{display:flex;flex-direction:column}.ditari-list-layout .ditari-list-table{flex:1}.ditari-list-layout .ditari-list-table .ant-card-body{display:flex;flex-direction:column;height:100%}.ditari-list-layout .ditari-list-form .ant-card-body{padding-bottom:0}.ditari-list-layout .wrapper{height:100%}.ditari-ant-back-top{right:4px;bottom:120px}.ditari-layout{height:100%}.ditari-layout .ditari-layout-sider{position:fixed;left:0;top:0;bottom:0;z-index:1}.ditari-layout .ditari-top-layout{position:fixed;left:200px;right:0;z-index:210}.ditari-layout .ditari-layout-content{margin-left:200px;margin-top:84px}.fade-enter-active,.fade-leave-active{transition:opacity .1s ease}.fade-enter-from,.fade-leave-to{opacity:0}.main-enter-active{transition:.2s}.main-leave-active{transition:.15s}.main-enter-from{opacity:0;margin-left:-20px}.main-leave-to{opacity:0;margin-left:20px}.ditari-layout-header{display:flex;justify-content:space-between;align-items:center;padding:0 15px;height:42px;border-bottom:1px solid #f0f2f5;background-color:#fff}.ditari-layout-header .ditari-layout-header-left{display:flex;justify-content:center}.ditari-layout-header .ditari-layout-header-left .ditari-side-collapsed{margin-right:20px;cursor:pointer;width:42px;line-height:30px;text-align:center;transition-duration:.2s}.ditari-layout-header .ditari-layout-header-left .ditari-side-collapsed:hover{background-color:#f0f2f5;border-radius:4px}.ditari-layout-header .ditari-layout-header-left .ditari-side-collapsed .icon{transition-duration:.2s}.ditari-user-menu{display:flex;align-items:center;height:100%}.ditari-user-menu .ditari-operation-items{margin-left:10px;height:100%}.ditari-user-menu .ditari-operation-items .ant-dropdown-link{display:flex;align-items:center;justify-content:center;height:100%}.collapsed-animation{transform:rotate(-180deg)}.ditari-bsui-nav{display:flex;background:linear-gradient(270deg, #019cfe 0%, #0165fe 100%)}.ditari-bsui-nav .ant-tabs-nav{margin:0}.ditari-bsui-nav .ant-tabs-content-holder{display:none}.ditari-bsui-nav .ant-tabs-nav-list{padding-right:30px}.ditari-bsui-nav .ant-tabs-tab{position:relative;margin-left:0 !important;border:0 !important;transition:none !important;border-radius:10px 10px 0 0 !important;color:#fff}.ditari-bsui-nav .ant-tabs-tab:first-child .tab-dividers::before,.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active{background-color:#fff}.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active .tab-item{color:#0065b3}.ditari-bsui-nav .ant-tabs-tab:not(.ant-tabs-tab-active){background:rgba(0,0,0,0)}.ditari-bsui-nav .ant-tabs-tab:hover:not(.ant-tabs-tab-active){background:#065de1}.ditari-bsui-nav .ant-tabs-tab:hover:not(.ant-tabs-tab-active) .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-tab:hover:not(.ant-tabs-tab-active)+.ant-tabs-tab .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-tab .ant-tabs-tab-btn{display:flex;align-items:center}.ditari-bsui-nav .ant-tabs-tab .tab-close{padding:4px;margin-left:10px;display:flex;align-items:center;justify-content:center;border-radius:50%}.ditari-bsui-nav .ant-tabs-tab .tab-close:hover{background-color:#63aeff;color:#fff}.ditari-bsui-nav .ant-tabs-tab .tab-close .anticon{margin:0}.ditari-bsui-nav .ant-tabs-tab-active+.ant-tabs-tab .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-nav-wrap{padding:4px 8px 0}.ditari-bsui-nav .ant-tabs-nav::before{border-bottom-width:0}.ditari-bsui-nav .ant-tabs-tab::before,.ditari-bsui-nav .ant-tabs-tab::after{position:absolute;bottom:0;content:"";width:20px;height:20px;border-radius:100%;box-shadow:0 0 0 40px rgba(0,0,0,0)}.ditari-bsui-nav .ant-tabs-tab::before{left:-20px;clip-path:inset(50% -10px 0 50%)}.ditari-bsui-nav .ant-tabs-tab::after{right:-20px;clip-path:inset(50% 50% 0 -10px)}.ditari-bsui-nav .ant-tabs-tab:hover::before,.ditari-bsui-nav .ant-tabs-tab:hover::after{box-shadow:0 0 0 30px #065de1}.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active::before,.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active::after{z-index:10;box-shadow:0 0 0 30px #fff}.ditari-bsui-nav .tab-dividers{position:absolute;z-index:0;height:14px;top:50%;left:0;margin-top:-7px}.ditari-bsui-nav .tab-dividers::before{content:"";display:block;position:absolute;top:0;left:1px;bottom:0;width:1px;opacity:1;background-color:#fff;transition:opacity .2s ease,background-color .3s}.ditari-show-layout{position:relative}.ditari-show-layout .ant-card{margin-bottom:10px}.ditari-show-layout .ant-card .ant-card-head{padding:10px 24px}.ditari-show-layout .ant-card .ant-card-head .ant-card-head-title{padding:0}.ditari-show-layout .ant-card:last-child{margin-bottom:0}.ditari-show-layout .ditari-page-header{position:sticky;top:84px;z-index:10;padding:4px 24px;transition:all .3s}.ditari-show-layout .ditari-page-header.active{box-shadow:7px 12px 20px 0 #e0e0e0}.ditari-show-layout .ditari-show-footer{position:fixed;right:0;bottom:0;left:200px;z-index:10;padding:10px;background:#fff;box-shadow:4px -2px 5px 3px #e0e0e0}.ditari-fuck-top-layout{position:fixed;left:200px;right:0;z-index:210;display:flex;background:linear-gradient(270deg, #019cfe 0%, #0165fe 100%)}.ditari-fuck-top-layout .ditari-bsui-nav{flex:1;min-width:0}.ditari-fuck-top-layout .ditari-side-collapsed{display:flex;align-items:center;justify-content:center;width:42px;cursor:pointer;color:#fff}.ditari-bsui-pagination{margin-top:24px;text-align:center}.ant-table.ant-table-bordered>.ant-table-container{border-bottom:1px solid #f0f0f0}.ditari-bsui-desensitize .value{padding:0 4px}.ditari-bsui-modal .ant-modal-body{padding:0}.ditari-bsui-modal .ditari-bsui-modal-content{max-height:200px;overflow-y:scroll}.ditari-bsui-modal .ditari-bsui-modal-content::-webkit-scrollbar{width:0 !important;display:none}.ant-table.ant-table-bordered>.ant-table-container{border-bottom:1px solid #f0f0f0}@media screen and (min-width: 320px){.modal{font-size:12px}}@media screen and (min-width: 640px){.modal{font-size:14px}}@media screen and (min-width: 1024px){.modal{font-size:16px}}@media screen and (min-width: 1440px){.modal{font-size:18px}}@media screen and (max-width: 640px){.modal-sm{width:100%;height:100%;min-width:240px;min-height:160px}}@media screen and (min-width: 640px)and (max-width: 1024px){.modal-md{margin:100px auto;max-width:600px;max-height:480px}}@media screen and (min-width: 1024px)and (max-width: 1440px){.modal-lg{margin:100px auto;max-width:800px;max-height:600px}}@media screen and (min-width: 1440px){.modal-xl{margin:100px auto}}html,body,#app{height:100%;background:#f0f2f5}html::-webkit-scrollbar,body::-webkit-scrollbar,#app::-webkit-scrollbar{width:0 !important;display:none}
+.ditari-bsui-grid{position:relative;display:grid}.ditari-bsui-grid .ditari-bsui-grid--item{border:1px solid #4e4e4e;margin-left:-1px;margin-top:-1px}.ditari-bsui-grid-form .ant-form-item{margin-bottom:0;height:100%}.ditari-bsui-grid-form .ant-form-item .ant-form-item-label{border-right:1px solid #4e4e4e}.ditari-bsui-grid-form .ant-form-item .ant-input,.ditari-bsui-grid-form .ant-form-item .ant-select-selector,.ditari-bsui-grid-form .ant-form-item .ant-input-number{border:0;border-radius:0}.ditari-bsui-grid-form .ant-form-item .ant-input:focus,.ditari-bsui-grid-form .ant-form-item .ant-select-selector:focus,.ditari-bsui-grid-form .ant-form-item .ant-input-number:focus{box-shadow:0 0 0 2px #1890ff}.ditari-bsui-grid-form .ant-form-item .ant-input .ant-input-number-input,.ditari-bsui-grid-form .ant-form-item .ant-select-selector .ant-input-number-input,.ditari-bsui-grid-form .ant-form-item .ant-input-number .ant-input-number-input{border:0;border-radius:0}.ditari-bsui-grid-form .ant-form-item .ant-input .ant-input-number-input:focus,.ditari-bsui-grid-form .ant-form-item .ant-select-selector .ant-input-number-input:focus,.ditari-bsui-grid-form .ant-form-item .ant-input-number .ant-input-number-input:focus{box-shadow:0 0 0 2px #1890ff}.ditari-bsui-grid-form .ant-form-item .ant-input[disabled]{color:#525252}.ditari-bsui-grid-form .ant-form-item-has-error .ant-form-item-explain{display:block}.ditari-bsui-grid-form .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector{box-shadow:0 0 0 2px #1890ff}.ditari-bsui-grid-form .ant-form-item-has-error :not(.ant-input-disabled):not(.ant-input-borderless).ant-input:focus{box-shadow:0 0 0px 2px red;border-radius:0}.ditari-bsui-grid-form .ant-form-item-has-error :not(.ant-input-disabled):not(.ant-input-borderless).ant-input{box-shadow:0 0 0px 2px #ff4d4f}.ditari-menu{height:calc(100vh - 240px - 0px);overflow:scroll}.ditari-menu::-webkit-scrollbar{width:0 !important;display:none}.ditari-layout-sider{background-color:#162157}.ditari-layout-sider .ant-menu-dark{background-color:#162157}.ditari-layout-sider .ant-menu-dark .ant-menu-inline.ant-menu-sub{background-color:#101847}.ditari-bsui-breadcrumb .ant-breadcrumb-separator{display:none}.ditari-bsui-breadcrumb .breadcrumb{display:flex}.ditari-bsui-breadcrumb .breadcrumb .breadcrumb-item{color:#333}.ditari-bsui-breadcrumb .breadcrumb .breadcrumb-item:first-child .breadcrumb-link{border-radius:6px 0 0 6px;clip-path:polygon(0 0, calc(100% - 8px) 0, 100% 50%, calc(100% - 8px) 100%, 0 100%)}.ditari-bsui-breadcrumb .breadcrumb .breadcrumb-item:last-child:not(:first-child) .breadcrumb-link{border-radius:0 6px 6px 0;clip-path:polygon(0 0, 100% 0, 100% 100%, 0 100%, 8px 50%)}.ditari-bsui-breadcrumb .breadcrumb-link{display:block;padding:4px 12px;background:#f0f2f5;clip-path:polygon(0 0, calc(100% - 8px) 0, 100% 50%, calc(100% - 8px) 100%, 0 100%, 8px 50%)}.ditari-bsui-breadcrumb a.breadcrumb-link{color:#2589ff}.breadcrumb-enter-active{transition:all .25s}.breadcrumb-enter-from,.breadcrumb-leave-active{opacity:0;transform:translateX(30px) skewX(-50deg)}.ditari-list-layout{padding:20px;height:100%}.ditari-list-layout .wrapper{display:flex;flex-direction:column}.ditari-list-layout .ditari-list-table{flex:1}.ditari-list-layout .ditari-list-table .ant-card-body{display:flex;flex-direction:column;height:100%}.ditari-list-layout .ditari-list-form .ant-card-body{padding-bottom:0}.ditari-list-layout .wrapper{height:100%}.ditari-ant-back-top{right:4px;bottom:120px}.ditari-layout{height:100%}.ditari-layout .ditari-layout-sider{position:fixed;left:0;top:0;bottom:0;z-index:1}.ditari-layout .ditari-top-layout{position:fixed;left:200px;right:0;z-index:210}.ditari-layout .ditari-layout-content{margin-left:200px;margin-top:84px}.fade-enter-active,.fade-leave-active{transition:opacity .1s ease}.fade-enter-from,.fade-leave-to{opacity:0}.main-enter-active{transition:.2s}.main-leave-active{transition:.15s}.main-enter-from{opacity:0;margin-left:-20px}.main-leave-to{opacity:0;margin-left:20px}.ditari-layout-header{display:flex;justify-content:space-between;align-items:center;padding:0 15px;height:42px;border-bottom:1px solid #f0f2f5;background-color:#fff}.ditari-layout-header .ditari-layout-header-left{display:flex;justify-content:center}.ditari-layout-header .ditari-layout-header-left .ditari-side-collapsed{margin-right:20px;cursor:pointer;width:42px;line-height:30px;text-align:center;transition-duration:.2s}.ditari-layout-header .ditari-layout-header-left .ditari-side-collapsed:hover{background-color:#f0f2f5;border-radius:4px}.ditari-layout-header .ditari-layout-header-left .ditari-side-collapsed .icon{transition-duration:.2s}.ditari-user-menu{display:flex;align-items:center;height:100%}.ditari-user-menu .ditari-operation-items{margin-left:10px;height:100%}.ditari-user-menu .ditari-operation-items .ant-dropdown-link{display:flex;align-items:center;justify-content:center;height:100%}.collapsed-animation{transform:rotate(-180deg)}.ditari-bsui-nav{display:flex;background:linear-gradient(270deg, #019cfe 0%, #0165fe 100%)}.ditari-bsui-nav .ant-tabs-nav{margin:0}.ditari-bsui-nav .ant-tabs-content-holder{display:none}.ditari-bsui-nav .ant-tabs-nav-list{padding-right:30px}.ditari-bsui-nav .ant-tabs-tab{position:relative;margin-left:0 !important;border:0 !important;transition:none !important;border-radius:10px 10px 0 0 !important;color:#fff}.ditari-bsui-nav .ant-tabs-tab:first-child .tab-dividers::before,.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active{background-color:#fff}.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active .tab-item{color:#0065b3}.ditari-bsui-nav .ant-tabs-tab:not(.ant-tabs-tab-active){background:rgba(0,0,0,0)}.ditari-bsui-nav .ant-tabs-tab:hover:not(.ant-tabs-tab-active){background:#065de1}.ditari-bsui-nav .ant-tabs-tab:hover:not(.ant-tabs-tab-active) .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-tab:hover:not(.ant-tabs-tab-active)+.ant-tabs-tab .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-tab .ant-tabs-tab-btn{display:flex;align-items:center}.ditari-bsui-nav .ant-tabs-tab .tab-close{padding:4px;margin-left:10px;display:flex;align-items:center;justify-content:center;border-radius:50%}.ditari-bsui-nav .ant-tabs-tab .tab-close:hover{background-color:#63aeff;color:#fff}.ditari-bsui-nav .ant-tabs-tab .tab-close .anticon{margin:0}.ditari-bsui-nav .ant-tabs-tab-active+.ant-tabs-tab .tab-dividers::before{opacity:0}.ditari-bsui-nav .ant-tabs-nav-wrap{padding:4px 8px 0}.ditari-bsui-nav .ant-tabs-nav::before{border-bottom-width:0}.ditari-bsui-nav .ant-tabs-tab::before,.ditari-bsui-nav .ant-tabs-tab::after{position:absolute;bottom:0;content:"";width:20px;height:20px;border-radius:100%;box-shadow:0 0 0 40px rgba(0,0,0,0)}.ditari-bsui-nav .ant-tabs-tab::before{left:-20px;clip-path:inset(50% -10px 0 50%)}.ditari-bsui-nav .ant-tabs-tab::after{right:-20px;clip-path:inset(50% 50% 0 -10px)}.ditari-bsui-nav .ant-tabs-tab:hover::before,.ditari-bsui-nav .ant-tabs-tab:hover::after{box-shadow:0 0 0 30px #065de1}.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active::before,.ditari-bsui-nav .ant-tabs-tab.ant-tabs-tab-active::after{z-index:10;box-shadow:0 0 0 30px #fff}.ditari-bsui-nav .tab-dividers{position:absolute;z-index:0;height:14px;top:50%;left:0;margin-top:-7px}.ditari-bsui-nav .tab-dividers::before{content:"";display:block;position:absolute;top:0;left:1px;bottom:0;width:1px;opacity:1;background-color:#fff;transition:opacity .2s ease,background-color .3s}.ditari-show-layout{position:relative}.ditari-show-layout .ant-card{margin-bottom:10px}.ditari-show-layout .ant-card .ant-card-head{padding:10px 24px}.ditari-show-layout .ant-card .ant-card-head .ant-card-head-title{padding:0}.ditari-show-layout .ant-card:last-child{margin-bottom:0}.ditari-show-layout .ditari-page-header{position:sticky;top:84px;z-index:10;padding:4px 24px;transition:all .3s}.ditari-show-layout .ditari-page-header.active{box-shadow:7px 12px 20px 0 #e0e0e0}.ditari-show-layout .ditari-show-footer{position:fixed;right:0;bottom:0;left:200px;z-index:10;padding:10px;background:#fff;box-shadow:4px -2px 5px 3px #e0e0e0}.ditari-fuck-top-layout{position:fixed;left:200px;right:0;z-index:210;display:flex;background:linear-gradient(270deg, #019cfe 0%, #0165fe 100%)}.ditari-fuck-top-layout .ditari-bsui-nav{flex:1;min-width:0}.ditari-fuck-top-layout .ditari-side-collapsed{display:flex;align-items:center;justify-content:center;width:42px;cursor:pointer;color:#fff}.ditari-bsui-pagination{margin-top:24px;text-align:center}.ant-table.ant-table-bordered>.ant-table-container{border-bottom:1px solid #f0f0f0}.ditari-bsui-desensitize .value{padding:0 4px}.ditari-bsui-modal .ant-modal-body{padding:0}.ditari-bsui-modal .ditari-bsui-modal-content{max-height:200px;overflow-y:scroll}.ditari-bsui-modal .ditari-bsui-modal-content::-webkit-scrollbar{width:0 !important;display:none}.ant-table.ant-table-bordered>.ant-table-container{border-bottom:1px solid #f0f0f0}@media screen and (min-width: 320px){.modal{font-size:12px}}@media screen and (min-width: 640px){.modal{font-size:14px}}@media screen and (min-width: 1024px){.modal{font-size:16px}}@media screen and (min-width: 1440px){.modal{font-size:18px}}@media screen and (max-width: 640px){.modal-sm{width:100%;height:100%;min-width:240px;min-height:160px}}@media screen and (min-width: 640px)and (max-width: 1024px){.modal-md{margin:100px auto;max-width:600px;max-height:480px}}@media screen and (min-width: 1024px)and (max-width: 1440px){.modal-lg{margin:100px auto;max-width:800px;max-height:600px}}@media screen and (min-width: 1440px){.modal-xl{margin:100px auto}}html,body,#app{height:100%;background:#f0f2f5}html::-webkit-scrollbar,body::-webkit-scrollbar,#app::-webkit-scrollbar{width:0 !important;display:none}

package/dist/css/menu/style/index.css

@@ -1 +1 @@
-.ditari-menu{height:calc(100vh - 240px - 0);overflow:scroll}.ditari-menu::-webkit-scrollbar{width:0 !important;display:none}.ditari-layout-sider{background-color:#162157}.ditari-layout-sider .ant-menu-dark{background-color:#162157}.ditari-layout-sider .ant-menu-dark .ant-menu-inline.ant-menu-sub{background-color:#101847}
+.ditari-menu{height:calc(100vh - 240px - 0px);overflow:scroll}.ditari-menu::-webkit-scrollbar{width:0 !important;display:none}.ditari-layout-sider{background-color:#162157}.ditari-layout-sider .ant-menu-dark{background-color:#162157}.ditari-layout-sider .ant-menu-dark .ant-menu-inline.ant-menu-sub{background-color:#101847}

package/dist/esm/components/layout/Main.vue.esm.js

@@ -18,26 +18,28 @@ const V = { class: "ditari-logo" }, T = { class: "ditari-menu" }, j = { class: "
     showConfig: { default: { backBtn: "LeftOutlined" } },
     breadcrumbStatus: { type: Boolean }
   },
-  setup(g) {
-    const v = g, h = E(), k = f(() => h.get), u = F(), { switchCollapsed: m } = u, s = f(() => u.getCollapsed);
-    return x("showConfig", v.showConfig), (r, d) => {
+  setup(v) {
+    const g = v, h = E(), k = f(() => h.get), u = F(), { switchCollapsed: m } = u, l = f(() => u.getCollapsed);
+    return x("showConfig", g.showConfig), (r, d) => {
       const b = n("a-layout-sider"), C = n("router-view"), w = n("a-layout-content"), _ = n("a-layout"), S = n("a-back-top");
       return a(), B(A, null, [
         t(_, { class: "ditari-layout" }, {
           default: i(() => [
             t(b, {
-              collapsed: e(s),
-              "onUpdate:collapsed": d[0] || (d[0] = (l) => M(s) ? s.value = l : null),
+              collapsed: e(l),
+              "onUpdate:collapsed": d[0] || (d[0] = (s) => M(l) ? l.value = s : null),
               trigger: null,
               collapsible: "",
               class: "ditari-layout-sider"
             }, {
               default: i(() => [
-                o("div", V, [
-                  p(r.$slots, "logo")
-                ]),
-                o("div", T, [
-                  t(e(U))
+                o("div", null, [
+                  o("div", V, [
+                    p(r.$slots, "logo")
+                  ]),
+                  o("div", T, [
+                    t(e(U))
+                  ])
                 ])
               ]),
               _: 3
@@ -46,7 +48,7 @@ const V = { class: "ditari-logo" }, T = { class: "ditari-menu" }, j = { class: "
               default: i(() => [
                 o("div", {
                   class: "ditari-top-layout",
-                  style: y({ left: e(s) ? "80px" : "200px" })
+                  style: y({ left: e(l) ? "80px" : "200px" })
                 }, [
                   t(K),
                   o("div", j, [
@@ -54,9 +56,9 @@ const V = { class: "ditari-logo" }, T = { class: "ditari-menu" }, j = { class: "
                       o("div", {
                         class: "ditari-side-collapsed",
                         onClick: d[1] || (d[1] = //@ts-ignore
-                        (...l) => e(m) && e(m)(...l))
+                        (...s) => e(m) && e(m)(...s))
                       }, [
-                        e(s) ? (a(), c(e(O), {
+                        e(l) ? (a(), c(e(O), {
                           key: 0,
                           class: "trigger",
                           style: { "font-size": "16px", "font-weight": "bold", cursor: "pointer" }
@@ -74,11 +76,11 @@ const V = { class: "ditari-logo" }, T = { class: "ditari-menu" }, j = { class: "
                 ], 4),
                 t(w, {
                   class: "ditari-layout-content",
-                  style: y({ marginLeft: e(s) ? "80px" : "200px" })
+                  style: y({ marginLeft: e(l) ? "80px" : "200px" })
                 }, {
                   default: i(() => [
                     t(C, null, {
-                      default: i(({ Component: l }) => [
+                      default: i(({ Component: s }) => [
                         t(z, {
                           name: "main",
                           mode: "out-in",
@@ -89,7 +91,7 @@ const V = { class: "ditari-logo" }, T = { class: "ditari-menu" }, j = { class: "
                               ref: "keepAliveRef",
                               include: e(k)
                             }, [
-                              (a(), c(N(l), {
+                              (a(), c(N(s), {
                                 key: r.$route.path
                               }))
                             ], 1032, ["include"]))

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

@@ -1,6 +1,6 @@
-import { defineComponent as j, inject as k, watchEffect as N, createVNode as r, Fragment as c, resolveComponent as i, isVNode as I, withDirectives as R, vShow as D, h as H } from "vue";
+import { defineComponent as j, inject as k, watchEffect as N, createVNode as r, Fragment as u, resolveComponent as c, isVNode as I, withDirectives as R, vShow as D, h as H } from "vue";
 import { useRouter as O, useRoute as P } from "vue-router";
-import { storeToRefs as v } from "pinia";
+import { storeToRefs as m } from "pinia";
 import { useMenuStore as T } from "../../store/modules/Menu.esm.js";
 import { useSettingsStore as V } from "../../store/modules/Settings.esm.js";
 function _(l) {
@@ -9,50 +9,51 @@ function _(l) {
 const $ = /* @__PURE__ */ j({
   name: "DMenu",
   setup() {
-    const l = O(), m = P(), {
-      componentName: a,
-      prop: g
-    } = k("menuIcon"), S = T(), {
-      list: d,
-      openMenusKeys: s,
+    const l = O(), g = P(), {
+      componentName: s,
+      prop: S
+    } = k("menuIcon"), y = T(), {
+      list: a,
+      openMenusKeys: i,
       selectedMenuKeys: o
-    } = v(S), y = V(), {
-      getCollapsed: M
-    } = v(y);
+    } = m(y), M = V(), {
+      getCollapsed: d
+    } = m(M);
     N(() => {
-      const e = o.value.length > 0 ? o.value[0] : "", t = p(d.value, e);
-      s.value = t || [];
+      if (d.value)
+        return;
+      const e = o.value.length > 0 ? o.value[0] : "", t = p(a.value, e);
+      i.value = t || [];
     });
     function p(e, t) {
       for (let n = 0; n < e.length; n++) {
         if (e[n].url === t || t.startsWith(e[n].url))
           return [e[n].url];
         if (e[n].children && e[n].children.length > 0) {
-          const u = p(e[n].children, t);
-          if (u)
-            return [e[n].url, ...u];
+          const v = p(e[n].children, t);
+          if (v)
+            return [e[n].url, ...v];
         }
       }
       return null;
     }
     const b = ({
-      item: e,
-      key: t,
-      keyPath: n
+      key: e,
+      keyPath: t
     }) => {
-      s.value = n, o.value = [t], m.path !== t && l.push(t).then((u) => u ? console.warn(u) : null);
-    }, C = (e) => r(c, null, [r(i("a-menu-item"), {
+      i.value = t, o.value = [e], g.path !== e && l.push(e).then((n) => n ? console.warn(n) : null);
+    }, C = (e) => r(u, null, [r(c("a-menu-item"), {
       key: e.url
     }, {
       icon: () => f(e),
       default: () => e.title
-    })]), K = ["anticon", "anticon-menu", "ant-menu-item-icon"], f = (e) => r(c, null, [e.icon ? U(e.icon) : R(r("div", {
+    })]), K = ["anticon", "anticon-menu", "ant-menu-item-icon"], f = (e) => r(u, null, [e.icon ? U(e.icon) : R(r("div", {
       className: K
-    }, [e.title.substring(0, 1)]), [[D, M.value]])]), U = (e) => a === "nativeHtml" ? r("span", {
+    }, [e.title.substring(0, 1)]), [[D, d.value]])]), U = (e) => s === "nativeHtml" ? r("span", {
       innerHTML: e
-    }, null) : H(i(a), {
-      [`${g}`]: e
-    }), h = (e) => r(c, null, [r(i("a-sub-menu"), {
+    }, null) : H(c(s), {
+      [`${S}`]: e
+    }), h = (e) => r(u, null, [r(c("a-sub-menu"), {
       key: e.url
     }, {
       title: () => e.title,
@@ -61,22 +62,22 @@ const $ = /* @__PURE__ */ j({
         (t) => !t.children || t.children.length === 0 ? w(t) : h(t)
         // 递归调用
       )
-    })]), w = (e) => r(c, null, [r(i("a-menu-item"), {
+    })]), w = (e) => r(u, null, [r(c("a-menu-item"), {
       key: e.url
     }, {
       default: () => e.title
     })]);
     return () => {
       let e;
-      return r(c, null, [r(i("a-menu"), {
+      return r(u, null, [r(c("a-menu"), {
         mode: "inline",
         theme: "dark",
-        openKeys: s.value,
-        "onUpdate:openKeys": (t) => s.value = t,
+        openKeys: i.value,
+        "onUpdate:openKeys": (t) => i.value = t,
         selectedKeys: o.value,
         "onUpdate:selectedKeys": (t) => o.value = t,
         onClick: b
-      }, _(e = d.value.map((t) => {
+      }, _(e = a.value.map((t) => {
         var n;
         return !t.children || ((n = t.children) == null ? void 0 : n.length) === 0 ? C(t) : h(t);
       })) ? e : {

package/dist/style/theme/variable.scss

@@ -5,7 +5,7 @@ $bg-color: #f0f2f5;
 //左侧logo高度
 $logo-height: 240px !default;
 // 左侧菜单底部图片
-$footer-slogan: 0!default;
+$footer-slogan: 0px!default;
 /******======网格变量======******/
 //网格边框颜色
 $grid-border-color: #4e4e4e !default;
@@ -64,4 +64,4 @@ $bread-txt-color: #333;
 
 /******======FUCK MAIN======******/
 // 菜单收缩颜色
-$fuck-main-collapsed-color: #fff!default;
+$fuck-main-collapsed-color: #fff!default;

package/package.json

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

package/src/components/layout/Main.vue

@@ -12,6 +12,7 @@ import DNavTabs from "./NavTabs.vue";
 import DBreadcrumb from "./Breadcrumb.vue";
 // 菜单组件
 import Menu from "../menu/Menu";
+import CollapsedMenu from "../menu/CollapsedMenu.vue";
 
 interface Props {
   showConfig?: ShowConfig;
@@ -36,7 +37,6 @@ const keepAliveNames = computed(() => store.get);
 const settingsStore = useSettingsStore();
 const { switchCollapsed } = settingsStore;
 const collapsedStatus = computed(() => settingsStore.getCollapsed);
-
 // 注入show组件的配置文件
 provide("showConfig", props.showConfig);
 </script>
@@ -53,11 +53,14 @@ export default {
       collapsible
       class="ditari-layout-sider"
     >
-      <div class="ditari-logo">
-        <slot name="logo"></slot>
-      </div>
-      <div class="ditari-menu">
-        <Menu />
+      <div>
+        <div class="ditari-logo">
+          <slot name="logo"></slot>
+        </div>
+        <div class="ditari-menu">
+          <Menu  />
+
+        </div>
       </div>
     </a-layout-sider>
     <a-layout>

package/src/components/menu/Menu.jsx

@@ -1,4 +1,11 @@
-import { defineComponent, h, inject, resolveComponent, watchEffect } from "vue";
+import {
+  computed,
+  defineComponent,
+  h,
+  inject,
+  resolveComponent,
+  watchEffect
+} from "vue";
 import { useRouter, useRoute } from "vue-router";
 
 import { storeToRefs } from "pinia";
@@ -20,6 +27,11 @@ export default defineComponent({
     const { getCollapsed } = storeToRefs(settingsStore);
 
     watchEffect(() => {
+      if (getCollapsed.value) {
+        // 如果菜单是收缩的状态，则不匹配激活的菜单
+        // 否则 在切换标签的时候，收缩菜单会自动激活悬浮的动作
+        return;
+      }
       // 会被触发两次
       // 当前激活的url
       const activatedUrl =
@@ -51,9 +63,8 @@ export default defineComponent({
      * @param key
      * @param keyPath
      */
-    const onClick = ({ item, key, keyPath }) => {
+    const onClick = ({ key, keyPath }) => {
       openMenusKeys.value = keyPath;
-
       selectedMenuKeys.value = [key];
       // 判断目标路由和当前路由是否相等
       // 不相等的时候再跳转
@@ -61,14 +72,6 @@ export default defineComponent({
         ? router.push(key).then((r) => (r ? console.warn(r) : null))
         : null;
     };
-    /**
-     * 监听菜单展开事件
-     * @param keys
-     */
-    const openChange = (keys) => {
-      //TODO 暂时先不处理
-      console.log(keys);
-    };
 
     // 渲染菜单
     const renderMenu = (menu) => {

package/src/components/theme/variable.scss

@@ -5,7 +5,7 @@ $bg-color: #f0f2f5;
 //左侧logo高度
 $logo-height: 240px !default;
 // 左侧菜单底部图片
-$footer-slogan: 0!default;
+$footer-slogan: 0px!default;
 /******======网格变量======******/
 //网格边框颜色
 $grid-border-color: #4e4e4e !default;
@@ -64,4 +64,4 @@ $bread-txt-color: #333;
 
 /******======FUCK MAIN======******/
 // 菜单收缩颜色
-$fuck-main-collapsed-color: #fff!default;
+$fuck-main-collapsed-color: #fff!default;

package/src/components/menu/Menu-bak.jsx

@@ -1,98 +0,0 @@
-import { defineComponent, h, ref, resolveComponent } from "vue";
-import { useMenuStore } from "../../store";
-
-export default defineComponent({
-  name: "DMenu",
-  setup() {
-    const { list } = useMenuStore();
-    // 当前展开的菜单
-    const openKeys = ref(["/labelList", "/label"]);
-    // 当前选中的菜单
-    const selectedKeys = ref(["/label"]);
-
-    /**
-     * 监听菜单点击事件
-     * @param item
-     * @param key
-     * @param keyPath
-     */
-    const onClick = ({ item, key, keyPath }) => {
-      console.log(item, key, keyPath);
-      openKeys.value = keyPath;
-      selectedKeys.value = [key];
-    };
-    /**
-     * 监听菜单展开事件
-     * @param keys
-     */
-    const openChange = (keys) => {
-      //TODO 暂时先不处理
-      console.log(keys);
-    };
-
-    // 递归渲染子菜单
-    const renderSubMenu = (menuList, parent) => {
-      if (!menuList || !menuList.length) {
-        return null;
-      }
-
-      return (
-        <a-sub-menu>
-          {{
-            title: () => parent.title,
-            default: () => {
-              return menuList.map((menu) => (
-                <a-menu-item key={menu.url}>{menu.title}</a-menu-item>
-              ));
-            }
-          }}
-        </a-sub-menu>
-      );
-    };
-
-    return () => (
-      <a-menu
-        mode="inline"
-        theme="dark"
-        v-model:openKeys={openKeys.value}
-        v-model:selectedKeys={selectedKeys.value}
-        onClick={onClick}
-      >
-        {list.map((menu) => {
-          menu.children.length === 0 ? <>ok</> : <>ww</>;
-        })}
-        {/*{list.map((menu) => (*/}
-        {/*  <a-sub-menu key={menu.url}>*/}
-        {/*    {{*/}
-        {/*      title: () => <>{menu.title}</>,*/}
-        {/*      icon: () => (*/}
-        {/*        <>*/}
-        {/*          <span>*/}
-        {/*            {menu.icon ? h(resolveComponent(menu.icon)) : undefined}*/}
-        {/*          </span>*/}
-        {/*        </>*/}
-        {/*      ),*/}
-        {/*      default: () => {*/}
-        {/*        if (menu.children && menu.children.length) {*/}
-        {/*          return menu.children.map((child) => {*/}
-        {/*            return (*/}
-        {/*              <>*/}
-        {/*                {child.children ? (*/}
-        {/*                  renderSubMenu(child.children, menu)*/}
-        {/*                ) : (*/}
-        {/*                  <a-menu-item key={child.url}>*/}
-        {/*                    {child.title}*/}
-        {/*                  </a-menu-item>*/}
-        {/*                )}*/}
-        {/*              </>*/}
-        {/*            );*/}
-        {/*          });*/}
-        {/*        }*/}
-        {/*      }*/}
-        {/*    }}*/}
-        {/*  </a-sub-menu>*/}
-        {/*))}*/}
-      </a-menu>
-    );
-  }
-});