update

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

@@ -107,11 +107,7 @@ const currentSelectedApplicationId = ref('');
 
 const refreshRelationshipComponents = (id) => {
   currentSelectedApplicationId.value = id;
-  if (currentSelectedApplicationId.value) {
-    menuTreeGridRef.value?.refresh();
-  } else {
-    menuTreeGridRef.value?.setLocalData();
-  }
+  menuTreeGridRef.value?.refresh();
 };
 
 const update = (ids, gridComponent) => {

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

@@ -35,12 +35,10 @@
             'export',
           ]"
           :columns="[
-            { width: 300, name: 'name', label: $t('name') },
+            { width: '100%', name: 'name', label: $t('name') },
             { width: 150, name: 'code', label: $t('code') },
             { width: 60, name: 'order', label: $t('order') },
             { width: 70, name: 'enable', label: $t('status'), align: 'center', format: Formater.enableTag() },
-            { width: 100, name: 'lastModifier', label: $t('lastModifier') },
-            { width: 110, name: 'lastModifyDate', label: $t('lastModifyDate'), format: Formater.dateOnly() },
           ]"
           :editor="{
             dialog: {
@@ -119,6 +117,8 @@ const refreshRelationshipComponents = (id) => {
   currentSelectedCorporationCode.value = id;
   if (currentSelectedCorporationCode.value) {
     userGridRef.value?.refresh();
+  } else {
+    userGridRef.value?.clear();
   }
 };
 
@@ -168,8 +168,6 @@ const selectAllOut = (gridComponent) => {
 };
 
 onActivated(() => {
-  if (currentSelectedCorporationCode.value) {
-    userGridRef.value?.refresh();
-  }
+  refreshRelationshipComponents(currentSelectedCorporationCode.value);
 });
 </script>

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

@@ -130,7 +130,7 @@
   </q-splitter>
 </template>
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref, onActivated } from 'vue';
 import { Environment, axios, Options, Formater, SessionManager } from 'platform-core';
 import SelectUserGrid from '../shared/SelectUserGrid.vue';
 import SelectMenuTreeGrid from '../shared/SelectMenuTreeGrid.vue';
@@ -146,8 +146,13 @@ const currentSelectedRoleId = ref('');
 
 const refreshRelationshipComponents = (id) => {
   currentSelectedRoleId.value = id;
-  menuTreeGridRef.value?.refresh();
-  userGridRef.value?.refresh();
+  if (currentSelectedRoleId.value) {
+    menuTreeGridRef.value?.refresh();
+    userGridRef.value?.refresh();
+  } else {
+    menuTreeGridRef.value?.clear();
+    userGridRef.value?.clear();
+  }
 };
 
 const selectIn = (ids: string[], gridComponent, dialogComponent) => {
@@ -206,18 +211,21 @@ const update = (ids, gridComponent) => {
     });
 };
 
-onMounted(() => {
-  axios.get(Environment.apiContextPath('/api/system/corporation?pageable=false')).then((response) => {
-    const options = [];
-    const corporationMap = {};
-    if (response.data?.content && response.data?.content.length > 0) {
-      for (const item of response.data.content) {
-        options.push({ label: item.name, value: item.code });
-        corporationMap[item.code] = item.name;
+onActivated(() => {
+  refreshRelationshipComponents(currentSelectedRoleId.value);
+  if (SessionManager.isPrimaryCorporation()) {
+    axios.get(Environment.apiContextPath('/api/system/corporation?pageable=false')).then((response) => {
+      const options = [];
+      const corporationMap = {};
+      if (response.data?.content && response.data?.content.length > 0) {
+        for (const item of response.data.content) {
+          options.push({ label: item.name, value: item.code });
+          corporationMap[item.code] = item.name;
+        }
       }
-    }
-    corporationOptionRef.value = options;
-    corporationMapRef.value = corporationMap;
-  });
+      corporationOptionRef.value = options;
+      corporationMapRef.value = corporationMap;
+    });
+  }
 });
 </script>

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

@@ -6,7 +6,7 @@
     selection="multiple"
     :checkbox-selection="true"
     :fetch-data-url="fetchDataUrl + '?' + foreignKey + '=' + foreignValue"
-    :auto-fetch-data="false"
+    :auto-fetch-data="true"
     :toolbar-configure="{ noIcon: false }"
     :toolbar-actions="[
       'refresh',
@@ -109,7 +109,7 @@
   ></SelectApplicationDialog>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, onUpdated } from 'vue';
+import { ref } from 'vue';
 
 import { DialogManager, Formater, Tools } from 'platform-core';
 import SelectApplicationDialog from './SelectApplicationDialog.vue';
@@ -132,17 +132,9 @@ const gridRef = ref();
 const dialogRef = ref();
 
 const refresh = () => {
-  gridRef.value.refresh();
+  gridRef.value?.refresh();
 };
 
-onMounted(() => {
-  refresh();
-});
-
-onUpdated(() => {
-  refresh();
-});
-
 defineExpose({
   refresh,
 });

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

@@ -20,7 +20,7 @@
       }
     "
     :fetch-data-url="fetchDataUrl + '?' + foreignKey + '=' + foreignValue"
-    :auto-fetch-data="false"
+    :auto-fetch-data="true"
     :pageable="false"
     :toolbar-configure="{ noIcon: false }"
     :toolbar-actions="[
@@ -95,7 +95,7 @@
   ></w-grid>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, onUpdated } from 'vue';
