From 39770392e69895c5484b46a1a412ba4e7441c5c5 Mon Sep 17 00:00:00 2001 From: JackLee <809262979@qq.com> Date: Thu, 12 Mar 2026 20:50:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=9F=E8=83=BD=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/ets/pages/CustomStyle/ComboBox.ets | 4 +- entry/src/main/ets/pages/CustomStyle/Menu.ets | 52 +++++-- .../ets/pages/LayoutInterface/Layout/CAD.ets | 132 +++++++++++++++++- .../LayoutInterface/Layout/FileModel.ets | 2 +- .../ets/pages/TitleTabLayout/TitleTab.ets | 2 +- .../pages/TitleTabLayout/TitleTabContent.ets | 7 +- 6 files changed, 169 insertions(+), 30 deletions(-) diff --git a/entry/src/main/ets/pages/CustomStyle/ComboBox.ets b/entry/src/main/ets/pages/CustomStyle/ComboBox.ets index cf4b5c26..124805ca 100644 --- a/entry/src/main/ets/pages/CustomStyle/ComboBox.ets +++ b/entry/src/main/ets/pages/CustomStyle/ComboBox.ets @@ -9,7 +9,7 @@ export struct TextComboBox { Menu() { ForEach(this.menu, (item: TitleButton, index: number) => { MenuItem({ content: item.eName }) - .width('150') + .width('auto') .margin({ top: 0, left: 0, @@ -37,7 +37,7 @@ export struct TextInputComboBox { Menu() { ForEach(this.menu, (item: TitleButton, index: number) => { MenuItem({ content: item.eName }) - .width('150') + .width('auto') .margin({ top: 0, left: 0, diff --git a/entry/src/main/ets/pages/CustomStyle/Menu.ets b/entry/src/main/ets/pages/CustomStyle/Menu.ets index 97d948ff..c09941df 100644 --- a/entry/src/main/ets/pages/CustomStyle/Menu.ets +++ b/entry/src/main/ets/pages/CustomStyle/Menu.ets @@ -7,19 +7,25 @@ import { EventBtn } from "./Button"; //主要用于功能组操作菜单.文件下拉菜单等. @ComponentV2 export struct GroupTextEventMenu { - @Param grpEvent:TitleGroup|undefined=undefined; + @Param grpEvent: TitleGroup | undefined = undefined; + @Builder GroupMenu(menus: Array) { - ForEach(menus, (item: TitleMenu, index: number) => { - MenuItem({ startIcon: $r('app.media.'+item.mIcon), content: item.mName }) - .width('150') - .margin({ top: 0, left: 0, bottom: 0, right: 0 - }) - }) + ForEach(menus, (item: TitleMenu, index: number) => { + MenuItem({ startIcon: $r('app.media.' + item.mIcon), content: item.mName }) + .width('auto') + .margin({ + top: 0, + left: 0, + bottom: 0, + right: 0 + }) + }) } - build(){ - Row(){ - if(this.grpEvent!=undefined){ + + build() { + Row() { + if (this.grpEvent != undefined) { //功能组名文本 Blank().width('auto') Text(this.grpEvent.grpName) @@ -55,7 +61,7 @@ export struct MenuBtn { Menu() { ForEach(this.menuBtn, (item: TitleButton, index: number) => { MenuItem({ startIcon: $r('app.media.' + item.eIcon), content: item.eName }) - .width('150') + .width('auto') .margin({ top: 0, left: 0, @@ -67,9 +73,29 @@ export struct MenuBtn { } build() { - if (this.menuBtn != undefined) { - EventBtn({ eventBtn: this.menuBtn[0] }).bindMenu(this.EventMenu) + Column({ space: 2 }) { + if (this.menuBtn != undefined) { + Button() + .bindMenu(this.EventMenu) + .width('35vp') + .height('35vp') + .backgroundImage($r('app.media.' + this.menuBtn[0].eIcon)) + .backgroundImagePosition({ x: '10%', y: '10%' }) + .backgroundColor(Color.Transparent) + .backgroundImageSize({ + width: '80%', // 图片宽度占满按钮 + height: '80%' // 图片高度占满按钮 + }) + Text(this.menuBtn[0].eName) + .fontSize('10fp') + .width('45vp') + .height('10vp') + .textAlign(TextAlign.Center) + } } + .height('50vp') + .width('50vp') + .padding('1vp') } } diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets index 10a1128b..10957c3d 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets @@ -11,16 +11,134 @@ export let TitleCAD:Array=[ //数组表示非单个BtnEvent [ //数组成员区别是GroupEvent还是BtnEvent - [{grpName:'基础模型',grpBtn:[ - {eModel:[ModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""} + [{grpName:'构建',grpBtn:[ + {eModel:[ModelType.BASE],eName:"草图",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""}, + [ + {eModel:[ModelType.BASE],eName:"基准平面",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"基准轴",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"基准坐标系",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"基准平面栅格",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"调整基准坐标系大小",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"打印坐标系",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"点",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"直线",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"圆弧/圆",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"样条",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"艺术样条",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"文本",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"点集",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"参考点云",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""} + ] + ],grpMenu:GroupOption}] as Array, + [{grpName:'基本',grpBtn:[ + [ + {eModel:[ModelType.BASE],eName:"拉伸",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"旋转",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"合并",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"减去",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"求交",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"凸起",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"凸起体",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"组合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"缝合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"补片",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"拼合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"偏置凸起",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"装配切割",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"取消缝合",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"连接面",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"构造实体",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"孔",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"腔",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"槽",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"凸台",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"垫块",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"筋板",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"螺纹",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"剪口",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"轮廓筋板",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"算法特征",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"用户定义",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""} + ], + [ + {eModel:[ModelType.BASE],eName:"边倒圆",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"面倒圆",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"样式倒圆",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"美学面倒圆",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"桥接曲面",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"倒圆拐角",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"样式拐角",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"球形拐角",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"倒斜角",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"拔模",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"拔模体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""} + ], + [ + {eModel:[ModelType.BASE],eName:"修剪体",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"拆分体",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"删除体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"分割面",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"修剪片体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"延伸片体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"修剪和延伸",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"取消修建",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"抽壳",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"加厚",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"缩放体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"包容体",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"包裹几何体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"抽取几何体",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"阵列特征",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"阵列面",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"阵列几何特征",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"阵列体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"镜像面",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"镜像几何特征",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"镜像几何体",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"提升体",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"隔离特征对象",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"偏置面",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"偏置曲面",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"可变偏置",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"变距偏置面",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"大致偏置",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""} + ] + ],grpMenu:GroupOption}] as Array, + [{grpName:'同步建模',grpBtn:[ + [ + {eModel:[ModelType.BASE],eName:"移动",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"删除",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"替换",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"替换圆角",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"偏置",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"调整圆角大小",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"局部比例",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + ], + [ + {eModel:[ModelType.BASE],eName:"复制面",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"剪切面",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"粘贴面",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"镜像面",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"阵列面",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, + ] ],grpMenu:GroupOption}] as Array ] ]}, - {cmName:'曲面',cmPage:'',cmTips:'',cmEvents: [ + {cmName:'基本建模',cmPage:'',cmTips:'',cmEvents: [ //数组表示非单个BtnEvent [ //数组成员区别是GroupEvent还是BtnEvent diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets index bcfa8faa..61d2dc93 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets @@ -10,6 +10,6 @@ export let FileModel:TitleModel={cmName:"文件",cmPage:"",cmTips:"",cmEvents:[ {eModel:[ModelType.BASE],eName:"导入",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"导出",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"选项",eNamed:"",eIcon:"base_preferences",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"退出",eNamed:"",eIcon:"base_exit",eTips:"",eEvent:""}, ]} \ No newline at end of file diff --git a/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets b/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets index b414def8..a5e3628b 100644 --- a/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets +++ b/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets @@ -72,7 +72,7 @@ export struct TitleTab { TitleTabContent({curtLayout:item}) }.align(Alignment.Start) .padding(1) - .margin({ top: 0,left:0,bottom:2,right:0}) + .margin({ top: 0,left:0,bottom:0,right:0}) }) }.scrollable(false) .barHeight(0) diff --git a/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets b/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets index 09b73113..2f665594 100644 --- a/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets +++ b/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets @@ -54,12 +54,6 @@ export struct TitleTabContent { .width('50') .padding('1') .type(ButtonType.Normal) - Button() - .height('5%') - .width('50') - .padding('1') - .type(ButtonType.Normal) - //.bindMenu(this.BtnMenu((row_item as Array))) } } }) @@ -69,5 +63,6 @@ export struct TitleTabContent { .borderColor(Color.Gray) }) }.margin({ top: 1,left:1,bottom:1,right:1}) + .borderWidth(1) } } \ No newline at end of file