.gitignore

@@ -12,3 +12,4 @@ pnpm-lock.yaml
 .env.cklocal
 .vscode/*
 .vscode/settings.json
+launch.json

src/layout/components/Menu/src/Menu.vue

@@ -202,6 +202,35 @@ $prefix-cls: #{$namespace}-menu;
       .#{$elNamespace}-menu-item {
         padding-right: 0;
       }
+
+      &:not(.#{$elNamespace}-menu--collapse) {
+        .#{$elNamespace}-sub-menu__title,
+        .#{$elNamespace}-menu-item {
+          display: flex;
+          align-items: flex-start;
+          min-height: var(--el-menu-item-height);
+          height: auto;
+          padding-top: 10px;
+          padding-bottom: 10px;
+          white-space: normal;
+        }
+
+        .#{$elNamespace}-sub-menu__icon-arrow {
+          margin-top: 8px;
+        }
+
+        .#{$prefix-cls}__title {
+          display: block;
+          flex: 1;
+          min-width: 0;
+          overflow: visible;
+          text-overflow: initial;
+          white-space: normal;
+          overflow-wrap: anywhere;
+          word-break: break-word;
+          line-height: 1.4;
+        }
+      }
     }
   }
 
@@ -228,6 +257,10 @@ $prefix-cls: #{$namespace}-menu;
       }
 
       .#{$prefix-cls}__title {
+        display: inline-block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
         /* stylelint-disable-next-line */
         max-height: calc(var(--top-tool-height) - 2px) !important;
         /* stylelint-disable-next-line */

src/layout/components/Menu/src/components/useRenderMenuTitle.tsx

@@ -10,14 +10,10 @@ export const useRenderMenuTitle = () => {
     return icon ? (
       <>
         <Icon icon={meta.icon}></Icon>
-        <span class="v-menu__title overflow-hidden overflow-ellipsis whitespace-nowrap">
+        <span class="v-menu__title">{t(title as string)}</span>
-          {t(title as string)}
-        </span>
       </>
     ) : (
-      <span class="v-menu__title overflow-hidden overflow-ellipsis whitespace-nowrap">
+      <span class="v-menu__title">{t(title as string)}</span>
-        {t(title as string)}
-      </span>
     )
   }
 

src/locales/en.ts

