Merge branch 'beta' of https://git.cocorobo.cn/jack/PPT into beta

src/components/Message.vue

@@ -127,7 +127,7 @@ defineExpose({
     width: 100%;
   }
   .description {
-    line-height: 1.5;
+    line-height: 1.15;
     color: $textColor;
   }
   .title + .description {

src/hooks/useImport.ts

@@ -1324,7 +1324,7 @@ export default () => {
                 defaultColor: theme.value.fontColor,
                 content: convertFontSizePtToPx(el.content, ratio),
                 style: getStyle(convertFontSizePtToPx(el.content, ratio)),
-                lineHeight: 1.5,
+                lineHeight: 1.15,
                 outline: {
                   color: el.borderColor,
                   width: +(el.borderWidth * ratio).toFixed(2),

src/plugins/directive/tooltip.scss

@@ -4,7 +4,7 @@
   border-radius: $borderRadius;
   padding: 8px;
   font-size: 12px;
-  line-height: 1.5;
+  line-height: 1.15;
 
   .tippy-arrow {
     width: 12px;

src/utils/prosemirror/schema/nodes.ts

@@ -151,7 +151,7 @@ const paragraph: NodeSpec = {
   toDOM: (node: Node) => {
     const { align, indent, textIndent } = node.attrs
     let style = ''
-    if (align && align !== 'left') style += `text-align: ${align};`
+    if (align && align !== 'left') style += `text-align: ${align};text-align-last: ${align};`
     if (textIndent) style += `text-indent: ${textIndent}em;`
 
     const attr: Attr = { style }

src/views/Editor/Remark/Editor.vue

@@ -211,7 +211,7 @@ onUnmounted(() => {
     font-size: 12px;
     overflow: auto;
     padding: 8px;
-    line-height: 1.5;
+    line-height: 1.15;
 
     & > p[data-placeholder]::before {
       content: attr(data-placeholder);

src/views/Mobile/MobileEditor/SlideToolbar.vue

@@ -109,7 +109,7 @@ const handleInputMark = (e: Event) => {
   position: relative;
   flex: 1;
   border-bottom: 1px solid $borderColor;
-  line-height: 1.5;
+  line-height: 1.15;
 
   textarea {
     width: 100%;

src/views/Screen/PresenterView.vue

@@ -298,7 +298,7 @@ const contextmenus = (): ContextmenuItem[] => {
   .remark-content {
     height: calc(100% - 60px);
     padding: 20px;
-    line-height: 1.5;
+    line-height: 1.15;
     @include overflow-overlay();
 
     &.empty {

src/views/Student/index.vue

@@ -4166,7 +4166,7 @@ const clearTimerState = () => {
 }
 
 .layout-content-right {
-  width: 400px;
+  width: 350px;
   height: 100%;
   background-color: #fff;
   border-radius: 5px 0 5px 0;

src/views/components/element/FrameElement/BaseFrameElement.vue

@@ -131,7 +131,7 @@
       72: 'ssAIApp',
       73: 'ssH5Page',
       74: 'ssVideo',
-      75: 'ssBilibili',
+      75: lang.lang == 'cn' ? 'ssBiliVideo' : 'ssYouTube',
       76: 'ssCreateSpace'
     }
     const key = typeMap[type]

src/views/components/element/TableElement/EditableTable.vue

@@ -816,7 +816,7 @@ table {
 
   .cell-text {
     padding: 5px;
-    line-height: 1.5;
+    line-height: 1.15;
     user-select: none;
     cursor: text;
 

src/views/components/element/TableElement/StaticTable.vue

@@ -137,7 +137,7 @@ table {
 
   .cell-text {
     padding: 5px;
-    line-height: 1.5;
+    line-height: 1.15;
   }
 }
 </style>

src/views/components/element/TextElement/BaseTextElement.vue

@@ -77,7 +77,7 @@ const { shadowStyle } = useElementShadow(shadow)
 .element-content {
   position: relative;
   padding: 10px;
-  line-height: 1.5;
+  line-height: 1.15;
   word-break: break-word;
 
   .text {

src/views/components/element/TextElement/index.vue

@@ -195,7 +195,7 @@ watch(isHandleElement, () => {
 .element-content {
   position: relative;
   padding: 10px;
-  line-height: 1.5;
+  line-height: 1.15;
   word-break: break-word;
   cursor: move;
 

src/views/lang/cn.json

@@ -323,6 +323,7 @@
   "ssAIApp": "AI应用",
   "ssH5Page": "H5页面",
   "ssBilibili": "B站视频",
+  "ssYouTube": "YouTube视频",
   "ssCreateSpace": "创作空间",
   "ssInsertCol": "插入列",
   "ssToLeft": "到左侧",

src/views/lang/en.json

@@ -322,7 +322,8 @@
   "ssEssayQ": "Q&A",
   "ssAIApp": "AI Apps",
   "ssH5Page": "Web Page",
-  "ssBilibili": "Bilibili video",
+  "ssBilibili": "Bilibili Video",
+  "ssYouTube": "YouTube Video",
   "ssCreateSpace": "Creative Space",
   "ssInsertCol": "Insert column",
   "ssToLeft": "To left",

src/views/lang/hk.json

@@ -323,6 +323,7 @@
   "ssAIApp": "AI應用",
   "ssH5Page": "H5頁面",
   "ssBilibili": "B站視頻",
+  "ssYouTube": "YouTube視頻",
   "ssCreateSpace": "創作空間",
   "ssInsertCol": "插入列",
   "ssToLeft": "到左側",