diff --git a/web/src/config/index.js b/web/src/config/index.js index e9b0344f..b0457ded 100644 --- a/web/src/config/index.js +++ b/web/src/config/index.js @@ -4,6 +4,7 @@ import { borderWidthList, borderRadiusList, lineWidthList, + lineHeightList, store, langList, fontFamilyList as fontFamilyListZh, @@ -166,6 +167,7 @@ export { borderWidthList, borderRadiusList, lineWidthList, + lineHeightList, store, colorList, langList, diff --git a/web/src/config/zh.js b/web/src/config/zh.js index 2a41be00..0bd8443f 100644 --- a/web/src/config/zh.js +++ b/web/src/config/zh.js @@ -143,6 +143,9 @@ export const borderRadiusList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] // 线宽 export const lineWidthList = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10] +// 行高 +export const lineHeightList = [1, 1.2, 1.5, 2, 2.5, 3] + export const lineStyleMap = { straight: ``, curve: ``, diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js index 1c2de514..181e661e 100644 --- a/web/src/lang/en_us.js +++ b/web/src/lang/en_us.js @@ -40,7 +40,8 @@ export default { edge: 'Edge', rainbowLines: 'Rainbow lines', notUseRainbowLines: 'Not use rainbow lines', - outerFramePadding: 'Outer frame padding' + outerFramePadding: 'Outer frame padding', + associativeLineStyle: 'Associative line style' }, setting: { title: 'Setting', @@ -74,8 +75,6 @@ export default { watermarkTextOpacity: 'Text opacity', watermarkTextFontSize: 'Font size', belowNode: 'Display below nodes', - tagPositionRight: 'Text right', - tagPositionBottom: 'Text bottom', alwaysShowExpandBtn: 'Always show expand btn', enableAutoEnterTextEditWhenKeydown: 'Auto enter text edit when keydown', confirm: 'Confirm', @@ -420,11 +419,29 @@ export default { animate: 'Animate' }, nodeOuterFrame: { - outerFrameSetting: 'Setting', + outerFrameSetting: 'Outer frame setting', deleteOuterFrame: 'Delete outer frame', boxStyle: 'Box style', boxColor: 'Box color', - fillColor: 'Fill color' + fillColor: 'Fill color', + nodeOuterFrameStyle: 'Outer frame style', + outerFrameText: 'Outer frame text', + deleteOuterFrameText: 'Delete outer frame text', + fontFamily: 'Font family', + color: 'Color', + fontSize: 'font size', + radius: 'Radius', + fontBold: 'Font bold', + italic: 'Italic', + lineHeight: 'Line height', + textFillRadius: 'Text fill radius', + textFill: 'Text fill color', + textAlign: 'Text align', + left: 'Left', + center: 'Center', + right: 'Right', + paddingX: 'Padding x', + paddingY: 'Padding y' }, nodeTagStyle: { placeholder: 'Please enter the tag content', diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js index 6bd967ca..e22e9856 100644 --- a/web/src/lang/zh_cn.js +++ b/web/src/lang/zh_cn.js @@ -39,7 +39,8 @@ export default { edge: '边缘', rainbowLines: '彩虹线条', notUseRainbowLines: '不使用彩虹线条', - outerFramePadding: '外框内边距' + outerFramePadding: '外框内边距', + associativeLineStyle: '关联线样式' }, setting: { title: '设置', @@ -72,8 +73,6 @@ export default { watermarkTextOpacity: '文字透明度', watermarkTextFontSize: '文字字号', belowNode: '显示在节点下方', - tagPositionRight: '文本右侧', - tagPositionBottom: '文本下面', alwaysShowExpandBtn: '是否一直显示展开收起按钮', enableAutoEnterTextEditWhenKeydown: '键盘输入时自动进入文本编辑', enableInheritAncestorLineStyle: '节点连线样式继承祖先节点的样式', @@ -341,7 +340,8 @@ export default { dragTip: '在此释放以导入该文件', deleteNodeImgTip: '是否确认删除该节点图片?', autoOpenNodeRichTextTip: '检测到导入了富文本内容,已自动开启富文本模式', - localStorageExceededTip: '你创建的思维导图体积已经超过浏览器允许存储的上限,请立即导出,否则数据将丢失!建议下载客户端进行使用,客户端无大小限制。' + localStorageExceededTip: + '你创建的思维导图体积已经超过浏览器允许存储的上限,请立即导出,否则数据将丢失!建议下载客户端进行使用,客户端无大小限制。' }, mouseAction: { tip1: '当前:左键拖动画布,右键框选节点', @@ -407,11 +407,29 @@ export default { animate: '开启动画' }, nodeOuterFrame: { - outerFrameSetting: '外框设置', + nodeOuterFrameStyle: '外框样式', + outerFrameSetting: '外框', deleteOuterFrame: '删除外框', boxStyle: '边框样式', boxColor: '边框颜色', - fillColor: '填充颜色' + fillColor: '填充颜色', + outerFrameText: '外框文字', + deleteOuterFrameText: '删除文字', + fontFamily: '字体', + color: '颜色', + fontSize: '字号', + radius: '圆角', + fontBold: '加粗', + italic: '斜体', + lineHeight: '行高', + textFillRadius: '背景圆角', + textFill: '背景填充', + textAlign: '显示位置', + left: '左', + center: '中', + right: '右', + paddingX: '水平内边距', + paddingY: '垂直内边距' }, nodeTagStyle: { placeholder: '请输入标签内容', diff --git a/web/src/lang/zh_tw.js b/web/src/lang/zh_tw.js index 533a77a1..ad928f79 100644 --- a/web/src/lang/zh_tw.js +++ b/web/src/lang/zh_tw.js @@ -41,8 +41,7 @@ export default { rainbowLines: '彩虹線條', notUseRainbowLines: '不使用彩虹線條', outerFramePadding: '外框內距', - tagPositionRight: '文本右側', - tagPositionBottom: '文本下面' + associativeLineStyle: '關聯線樣式' }, setting: { title: '設置', @@ -274,7 +273,8 @@ export default { bottom: '下', left: '左', right: '右', - tag: '標簽' + tag: '標簽', + direction: '方向' }, theme: { title: '主題', @@ -407,11 +407,29 @@ export default { animate: '動畫' }, nodeOuterFrame: { - outerFrameSetting: '外框設定', + outerFrameSetting: '外框', deleteOuterFrame: '刪除外框', boxStyle: '邊框樣式', boxColor: '邊框顏色', - fillColor: '填充顏色' + fillColor: '填充顏色', + nodeOuterFrameStyle: '外框樣式', + outerFrameText: '外框文字', + deleteOuterFrameText: '刪除文字', + fontFamily: '字型', + color: '顏色', + fontSize: '字型大小', + radius: '圓角', + fontBold: '加粗', + italic: '斜體', + lineHeight: '行高', + textFillRadius: '背景圓角', + textFill: '背景填充', + textAlign: '顯示位置', + left: '左', + center: '中', + right: '右', + paddingX: '水平內邊距', + paddingY: '垂直內邊距' }, nodeTagStyle: { placeholder: '請輸入標籤內容', diff --git a/web/src/pages/Edit/components/NodeOuterFrame.vue b/web/src/pages/Edit/components/NodeOuterFrame.vue index 2f5a5e19..e218d011 100644 --- a/web/src/pages/Edit/components/NodeOuterFrame.vue +++ b/web/src/pages/Edit/components/NodeOuterFrame.vue @@ -1,15 +1,6 @@