wangshaoping
/
platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update

main
wangshaoping 1 year ago
parent
ba438f1314
commit
339ce8686a
6 changed files with 112 additions and 90 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
  2. 106
      io.sc.platform.core.frontend/src/views/Table.vue
  3. 78
      io.sc.platform.core.frontend/src/views/TreeGrid.vue
  4. 1
      io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/support/AuditLogAspectorBean.java
  5. 11
      io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java
  6. 4
      io.sc.platform.system.frontend/src/views/corporation/Corporation.vue

2
io.sc.platform.core.frontend/src/platform/components/grid/TreeGridRow.vue
View File

@ -5,7 +5,7 @@
@dblclick.stop.prevent="dbClick($event, row, row.rowIndex)"
>
<q-td class="nowrap text-nowrap">
<div class="flex flex-nowrap items-center">
<div class="flex flex-nowrap items-center" style="flex-wrap: nowrap">
<!--层级占位符-->
<span :style="`width:${27 * props.level}px;`"></span>
<!--展开按钮-->

106
io.sc.platform.core.frontend/src/views/Table.vue
View File

@ -1,56 +1,64 @@
<template>
<w-list-grid
:tree="true"
title="User List"
:no-action-icon="true"
:target-object-name="$t('菜单')"
:actions="[
'query',
'refresh',
'expandAll',
'selectAll',
'separator',
'add',
'clone',
'edit',
'remove',
'removeAll',
'separator',
'detail',
'addTop',
'addChild',
]"
:columns="columns"
:auto-fetch-data="true"
:data-url="Environment.apiContextPath('/api/system/menu/allMenus')"
></w-list-grid>
<w-grid
:tree="true"
:title="$t('system.corporation.grid.title')"
:data-url="Environment.apiContextPath('/api/system/corporation')"
selection="multiple"
:checkbox-selection="false"
:pageable="false"
:full-screen-button="false"
:tree-icon="
(row) => {
return { name: 'folder', color: 'amber' };
}
"
:toolbar-configure="{ noIcon: false }"
:toolbar-actions="['refresh', 'separator', ['addTop', 'addChild'], 'edit', 'remove', 'separator', 'view']"
:columns="[
{ width: '100%', name: 'name', label: $t('name') },
{ width: 150, name: 'code', label: $t('code') },
{ width: 90, name: 'dataComeFrom', label: $t('dataComeFrom'), format: Formater.enum(DataComeFromEnum) },
{ width: 100, name: 'lastModifier', label: $t('lastModifier') },
{ width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
{ width: 80, name: 'enable', label: $t('status'), format: Formater.enableTag() },
]"
:editor="{
dialog: {
width: '600px',
height: '300px',
},
form: {
colsNum: 1,
fields: [
{ name: 'code', label: $t('code'), type: 'text', required: true },
{ name: 'name', label: $t('name'), type: 'text', required: true },
{ name: 'description', label: $t('description'), type: 'textarea', rows: 1 },
{ name: 'enable', label: $t('enable'), type: 'checkbox', defaultValue: true },
],
},
}"
:viewer="{
panel: {
columnNum: 1,
fields: [
{ name: 'id', label: $t('id') },
{ name: 'code', label: $t('code') },
{ name: 'name', label: $t('name') },
{ name: 'description', label: $t('description') },
{ name: 'enable', label: $t('enable'), format: (value) => value },
{ name: 'dataComeFrom', label: $t('dataComeFrom'), format: (value) => value },
{ name: 'creator', label: $t('creator') },
{ name: 'createDate', label: $t('createDate') },
{ name: 'lastModifier', label: $t('lastModifier') },
{ name: 'lastModifyDate', label: $t('lastModifyDate'), format: (value) => value },
],
},
}"
></w-grid>
</template>
<script setup lang="ts">
import { ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { Environment } from '@/platform';
import { Environment,Formater,Options } from '@/platform';
const { t } = useI18n();
const columns = [
{
name: 'name',
required: true,
label: t('name'),
align: 'left',
field: 'name',
sortable: true,
format: (value, data) => {
return t(data.titleI18nKey);
},
},
{ name: 'type', align: 'center', label: 'type', field: 'type', sortable: true },
{ name: 'enable', label: 'enable', field: 'enable', sortable: true },
{ name: 'dataComeFrom', label: 'dataComeFrom', field: 'dataComeFrom' },
{ name: 'lastModifier', label: 'lastModifier', field: 'lastModifier' },
{ name: 'lastModifyDate', label: 'lastModifyDate', field: 'lastModifyDate' },
{ name: 'corporationCode', label: 'corporationCode', field: 'corporationCode', sortable: true },
];
</script>

78
io.sc.platform.core.frontend/src/views/TreeGrid.vue
View File

@ -1,58 +1,62 @@
<template>
<w-grid
ref="auditLogGridRef"
:title="$t('system.user.grid.title')"
:tree="true"
:title="$t('system.corporation.grid.title')"
:data-url="Environment.apiContextPath('/api/system/corporation')"
selection="multiple"
:data-url="Environment.apiContextPath('/api/system/monitor/auditlog')"
:query-form-fields="[
{ name: 'code', label: $t('code'), type: 'text' },
{ name: 'message', label: $t('i18nMessage'), type: 'text' },
{ name: 'lang', label: $t('language'), type: 'select' },
{ name: 'dataComeFrom', label: $t('dataComeFrom'), type: 'select' },
]"
:checkbox-selection="false"
:pageable="false"
:full-screen-button="false"
:tree-icon="
(row) => {
return { name: 'folder', color: 'amber' };
}
"
:toolbar-configure="{ noIcon: false }"
:toolbar-actions="['query', 'refresh', 'separator', 'view', 'export']"
:toolbar-actions="['refresh', 'separator', ['addTop', 'addChild'], 'edit', 'remove', 'separator', 'view']"
:columns="[
{ width: 100, name: 'status', label: $t('status'), format: Formater.successTag() },
{ width: 60, name: 'action', label: $t('action') },
{ width: 100, name: 'startDate', label: $t('startDate') },
{ width: 60, name: 'executeTime', label: $t('executeTime') },
{ width: 80, name: 'loginName', label: $t('loginName') },
{ width: 60, name: 'httpMethod', label: $t('httpMethod') },
{ width: 200, name: 'url', label: $t('url') },
{ width: 100, name: 'ip', label: $t('ip') },
{ width: 100, name: 'className', label: $t('className') },
{ width: 100, name: 'methodName', label: $t('methodName') },
{ width: 100, name: 'oldValue', label: $t('oldValue') },
{ width: 100, name: 'newValue', label: $t('newValue') },
{ width: 100, name: 'exception', label: $t('exception') },
{ width: 100, name: 'exceptionMessage', label: $t('exceptionMessage') },
{ width: 100, name: 'exceptionStackTrace', label: $t('exceptionStackTrace') },
{ width: 100, name: 'name', label: $t('name') },
{ width: '100%', name: 'code', label: $t('code') },
{ width: 90, name: 'dataComeFrom', label: $t('dataComeFrom'), format: Formater.enum(DataComeFromEnum) },
{ width: 100, name: 'lastModifier', label: $t('lastModifier') },
{ width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
{ width: 80, name: 'enable', label: $t('status'), format: Formater.enableTag() },
]"
:editor="{
dialog: {
width: '600px',
height: '300px',
},
form: {
colsNum: 1,
fields: [
{ name: 'code', label: $t('code'), type: 'text', required: true },
{ name: 'name', label: $t('name'), type: 'text', required: true },
{ name: 'description', label: $t('description'), type: 'textarea', rows: 1 },
{ name: 'enable', label: $t('enable'), type: 'checkbox', defaultValue: true },
],
},
}"
:viewer="{
panel: {
columnNum: 1,
fields: [
{ name: 'id', label: $t('id') },
{ name: 'code', label: $t('code') },
{ name: 'lang', label: $t('language') },
{ name: 'message', label: $t('i18nMessage') },
{ name: 'dataComeFrom', label: $t('dataComeFrom') },
{ name: 'name', label: $t('name') },
{ name: 'description', label: $t('description') },
{ name: 'enable', label: $t('enable'), format: (value) => value },
{ name: 'dataComeFrom', label: $t('dataComeFrom'), format: (value) => value },
{ name: 'creator', label: $t('creator') },
{ name: 'createDate', label: $t('createDate') },
{ name: 'lastModifier', label: $t('lastModifier') },
{ name: 'lastModifyDate', label: $t('lastModifyDate') },
{ name: 'corporationCode', label: $t('corporationCode') },
{ name: 'lastModifyDate', label: $t('lastModifyDate'), format: (value) => value },
],
},
}"
@row-click="(evt, row, index) => {}"
>
</w-grid>
></w-grid>
</template>
<script setup lang="ts">
import { ref } from 'vue';
import { Environment, axios, Formater, Options } from '@/platform';
const auditLogGridRef = ref();
<script setup lang="ts">
import { Environment, Formater, Options } from '@/platform';
</script>

1
io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/autoconfigure/support/AuditLogAspectorBean.java
View File

@ -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));

11
io.sc.platform.mvc/src/main/java/io/sc/platform/mvc/controller/support/RestCrudController.java
View File

@ -56,6 +56,17 @@ public abstract class RestCrudController<V extends BaseVo, E extends BaseEntity<
return service.remove(id);
}
@AuditLog(action=AuditLogAction.REMOVE)
@DeleteMapping("")
@ResponseBody
public List<ID> _removes(HttpServletRequest request,HttpServletResponse response,@RequestBody List<ID> ids) throws Exception{
return removes(request,response,ids);
}
protected List<ID> removes(HttpServletRequest request,HttpServletResponse response,@RequestBody List<ID> ids) throws Exception{
return service.remove(ids);
}
@AuditLog(action=AuditLogAction.UPDATE)
@PutMapping("{id}")
@ResponseBody

4
io.sc.platform.system.frontend/src/views/corporation/Corporation.vue
View File

@ -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') },

Write Preview
Loading…
Cancel
Save