Merge pull request #1508 from dataease/pr@dev@fix_i18n

fix: 翻译优化

backend/src/main/java/io/dataease/base/mapper/ext/HomeMapper.xml

@@ -24,13 +24,15 @@
         inner join panel_group g
             on s.panel_group_id = g.id
         where
-            ( s.target_id = #{userId} and s.type = 0 ) or
-            ( s.target_id = #{deptId} and s.type = 2 ) or
-            ( s.target_id in
-            <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
-                #{roleId}
-            </foreach>
-            and s.type = 1 )
+            g.mobile_layout = 1 and (
+                ( s.target_id = #{userId} and s.type = 0 ) or
+                ( s.target_id = #{deptId} and s.type = 2 ) or
+                ( s.target_id in
+                <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
+                    #{roleId}
+                </foreach>
+                and s.type = 1 )
+            )
         order by s.create_time desc
     </select>
 

frontend/src/lang/en.js

@@ -1278,8 +1278,8 @@ export default {
     link_share_desc: 'After opening the link, anyone can access the dashboard through this link.',
     share: 'Share',
     remove_share_confirm: 'Sure removel All share ?',
-    share_in: 'Share in',
-    share_out: 'Share out',
+    share_in: 'Share With Me',
+    share_out: 'I Share',
     who_share: 'Who share',
     when_share: 'When share',
     share_to: 'Share to',
@@ -1289,7 +1289,7 @@ export default {
     datalist: 'Chart List',
     group: 'Catalogue',
     panel: 'Dashboard',
-    groupAdd: 'Create Catalogue',
+    groupAdd: 'New Group',
     panelAdd: 'Create Dashboard',
     delete: 'Delete',
     move_to: 'Move',
@@ -1325,7 +1325,7 @@ export default {
     create_public_links: 'Create public links',
     to_default: 'Save To Default',
     to_default_panel: 'Save To Default Dashboard',
-    store: 'Store',
+    store: 'Favorites',
     save_to_panel: 'Save to template',
     export_to_panel: 'Export to template',
     export_to_pdf: 'Export to PDF',