update

io.sc.platform.developer.frontend/src/views/backend/ExportLiquibase.vue

@@ -94,7 +94,7 @@
     </div>
     <div class="row py-1 q-col-gutter-sm">
       <div class="col-12">
-        <w-code-mirror v-model="valueReactive.sql" label="SQL" :rows="5" lang="sql"></w-code-mirror>
+        <w-code-mirror v-model="valueReactive.sql" label="SQL" :rows="5" lang="sql" :toolbar="false"></w-code-mirror>
       </div>
     </div>
 

io.sc.platform.developer.frontend/src/views/backend/sql/Sql.vue

@@ -25,11 +25,6 @@
         map-options
         :options="schemaOptionsRef"
         style="width: 200px"
-        @update:model-value="
-          (value) => {
-            schemaChanged(valueReactive.datasource, value);
-          }
-        "
       ></q-select>
       <q-space />
       <q-btn :label="$t('developer.backend.sql.action.execute')" no-caps outline icon="bi-lightning" />
@@ -47,15 +42,14 @@
       />
     </q-toolbar>
     <div class="px-3 pt-2">
-      <w-code-mirror label="SQL" :rows="10" lang="sql"></w-code-mirror>
+      <w-code-mirror label="SQL" :rows="10" lang="sql" :toolbar="false"></w-code-mirror>
     </div>
     <ImportExcel ref="importExcelDialogRef"></ImportExcel>
   </div>
 </template>
 <script setup lang="ts">