@@ -546,7 +546,8 @@ export default {
   },
   home: {
     welcome: 'Welcome to use the Besure Digital Intelligent Central Control Platform',
-    message: 'The Besure Digital Intelligent Central Control Platform takes production operation as the core, uniformly integrating key business modules such as production planning, data collection, warehousing, equipment, energy, molds, quality, formulas and report analysis, to achieve full-process digital management from planning to execution, from equipment to products, and from data to decision-making.',
+    message:
+      'The Besure Digital Intelligent Central Control Platform takes production operation as the core, uniformly integrating key business modules such as production planning, data collection, warehousing, equipment, energy, molds, quality, formulas and report analysis, to achieve full-process digital management from planning to execution, from equipment to products, and from data to decision-making.',
     productTitle: 'Overall production overview',
     placeholderCreateTimeStart: 'Start Date',
     placeholderCreateTimeEnd: 'End Date',
@@ -579,7 +580,8 @@ export default {
     failureRate: 'failure rate',
     equipmentTitle: 'Statistics of equipment maintenance quantities',
     equipmentClass: 'Equipment classification statistics',
-    equipmentMessage:'Classify and count by mold type, and select the top 10 items with the largest number of molds.',
+    equipmentMessage:
+      'Classify and count by mold type, and select the top 10 items with the largest number of molds.'
   },
   login: {
     welcome: 'Welcome to the system',
@@ -999,7 +1001,8 @@ export default {
       emailInvalid: 'Please input a valid email address',
       mobileInvalid: 'Please input a valid mobile number',
       importFileRequired: 'Please upload file',
-      importSuccessTip: 'Upload success: {createCount}; Update success: {updateCount}; Update failed: {failureCount};',
+      importSuccessTip:
+        'Upload success: {createCount}; Update success: {updateCount}; Update failed: {failureCount};',
       importFailed: 'Upload failed, please upload again!',
       importFileLimit: 'Only one file can be uploaded!',
       resetPasswordTitle: 'Please input new password for "{username}"',
@@ -1277,7 +1280,7 @@ export default {
       qrcodeEmpty: 'No QR code',
       validatorDeviceCodeRequired: 'Code can not be empty',
       gjTitle: 'Select key components',
-      bjTitle: 'Select spare parts',
+      bjTitle: 'Select spare parts'
     },
     // Critical Component
     EquipmentKeyItems: {
@@ -1327,7 +1330,7 @@ export default {
       placeholderInspectionMethod: 'Please select inspection method',
       placeholderValueType: 'Please select value type',
       placeholderUpperVal: 'Please input upper value',
-      placeholderLowerVal: 'Please input lower value',
+      placeholderLowerVal: 'Please input lower value'
     },
     // Plan Maintenance
     PlanMaintenance: {
@@ -1818,8 +1821,8 @@ export default {
       addButtonText: 'Add',
       exportButtonText: 'Export',
       expandButtonText: 'Expand/Collapse',
-      tableCodeColumn: 'Category Code',
+      tableCodeColumn: 'Code',
-      tableNameColumn: 'Category Name',
+      tableNameColumn: 'Name',
       tableSortColumn: 'Sort',
       tableStatusColumn: 'Status',
       tableCreateTimeColumn: 'Create Time',
@@ -2151,9 +2154,10 @@ export default {
       importFormatLimit: 'Only xls, xlsx format files are allowed.',
       importDownloadTemplate: 'Download template',
       importFileRequired: 'Please upload file',
-      importSuccessTip: 'Upload success: {createCount}; Update success: {updateCount}; Update failed: {failureCount};',
+      importSuccessTip:
+        'Upload success: {createCount}; Update success: {updateCount}; Update failed: {failureCount};',
       importFailed: 'Upload failed, please upload again!',
-      importFileLimit: 'Only one file can be uploaded!',
+      importFileLimit: 'Only one file can be uploaded!'
     },
     CalHoliday: {
       setWorkingDays: 'set working days',
@@ -2216,7 +2220,6 @@ export default {
       validatorClassificationRequired: 'File classification can not be empty',
       validatorTypeRequired: 'File type can not be empty',
       validatorStatusRequired: 'File status can not be empty'
-
     }
   },
 
@@ -2763,7 +2766,7 @@ export default {
       validatorSampleMethodRequired: 'Sampling method can not be empty',
       validatorValRequired: 'Value can not be empty',
       atIntervals: 'at intervals',
-      extraction:'extraction',
+      extraction: 'extraction'
     },
     ZjTask: {
       moduleName: 'Inspection Task',
@@ -3025,7 +3028,8 @@ export default {
       readDialogSubmitButtonText: 'Read',
       readDialogCancelButton: 'Cancel',
       readDeviceConfirmMessage: 'Do you want to read device data?',
-      readDialogOverwriteTip: 'Reading again will overwrite existing device data and manual parameters',
+      readDialogOverwriteTip:
+        'Reading again will overwrite existing device data and manual parameters',
       detailTabDeviceDataLabel: 'Device Data',
       detailTabManualLabel: 'Manual Parameters',
       detailDevicePointNameColumn: 'Point Name',
@@ -3051,7 +3055,7 @@ export default {
       nanualFormRemarkLabel: 'Remark',
       nanualFormRemarkPlaceholder: 'Please enter remark',
       nanualFormInputTimeLabel: 'Input Time',
-      nanualFormInputTimePlaceholder:'Please select input time',
+      nanualFormInputTimePlaceholder: 'Please select input time'
     }
   },
   EnergyManagement: {
@@ -3098,7 +3102,7 @@ export default {
       validatorUnitRequired: 'Unit can not be empty',
       validatorIsEnableRequired: 'Enabled can not be empty',
 
-      exportFilename: 'EnergyType.xls',
+      exportFilename: 'EnergyType.xls'
     },
     EnergyDeviceCheck: {
       moduleName: 'Energy Report',
@@ -3514,7 +3518,8 @@ export default {
       capacityTypeDataCollection: 'Data Collection Capacity',
       inventoryTaskType: 'Inventory Task',
       taskNoDetailWarning: 'Task order {code} has no detail data, cannot be selected',
-      partialTaskNoDetailWarning: 'Some task orders have no detail data, selection has been automatically cancelled',
+      partialTaskNoDetailWarning:
+        'Some task orders have no detail data, selection has been automatically cancelled',
       taskItemNeedPrefix: 'Task Order-',
       detailNoProductWarning: 'Current detail has no related product, cannot set device',
       deviceRelationSaved: 'Device relation saved',
@@ -4137,7 +4142,7 @@ export default {
       messageDeviceInfoMissingForRules: 'Device information is missing, unable to load point rules',
 
       gridView: 'gridView',
-      sudoku:'sudoku',
+      sudoku: 'sudoku'
     },
     RunReport: {
       moduleName: 'Device Operation Report',

src/locales/zh-CN.ts

@@ -547,7 +547,8 @@ export default {
   },
   home: {
     welcome: '欢迎您使用必硕数字化智能中控平台',
-    message: '必硕数字化智能中控平台以生产运营为核心，统一整合生产计划、数据采集、仓储、设备、能源、模具、质量、配方及报表分析等关键业务模块，实现从计划到执行、从设备到制品、从数据到决策的全流程数字化管理。',
+    message:
+      '必硕数字化智能中控平台以生产运营为核心，统一整合生产计划、数据采集、仓储、设备、能源、模具、质量、配方及报表分析等关键业务模块，实现从计划到执行、从设备到制品、从数据到决策的全流程数字化管理。',
     productTitle: '整体生产概况',
     placeholderCreateTimeStart: '开始日期',
     placeholderCreateTimeEnd: '结束日期',
@@ -1269,7 +1270,7 @@ export default {
       qrcodeEmpty: '暂无二维码',
       validatorDeviceCodeRequired: '编码不能为空',
       gjTitle: '选择关键件',
-      bjTitle: '选择备件',
+      bjTitle: '选择备件'
     },
     // 设备关键件
     EquipmentKeyItems: {
@@ -2269,7 +2270,7 @@ export default {
       validatorSampleMethodRequired: '抽检方式不能为空',
       validatorValRequired: '值不能为空',
       atIntervals: '每间隔',
-      extraction:'抽取',
+      extraction: '抽取'
     },
     ZjTask: {
       moduleName: '检验任务',
@@ -2555,8 +2556,7 @@ export default {
       nanualFormReferLabel: '参考值',
       nanualFormReferPlaceholder: '请输入参考值',
       nanualFormRemarkLabel: '备注',
-      nanualFormRemarkPlaceholder: '请输入备注',
+      nanualFormRemarkPlaceholder: '请输入备注'
-
     }
   },
   FactoryModeling: {
@@ -2650,8 +2650,8 @@ export default {
       addButtonText: '新增',
       exportButtonText: '导出',
       expandButtonText: '展开/折叠',
-      tableCodeColumn: '分类编码',
+      tableCodeColumn: '编码',
-      tableNameColumn: '分类名称',
+      tableNameColumn: '名称',
       tableSortColumn: '排序',
       tableStatusColumn: '状态',
       tableCreateTimeColumn: '创建时间',
@@ -2986,7 +2986,7 @@ export default {
       importSuccessTip:
         '上传成功数量：{createCount}；更新成功数量：{updateCount}；更新失败数量：{failureCount}；',
       importFailed: '上传失败，请您重新上传！',
-      importFileLimit: '最多只能上传一个文件！',
+      importFileLimit: '最多只能上传一个文件！'
     },
     //假日管理
     CalHoliday: {
@@ -3046,7 +3046,6 @@ export default {
       validatorNameRequired: '文件名不能为空',
       validatorStatusRequired: '文件状态不能为空'
     }
-
   },
   ProductionPlan: {
     Task: {
@@ -3980,7 +3979,7 @@ export default {
       messageDeviceInfoMissingForRules: '设备信息缺失，无法加载点位规则',
 
       gridView: '表格视图',
-      sudoku:'九宫格',
+      sudoku: '九宫格'
     },
     RunReport: {
       moduleName: '设备运行报表',
@@ -4490,8 +4489,6 @@ export default {
         messageDeviceNoParams: '该设备下没有参数',
         messageFetchChartFailed: '获取图表数据失败'
       }
-
-
     }
   },
   ProductionReport: {