diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js index 95c7c6bd..709477cc 100644 --- a/web/src/lang/en_us.js +++ b/web/src/lang/en_us.js @@ -84,7 +84,8 @@ export default { changeRichTextTip3: 'Do you want to switch to non rich text mode?', enableDragImport: 'Is it allowed to directly drag and drop files to the page for import', imgTextMargin: 'Node image and text margin', - textContentMargin: 'Node contents margin' + textContentMargin: 'Node contents margin', + enableInheritAncestorLineStyle: 'Node connection style inherits the style of ancestor nodes', }, color: { moreColor: 'More color' diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js index b8e17232..b508b0cf 100644 --- a/web/src/lang/zh_cn.js +++ b/web/src/lang/zh_cn.js @@ -75,6 +75,7 @@ export default { tagPositionBottom: '文本下面', alwaysShowExpandBtn: '是否一直显示展开收起按钮', enableAutoEnterTextEditWhenKeydown: '键盘输入时自动进入文本编辑', + enableInheritAncestorLineStyle: '节点连线样式继承祖先节点的样式', confirm: '确定', cancel: '取消', changeRichTextTip: diff --git a/web/src/lang/zh_tw.js b/web/src/lang/zh_tw.js index 99a578b3..645d684e 100644 --- a/web/src/lang/zh_tw.js +++ b/web/src/lang/zh_tw.js @@ -42,9 +42,7 @@ export default { notUseRainbowLines: '不使用彩虹線條', outerFramePadding: '外框內距', tagPositionRight: '文本右側', - tagPositionBottom: '文本下面', - alwaysShowExpandBtn: '是否壹直顯示展開收起按鈕', - enableAutoEnterTextEditWhenKeydown: '鍵盤輸入時自動進入文本編輯' + tagPositionBottom: '文本下面' }, setting: { title: '設置', @@ -84,7 +82,10 @@ export default { changeRichTextTip3: '是否切換爲非富文本模式?', enableDragImport: '是否允許直接拖拽文件到頁面進行導入', imgTextMargin: '節點圖片和文本間隔', - textContentMargin: '節點各種內容間隔' + textContentMargin: '節點各種內容間隔', + enableAutoEnterTextEditWhenKeydown: '鍵盤輸入時自動進入文本編輯', + enableInheritAncestorLineStyle: '節點連線樣式繼承祖先節點的樣式', + alwaysShowExpandBtn: '是否壹直顯示展開收起按鈕' }, color: { moreColor: '更多顏色' diff --git a/web/src/pages/Edit/components/BaseStyle.vue b/web/src/pages/Edit/components/BaseStyle.vue index 5871f5f8..59a107fc 100644 --- a/web/src/pages/Edit/components/BaseStyle.vue +++ b/web/src/pages/Edit/components/BaseStyle.vue @@ -1,6 +1,6 @@