+
diff --git a/io.sc.platform.lcdp.frontend/package.json b/io.sc.platform.lcdp.frontend/package.json
index cb7882df..0ffe750b 100644
--- a/io.sc.platform.lcdp.frontend/package.json
+++ b/io.sc.platform.lcdp.frontend/package.json
@@ -92,7 +92,7 @@
"luckyexcel": "1.0.1",
"mockjs": "1.1.0",
"pinia": "2.1.7",
- "platform-core": "8.1.220",
+ "platform-core": "8.1.221",
"quasar": "2.15.3",
"tailwindcss": "3.4.3",
"vue": "3.4.24",
diff --git a/io.sc.platform.system.api/src/main/java/io/sc/platform/system/api/menu/MenuVo.java b/io.sc.platform.system.api/src/main/java/io/sc/platform/system/api/menu/MenuVo.java
index 20230104..f8707e55 100644
--- a/io.sc.platform.system.api/src/main/java/io/sc/platform/system/api/menu/MenuVo.java
+++ b/io.sc.platform.system.api/src/main/java/io/sc/platform/system/api/menu/MenuVo.java
@@ -14,6 +14,7 @@ public abstract class MenuVo extends CorporationAuditorVo {
protected Integer order;
protected String authorizeExpression;
protected boolean selected;
+ protected boolean ticked;
public MenuType getType() {
return type;
@@ -94,4 +95,12 @@ public abstract class MenuVo extends CorporationAuditorVo {
public void setSelected(boolean selected) {
this.selected = selected;
}
+
+ public boolean getTicked() {
+ return ticked;
+ }
+
+ public void setTicked(boolean ticked) {
+ this.ticked = ticked;
+ }
}
diff --git a/io.sc.platform.system.frontend/package.json b/io.sc.platform.system.frontend/package.json
index eb957c27..2de945b9 100644
--- a/io.sc.platform.system.frontend/package.json
+++ b/io.sc.platform.system.frontend/package.json
@@ -92,7 +92,7 @@
"luckyexcel": "1.0.1",
"mockjs": "1.1.0",
"pinia": "2.1.7",
- "platform-core": "8.1.219",
+ "platform-core": "8.1.223",
"quasar": "2.15.3",
"tailwindcss": "3.4.3",
"vue": "3.4.24",
diff --git a/io.sc.platform.system.frontend/src/views/application/Application.vue b/io.sc.platform.system.frontend/src/views/application/Application.vue
index 56ab8d9b..c230713a 100644
--- a/io.sc.platform.system.frontend/src/views/application/Application.vue
+++ b/io.sc.platform.system.frontend/src/views/application/Application.vue
@@ -63,14 +63,14 @@
}"
@row-click="
(evt, row, index) => {
- currentSelectedRoleId = row.id;
+ currentSelectedApplicationId = row.id;
menuTreeGridRef?.refresh();
userGridRef?.refresh();
}
"
@before-request-data="
() => {
- currentSelectedRoleId = '';
+ currentSelectedApplicationId = '';
menuTreeGridRef?.refresh();
userGridRef?.refresh();
}
@@ -89,9 +89,9 @@
@@ -105,14 +105,12 @@ import { ref } from 'vue';
import { Environment, axios, EnumTools, Options, Formater } from 'platform-core';
import SelectMenuTreeGrid from '../shared/SelectMenuTreeGrid.vue';
-const DataComeFromEnum = await EnumTools.fetch('io.sc.platform.orm.api.enums.DataComeFrom');
-
const applicationGridRef = ref();
const userGridRef = ref();
const menuTreeGridRef = ref();
const selectedTabRef = ref('menu');
-const currentSelectedRoleId = ref('');
+const currentSelectedApplicationId = ref('');
const update = (ids, gridComponent) => {
axios
diff --git a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue
index e8c519c1..fa9febbe 100644
--- a/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue
+++ b/io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue
@@ -8,7 +8,6 @@
selection="multiple"
:checkbox-selection="true"
tree-tick-strategy="strict"
- ticked-field="selected"
:tree-icon="
(row) => {
if (row.type === 'SEPARATOR') {
@@ -40,7 +39,7 @@
},
click: (arg) => {
DialogManager.confirm($t('system.shared.selectMenu.grid.toolbar.save.tip'), () => {
- const ids = Tools.extractProperties(arg.selecteds, 'id');
+ const ids = Tools.extractProperties(arg.tickeds, 'id');
emit('update', ids, treeGridRef);
});
},
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/controller/MenuWebController.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/controller/MenuWebController.java
index 4392ea88..78164bac 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/controller/MenuWebController.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/controller/MenuWebController.java
@@ -96,6 +96,21 @@ public class MenuWebController extends RestCrudController
listAllMenusWithSelectedStatusByApplication(@RequestParam(name="applicationId",required=false) String applicationId, QueryParameter queryParameter) throws Exception{
+ if(StringUtils.hasText(applicationId)){
+ return service.listAllMenusWithSelectedStatusByApplication(applicationId,queryParameter);
+ }
+ return QueryResult.emptyList();
+ }
+
/**
* 给菜单添加角色
* @param wrapper 具有级联关系的菜单和角色关系封装器, 由于菜单具有级联关系(如果某个角色拥有一个子菜单的访问权限,那么该角色同时拥有该子菜单所有父菜单分类的访问权限),
diff --git a/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java b/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java
index aaea6d0b..5f9b25af 100644
--- a/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java
+++ b/io.sc.platform.system/src/main/java/io/sc/platform/system/menu/service/impl/MenuServiceImpl.java
@@ -210,7 +210,7 @@ public class MenuServiceImpl extends DaoServiceImpl