From 6cedc0d6b643ff3d7b2b633f0cca98966c601afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E6=98=8E=E9=94=8B?= Date: Fri, 6 Oct 2023 13:32:57 +0800 Subject: [PATCH] =?UTF-8?q?wip:(gen)=20=E6=9B=B4=E6=96=B0vben=E7=9A=84rout?= =?UTF-8?q?es=E6=A8=A1=E6=9D=BF=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=9B=BE?= =?UTF-8?q?=E6=A0=87=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Templates/vue_VbenRouterRoutes.cshtml | 4 +++- .../build/osharp-code-generator.db.bak | Bin 159744 -> 163840 bytes .../osharp-code-generator.db | Bin 151552 -> 0 bytes 3 files changed, 3 insertions(+), 1 deletion(-) delete mode 100644 samples/wpf/OSharp.CodeGenerator/osharp-code-generator.db diff --git a/samples/wpf/OSharp.CodeGeneration/Templates/vue_VbenRouterRoutes.cshtml b/samples/wpf/OSharp.CodeGeneration/Templates/vue_VbenRouterRoutes.cshtml index fe7f5768..6dd9af65 100644 --- a/samples/wpf/OSharp.CodeGeneration/Templates/vue_VbenRouterRoutes.cshtml +++ b/samples/wpf/OSharp.CodeGeneration/Templates/vue_VbenRouterRoutes.cshtml @@ -47,6 +47,7 @@ const osharp: AppRouteModule = { redirect: '/system/@(urlModule)/@(module.Entities.FirstOrDefault()?.Name.UpperToLowerAndSplit() ?? "index")', meta: { title: t('routes.osharp.@(lowerModule).@(lowerModule)'), + icon: '@(module.Icon)', acl: ['Root.Admin.@(module.Name)'], }, children: [ @@ -57,9 +58,10 @@ const osharp: AppRouteModule = { { path: '@(urlEntity)', name: '@(entity.Name)', - component: () => import('/@@/views/osharp/@(lowerModule)/@(lowerEntity).vue'), + component: () => import('/@@/views/osharp/@(lowerModule)/@(entity.Name).vue'), meta: { title: t('routes.osharp.@(lowerModule).@(lowerEntity)'), + icon: '@(entity.Icon)', acl: ['Root.Admin.@(module.Name).@(entity.Name)'], }, }, diff --git a/samples/wpf/OSharp.CodeGenerator/build/osharp-code-generator.db.bak b/samples/wpf/OSharp.CodeGenerator/build/osharp-code-generator.db.bak index 9efcfcbf1655a8397e06a1f0522fa917d735d808..c5cd8f92f662544b73849844e7513854d7fa5914 100644 GIT binary patch delta 3577 zcmb_eU2I!t89tvA$LFN6PfU|$CW+IeHZkfx=R5!B1a;N%`I(|tbfui3X@lX#Ze%U7 zLu^;-1lZ?-LAapqyzKx&`_W)jLZ#YT)mplBg$qCkA+As_*t#K-tlCAd*bNu(9ounE zvc~BJmVJKY_x---ectDL-?#b^Rju~dM*So~5Q&S2j|1|pZ@+$_55En8<$9nt?ZY=z zd#;xtK)(Ll+V5#QK0IK}kP%>qNs82*!Mrb4|DZNfzjQHN_g{qm?cU%qo@G@UQO zOtzR?$j?5TJr4`z(qb;3&0s)kef7g*1NNaF${L9Pm9$ROYaiy1dK_~3vjsSxTbW^2nTo~6t(&JRj&X-qmrSq^jpU!vO-u?)nNdF%Rid-Z5C+M$+ zUJTw1D&*S0>VezTBF6t3IbzTB4Ox?sBNXO=BHfR>i{ZRJ1}YWL4w-Z*{Y<*(!Gx$G z95{B|@^l@Kb1E_z4lxi(oDNw*<{@Wj3N#Ilm3du8tfrhSEadX|viY+c>+ij^;rwd- zedo;iVkx_ne6*a)^sKG4kMAbl2)cY{$WnH5`dk z+aC<-Sp9c@iaEcT0G2nRaxuHoam309e?A)G{~3)N481EF=i~&4JI{=Qb0c<=9I{3y zjx=-7NrdLS_XvnNzZeBivYx1yvc+P0!IKOaz|N8QwzDh9N1f0Z_%849n=j-`X)ML< zz-{QqY23=ctAJMi)qY>hd2$>)!Fk-zmhQHV=J#7KuWRdtwy654P^HdZZ?{#(HyoR5ScouLowy;ttFT->uv%SuY z^Kldmfm8Kce~vj{oB)q|PsaUyt{(=ygNLY4ji7JSSLo;IZ_+${AoS1BJE0mr7w1Ct zD;EM&`wE$Ayz>Y+5$*$Ym7uFv!{{7c`9A2!3Or3v1ZlP9BS29^8q^HlfQrc}(7-iC z)Kan{2(pEPa({D~lezL@uAJ1fONHcICYvwe1D!P7TP|Bnx;76W#{)_~E;E3>jU&T= z{z}W!Jr?yKK>XOxM}LN|M1uYg{aIsh8EnvD{5my*FTsc0h55i`Cr|}X43d8#-yokO zPm_tje*=FHT*j;&3%IORT-JD~C^cbqp z)bWZYD~T|ri95*wL9WD-v%OX@Y20OoE^&!Y#P?t$8B$5!=@ai`lu%C%=B- zlhwC3-+g)gLZjU`=kg_v^=&oIcHcy^ET7~hS&(IcQ=M-`!BoW_Pu>@V+b?#3*h|N) zYPI>|rHvmoJ`dvl7&zRzSsbDBbQDaI_7oh$-S*4Qm8kE~{8r>$&%|7@73s!LudLVJ z+`M{Y^Tw;~*i!|}N;)6jxigYx89vD|JTJ2%9suHjsfX{gY1i|$|EB(3n~Jj>n?$T2 zFrtL}QM_^TpzqpKUkKvT=^t1l=(C}BLqoyhz#6WXmj)`f$dBQ{ZrBw=OA^#+g4`*I zeX6OOjg8gn`dhEGGUC4P-$`1yD|pCiYekwxOj1USC@@mHHg`P|c9d)B2siE~^5(6L zoNA@CjeM{2ZWSwT+uKV>oiWghP*NmOR$L|R+nntDB!0sZBpJmx3&oW37lm~(K EKX!en$^ZZW delta 799 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 GCGfwZJt-yt