diff --git a/web/src/assets/icon-font/iconfont.css b/web/src/assets/icon-font/iconfont.css index 1ca4efda..dadf7589 100644 --- a/web/src/assets/icon-font/iconfont.css +++ b/web/src/assets/icon-font/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 2479351 */ - src: url('iconfont.woff2?t=1718261316837') format('woff2'), - url('iconfont.woff?t=1718261316837') format('woff'), - url('iconfont.ttf?t=1718261316837') format('truetype'); + src: url('iconfont.woff2?t=1719815803051') format('woff2'), + url('iconfont.woff?t=1719815803051') format('woff'), + url('iconfont.ttf?t=1719815803051') format('truetype'); } .iconfont { @@ -13,6 +13,10 @@ -moz-osx-font-smoothing: grayscale; } +.iconwaikuang:before { + content: "\e640"; +} + .iconhighlight:before { content: "\e6b8"; } diff --git a/web/src/assets/icon-font/iconfont.ttf b/web/src/assets/icon-font/iconfont.ttf index d9c9585d..9b4dcc24 100644 Binary files a/web/src/assets/icon-font/iconfont.ttf and b/web/src/assets/icon-font/iconfont.ttf differ diff --git a/web/src/assets/icon-font/iconfont.woff b/web/src/assets/icon-font/iconfont.woff index d5edbe88..ae10beee 100644 Binary files a/web/src/assets/icon-font/iconfont.woff and b/web/src/assets/icon-font/iconfont.woff differ diff --git a/web/src/assets/icon-font/iconfont.woff2 b/web/src/assets/icon-font/iconfont.woff2 index 4301c47b..a21e2a92 100644 Binary files a/web/src/assets/icon-font/iconfont.woff2 and b/web/src/assets/icon-font/iconfont.woff2 differ diff --git a/web/src/lang/en_us.js b/web/src/lang/en_us.js index 51c7339a..3453d60b 100644 --- a/web/src/lang/en_us.js +++ b/web/src/lang/en_us.js @@ -266,6 +266,7 @@ export default { painter: 'Painter', formula: 'Formula', attachment: 'Attachment', + outerFrame: 'Outer frame', more: 'More', selectFileTip: 'Please select a file', notSupportTip: @@ -357,5 +358,12 @@ export default { lineWidth: 'Line width', padding: 'Padding', animate: 'Animate' + }, + nodeOuterFrame: { + outerFrameSetting: 'Setting', + deleteOuterFrame: 'Delete outer frame', + boxStyle: 'Box style', + boxColor: 'Box color', + fillColor: 'Fill color' } } diff --git a/web/src/lang/zh_cn.js b/web/src/lang/zh_cn.js index c5958717..81a91ff5 100644 --- a/web/src/lang/zh_cn.js +++ b/web/src/lang/zh_cn.js @@ -263,6 +263,7 @@ export default { painter: '格式刷', formula: '公式', attachment: '附件', + outerFrame: '外框', more: '更多', selectFileTip: '请选择文件', notSupportTip: '你的浏览器不支持该功能,或者当前页面非https协议', @@ -349,5 +350,12 @@ export default { lineWidth: '线宽', padding: '内边距', animate: '开启动画' + }, + nodeOuterFrame: { + outerFrameSetting: '外框设置', + deleteOuterFrame: '删除外框', + boxStyle: '边框样式', + boxColor: '边框颜色', + fillColor: '填充颜色' } } diff --git a/web/src/pages/Edit/components/Edit.vue b/web/src/pages/Edit/components/Edit.vue index 60274a5d..46222bec 100644 --- a/web/src/pages/Edit/components/Edit.vue +++ b/web/src/pages/Edit/components/Edit.vue @@ -36,6 +36,7 @@ +
{ // const el = document.createElement('div') // el.style.width = '50px' diff --git a/web/src/pages/Edit/components/NodeOuterFrame.vue b/web/src/pages/Edit/components/NodeOuterFrame.vue new file mode 100644 index 00000000..fc8e7741 --- /dev/null +++ b/web/src/pages/Edit/components/NodeOuterFrame.vue @@ -0,0 +1,358 @@ + + + + + + diff --git a/web/src/pages/Edit/components/Toolbar.vue b/web/src/pages/Edit/components/Toolbar.vue index cad531e2..ec58f8df 100644 --- a/web/src/pages/Edit/components/Toolbar.vue +++ b/web/src/pages/Edit/components/Toolbar.vue @@ -194,7 +194,8 @@ export default { 'associativeLine', 'formula', // 'attachment', - 'annotation' + 'annotation', + 'outerFrame' ], horizontalList: [], verticalList: [], diff --git a/web/src/pages/Edit/components/ToolbarNodeBtnList.vue b/web/src/pages/Edit/components/ToolbarNodeBtnList.vue index d4652c48..c9e4f44b 100644 --- a/web/src/pages/Edit/components/ToolbarNodeBtnList.vue +++ b/web/src/pages/Edit/components/ToolbarNodeBtnList.vue @@ -167,6 +167,17 @@ {{ $t('toolbar.attachment') }}
+
+ + {{ $t('toolbar.outerFrame') }} +