Merge branch 'dev' of https://gitee.com/xlsea/ruoyi-plus-soybean into flow

src/locales/langs/en-us.ts

@@ -135,6 +135,9 @@ const local: App.I18n.Schema = {
       },
       multilingual: {
         visible: 'Display multilingual button'
+      },
+      globalSearch: {
+        visible: 'Display GlobalSearch button'
       }
     },
     tab: {
@@ -165,6 +168,20 @@ const local: App.I18n.Schema = {
       visible: 'Watermark Full Screen Visible',
       text: 'Watermark Text'
     },
+    tablePropsTitle: 'Table Props',
+    table: {
+      size: {
+        title: 'Table Size',
+        small: 'Small',
+        medium: 'Medium',
+        large: 'Large'
+      },
+      bordered: 'Bordered',
+      bottomBordered: 'Bottom Bordered',
+      singleColumn: 'Single Column',
+      singleLine: 'Single Line',
+      striped: 'Striped'
+    },
     themeDrawerTitle: 'Theme Configuration',
     pageFunTitle: 'Page Function',
     resetCacheStrategy: {
@@ -222,6 +239,13 @@ const local: App.I18n.Schema = {
     'workflow_process-instance': 'Process Instance',
     workflow_leave: 'Leave Apply'
   },
+  dict: {
+    sys_user_sex: {
+      male: 'Male',
+      female: 'Female',
+      unknown: 'Unknown'
+    }
+  },
   page: {
     login: {
       common: {
@@ -579,6 +603,7 @@ const local: App.I18n.Schema = {
         buttonPermissionList: 'Button Permission List',
         emptyMenu: 'Empty Menu',
         menuDetail: 'Menu Detail',
+        cascadeDeleteContent: 'Cascade delete menu will delete the selected menu and all its sub-menus, are you sure?',
         iconifyTip: 'iconify address：`https://icones.js.org`',
         isFrameTip: 'If you choose External Link, the routing address needs to start with `http(s)://`',
         isCacheTip:
@@ -603,6 +628,10 @@ const local: App.I18n.Schema = {
             required: 'Please select Menu Icon',
             invalid: 'Menu Icon cannot be empty'
           },
+          menuIds: {
+            required: 'Please select Menu',
+            invalid: 'Menu cannot be empty'
+          },
           menuName: {
             required: 'Please enter Menu Name',
             invalid: 'Menu Name cannot be empty'
@@ -660,7 +689,8 @@ const local: App.I18n.Schema = {
         button: 'Button',
         addMenu: 'Add Menu',
         addChildMenu: 'Add Child Menu',
-        editMenu: 'Edit Menu'
+        editMenu: 'Edit Menu',
+        cascadeDelete: 'Cascade Delete Menu'
       },
       notice: {
         title: 'Notice List',