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 3c17b29f..f62873e1 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Framework.Net6/Yi.Framework.Common/Helper/TreeHelper.cs b/Yi.Framework.Net6/Yi.Framework.Common/Helper/TreeHelper.cs index 4ff321a1..da1242ab 100644 --- a/Yi.Framework.Net6/Yi.Framework.Common/Helper/TreeHelper.cs +++ b/Yi.Framework.Net6/Yi.Framework.Common/Helper/TreeHelper.cs @@ -30,7 +30,7 @@ namespace Yi.Framework.Common.Helper SetTreeChildren(list, children, model, action); } } - return result.OrderBy(m => (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: "",