+import { ref } from 'vue';
 import { DialogManager, Formater, Tools } from 'platform-core';
 
 defineProps({
@@ -111,7 +111,7 @@ const emit = defineEmits<{
 const treeGridRef = ref();
 
 const refresh = () => {
-  treeGridRef.value.refresh();
+  treeGridRef.value?.refresh();
 };
 
 defineExpose({

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

@@ -15,6 +15,7 @@
       }
     "
     :fetch-data-url="fetchDataUrl + '?' + foreignKey + '=' + foreignValue"
+    :auto-fetch-data="true"
     :pageable="false"
     :toolbar-configure="{ noIcon: false }"
     :toolbar-actions="[
@@ -69,7 +70,7 @@
   ></w-grid>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, onUpdated } from 'vue';
+import { ref } from 'vue';
 import { DialogManager, Formater, Tools } from 'platform-core';
 
 defineProps({
@@ -85,7 +86,7 @@ const emit = defineEmits<{
 const treeGridRef = ref();
 
 const refresh = () => {
-  treeGridRef.value.refresh();
+  treeGridRef.value?.refresh();
 };
 
 defineExpose({

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

@@ -6,7 +6,7 @@
     selection="multiple"
     :checkbox-selection="true"
     :fetch-data-url="fetchDataUrl + '?' + foreignKey + '=' + foreignValue"
-    :auto-fetch-data="false"
+    :auto-fetch-data="true"
     :toolbar-configure="{ noIcon: false }"
     :toolbar-actions="[
       'refresh',
@@ -109,7 +109,7 @@
   ></SelectRoleDialog>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, onUpdated } from 'vue';
+import { ref } from 'vue';
 
 import { DialogManager, Formater, Tools } from 'platform-core';
 import SelectRoleDialog from './SelectRoleDialog.vue';
@@ -132,7 +132,7 @@ const gridRef = ref();
 const dialogRef = ref();
 
 const refresh = () => {
-  gridRef.value.refresh();
+  gridRef.value?.refresh();
 };
 
 defineExpose({

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

@@ -6,7 +6,7 @@
     selection="multiple"
     :checkbox-selection="true"
     :fetch-data-url="fetchDataUrl + '?' + foreignKey + '=' + foreignValue"
-    :auto-fetch-data="false"
+    :auto-fetch-data="true"
     :toolbar-configure="{ noIcon: false }"
     :toolbar-actions="[
       'refresh',
@@ -128,7 +128,7 @@
   ></SelectUserDialog>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, onUpdated } from 'vue';
+import { ref } from 'vue';
 import { DialogManager, Tools } from 'platform-core';
 import SelectUserDialog from './SelectUserDialog.vue';
 import UserStatusTag from './UserStatusTag.vue';
@@ -151,7 +151,7 @@ const gridRef = ref();
 const dialogRef = ref();
 
 const refresh = () => {
-  gridRef.value.refresh();
+  gridRef.value?.refresh();
 };
 
 defineExpose({

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

@@ -232,7 +232,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref, onMounted } from 'vue';
+import { ref, onActivated } from 'vue';
 import { Environment, axios, SessionManager, NotifyManager, DialogManager, Formater, Options, Tools } from 'platform-core';
 import SelectRoleGrid from '../shared/SelectRoleGrid.vue';
 import SelectOrgTreeGrid from '../shared/SelectOrgTreeGrid.vue';
@@ -251,8 +251,13 @@ const currentSelectedUserId = ref('');
 
 const refreshRelationshipComponents = (id) => {
   currentSelectedUserId.value = id;
-  roleGridRef.value?.refresh();
-  orgTreeGridRef.value?.refresh();
+  if (currentSelectedUserId.value) {
+    roleGridRef.value?.refresh();
+    orgTreeGridRef.value?.refresh();
+  } else {
+    roleGridRef.value?.clear();
+    orgTreeGridRef.value?.clear();
+  }
 };
 
 const selectIn = (ids: string[], gridComponent, dialogComponent) => {
@@ -311,18 +316,21 @@ const update = (ids, gridComponent) => {
     });
 };
 
-onMounted(() => {
-  axios.get(Environment.apiContextPath('/api/system/corporation?pageable=false')).then((response) => {
-    const options = [];
-    const corporationMap = {};
-    if (response.data?.content && response.data?.content.length > 0) {
-      for (const item of response.data.content) {
-        options.push({ label: item.name, value: item.code });
-        corporationMap[item.code] = item.name;
+onActivated(() => {
+  refreshRelationshipComponents(currentSelectedUserId.value);
+  if (SessionManager.isPrimaryCorporation()) {
+    axios.get(Environment.apiContextPath('/api/system/corporation?pageable=false')).then((response) => {
+      const options = [];
+      const corporationMap = {};
+      if (response.data?.content && response.data?.content.length > 0) {
+        for (const item of response.data.content) {
+          options.push({ label: item.name, value: item.code });
+          corporationMap[item.code] = item.name;
+        }
       }
-    }
-    corporationOptionRef.value = options;
-    corporationMapRef.value = corporationMap;
-  });
+      corporationOptionRef.value = options;
+      corporationMapRef.value = corporationMap;
+    });
+  }
 });
 </script>