Jack Zhou пре 1 недеља
родитељ
комит
bb68eb5aba

+ 1 - 1
src/views/Booking/src/components/BookingTable/src/BookingTable.vue

@@ -484,7 +484,7 @@ defineExpose({
     style="padding: 0px 24px"
     style="padding: 0px 24px"
     class="booking-table"
     class="booking-table"
     v-loading.fullscreen.lock="exportLoading"
     v-loading.fullscreen.lock="exportLoading"
-    element-loading-text="{{ t('common.loading') }}"
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
   >
   >

+ 1 - 1
src/views/DestinationDelivery/src/components/TableView/src/TableView.vue

@@ -354,7 +354,7 @@ defineExpose({
   <div
   <div
     style="padding: 0px 20px"
     style="padding: 0px 20px"
     class="table-box"
     class="table-box"
-    element-loading-text="Loading..."
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
   >
   >

+ 1 - 1
src/views/Layout/src/components/Header/HeaderView.vue

@@ -225,7 +225,7 @@ const languageChangetest = async (label: string) => {
   <div
   <div
     class="layout-toolbar"
     class="layout-toolbar"
     v-loading.fullscreen.lock="userManualLoading"
     v-loading.fullscreen.lock="userManualLoading"
-    element-loading-text="{{ t('common.loading') }}"
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
   >
   >

+ 1 - 1
src/views/Layout/src/components/Header/components/KAMMapping.vue

@@ -133,7 +133,7 @@ watch(
 <template>
 <template>
   <div
   <div
     v-loading.fullscreen.lock="loadingVisible"
     v-loading.fullscreen.lock="loadingVisible"
-    element-loading-text="Loading..."
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     class="kam-mapping-container"
     class="kam-mapping-container"

+ 18 - 18
src/views/Layout/src/components/Menu/MenuView.vue

@@ -29,84 +29,84 @@ const getMenuList = () => {
   menuList.value = [
   menuList.value = [
     {
     {
       index: '1',
       index: '1',
-      label: 'dashboard',
+      cleaned_field_name: 'dashboard',
       icon: 'icon_data_fill_b',
       icon: 'icon_data_fill_b',
       path: '/dashboard'
       path: '/dashboard'
     },
     },
     {
     {
       index: '2',
       index: '2',
-      label: 'booking',
+      cleaned_field_name: 'booking',
       icon: 'icon_booking__fill_b',
       icon: 'icon_booking__fill_b',
       type: 'list',
       type: 'list',
       children: [
       children: [
         {
         {
           index: '2-1',
           index: '2-1',
-          label: 'booking_management',
+          cleaned_field_name: 'booking_management',
           path: '/booking'
           path: '/booking'
         },
         },
         {
         {
           index: '2-2',
           index: '2-2',
-          label: 'destination_delivery',
+          cleaned_field_name: 'destination_delivery',
           path: '/destination-delivery'
           path: '/destination-delivery'
         }
         }
       ]
       ]
     },
     },
     {
     {
       index: '3',
       index: '3',
-      label: 'tracking',
+      cleaned_field_name: 'tracking',
       icon: 'icon_tracking__fill_b',
       icon: 'icon_tracking__fill_b',
       path: '/tracking'
       path: '/tracking'
     },
     },
     {
     {
       index: '4',
       index: '4',
-      label: 'report',
+      cleaned_field_name: 'report',
       icon: 'icon_report__fill_b',
       icon: 'icon_report__fill_b',
       path: '/report'
       path: '/report'
     },
     },
     {
     {
       index: '5',
       index: '5',
-      label: 'system_management',
+      cleaned_field_name: 'system_management',
       icon: 'icon_system__management_fill_b',
       icon: 'icon_system__management_fill_b',
       type: 'list',
       type: 'list',
       children: [
       children: [
         {
         {
           index: '5-7',
           index: '5-7',
-          label: 'template_management',
+          cleaned_field_name: 'template_management',
           path: '/template-management'
           path: '/template-management'
         },
         },
         {
         {
           index: '5-1',
           index: '5-1',
-          label: 'system_message',
+          cleaned_field_name: 'system_message',
           path: '/system-message'
           path: '/system-message'
         },
         },
         {
         {
           index: '5-2',
           index: '5-2',
-          label: 'system_settings',
+          cleaned_field_name: 'system_settings',
           path: '/system-settings'
           path: '/system-settings'
         },
         },
         {
         {
           index: '5-3',
           index: '5-3',
-          label: 'multilingual_config',
+          cleaned_field_name: 'multilingual_config',
           path: '/multilingual-config'
           path: '/multilingual-config'
         },
         },
         {
         {
           index: '5-4',
           index: '5-4',
-          label: 'chat_log',
+          cleaned_field_name: 'chat_log',
           path: '/chat-log'
           path: '/chat-log'
         },
         },
         {
         {
           index: '5-5',
           index: '5-5',
-          label: 'ai_api_log',
+          cleaned_field_name: 'ai_api_log',
           path: '/ai-api-log'
           path: '/ai-api-log'
         },
         },
         {
         {
           index: '5-6',
           index: '5-6',
-          label: 'operation_log',
+          cleaned_field_name: 'operation_log',
           path: '/operation-log'
           path: '/operation-log'
         },
         },
         {
         {
           index: '5-7',
           index: '5-7',
-          label: 'prompt_configuration',
+          cleaned_field_name: 'prompt_configuration',
           path: '/prompt-configuration'
           path: '/prompt-configuration'
         }
         }
       ]
       ]
@@ -246,16 +246,16 @@ const jumpLink = (link: string) => {
           :index="item.path"
           :index="item.path"
         >
         >
           <span class="font_family" :class="[`icon-${item.icon}`]"></span>
           <span class="font_family" :class="[`icon-${item.icon}`]"></span>
-          <template #title>{{ t(`menu.${item.label}`) }}</template>
+          <template #title>{{ t(`menu.${item.cleaned_field_name}`) }}</template>
         </el-menu-item>
         </el-menu-item>
         <el-sub-menu v-else :index="item.index">
         <el-sub-menu v-else :index="item.index">
           <template #title>
           <template #title>
             <div class="font_family" style="font-size: 16px" :class="[`icon-${item.icon}`]"></div>
             <div class="font_family" style="font-size: 16px" :class="[`icon-${item.icon}`]"></div>
-            <span>{{ t(`menu.${item.label}`) }}</span>
+            <span>{{ t(`menu.${item.cleaned_field_name}`) }}</span>
           </template>
           </template>
           <template v-for="childrenItem in item.children" :key="childrenItem.index">
           <template v-for="childrenItem in item.children" :key="childrenItem.index">
             <el-menu-item :index="childrenItem.path">{{
             <el-menu-item :index="childrenItem.path">{{
-              t(`menu.${childrenItem.label}`)
+              t(`menu.${childrenItem.cleaned_field_name}`)
             }}</el-menu-item>
             }}</el-menu-item>
           </template>
           </template>
         </el-sub-menu>
         </el-sub-menu>

+ 1 - 1
src/views/Login/src/loginView.vue

@@ -355,7 +355,7 @@ const firstLoginTipsRef = ref()
   <div
   <div
     class="login"
     class="login"
     v-loading.fullscreen.lock="loginLoading"
     v-loading.fullscreen.lock="loginLoading"
-    element-loading-text="Loading..."
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     :class="{ 'dark-bg': themeStore.theme === 'dark' }"
     :class="{ 'dark-bg': themeStore.theme === 'dark' }"

+ 0 - 1
src/views/MultilingualConfig/src/MultilingualConfig.vue

@@ -195,7 +195,6 @@ const tableData = ref<VxeGridProps<RowItem>>({
   columnConfig: {
   columnConfig: {
     resizable: true
     resizable: true
   },
   },
-  // scrollY: { enabled: true, oSize: 20, gt: 30 },
   emptyText: ' '
   emptyText: ' '
 })
 })
 
 

+ 1 - 1
src/views/Report/src/components/ReportDetail/src/components/FieldsTable.vue

@@ -212,7 +212,7 @@ defineExpose({
 <template>
 <template>
   <div
   <div
     v-loading.fullscreen.lock="exportLoading"
     v-loading.fullscreen.lock="exportLoading"
-    element-loading-text="Loading..."
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
   >
   >

+ 1 - 1
src/views/Tracking/src/components/DownloadAttachment/src/DownloadAttachment.vue

@@ -257,7 +257,7 @@ const handleDownloadAllSelectedFiles = (label?: string) => {
   <div
   <div
     class="tracking-download-attachment"
     class="tracking-download-attachment"
     v-loading.fullscreen.lock="bodyLoading"
     v-loading.fullscreen.lock="bodyLoading"
-    element-loading-text="Loading..."
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     v-vloading="pageLoading"
     v-vloading="pageLoading"

+ 1 - 1
src/views/Tracking/src/components/TrackingTable/src/TrackingTable.vue

@@ -581,7 +581,7 @@ defineExpose({
     style="padding: 0px 24px"
     style="padding: 0px 24px"
     class="tracking-table"
     class="tracking-table"
     v-loading.fullscreen.lock="exportLoading"
     v-loading.fullscreen.lock="exportLoading"
-    element-loading-text="Loading..."
+    :element-loading-text="t('common.loading')"
     element-loading-custom-class="element-loading"
     element-loading-custom-class="element-loading"
     element-loading-background="rgb(43, 47, 54, 0.7)"
     element-loading-background="rgb(43, 47, 54, 0.7)"
   >
   >