diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue index 1d1ca967..114e76b5 100644 --- a/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue +++ b/io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue @@ -5,7 +5,7 @@ @dblclick.stop.prevent="dbClick($event, row, row.rowIndex)" > -
+
diff --git a/io.sc.platform.core.frontend/src/views/Table.vue b/io.sc.platform.core.frontend/src/views/Table.vue index 16438869..72a4bc62 100644 --- a/io.sc.platform.core.frontend/src/views/Table.vue +++ b/io.sc.platform.core.frontend/src/views/Table.vue @@ -1,56 +1,64 @@ diff --git a/io.sc.platform.core.frontend/src/views/TreeGrid.vue b/io.sc.platform.core.frontend/src/views/TreeGrid.vue index 91556376..0ab8ba85 100644 --- a/io.sc.platform.core.frontend/src/views/TreeGrid.vue +++ b/io.sc.platform.core.frontend/src/views/TreeGrid.vue @@ -1,58 +1,62 @@ - diff --git a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/support/AuditLogAspectorBean.java b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/support/AuditLogAspectorBean.java index 2cd05453..7b04032a 100644 --- a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/support/AuditLogAspectorBean.java +++ b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/support/AuditLogAspectorBean.java @@ -113,7 +113,6 @@ public class AuditLogAspectorBean { if(httpServletRequest!=null) { auditLog.setUrl(httpServletRequest.getRequestURL().toString()); - //auditLog.setLoginName(httpServletRequest.getRemoteUser()); auditLog.setLoginName(SecurityUtil.getLoginName()); auditLog.setIp(IpUtil.getRemoteIp(httpServletRequest)); diff --git a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java index 930f6dfb..b5a20c05 100644 --- a/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java +++ b/io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java @@ -56,6 +56,17 @@ public abstract class RestCrudController _removes(HttpServletRequest request,HttpServletResponse response,@RequestBody List ids) throws Exception{ + return removes(request,response,ids); + } + + protected List removes(HttpServletRequest request,HttpServletResponse response,@RequestBody List ids) throws Exception{ + return service.remove(ids); + } + @AuditLog(action=AuditLogAction.UPDATE) @PutMapping("{id}") @ResponseBody diff --git a/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue b/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue index ebb2b67e..dfc56f05 100644 --- a/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue +++ b/io.sc.platform.system.frontend/src/views/corporation/Corporation.vue @@ -8,7 +8,7 @@ :title="$t('system.corporation.grid.title')" :data-url="Environment.apiContextPath('/api/system/corporation')" selection="multiple" - :checkbox-selection="false" + :checkbox-selection="true" :pageable="false" :full-screen-button="false" :tree-icon=" @@ -17,7 +17,7 @@ } " :toolbar-configure="{ noIcon: false }" - :toolbar-actions="['refresh', 'separator', ['addTop', 'addChild'], 'edit', 'remove', 'separator', 'view']" + :toolbar-actions="['refresh', 'separator', ['addTop', 'addChild'], 'expand', 'edit', 'remove', 'separator', 'view']" :columns="[ { width: '100%', name: 'name', label: $t('name') }, { width: 150, name: 'code', label: $t('code') },