-import { ref, reactive, onMounted, onUpdated } from 'vue';
+import { ref, reactive, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
+import { axios, Environment } from 'platform-core';
-import { axios, Environment, DialogManager, Downloader } from 'platform-core';
 import ImportExcel from './import-excel/ImportExcel.vue';
 
 const datasourceOptionsRef = ref([]);

io.sc.platform.system.frontend/src/views/announcement/Announcement.vue

@@ -1,70 +0,0 @@
-<template>
-  <div>
-    <platform-grid
-      ref="announcementGridRef"
-      :table-props="{ borderded: false, flat: true }"
-      :query-form-cols-number="announcementConfigure.queryFormColsNumber"
-      :query-form-cols-auto="announcementConfigure.queryFormColsAuto"
-      :table-title="announcementConfigure.tableTitle"
-      :table-row-key="announcementConfigure.tableRowKey"
-      :table-init-load-data="announcementConfigure.tableInitLoadData"
-      :table-data-url="announcementConfigure.tableDataUrl"
-      :table-show-sort-no="false"
-      :table-columns="announcementConfigure.tableColumns"
-      :table-left-column-sticky-number="announcementConfigure.tableLeftColumnStickyNumber"
-      :table-buttons="announcementConfigure.tableButtons"
-      :query-form-fields="announcementConfigure.queryFormFields"
-      :table-pagination="announcementConfigure.tablePagination"
-      :add-form-props="announcementConfigure.addFormProps"
-      :table-dense="false"
-      @row-click="announcementConfigure.rowClickFun"
-    >
-    </platform-grid>
-  </div>
-</template>
-<script setup lang="ts">
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { Environment, axios } from 'platform-core';
-
-const { t } = useI18n();
-
-const announcementConfigure = {
-  queryFormColsNumber: 4,
-  queryFormColsAuto: false,
-  hideBottom: false,
-  tableInitLoadData: true,
-  tableLeftColumnStickyNumber: 0,
-  tableTitle: t('system.announcement.gridTitle'),
-  tableRowKey: 'id',
-  tableDataUrl: Environment.apiContextPath('/api/system/announcement'),
-  tablePagination: {
-    sortBy: 'lastModifyDate',
-    descending: true,
-    reqPageStart: 0,
-    rowsPerPage: 10,
-  },
-  queryFormFields: [
-    { width: 100, name: 'title', label: t('title') },
-    { width: 110, name: 'lastModifier', label: t('lastModifier') },
-    { width: 115, name: 'lastModifyDate', label: t('lastModifyDate') },
-  ],
-  tableButtons: ['add', 'edit', 'delete', 'separator', 'view', 'inFullscreen'],
-  tableColumns: [
-    { width: 100, name: 'title', label: t('title') },
-    { width: 100, name: 'content', label: t('content') },
-    { width: 110, name: 'lastModifier', label: t('lastModifier') },
-    { width: 115, name: 'lastModifyDate', label: t('lastModifyDate') },
-  ],
-  addFormProps: {
-    dialogInitWidth: '50%',
-    dialogInitHeight: '90%',
-    formColsNumber: 1,
-    formColsAuto: false,
-    formFields: [
-      { modelName: 'title', label: t('title'), type: 'text', required: true },
-      { modelName: 'content', label: t('content'), type: 'textarea', required: true },
-    ],
-  },
-};
-</script>

io.sc.platform.system.frontend/src/views/announcement/AnnouncementManager.vue

@@ -14,8 +14,6 @@
     :columns="[
       { width: 300, name: 'title', label: $t('title') },
       { width: '100%', name: 'content', label: $t('content'), sortable: false },
-      { width: 120, name: 'lastModifier', label: $t('lastModifier') },
-      { width: 120, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
     ]"
     :editor="{
       dialog: {

io.sc.platform.system.frontend/src/views/application/Application.vue

@@ -66,7 +66,7 @@
           "
           @before-request-data="
             () => {
-              refreshRelationshipComponents('');
+              menuTreeGridRef?.clear();
             }
           "
         >
@@ -95,7 +95,7 @@
   </q-splitter>
 </template>
 <script setup lang="ts">
-import { ref, onActivated } from 'vue';
+import { ref, onActivated, onMounted } from 'vue';
 import { Environment, axios, Options, Formater } from 'platform-core';
 import SelectMenuTreeGrid from '../shared/SelectMenuTreeGrid.vue';
 
@@ -122,6 +122,6 @@ const update = (ids, gridComponent) => {
 };
 
 onActivated(() => {
-  refreshRelationshipComponents(currentSelectedApplicationId.value);
+  menuTreeGridRef.value?.refresh();
 });
 </script>

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

@@ -80,7 +80,7 @@
           "
           @before-request-data="
             () => {
-              refreshRelationshipComponents('');
+              userGridRef.value?.clear();
             }
           "
         ></w-grid>
@@ -115,11 +115,7 @@ const currentSelectedCorporationCode = ref('');
 
 const refreshRelationshipComponents = (id) => {
   currentSelectedCorporationCode.value = id;
-  if (currentSelectedCorporationCode.value) {
+  userGridRef.value?.refresh();
-    userGridRef.value?.refresh();
-  } else {
-    userGridRef.value?.clear();
-  }
 };
 
 const selectIn = (ids: string[], gridComponent, dialogComponent) => {
@@ -168,6 +164,6 @@ const selectAllOut = (gridComponent) => {
 };
 
 onActivated(() => {
-  refreshRelationshipComponents(currentSelectedCorporationCode.value);
+  userGridRef.value?.refresh();
 });
 </script>

io.sc.platform.system.frontend/src/views/datasource/Datasource.vue

@@ -45,10 +45,8 @@
         { width: 100, name: 'jndiName', label: $t('system.datasource.grid.entity.jndiName'), sortable: false },
         { width: 100, name: 'databaseType', label: $t('system.datasource.grid.entity.databaseType'), sortable: false },
         { width: 200, name: 'jdbcDriver', label: $t('system.datasource.grid.entity.jdbcDriver'), sortable: false },
-        { width: 200, name: 'jdbcUrl', label: $t('system.datasource.grid.entity.jdbcUrl'), sortable: false },
         { width: 100, name: 'username', label: $t('userName'), sortable: false },
-        { width: 100, name: 'lastModifier', label: $t('lastModifier') },
+        { width: '100%', name: 'jdbcUrl', label: $t('system.datasource.grid.entity.jdbcUrl'), sortable: false },
-        { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
       ]"
       :editor="{
         dialog: {

io.sc.platform.system.frontend/src/views/department/Department.vue

@@ -37,8 +37,6 @@
           :columns="[
             { width: '100%', name: 'name', label: $t('name') },
             { width: 120, name: 'code', label: $t('code') },
-            { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-            { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
             { width: 80, name: 'enable', label: $t('status'), sortable: false, format: Formater.enableTag() },
           ]"
           :editor="{
@@ -80,7 +78,7 @@
           "
           @before-request-data="
             () => {
-              refreshRelationshipComponents('');
+              userGridRef?.clear();
             }
           "
         ></w-grid>
@@ -113,8 +111,8 @@
   </q-splitter>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, onActivated } from 'vue';
-import { Environment, axios, EnumTools, Formater } from 'platform-core';
+import { Environment, axios, Formater } from 'platform-core';
 import SelectUserGrid from '../shared/SelectUserGrid.vue';
 
 const treeGridRef = ref();
@@ -173,14 +171,7 @@ const selectAllOut = (gridComponent) => {
     });
 };
 
-const update = (ids, gridComponent) => {
+onActivated(() => {
-  axios
+  userGridRef.value?.refresh();
-    .post(Environment.apiContextPath('/api/system/department/updateMenus'), {
+});
-      one: treeGridRef.value.getSelectedRows()[0].id,
-      many: ids,
-    })
-    .then(() => {
-      gridComponent.refresh();
-    });
-};
 </script>

io.sc.platform.system.frontend/src/views/desensitizer/Desensitizer.vue

@@ -29,8 +29,6 @@
                 return $t(row.className + '.' + row.fieldName);
               },
             },
