Merge remote-tracking branch 'origin/main'

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

@@ -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>
         <!--展开按钮-->

io.sc.platform.core.frontend/src/views/Table.vue

@@ -1,56 +1,64 @@
 <template>
-  <w-list-grid
+  <w-grid
-    :tree="true"
+          :tree="true"
-    title="User List"
+          :title="$t('system.corporation.grid.title')"
-    :no-action-icon="true"
+          :data-url="Environment.apiContextPath('/api/system/corporation')"
-    :target-object-name="$t('菜单')"
+          selection="multiple"
-    :actions="[
+          :checkbox-selection="false"
-      'query',
+          :pageable="false"
-      'refresh',
+          :full-screen-button="false"
-      'expandAll',
+          :tree-icon="
-      'selectAll',
+            (row) => {
-      'separator',
+              return { name: 'folder', color: 'amber' };
-      'add',
+            }
-      'clone',
+          "
-      'edit',
+          :toolbar-configure="{ noIcon: false }"
-      'remove',
+          :toolbar-actions="['refresh', 'separator', ['addTop', 'addChild'], 'edit', 'remove', 'separator', 'view']"
-      'removeAll',
+          :columns="[
-      'separator',
+            { width: '100%', name: 'name', label: $t('name') },
-      'detail',
+            { width: 150, name: 'code', label: $t('code') },
-
+            { width: 90, name: 'dataComeFrom', label: $t('dataComeFrom'), format: Formater.enum(DataComeFromEnum) },
-      'addTop',
+            { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-      'addChild',
+            { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
-    ]"
+            { width: 80, name: 'enable', label: $t('status'), format: Formater.enableTag() },
-    :columns="columns"
+          ]"
-    :auto-fetch-data="true"
+          :editor="{
-    :data-url="Environment.apiContextPath('/api/system/menu/allMenus')"
+            dialog: {
-  ></w-list-grid>
+              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 { Environment,Formater,Options } from '@/platform';
-import { useI18n } from 'vue-i18n';
-import { Environment } 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>

io.sc.platform.core.frontend/src/views/TreeGrid.vue

@@ -1,58 +1,62 @@
 <template>
   <w-grid
-    ref="auditLogGridRef"
+    :tree="true"
-    :title="$t('system.user.grid.title')"
+    :title="$t('system.corporation.grid.title')"
+    :data-url="Environment.apiContextPath('/api/system/corporation')"
     selection="multiple"
-    :data-url="Environment.apiContextPath('/api/system/monitor/auditlog')"
+    :checkbox-selection="false"
-    :query-form-fields="[
+    :pageable="false"
-      { name: 'code', label: $t('code'), type: 'text' },
+    :full-screen-button="false"
-      { name: 'message', label: $t('i18nMessage'), type: 'text' },
+    :tree-icon="
-      { name: 'lang', label: $t('language'), type: 'select' },
+      (row) => {
-      { name: 'dataComeFrom', label: $t('dataComeFrom'), type: 'select' },
+        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: 100, name: 'name', label: $t('name') },
-      { width: 60, name: 'action', label: $t('action') },
+      { width: '100%', name: 'code', label: $t('code') },
-      { width: 100, name: 'startDate', label: $t('startDate') },
+      { width: 90, name: 'dataComeFrom', label: $t('dataComeFrom'), format: Formater.enum(DataComeFromEnum) },
-      { width: 60, name: 'executeTime', label: $t('executeTime') },
+      { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-      { width: 80, name: 'loginName', label: $t('loginName') },
+      { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
-      { width: 60, name: 'httpMethod', label: $t('httpMethod') },
+      { width: 80, name: 'enable', label: $t('status'), format: Formater.enableTag() },
-      { 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') },
     ]"
+    :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: 'name', label: $t('name') },
-          { name: 'message', label: $t('i18nMessage') },
+          { name: 'description', label: $t('description') },
-          { name: 'dataComeFrom', label: $t('dataComeFrom') },
+          { 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: 'lastModifyDate', label: $t('lastModifyDate'), format: (value) => value },
-          { name: 'corporationCode', label: $t('corporationCode') },
         ],
       },
     }"
-    @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>

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

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

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

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