From 95c506c6387b386fa20afb1618658417bd5b44d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A9=99=E5=AD=90?= <454313500@qq.com> Date: Sun, 16 Oct 2022 13:43:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yi-sqlsugar-dev.db | Bin 364544 -> 364544 bytes .../Yi.Framework.Common/Helper/TreeHelper.cs | 4 ++-- .../Yi.Framework.Model/MenuEntity.cs | 5 +++-- .../Yi.Framework.Template/vue3-ruoyi/api.js | 2 +- .../Yi.Framework.Template/vue3-ruoyi/api.tt | 2 +- .../Yi.Framework.Template/vue3-ruoyi/view.tt | 6 +++--- .../src/api/business/articleApi.js | 2 +- .../src/views/business/article.vue | 6 +++--- Yi.Vue3.x.Vant/index.html | 2 +- Yi.Vue3.x.Vant/src/view/login.vue | 6 +++--- 10 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index 3c17b29f3bfaf85ec774c6a6bde02f3e893db76a..f62873e1bd31a156cc778f25ba9d2ab3a8c077bc 100644 GIT binary patch delta 737 zcmaiyO=uHA6vt=xB|Fh>(up|Lwn7^do4Bb-Hc4YlkbL2(AjN|o{2;|pER@oVU>ne+ zkTysKJ=pPP#PpzetCE7C(u;a19)bv>(3_W}Q7c#vif_~6Nhrg>@5lSUx6IBIDqV$2 z*X>?u^3I`*G+E4+veL7xTy2@EbcP6Z1X5x+DNT#juX0(Ti?mEGi*XMu zAi)Fi%L93X4vT9?VGc>YCu9xQkfhh5uEAY{d}6{2BS_?OgJ72s<@dsW z3_csdAAgEF*x@%^T52qpOU_DC+!H0&tsZTM4t8g#FYhXu<4M=q6pDPQ12F z<=|NH2vh8iz5@;~$zT&+U;Bv&Jr4;j(yxbN!J$}C_ninwbUhT!6M|tV+xc)z5BLIlBsf-d{%3e*sy%$)b~tE+_2^JU4}@wL%H}Hl3$9tL6aWAK delta 514 zcmXZXKWGzC90%}s_xs(wyWGpYcY_&hL0e0kCbfZfsL-J?)~O)DK}Bjw{Z|Ve6)a+V zS4dlmf)4gA1tX+`E)G>PC@Ps;q(cT5g>EiQqk~u-q(5>Q9(+IV_xtjAVI>t-Qct>! zxu@OdjJc>(E*Wo2X0?Scc$H~UgtK}oZ!GHiPjh{zM_sjR)jwt_-5>B#Cb#66zw3)+ zR&0ut_ujjc*meKAcb(tPEvJ`%lUFt4mp@>%;N}sZD375FEYsZHmFff|2 zq|Tj&?-=D#YBdZW@ix$6V;FAY4U^J%4rcMXL8+3XyFm6aohU-@PS44IzFvN9Sj(+& zWT>uKAiy?`wZbk&P%)O~GX=$D8wY!@?wN}D9X$65$r$ez9#coO(QE{ZD~fqB)~;<9 z6idWd&Cbx8+rbHKD&`0%(yPt#S3% (m as ITreeModel).OrderNum).ToList(); + return result.OrderByDescending(m => (m as ITreeModel).OrderNum).ToList(); } return null; } @@ -52,7 +52,7 @@ namespace Yi.Framework.Common.Helper SetTreeChildren(list, _children, item, action); } } - mm.Children = mm.Children.OrderBy(m => (m as ITreeModel).OrderNum).ToList(); + mm.Children = mm.Children.OrderByDescending(m => (m as ITreeModel).OrderNum).ToList(); } } } diff --git a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs index e13518dd..e56f69ea 100644 --- a/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs +++ b/Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs @@ -24,6 +24,7 @@ namespace Yi.Framework.Model.Models { var r = new VueRouterModel(); + r.OrderNum = m.OrderNum ?? 0; var routerName = m.Router.Split("/").LastOrDefault(); r.Id = m.Id; r.ParentId = (long)m.ParentId; @@ -40,14 +41,14 @@ namespace Yi.Framework.Model.Models r.AlwaysShow = true; //判断是否为最顶层的路由 - if (0==m.ParentId) + if (0 == m.ParentId) { r.Component = "Layout"; } else { r.Component = "ParentView"; - } + } } if (m.MenuType == MenuTypeEnum.Menu.GetHashCode()) { diff --git a/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.js b/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.js index 59a62015..403e94c0 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.js +++ b/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.js @@ -40,6 +40,6 @@ export function delData(code) { return request({ url: '/article/delList', method: 'delete', - data:"string"==typeof(code)?code:[code] + data:"string"==typeof(code)?[code]:code }) } diff --git a/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.tt b/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.tt index 7757cbed..a32440e8 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.tt +++ b/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.tt @@ -49,6 +49,6 @@ export function delData(code) { return request({ url: '/<#= entityName #>/delList', method: 'delete', - data:"string"==typeof(code)?code:[code] + data:"string"==typeof(code)?[code]:code }) } diff --git a/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/view.tt b/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/view.tt index d7f9ea0b..af02e22f 100644 --- a/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/view.tt +++ b/Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/view.tt @@ -297,9 +297,9 @@ function submitForm() { } /** 删除按钮操作 */ function handleDelete(row) { - const ids = row.id || ids.value; - proxy.$modal.confirm('是否确认删除字典编号为"' + ids + '"的数据项？').then(function() { - return delData(ids); + const delIds = row.id || ids.value; + proxy.$modal.confirm('是否确认删除字典编号为"' + delIds + '"的数据项？').then(function() { + return delData(delIds); }).then(() => { getList(); proxy.$modal.msgSuccess("删除成功"); diff --git a/Yi.Vue3.x.RuoYi/src/api/business/articleApi.js b/Yi.Vue3.x.RuoYi/src/api/business/articleApi.js index 59a62015..403e94c0 100644 --- a/Yi.Vue3.x.RuoYi/src/api/business/articleApi.js +++ b/Yi.Vue3.x.RuoYi/src/api/business/articleApi.js @@ -40,6 +40,6 @@ export function delData(code) { return request({ url: '/article/delList', method: 'delete', - data:"string"==typeof(code)?code:[code] + data:"string"==typeof(code)?[code]:code }) } diff --git a/Yi.Vue3.x.RuoYi/src/views/business/article.vue b/Yi.Vue3.x.RuoYi/src/views/business/article.vue index a3e91803..5e36ac1f 100644 --- a/Yi.Vue3.x.RuoYi/src/views/business/article.vue +++ b/Yi.Vue3.x.RuoYi/src/views/business/article.vue @@ -373,11 +373,11 @@ function submitForm() { } /** 删除按钮操作 */ function handleDelete(row) { - const ids = row.id || ids.value; + const delIds = row.id || ids.value; proxy.$modal - .confirm('是否确认删除字典编号为"' + ids + '"的数据项？') + .confirm('是否确认删除字典编号为"' + delIds + '"的数据项？') .then(function () { - return delData(ids); + return delData(delIds); }) .then(() => { getList(); diff --git a/Yi.Vue3.x.Vant/index.html b/Yi.Vue3.x.Vant/index.html index 4f2bf625..5e7092b5 100644 --- a/Yi.Vue3.x.Vant/index.html +++ b/Yi.Vue3.x.Vant/index.html @@ -4,7 +4,7 @@ - Vite + Vue + TS + 大白荟
diff --git a/Yi.Vue3.x.Vant/src/view/login.vue b/Yi.Vue3.x.Vant/src/view/login.vue index 6a407818..6b1b917a 100644 --- a/Yi.Vue3.x.Vant/src/view/login.vue +++ b/Yi.Vue3.x.Vant/src/view/login.vue @@ -2,7 +2,7 @@
大白荟
- 农夫山泉有点甜 + 有幸相遇、不负未来
密码登录
@@ -42,8 +42,8 @@ import { Toast } from "vant"; const router = useRouter(); const redirect = ref(undefined); const loginForm = ref({ - username: "cc", - password: "123456", + username: "", + password: "", rememberMe: false, code: "", uuid: "",