-            { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-            { width: 150, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
           ]"
           :viewer="{
             panel: {
@@ -61,7 +59,7 @@
           "
           @before-request-data="
             () => {
-              refreshRelationshipComponents('');
+              roleGridRef?.clear();
             }
           "
         ></w-grid>
@@ -85,7 +83,7 @@
   </q-splitter>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue';
+import { onActivated, ref } from 'vue';
 import { axios, Environment, Formater } from 'platform-core';
 import SelectRoleGrid from '../shared/SelectRoleGrid.vue';
 
@@ -138,4 +136,8 @@ const selectAllOut = (gridComponent) => {
       gridComponent?.refresh();
     });
 };
+
+onActivated(() => {
+  roleGridRef.value?.refresh();
+});
 </script>

io.sc.platform.system.frontend/src/views/dictionary/Dictionary.vue

@@ -10,19 +10,18 @@
     :toolbar-configure="{ noIcon: false }"
     :toolbar-actions="['query', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']"
     :columns="[
-      { name: 'code', label: $t('code') },
+      { width: 200, name: 'code', label: $t('code') },
       {
+        width: '100%',
         name: 'name',
         label: $t('name'),
         format: (value, row) => {
           return $t(row.code);
         },
       },
-      { width: 100, name: 'order', label: $t('order'), align: 'right' },
+      { width: 60, name: 'order', label: $t('order'), align: 'right' },
-      { name: 'value', label: $t('value') },
+      { width: 300, name: 'value', label: $t('value') },
-      { name: 'value', label: $t('description'), sortable: false, format: (value, row) => $t(row.code + '.' + row.value) },
+      { width: 300, name: 'description', label: $t('description'), sortable: false, format: (value, row) => $t(row.code + '.' + row.value) },
-      { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-      { width: 150, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
     ]"
     :editor="{
       dialog: {

io.sc.platform.system.frontend/src/views/i18n/I18n.vue

@@ -40,7 +40,7 @@
         icon: 'bi-arrow-right-circle',
         click: () => {
           DialogManager.confirm($t('system.i18n.grid.toolbar.importAll.tip'), () => {
-            axios.post(Environment.apiContextPath('/api/system/i18n/importMessages')).then(() => {
+            axios.post(Environment.apiContextPath('/api/system/i18n/importMessages'), {}, { loading: true }).then(() => {
               NotifyManager.info($t('operationSuccess'));
               i18nGridRef.refresh();
             });
@@ -53,11 +53,9 @@
       'export',
     ]"
     :columns="[
-      { width: 200, name: 'code', label: $t('code') },
+      { width: 500, name: 'code', label: $t('code') },
       { width: 100, name: 'lang', label: $t('language'), format: Formater.enum(LanguageEnum) },
       { width: '100%', name: 'message', label: $t('i18nMessage') },
-      { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-      { width: 150, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
     ]"
     :editor="{
       dialog: {

io.sc.platform.system.frontend/src/views/menu/Menu.vue

@@ -189,7 +189,9 @@
           "
           @before-request-data="
             () => {
-              refreshRelationshipComponents('');
+              roleGridRef?.clear();
+              orgTreeGridRef?.clear();
+              applicationGridRef?.clear();
             }
           "
         ></w-grid>
@@ -248,7 +250,7 @@
   </q-splitter>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, onActivated } from 'vue';
 import { Environment, axios, Tools, EnumTools, Formater, Options } from 'platform-core';
 import SelectRoleGrid from '../shared/SelectRoleGrid.vue';
 import SelectOrgTreeGrid from '../shared/SelectOrgTreeGrid.vue';
@@ -271,6 +273,7 @@ const refreshRelationshipComponents = (id) => {
   currentSelectedMenuId.value = id;
   roleGridRef.value?.refresh();
   orgTreeGridRef.value?.refresh();
+  applicationGridRef.value?.refresh();
 };
 
 const selectRoleIn = (ids: string[], gridComponent, dialogComponent) => {
@@ -391,4 +394,10 @@ const update = (ids, gridComponent) => {
       gridComponent.refresh();
     });
 };
+
+onActivated(() => {
+  roleGridRef.value?.refresh();
+  orgTreeGridRef.value?.refresh();
+  applicationGridRef.value?.refresh();
+});
 </script>

io.sc.platform.system.frontend/src/views/org/Org.vue

@@ -36,8 +36,6 @@
           :columns="[
             { width: '100%', name: 'name', label: $t('name') },
             { width: 120, name: 'code', label: $t('code') },
-            { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-            { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
             { width: 80, name: 'enable', label: $t('status'), sortable: false, format: Formater.enableTag() },
           ]"
           :editor="{
@@ -79,7 +77,8 @@
           "
           @before-request-data="
             () => {
-              refreshRelationshipComponents('');
+              userGridRef?.clear();
+              menuTreeGridRef?.clear();
             }
           "
         ></w-grid>
@@ -122,8 +121,8 @@
   </q-splitter>
 </template>
 <script setup lang="ts">
-import { ref } from 'vue';
+import { ref, onActivated } from 'vue';
-import { Environment, axios, EnumTools, Formater } from 'platform-core';
+import { Environment, axios, Formater } from 'platform-core';
 import SelectUserGrid from '../shared/SelectUserGrid.vue';
 import SelectMenuTreeGrid from '../shared/SelectMenuTreeGrid.vue';
 
@@ -195,4 +194,9 @@ const update = (ids, gridComponent) => {
       gridComponent.refresh();
     });
 };
+
+onActivated(() => {
+  userGridRef.value?.refresh();
+  menuTreeGridRef.value?.refresh();
+});
 </script>

io.sc.platform.system.frontend/src/views/parameter/Parameter.vue

@@ -54,8 +54,6 @@
       },
       { width: 300, name: 'code', label: $t('code') },
       { width: '100%', name: 'value', label: $t('value') },
-      { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-      { width: 150, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
     ]"
     :editor="{
       dialog: {

io.sc.platform.system.frontend/src/views/role/Role.vue

@@ -22,8 +22,8 @@
           :toolbar-configure="{ noIcon: false }"
           :toolbar-actions="['query', 'refresh', 'separator', 'add', 'clone', 'edit', 'remove', 'separator', 'view', 'separator', 'export']"
           :columns="[
-            { width: 150, name: 'code', label: $t('code') },
+            { width: 200, name: 'code', label: $t('code') },
-            { width: 200, name: 'name', label: $t('name') },
+            { width: '100%', name: 'name', label: $t('name') },
             { width: 70, name: 'enable', label: $t('status'), align: 'center', format: Formater.enableTag() },
             {
               width: 200,
@@ -34,8 +34,6 @@
                 return corporationMapRef[value];
               },
             },
-            { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-            { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
           ]"
           :editor="{
             dialog: {
@@ -85,7 +83,8 @@
           "
           @before-request-data="
             () => {
-              refreshRelationshipComponents('');
+              menuTreeGridRef?.clear();
+              userGridRef?.clear();
             }
           "
         >
@@ -146,13 +145,8 @@ const currentSelectedRoleId = ref('');
 
 const refreshRelationshipComponents = (id) => {
   currentSelectedRoleId.value = id;
-  if (currentSelectedRoleId.value) {
+  menuTreeGridRef.value?.refresh();
-    menuTreeGridRef.value?.refresh();
+  userGridRef.value?.refresh();
-    userGridRef.value?.refresh();
-  } else {
-    menuTreeGridRef.value?.clear();
-    userGridRef.value?.clear();
-  }
 };
 
 const selectIn = (ids: string[], gridComponent, dialogComponent) => {
@@ -212,7 +206,8 @@ const update = (ids, gridComponent) => {
 };
 
 onActivated(() => {
-  refreshRelationshipComponents(currentSelectedRoleId.value);
+  menuTreeGridRef.value?.refresh();
+  userGridRef.value?.refresh();
   if (SessionManager.isPrimaryCorporation()) {
     axios.get(Environment.apiContextPath('/api/system/corporation?pageable=false')).then((response) => {
       const options = [];

io.sc.platform.system.frontend/src/views/shared/SelectApplicationGrid.vue

@@ -135,7 +135,12 @@ const refresh = () => {
   gridRef.value?.refresh();
 };
 
+const clear = () => {
+  gridRef.value?.setLocalData([]);
+};
+
 defineExpose({
   refresh,
+  clear,
 });
 </script>

io.sc.platform.system.frontend/src/views/shared/SelectMenuTreeGrid.vue

@@ -65,7 +65,7 @@
           }
         },
       },
-      { width: 100, name: 'enable', label: $t('status'), format: Formater.enableTag(), sortable: false },
+      { width: 70, name: 'enable', label: $t('status'), format: Formater.enableTag(), sortable: false },
     ]"
     :viewer="{
       panel: {
@@ -114,7 +114,12 @@ const refresh = () => {
   treeGridRef.value?.refresh();
 };
 
+const clear = () => {
+  treeGridRef.value?.setLocalData([]);
+};
+
 defineExpose({
   refresh,
+  clear,
 });
 </script>

io.sc.platform.system.frontend/src/views/shared/SelectOrgTreeGrid.vue

@@ -89,7 +89,12 @@ const refresh = () => {
   treeGridRef.value?.refresh();
 };
 
+const clear = () => {
+  treeGridRef.value?.setLocalData([]);
+};
+
 defineExpose({
   refresh,
+  clear,
 });
 </script>

io.sc.platform.system.frontend/src/views/shared/SelectRoleGrid.vue

@@ -70,7 +70,7 @@
       { width: 150, name: 'code', label: $t('code') },
       { width: '100%', name: 'name', label: $t('name') },
       {
-        width: 80,
+        width: 70,
         name: 'enable',
         label: $t('status'),
         format: Formater.enableTag(),
@@ -135,7 +135,12 @@ const refresh = () => {
   gridRef.value?.refresh();
 };
 
+const clear = () => {
+  gridRef.value?.setLocalData([]);
+};
+
 defineExpose({
   refresh,
+  clear,
 });
 </script>

io.sc.platform.system.frontend/src/views/shared/SelectUserGrid.vue

@@ -154,7 +154,12 @@ const refresh = () => {
   gridRef.value?.refresh();
 };
 
+const clear = () => {
+  gridRef.value?.setLocalData([]);
+};
+
 defineExpose({
   refresh,
+  clear,
 });
 </script>

io.sc.platform.system.frontend/src/views/user/User.vue

@@ -85,10 +85,10 @@
               'export',
             ]"
             :columns="[
-              { width: 150, name: 'loginName', label: $t('loginName') },
+              { width: 200, name: 'loginName', label: $t('loginName') },
               { width: '100%', name: 'userName', label: $t('userName') },
               {
-                width: 150,
+                width: 250,
                 name: 'enable',
                 label: $t('status'),
                 format: (value, row) => {
@@ -107,8 +107,6 @@
                   return corporationMapRef[value];
                 },
               },
-              { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-              { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
             ]"
             :editor="{
               dialog: {
@@ -188,7 +186,8 @@
             "
             @before-request-data="
               () => {
-                refreshRelationshipComponents('');
+                roleGridRef?.clear();
+                orgTreeGridRef?.clear();
               }
             "
           ></w-grid>
@@ -251,13 +250,8 @@ const currentSelectedUserId = ref('');
 
 const refreshRelationshipComponents = (id) => {
   currentSelectedUserId.value = id;
-  if (currentSelectedUserId.value) {
+  roleGridRef.value?.refresh();
-    roleGridRef.value?.refresh();
+  orgTreeGridRef.value?.refresh();
-    orgTreeGridRef.value?.refresh();
-  } else {
-    roleGridRef.value?.clear();
-    orgTreeGridRef.value?.clear();
-  }
 };
 
 const selectIn = (ids: string[], gridComponent, dialogComponent) => {
@@ -317,7 +311,8 @@ const update = (ids, gridComponent) => {
 };
 
 onActivated(() => {
-  refreshRelationshipComponents(currentSelectedUserId.value);
+  roleGridRef.value?.refresh();
+  orgTreeGridRef.value?.refresh();
   if (SessionManager.isPrimaryCorporation()) {
     axios.get(Environment.apiContextPath('/api/system/corporation?pageable=false')).then((response) => {
       const options = [];