Merge pull request #43 from humpback/develop-0.0.1

Develop 0.0.1

Author: skyler-yang

front/projects/web/components.d.ts

@@ -49,6 +49,7 @@ declare module 'vue' {
     ElSegmented: typeof import('element-plus/es')['ElSegmented']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
+    ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSlider: typeof import('element-plus/es')['ElSlider']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
@@ -86,7 +87,6 @@ declare module 'vue' {
     IconMdiNoteText: typeof import('~icons/mdi/note-text')['default']
     IconMdiPerformance: typeof import('~icons/mdi/performance')['default']
     IconMdiPlay: typeof import('~icons/mdi/play')['default']
-    IconMdiRefresh: typeof import('~icons/mdi/refresh')['default']
     IconMdiRemove: typeof import('~icons/mdi/remove')['default']
     IconMdiRestart: typeof import('~icons/mdi/restart')['default']
     IconMdiSearch: typeof import('~icons/mdi/search')['default']

front/projects/web/src/assets/logo.png

@@ -105,8 +105,8 @@ onMounted(() => search())
         <el-table-column :label="t('label.action')" align="right" fixed="right" header-align="center" width="130">
           <template #default="scope">
             <el-button link type="primary" @click="openAction(Action.Edit, scope.row)">{{ t("btn.edit") }}</el-button>
-            <el-button v-if="!isDefaultRegistry(scope.row.url)" link type="danger" @click="openAction(Action.Delete, scope.row)"
-              >{{ t("btn.delete") }}
+            <el-button v-if="!isDefaultRegistry(scope.row.url)" link type="danger" @click="openAction(Action.Delete, scope.row)">
+              {{ t("btn.delete") }}
             </el-button>
           </template>
         </el-table-column>

front/projects/web/src/views/administration/registries/registries.vue

@@ -82,7 +82,7 @@ async function save() {
     </el-form>
     <template #footer>
       <el-button @click="show = false">{{ t("btn.cancel") }}</el-button>
-      <el-button v-loading="loading" type="primary" @click="save">{{ t("btn.save") }}</el-button>
+      <el-button :loading="loading" type="primary" @click="save">{{ t("btn.save") }}</el-button>
     </template>
   </v-dialog>
 </template>

front/projects/web/src/views/my-account/change-password.vue

@@ -10,6 +10,7 @@ const { t } = useI18n()
 const userStore = useUserStore()
 
 const loading = ref(false)
+const isAction = ref(false)
 const isLoadingActivities = ref(false)
 const userInfo = ref<UserInfo>(NewUserEmptyInfo())
 
@@ -77,12 +78,15 @@ async function save() {
   if (!(await tableRef.value?.validate())) {
     return
   }
-  await userService.updateMeInfo({
-    username: userInfo.value.username,
-    email: userInfo.value.email,
-    phone: userInfo.value.phone,
-    description: userInfo.value.description
-  })
+  isAction.value = true
+  await userService
+    .updateMeInfo({
+      username: userInfo.value.username,
+      email: userInfo.value.email,
+      phone: userInfo.value.phone,
+      description: userInfo.value.description
+    })
+    .finally(() => (isAction.value = false))
   ShowSuccessMsg(t("message.saveSuccess"))
   await Promise.all([getUserInfo(), getUserActivities()])
 }
@@ -137,7 +141,7 @@ onMounted(async () => {
           <el-col>
             <el-form-item>
               <div class="text-align-right w-100">
-                <el-button type="primary" @click="save()">{{ t("btn.save") }}</el-button>
+                <el-button :loading="isAction" type="primary" @click="save()">{{ t("btn.save") }}</el-button>
               </div>
             </el-form-item>
           </el-col>
@@ -146,16 +150,12 @@ onMounted(async () => {
     </v-card>
 
     <v-card class="mt-5">
-      <div class="d-flex gap-1">
+      <div class="d-flex gap-2">
         <div class="f-bold">
           {{ t("label.activities") }}
         </div>
-        <el-button :disabled="isLoadingActivities" :title="t('label.refresh')" link type="primary" @click="getUserActivities()">
-          <el-icon v-if="!isLoadingActivities" :size="20">
-            <IconMdiRefresh />
-          </el-icon>
-          <v-loading v-else />
-        </el-button>
+        <el-button :disabled="isLoadingActivities" plain size="small" type="success" @click="getUserActivities()"> {{ t("btn.refresh") }}</el-button>
+        <v-loading v-if="isLoadingActivities" />
       </div>
       <div class="activity-content">
         <v-table
@@ -179,7 +179,7 @@ onMounted(async () => {
           </el-table-column>
           <el-table-column :label="t('label.description')" min-width="200px">
             <template #default="scope">
-              <span>{{ t(`activity.account.${scope.row.action}`) }}</span>
+              <span>{{ scope.row.action ? t(`activity.account.${scope.row.action}`) : "--" }}</span>
             </template>
           </el-table-column>
           <el-table-column width="160px">

front/projects/web/src/views/my-account/my-account.vue

@@ -1,13 +1,19 @@
 <script lang="ts" setup>
 import { TableHeight } from "@/utils"
 import { ActivityInfo } from "@/types"
+import VLoading from "@/components/business/v-loading/VLoading.vue"
+import { refreshData } from "@/views/service-management/service/common.ts"
 
 const { t } = useI18n()
 const route = useRoute()
 
 const tableHeight = computed(() => TableHeight(362))
 
+const groupId = ref(route.params.groupId as string)
+const serviceId = ref(route.params.serviceId as string)
+
 const isLoading = ref(false)
+const isLoadingActivity = ref(false)
 const queryInfo = ref<any>({
   filter: {
     "type": "services",
@@ -28,19 +34,25 @@ const setRowClass = ({ row }) => {
   return !row.oldContent && !row.newContent ? "hide-expand-icon" : ""
 }
 
-async function getActivities() {
+async function search() {
   isLoading.value = true
+  await refreshData(groupId.value, serviceId.value, "activity").finally(() => (isLoading.value = false))
+}
+
+async function getActivities() {
+  isLoadingActivity.value = true
   return await activityService
     .query(queryInfo.value)
     .then(data => {
       tableList.value.total = data.total
       tableList.value.data = data.list
     })
-    .finally(() => (isLoading.value = false))
+    .finally(() => (isLoadingActivity.value = false))
 }
 
-onMounted(() => {
-  getActivities()
+onBeforeMount(async () => {
+  await search()
+  await getActivities()
 })
 </script>
 
@@ -53,17 +65,13 @@ onMounted(() => {
     </div>
     <div class="d-flex gap-1">
       <el-text class="f-bold" size="large">{{ t("label.activities") }}</el-text>
-      <el-button :disabled="isLoading" :title="t('label.refresh')" link type="primary" @click="getActivities()">
-        <el-icon v-if="!isLoading" :size="20">
-          <IconMdiRefresh />
-        </el-icon>
-        <v-loading v-else />
-      </el-button>
     </div>
+    <el-button plain size="small" type="success" @click="getActivities()">{{ t("btn.refresh") }}</el-button>
+    <v-loading v-if="isLoading" />
   </div>
 
   <v-table
-    v-loading="isLoading"
+    v-loading="isLoadingActivity"
     v-model:page-info="queryInfo.pageInfo"
     :data="tableList.data"
     :max-height="tableHeight"
@@ -85,10 +93,10 @@ onMounted(() => {
     </el-table-column>
     <el-table-column :label="t('label.description')" min-width="200">
       <template #default="scope">
-        <span v-if="scope.row.instanceName">
-          {{ t(`activity.service.${scope.row.action}Instance`, { name: scope.row.instanceName }) }}
+        <span v-if="scope.row.action">
+          {{ t(`activity.service.${scope.row.action}`, { name: scope.row.instanceName }) }}
         </span>
-        <span v-else>{{ t(`activity.service.${scope.row.action}`) }} </span>
+        <span v-else>--</span>
       </template>
     </el-table-column>
     <el-table-column :label="t('label.operator')" min-width="140" prop="operator" />