xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复菜单排序问题

Browse Source
This commit is contained in:
橙子
2022-10-16 13:43:23 +08:00
parent 464b768c55
commit 95c506c638
10 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

4
Yi.Framework.Net6/Yi.Framework.Common/Helper/TreeHelper.cs
View File

@@ -30,7 +30,7 @@ namespace Yi.Framework.Common.Helper
SetTreeChildren(list, children, model, action); SetTreeChildren(list, children, model, action);
} }
} }
return result.OrderBy(m => (m as ITreeModel<T>).OrderNum).ToList(); return result.OrderByDescending(m => (m as ITreeModel<T>).OrderNum).ToList();
} }
return null; return null;
} }
@@ -52,7 +52,7 @@ namespace Yi.Framework.Common.Helper
SetTreeChildren(list, _children, item, action); SetTreeChildren(list, _children, item, action);
} }
} }
mm.Children = mm.Children.OrderBy(m => (m as ITreeModel<T>).OrderNum).ToList(); mm.Children = mm.Children.OrderByDescending(m => (m as ITreeModel<T>).OrderNum).ToList();
} }
} }
} }

5
Yi.Framework.Net6/Yi.Framework.Model/MenuEntity.cs
View File

@@ -24,6 +24,7 @@ namespace Yi.Framework.Model.Models
{ {
var r = new VueRouterModel(); var r = new VueRouterModel();
r.OrderNum = m.OrderNum ?? 0;
var routerName = m.Router.Split("/").LastOrDefault(); var routerName = m.Router.Split("/").LastOrDefault();
r.Id = m.Id; r.Id = m.Id;
r.ParentId = (long)m.ParentId; r.ParentId = (long)m.ParentId;
@@ -40,14 +41,14 @@ namespace Yi.Framework.Model.Models
r.AlwaysShow = true; r.AlwaysShow = true;
//判断是否为最顶层的路由 //判断是否为最顶层的路由
if (0==m.ParentId) if (0 == m.ParentId)
{ {
r.Component = "Layout"; r.Component = "Layout";
} }
else else
{ {
r.Component = "ParentView"; r.Component = "ParentView";
} }
} }
if (m.MenuType == MenuTypeEnum.Menu.GetHashCode()) if (m.MenuType == MenuTypeEnum.Menu.GetHashCode())
{ {

2
Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.js
View File

@@ -40,6 +40,6 @@ export function delData(code) {
return request({ return request({
url: '/article/delList', url: '/article/delList',
method: 'delete', method: 'delete',
data:"string"==typeof(code)?code:[code] data:"string"==typeof(code)?[code]:code
}) })
} }

2
Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/api.tt
View File

@@ -49,6 +49,6 @@ export function delData(code) {
return request({ return request({
url: '/<#= entityName #>/delList', url: '/<#= entityName #>/delList',
method: 'delete', method: 'delete',
data:"string"==typeof(code)?code:[code] data:"string"==typeof(code)?[code]:code
}) })
} }

6
Yi.Framework.Net6/Yi.Framework.Template/vue3-ruoyi/view.tt
View File

@@ -297,9 +297,9 @@ function submitForm() {
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const ids = row.id || ids.value; const delIds = row.id || ids.value;
proxy.$modal.confirm('是否确认删除字典编号为"' + ids + '"的数据项？').then(function() { proxy.$modal.confirm('是否确认删除字典编号为"' + delIds + '"的数据项？').then(function() {
return delData(ids); return delData(delIds);
}).then(() => { }).then(() => {
getList(); getList();
proxy.$modal.msgSuccess("删除成功"); proxy.$modal.msgSuccess("删除成功");

2
Yi.Vue3.x.RuoYi/src/api/business/articleApi.js
View File

@@ -40,6 +40,6 @@ export function delData(code) {
return request({ return request({
url: '/article/delList', url: '/article/delList',
method: 'delete', method: 'delete',
data:"string"==typeof(code)?code:[code] data:"string"==typeof(code)?[code]:code
}) })
} }

6
Yi.Vue3.x.RuoYi/src/views/business/article.vue
View File

@@ -373,11 +373,11 @@ function submitForm() {
} }
/** 删除按钮操作 */ /** 删除按钮操作 */
function handleDelete(row) { function handleDelete(row) {
const ids = row.id || ids.value; const delIds = row.id || ids.value;
proxy.$modal proxy.$modal
.confirm('是否确认删除字典编号为"' + ids + '"的数据项？') .confirm('是否确认删除字典编号为"' + delIds + '"的数据项？')
.then(function () { .then(function () {
return delData(ids); return delData(delIds);
}) })
.then(() => { .then(() => {
getList(); getList();

2
Yi.Vue3.x.Vant/index.html
View File

@@ -4,7 +4,7 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" /> <link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>Vite + Vue + TS</title> <title>大白荟</title>
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

6
Yi.Vue3.x.Vant/src/view/login.vue
View File

@@ -2,7 +2,7 @@
<div class="div-top"> <div class="div-top">
<span class="title">大白荟</span> <span class="title">大白荟</span>
<br /> <br />
<span class="subtitle">农夫山泉有点甜</span> <span class="subtitle">有幸相遇、不负未来</span>
</div> </div>
<div class="div-bottom"> <div class="div-bottom">
<h5>密码登录</h5> <h5>密码登录</h5>
@@ -42,8 +42,8 @@ import { Toast } from "vant";
const router = useRouter(); const router = useRouter();
const redirect = ref(undefined); const redirect = ref(undefined);
const loginForm = ref({ const loginForm = ref({
username: "cc", username: "",
password: "123456", password: "",
rememberMe: false, rememberMe: false,
code: "", code: "",
uuid: "", uuid: "",