From a4a6528a369d3f3d9b2a09385447bdf8eca300e3 Mon Sep 17 00:00:00 2001 From: JackLee <809262979@qq.com> Date: Sat, 21 Mar 2026 17:47:48 +0800 Subject: [PATCH] =?UTF-8?q?FileMenu=E7=9A=84=E7=BB=84=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B,=E6=95=B0=E6=8D=AE=E5=BD=92=E4=B8=80?= =?UTF-8?q?=E5=8C=96=E9=87=87=E7=94=A8TitleButton=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B.=E6=96=B9=E4=BE=BF=E5=90=8E=E7=BB=AD?= =?UTF-8?q?=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/pages/CustomStyle/Button.ets | 50 ++++++--------- .../src/main/ets/pages/CustomStyle/Dialog.ets | 1 - .../main/ets/pages/CustomStyle/Expandable.ets | 2 - entry/src/main/ets/pages/CustomStyle/Menu.ets | 63 +++++++++++++++---- .../Interface/GroupInterface.ets | 3 +- .../LayoutInterface/Interface/Interface.ets | 3 +- .../Interface/MenuInterface.ets | 11 ++-- .../LayoutInterface/Layout/ActionOption.ets | 10 --- .../ets/pages/LayoutInterface/Layout/CAD.ets | 26 ++++---- .../ets/pages/LayoutInterface/Layout/CAE.ets | 14 ++--- .../ets/pages/LayoutInterface/Layout/CAM.ets | 10 +-- .../LayoutInterface/Layout/FileMenuData.ets | 9 +++ .../LayoutInterface/Layout/FileModel.ets | 16 ----- .../LayoutInterface/Layout/GroupAction.ets | 9 +++ .../LayoutInterface/Layout/GroupOption.ets | 9 --- .../{LayoutOption.ets => LayoutSwitch.ets} | 2 +- .../pages/LayoutInterface/Layout/MainPage.ets | 29 --------- .../LayoutInterface/Layout/MatrixModel.ets | 6 +- .../LayoutInterface/Layout/MenuAction.ets | 10 +++ ...{SelectionMode.ets => SelectionFilter.ets} | 2 +- .../Layout/TitleDefaultBars.ets | 29 +++++++++ .../{TabContent.ets => TitleTabData.ets} | 10 +-- .../ets/pages/TitleLayout/TitleColumnSub.ets | 13 ++-- .../main/ets/pages/TitleLayout/TitleTab.ets | 34 +++------- .../ets/pages/TitleLayout/TitleTabContent.ets | 2 +- 25 files changed, 185 insertions(+), 188 deletions(-) delete mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/ActionOption.ets create mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/FileMenuData.ets delete mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets create mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets delete mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/GroupOption.ets rename entry/src/main/ets/pages/LayoutInterface/Layout/{LayoutOption.ets => LayoutSwitch.ets} (94%) delete mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/MainPage.ets create mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets rename entry/src/main/ets/pages/LayoutInterface/Layout/{SelectionMode.ets => SelectionFilter.ets} (95%) create mode 100644 entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets rename entry/src/main/ets/pages/LayoutInterface/Layout/{TabContent.ets => TitleTabData.ets} (60%) diff --git a/entry/src/main/ets/pages/CustomStyle/Button.ets b/entry/src/main/ets/pages/CustomStyle/Button.ets index ff2147cb..c92a9d3b 100644 --- a/entry/src/main/ets/pages/CustomStyle/Button.ets +++ b/entry/src/main/ets/pages/CustomStyle/Button.ets @@ -2,8 +2,10 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; import { ExecuteCommand } from '../EventSubWindow/ExecuteCommand'; import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; import { TitleModel } from "../LayoutInterface/Interface/ModelInterface"; -import { TitleData } from '../LayoutInterface/Layout/TabContent'; +import { TitleTabData } from '../LayoutInterface/Layout/TitleTabData'; import { mwInfo } from '../AppStorageV2Class'; +import {BaseMenu } from './Menu'; +import { BaseMenuData } from '../LayoutInterface/Interface/MenuInterface'; //按钮统一尺寸,该按钮为正方形,所以以主窗口宽为基准,长=高->正方形 let ebWidth=mwInfo.mainWindowWidth*0.02; @@ -23,7 +25,7 @@ export struct EventBtn { //普通功能按钮调用的数据 @Param eventBtn: TitleButton | undefined = undefined; //模块切换模块按钮数据 - @Consumer('curtModel') curtModel: Array | undefined = TitleData.mModels.get(0) + @Consumer('curtModel') curtModel: Array | undefined = TitleTabData.mModels.get(0) build() { Column({ space: 2 }) { @@ -59,11 +61,11 @@ export struct EventBtn { }) .onClick(() => { if (this.eventBtn?.eEvent == 'Switch_Model_CAD') { - this.curtModel = TitleData.mModels.get(1) + this.curtModel = TitleTabData.mModels.get(1) } else if (this.eventBtn?.eEvent == 'Switch_Model_CAM') { - this.curtModel = TitleData.mModels.get(2) + this.curtModel = TitleTabData.mModels.get(2) } else if (this.eventBtn?.eEvent == 'Switch_Model_CAE') { - this.curtModel = TitleData.mModels.get(3) + this.curtModel = TitleTabData.mModels.get(3) } }) } @@ -90,24 +92,15 @@ export struct EventBtn { export struct MenuBtn { @Param menuBtn: Array | undefined = undefined; @Local curtIndex:number=0; - @Builder - EventMenu() { - Menu() { - ForEach(this.menuBtn, (item: TitleButton, index: number) => { - MenuItem({ startIcon: $r('app.media.' + item.eIcon), content: item.eName }) - .onClick(()=>{ - this.curtIndex=index; - ExecuteCommand(item as TitleButton); - }).size({height: ebWidth}) - }) - }.fontSize(20) - } - + @Local argsMenu:BaseMenuData= { + aMenus: this.menuBtn as Array>, + aIndex: this.curtIndex + }; build() { Column({ space: 0 }) { if (this.menuBtn != undefined) { Button() - .bindMenu(this.EventMenu) + .bindMenu(BaseMenu(this.argsMenu)) .width(ebWidth) .height(ebHeigth) .backgroundImage($r('app.media.' + this.menuBtn[this.curtIndex].eIcon)) @@ -119,7 +112,7 @@ export struct MenuBtn { }) Button() .type(ButtonType.Normal) - .bindMenu(this.EventMenu) + .bindMenu(BaseMenu(this.argsMenu)) .width(ebWidth) .height(edHeigth) .backgroundImage($r('app.media.base_chevron_down')) @@ -142,16 +135,11 @@ export struct MenuBtn { export struct SubColumnMenu { @Param menus: Array| undefined = undefined; @Param icon:string=''; - @Builder - EventMenu() { - Menu() { - ForEach(this.menus, (item: TitleButton, index: number) => { - MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName }) - .width('150') - .size({height: mwInfo.mainWindowWidth*0.02}) - }) - }.fontSize(20) - } + @Local curtIndex:number=0; + @Local argsMenu:BaseMenuData= { + aMenus: this.menus as Array>, + aIndex: this.curtIndex + }; build(){ Row(){ Button() @@ -165,7 +153,7 @@ export struct SubColumnMenu { width: '90%', // 图片宽度占满按钮 height: '90%' // 图片高度占满按钮 }) - .bindMenu(this.EventMenu()) + .bindMenu(BaseMenu(this.argsMenu)) .type(ButtonType.Normal) } } diff --git a/entry/src/main/ets/pages/CustomStyle/Dialog.ets b/entry/src/main/ets/pages/CustomStyle/Dialog.ets index 6b05ab38..cebfbe30 100644 --- a/entry/src/main/ets/pages/CustomStyle/Dialog.ets +++ b/entry/src/main/ets/pages/CustomStyle/Dialog.ets @@ -1,6 +1,5 @@ import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; import {SwitchView} from "../LayoutInterface/Layout/SwitchView" -import { Popup } from "@kit.ArkUI"; //视图切换弹窗 @CustomDialog diff --git a/entry/src/main/ets/pages/CustomStyle/Expandable.ets b/entry/src/main/ets/pages/CustomStyle/Expandable.ets index b8f868d8..3b4233be 100644 --- a/entry/src/main/ets/pages/CustomStyle/Expandable.ets +++ b/entry/src/main/ets/pages/CustomStyle/Expandable.ets @@ -1,6 +1,4 @@ - -//一个复合式折叠组件 @ComponentV2 export struct Expandable { // 通过属性传入的标题和内容 diff --git a/entry/src/main/ets/pages/CustomStyle/Menu.ets b/entry/src/main/ets/pages/CustomStyle/Menu.ets index a7d3fec4..df55a097 100644 --- a/entry/src/main/ets/pages/CustomStyle/Menu.ets +++ b/entry/src/main/ets/pages/CustomStyle/Menu.ets @@ -1,25 +1,64 @@ -import { TitleMenu } from "../LayoutInterface/Interface/MenuInterface"; import { TitleGroup } from "../LayoutInterface/Interface/GroupInterface"; import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; import { ExecuteCommand } from "../EventSubWindow/ExecuteCommand"; import { mwInfo } from "../AppStorageV2Class"; +import { BaseMenuData } from "../LayoutInterface/Interface/MenuInterface"; +//按钮统一尺寸,该按钮为正方形,所以以主窗口宽为基准,长=高->正方形 +let ebWidth=mwInfo.mainWindowWidth*0.02; +let ebHeigth=mwInfo.mainWindowWidth*0.02; + + +//不带Index的Menu +@Builder +export function BaseMenu(indexMenu:BaseMenuData) { + Menu() { + ForEach(indexMenu.aMenus, (item: TitleButton|Array, index: number) => { + //如果是功能组则 + if(Array.isArray(item)){ + MenuItem({ + startIcon: $r('app.media.' + item[0].eIcon), + content: item[0].eName, + builder: SubMenu(item) + }) + }else{ + MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName }) + .onClick(()=> { + indexMenu.aIndex = index; + ExecuteCommand(item as TitleButton); + }) + .size({height: ebWidth}) + } + }) + }.fontSize(20) +} + +@Builder +export function SubMenu(subMenu:Array){ + Menu() { + ForEach(subMenu, (subItem: TitleButton, index: number) => { + MenuItem({ + startIcon: $r('app.media.' + subItem.eIcon), + content: subItem.eName, + }) + .onClick(() => { + ExecuteCommand(subItem as TitleButton); + }) + .size({ height: ebWidth }) + }) + }.fontSize(20) +} + //菜单按钮 //主要用于功能组操作菜单.文件下拉菜单等. @ComponentV2 export struct GroupTextEventMenu { @Param grpEvent: TitleGroup | undefined = undefined; - - @Builder - GroupMenu(menus: Array) { - Menu() { - ForEach(menus, (item: TitleMenu, index: number) => { - MenuItem({ startIcon: $r('app.media.' + item.mIcon), content: item.mName }) - .size({height: mwInfo.mainWindowWidth*0.02}) - }) - }.fontSize(20) - } + @Local argsMenu:BaseMenuData= { + aMenus: this.grpEvent?.grpMenu as Array>, + aIndex: 0 + }; build() { Row() { if (this.grpEvent != undefined) { @@ -39,7 +78,7 @@ export struct GroupTextEventMenu { width: '90%', // 图片宽度占满按钮 height: '90%' // 图片高度占满按钮 }) - .bindMenu(this.GroupMenu(this.grpEvent.grpMenu)) + .bindMenu(BaseMenu(this.argsMenu)) .backgroundColor(Color.Transparent) } }.align(Alignment.BottomEnd) diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets index c879493e..7ff535b7 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets @@ -1,4 +1,3 @@ -import { TitleMenu } from "./MenuInterface"; import { TitleButton } from "./ButtonInterface"; //功能组 @@ -8,5 +7,5 @@ export interface TitleGroup{ //按钮列表 grpBtn:Array> //功能组菜单 - grpMenu:Array + grpMenu:Array } \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets index bbf62a76..6248c065 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets @@ -1,3 +1,4 @@ +import { TitleGroup } from "./GroupInterface"; import { TitleModel } from "./ModelInterface"; //Title配置 @@ -5,7 +6,7 @@ export interface TitleInterface{ //Title配置ID名(唯一) mId:string; //基础模块 - mFileModel:TitleModel + mFileModel:Array> //功能模块 mModels:Map> } diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets index 92233b2b..ff078448 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets @@ -1,7 +1,6 @@ -export interface TitleMenu{ - mName:string - mIcon:string - mTips:string - mPage:string - mEvent:string +import { TitleButton } from "./ButtonInterface" + +export interface BaseMenuData { + aMenus: Array> + aIndex:number } \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/ActionOption.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/ActionOption.ets deleted file mode 100644 index 1153ff07..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/ActionOption.ets +++ /dev/null @@ -1,10 +0,0 @@ -import { TitleMenu } from "../Interface/MenuInterface"; - -//功能布局数据 -export let ActionOption:Array=[ - {mName:'增功能',mIcon:'',mPage:'',mTips:"",mEvent:''}, - {mName:'编辑组',mIcon:'',mPage:'',mTips:"",mEvent:''}, - {mName:'改图标',mIcon:'',mPage:'',mTips:"",mEvent:''}, - {mName:'重命名',mIcon:'',mPage:'',mTips:"",mEvent:''}, - {mName:'移动到',mIcon:'',mPage:'',mTips:"",mEvent:''} -] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets index 7d3d094c..154d48f8 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets @@ -1,12 +1,12 @@ -import { TitleModel } from "./TabContent"; -import {TitleMainPage} from './MainPage' +import { TitleModel } from "./TitleTabData"; +import {TitleDefaultBars} from './TitleDefaultBars' import {ModelType} from './ModelType' -import { GroupOption } from "./GroupOption"; +import { GroupActionMenu } from "./GroupAction"; import { TitleGroup } from "../Interface/GroupInterface"; import { MatrixModel ,DevModel} from "./MatrixModel"; export let TitleCAD:Array=[ - TitleMainPage[0], + TitleDefaultBars[0], {cmName:'建模',cmPage:'',cmTips:'',cmEvents: [ //数组表示非单个BtnEvent [ @@ -31,7 +31,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"点集",eNamed:"",ePage:'',eIcon:"sketch_point_set",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"参考点云",eNamed:"",ePage:'',eIcon:"sketch_reference_point_cloud",eTips:"",eEvent:""} ] - ],grpMenu:GroupOption}] as Array, + ],grpMenu:GroupActionMenu}] as Array, [{grpName:'基本',grpBtn:[ [ {eModel:[ModelType.BASE],eName:"拉伸",eNamed:"",ePage:'',eIcon:"modeling_extrude",eTips:"",eEvent:""}, @@ -118,7 +118,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"变距偏置面",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_offset_face_variable",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"大致偏置",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_rough_offset",eTips:"",eEvent:""} ] - ],grpMenu:GroupOption}] as Array, + ],grpMenu:GroupActionMenu}] as Array, [{grpName:'同步建模',grpBtn:[ [ {eModel:[ModelType.BASE],eName:"移动",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_move_face",eTips:"",eEvent:""}, @@ -178,7 +178,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"更新模型",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_updatemodel",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"更新特征",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_renew_feature",eTips:"",eEvent:""}, ] - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, {cmName:'基本建模',cmPage:'',cmTips:'',cmEvents: [ @@ -191,7 +191,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, {cmName:'曲线',cmPage:'',cmTips:'',cmEvents: [ @@ -204,7 +204,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, {cmName:'同步建模',cmPage:'',cmTips:'',cmEvents: [ @@ -217,7 +217,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, {cmName:'分析',cmPage:'',cmTips:'',cmEvents: [ @@ -230,7 +230,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, {cmName:'显示',cmPage:'',cmTips:'',cmEvents: [ @@ -243,7 +243,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, {cmName:'首选项',cmPage:'',cmTips:'',cmEvents: [ @@ -256,7 +256,7 @@ export let TitleCAD:Array=[ {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, MatrixModel, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets index 5d48a421..004d0b24 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets @@ -1,13 +1,13 @@ -import { TitleModel } from "./TabContent"; -import {TitleMainPage} from './MainPage' +import { TitleModel } from "./TitleTabData"; +import {TitleDefaultBars} from './TitleDefaultBars' import {ModelType} from './ModelType' -import { GroupOption } from "./GroupOption"; +import { GroupActionMenu } from "./GroupAction"; import { TitleGroup } from "../Interface/GroupInterface"; import { MatrixModel ,DevModel} from "./MatrixModel"; import { TitleButton } from "../Interface/ButtonInterface"; export let TitleCAE:Array=[ - TitleMainPage[0], + TitleDefaultBars[0], {cmName:'仿真',cmPage:'',cmTips:'',cmEvents: [ //数组表示非单个BtnEvent [ @@ -23,13 +23,13 @@ export let TitleCAE:Array=[ ] as Array, {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, MatrixModel, DevModel ] -export let TitleCAM:Array=[TitleMainPage[0], +export let TitleCAM:Array=[TitleDefaultBars[0], {cmName:'仿真',cmPage:'',cmTips:'',cmEvents: [ //数组表示非单个BtnEvent [ @@ -45,7 +45,7 @@ export let TitleCAM:Array=[TitleMainPage[0], ] as Array, {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, MatrixModel, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets index dc8d59c1..a1acd1a2 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets @@ -1,13 +1,13 @@ -import { TitleModel } from "./TabContent"; -import {TitleMainPage} from './MainPage' +import { TitleModel } from "./TitleTabData"; +import {TitleDefaultBars} from './TitleDefaultBars' import {ModelType} from './ModelType' -import { GroupOption } from "./GroupOption"; +import { GroupActionMenu } from "./GroupAction"; import { TitleGroup } from "../Interface/GroupInterface"; import { MatrixModel,DevModel } from "./MatrixModel"; import { TitleButton } from "../Interface/ButtonInterface"; export let TitleCAM:Array=[ - TitleMainPage[0], + TitleDefaultBars[0], {cmName:'加工',cmPage:'',cmTips:'',cmEvents: [ //数组表示非单个BtnEvent [ @@ -24,7 +24,7 @@ export let TitleCAM:Array=[ {eModel:[ModelType.BASE],eName:"新建工序",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"新建刀具",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""}, {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ] ]}, MatrixModel, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/FileMenuData.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/FileMenuData.ets new file mode 100644 index 00000000..cbeaec7b --- /dev/null +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/FileMenuData.ets @@ -0,0 +1,9 @@ +import { TitleButton } from "../Interface/ButtonInterface"; +import { BaseMenuData } from "../Interface/MenuInterface"; +import { TitleTabData } from "./TitleTabData"; + +//文件菜单数据初始化 +export let FileMenuData:BaseMenuData= { + aMenus: TitleTabData.mFileModel[0][0].grpBtn, + aIndex: 0 +}; \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets deleted file mode 100644 index d03bfda9..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets +++ /dev/null @@ -1,16 +0,0 @@ -import { TitleModel } from "../Interface/ModelInterface"; -import { ModelType } from "./ModelType"; - -//文件模块布局数据 -export let FileModel:TitleModel={cmName:"文件",cmPage:"",cmTips:"",cmEvents:[ - {eModel:[ModelType.BASE],eName:"新建",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"打开",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"保存",eNamed:"",ePage:'',eIcon:"base_save_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"关闭",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导入",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"首选项",eNamed:"",ePage:'',eIcon:"base_properties",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"工具",eNamed:"",ePage:'',eIcon:"base_tools",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"退出",eNamed:"",ePage:'',eIcon:"base_exit_icon",eTips:"",eEvent:""}, -]} diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets new file mode 100644 index 00000000..7381ed74 --- /dev/null +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets @@ -0,0 +1,9 @@ +import { TitleButton } from "../Interface/ButtonInterface"; +import { ModelType } from "./ModelType"; +//功能主的操作功能布局数据 +export let GroupActionMenu:Array=[ +{eModel:[ModelType.BASE],eName:"增加功能",eNamed:"",ePage:'',eIcon:"",eTips:"正三轴测图",eEvent:""}, +{eModel:[ModelType.BASE],eName:"编辑功能组",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, +{eModel:[ModelType.BASE],eName:"删除功能组",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, +{eModel:[ModelType.BASE],eName:"移动功能组",eNamed:"",ePage:'',eIcon:"",eTips:"正等测图",eEvent:""} +] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/GroupOption.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/GroupOption.ets deleted file mode 100644 index 7f42030c..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/GroupOption.ets +++ /dev/null @@ -1,9 +0,0 @@ -import { TitleMenu } from "../Interface/MenuInterface"; - -//功能主的操作功能布局数据 -export let GroupOption:Array=[ - {mName:'增加功能',mIcon:'',mPage:'',mTips:"",mEvent:''}, - {mName:'编辑功能组',mIcon:'',mPage:'',mTips:"",mEvent:''}, - {mName:'删除功能组',mIcon:'',mPage:'',mTips:"",mEvent:''}, - {mName:'移动功能组',mIcon:'',mPage:'',mTips:"",mEvent:''} -] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutOption.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets similarity index 94% rename from entry/src/main/ets/pages/LayoutInterface/Layout/LayoutOption.ets rename to entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets index 8e4d1d23..27ba1840 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutOption.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets @@ -2,7 +2,7 @@ import { TitleButton } from "../Interface/ButtonInterface"; import { ModelType } from "./ModelType"; //视图选择布局数据 -export let LayoutOption:Array=[ +export let LayoutSwitch:Array=[ {eModel:[ModelType.BASE],eName:"图层设置",eNamed:"",ePage:'',eIcon:"layer_settings",eTips:"正三轴测图",eEvent:""}, {eModel:[ModelType.BASE],eName:"视图中可见图层",eNamed:"",ePage:'',eIcon:"layer_vis_in_view",eTips:"俯视图",eEvent:""}, {eModel:[ModelType.BASE],eName:"图层类别",eNamed:"",ePage:'',eIcon:"layer_category",eTips:"正等测图",eEvent:""}, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MainPage.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/MainPage.ets deleted file mode 100644 index 975f1b4b..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/MainPage.ets +++ /dev/null @@ -1,29 +0,0 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { TitleGroup } from "../Interface/GroupInterface"; -import { DevModel, MatrixModel } from "./MatrixModel"; -import { ModelType } from "./ModelType"; -import { GroupOption } from "./GroupOption"; -import { TitleModel } from "./TabContent"; -import { FileModel } from "./FileModel"; - -//主页栏目布局数据 -export let TitleMainPage:Array= - [ - {cmName:'主页',cmPage:'',cmTips:'',cmEvents: [[[{grpName:'文件功能组',grpBtn:[ - {eModel:[ModelType.BASE],eName:"新建",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"打开",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - [ - {eModel:[ModelType.BASE],eName:"保存",eNamed:"",ePage:'',eIcon:"base_save_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"另存为",eNamed:"",ePage:'',eIcon:"base_saveas_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"保存全部",eNamed:"",ePage:'',eIcon:"base_saveall_file",eTips:"",eEvent:""}, - ] as Array, - {eModel:[ModelType.BASE],eName:"关闭",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导入",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_properties",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, - ], - grpMenu:GroupOption}] as Array]]}, - MatrixModel, - DevModel - ] diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets index a3145721..0fa49de2 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets @@ -1,6 +1,6 @@ import { TitleGroup } from '../Interface/GroupInterface' import {TitleModel} from '../Interface/ModelInterface' -import { GroupOption } from './GroupOption' +import { GroupActionMenu } from './GroupAction' import { ModelType } from './ModelType' //模块矩阵布局数据 @@ -10,7 +10,7 @@ export let MatrixModel:TitleModel= { {eModel:[ModelType.BASE],eName:"建模",eNamed:"",ePage:'',eIcon:"base_model_cad",eTips:"",eEvent:"Switch_Model_CAD"}, {eModel:[ModelType.BASE],eName:"加工",eNamed:"",ePage:'',eIcon:"base_model_cam",eTips:"",eEvent:"Switch_Model_CAM"}, {eModel:[ModelType.BASE],eName:"仿真",eNamed:"",ePage:'',eIcon:"base_model_cae",eTips:"",eEvent:"Switch_Model_CAE"}, - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ]] } //模块矩阵布局数据 @@ -22,6 +22,6 @@ export let DevModel:TitleModel= { {eModel:[ModelType.BASE],eName:"创建子窗体",eNamed:"",ePage:'pages/EventSubWindow/SWExtrude',eIcon:"base_new_file",eTips:"",eEvent:"Execute_CreateSubWindow"}, {eModel:[ModelType.BASE],eName:"关闭子窗体",eNamed:"",ePage:'pages/EventSubWindow/SWExtrude',eIcon:"base_new_file",eTips:"",eEvent:"Execute_ExitSubWindow"}, ] - ],grpMenu:GroupOption}] as Array + ],grpMenu:GroupActionMenu}] as Array ]] } \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets new file mode 100644 index 00000000..3b575632 --- /dev/null +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets @@ -0,0 +1,10 @@ +import { TitleButton } from "../Interface/ButtonInterface"; +import { ModelType } from "./ModelType"; +//功能布局数据 +export let MenuAction:Array=[ + {eModel:[ModelType.BASE],eName:"增功能",eNamed:"",ePage:'',eIcon:"",eTips:"增功能",eEvent:""}, + {eModel:[ModelType.BASE],eName:"编辑组",eNamed:"",ePage:'',eIcon:"",eTips:"编辑组",eEvent:""}, + {eModel:[ModelType.BASE],eName:"改图标",eNamed:"",ePage:'',eIcon:"",eTips:"改图标",eEvent:""}, + {eModel:[ModelType.BASE],eName:"重命名",eNamed:"",ePage:'',eIcon:"",eTips:"重命名",eEvent:""}, + {eModel:[ModelType.BASE],eName:"移动到",eNamed:"",ePage:'',eIcon:"",eTips:"移动到",eEvent:""}, +] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionMode.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets similarity index 95% rename from entry/src/main/ets/pages/LayoutInterface/Layout/SelectionMode.ets rename to entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets index a2b5a58c..577b4c22 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionMode.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets @@ -2,7 +2,7 @@ import { TitleButton } from "../Interface/ButtonInterface"; import { ModelType } from "./ModelType"; //拾取器过滤布局数据 -export let SelectionMode:Array=[ +export let SelectionFilter:Array=[ {eModel:[ModelType.BASE],eName:"实体特征",eNamed:"",ePage:'',eIcon:"",eTips:"正三轴测图",eEvent:""}, {eModel:[ModelType.BASE],eName:"曲线特征",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, {eModel:[ModelType.BASE],eName:"加工特征",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets new file mode 100644 index 00000000..090e15a7 --- /dev/null +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets @@ -0,0 +1,29 @@ +import { TitleButton } from "../Interface/ButtonInterface"; +import { TitleGroup } from "../Interface/GroupInterface"; +import { DevModel, MatrixModel } from "./MatrixModel"; +import { ModelType } from "./ModelType"; +import { GroupActionMenu } from "./GroupAction"; +import { TitleModel } from "./TitleTabData"; + +//主页栏目布局数据 +export let TitleDefaultBars:Array= + [ + {cmName:'主页',cmPage:'',cmTips:'',cmEvents: + [[[{ grpName:'文件', grpBtn: + [ + {eModel:[ModelType.BASE],eName:"新建",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"打开",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, + [ + {eModel:[ModelType.BASE],eName:"保存",eNamed:"",ePage:'',eIcon:"base_save_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"另存为",eNamed:"",ePage:'',eIcon:"base_saveas_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"保存全部",eNamed:"",ePage:'',eIcon:"base_saveall_file",eTips:"",eEvent:""}, + ] as Array, + {eModel:[ModelType.BASE],eName:"关闭",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"导入",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"导出",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_properties",eTips:"",eEvent:""}, + {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, + ], grpMenu:GroupActionMenu }] as Array]]}, + MatrixModel, + DevModel + ] diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TabContent.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets similarity index 60% rename from entry/src/main/ets/pages/LayoutInterface/Layout/TabContent.ets rename to entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets index 20f0fc86..0f25c567 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TabContent.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets @@ -1,17 +1,17 @@ -import { FileModel } from './FileModel' import { TitleInterface } from '../Interface/Interface' import { TitleModel } from '../Interface/ModelInterface' -import { TitleMainPage } from './MainPage' +import { TitleDefaultBars } from './TitleDefaultBars' import {TitleCAD} from './CAD' import {TitleCAM} from './CAM' import {TitleCAE} from './CAE' +import { TitleGroup } from '../Interface/GroupInterface' //Title栏得布局数据 -export let TitleData:TitleInterface= { +export let TitleTabData:TitleInterface= { mId:"0", - mFileModel:FileModel, + mFileModel:TitleDefaultBars[0].cmEvents[0] as Array>, mModels:new Map>([ - [0,TitleMainPage], + [0,TitleDefaultBars], [1,TitleCAD], [2,TitleCAM], [3,TitleCAE] diff --git a/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets b/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets index fdf763f5..379a36ee 100644 --- a/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets +++ b/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets @@ -2,10 +2,10 @@ import { TextComboBox,TextInputComboBox } from "../CustomStyle/ComboBox"; import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; import { ViewDialog } from "../CustomStyle/Dialog" import { SwitchView } from "../LayoutInterface/Layout/SwitchView"; -import {SelectionMode} from "../LayoutInterface/Layout/SelectionMode" +import {SelectionFilter} from "../LayoutInterface/Layout/SelectionFilter" import {DisplayMode} from "../LayoutInterface/Layout/DisplayMode" -import { LayoutOption } from "../LayoutInterface/Layout/LayoutOption"; -import { TitleData } from "../LayoutInterface/Layout/TabContent"; +import { LayoutSwitch } from "../LayoutInterface/Layout/LayoutSwitch"; +import { FileMenuData } from "../LayoutInterface/Layout/FileMenuData"; import { mwInfo } from "../AppStorageV2Class"; import { SubColumnMenu } from "../CustomStyle/Button"; @@ -17,6 +17,7 @@ export struct TitleColumnSub { @Local dX:number=0; @Local dY:number=0; @Local viewDialog:CustomDialogController|undefined=undefined; + //文件操作目录数据初始化 private ViewDialog(): CustomDialogController { return new CustomDialogController({ @@ -33,21 +34,21 @@ export struct TitleColumnSub { build(){ Row({space:5}){ - SubColumnMenu({menus:TitleData.mFileModel.cmEvents as Array,icon:'base_shortcut_menu'}) + SubColumnMenu({menus:FileMenuData.aMenus as Array,icon:'base_shortcut_menu'}) .margin({ top:0, left: 5, bottom: 0, right: 0 }) Text('菜单') .fontSize(20) Text('|') Text('拾取类型:') .fontSize(20) - TextComboBox({menu:SelectionMode}) + TextComboBox({menu:SelectionFilter}) .borderWidth(1) .borderColor(Color.Grey) .borderRadius(5) Text('图层:') .fontSize(20) TextInputComboBox({menu:this.layerArray}).width('10%') - SubColumnMenu({menus:LayoutOption,icon:LayoutOption[0].eIcon}) + SubColumnMenu({menus:LayoutSwitch,icon:LayoutSwitch[0].eIcon}) //视角弹窗 Button().onClick((event) => { this.dX=event.windowX diff --git a/entry/src/main/ets/pages/TitleLayout/TitleTab.ets b/entry/src/main/ets/pages/TitleLayout/TitleTab.ets index 61e37380..8882dd0a 100644 --- a/entry/src/main/ets/pages/TitleLayout/TitleTab.ets +++ b/entry/src/main/ets/pages/TitleLayout/TitleTab.ets @@ -1,14 +1,10 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; -import { ArrayList } from '@kit.ArkTS'; -import { AddFormMenuItem } from '@ohos.arkui.advanced.FormMenu'; -import { SceneResourceType } from '@kit.ArkGraphics3D'; - -//导入布局模块 -import {TitleData, TitleModel} from '../LayoutInterface/Layout/TabContent' -import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface' -import { TitleGroup } from '../LayoutInterface/Interface/GroupInterface' +import {TitleTabData, TitleModel} from '../LayoutInterface/Layout/TitleTabData' +import { FileMenuData } from "../LayoutInterface/Layout/FileMenuData"; import {TitleTabContent} from './TitleTabContent' import { mwInfo } from '../AppStorageV2Class'; +import { BaseMenu} from '../CustomStyle/Menu'; +import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface'; @Entry @ComponentV2 @@ -20,28 +16,18 @@ export struct TitleTab { //TabBar默认焦点 @Local titleBarDefaultFocusIndex: number = 0; //模块Bar栏 - @Provider('curtModel') curtModel:Array|undefined= TitleData.mModels.get(this.titleBarFocusIndex) - - @Builder - FileMenu(menus: Array) { - Menu() { - ForEach(menus, (item: TitleButton, index: number) => { - MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName }) - .size({height: mwInfo.mainWindowWidth*0.02}) - }) - }.fontSize(20) - } + @Provider('curtModel') curtModel:Array|undefined= TitleTabData.mModels.get(this.titleBarFocusIndex) build() { Flex({ direction: FlexDirection.Column }){ Scroll() { Row({space:0}) { - Button(TitleData.mFileModel.cmName) + Button((FileMenuData.aMenus[0] as TitleButton).eName) .fontSize(16) .fontColor(Color.Black) .height(mwInfo.mainWindowHeight*0.025) .width(mwInfo.mainWindowWidth*0.035) - .bindMenu(this.FileMenu(TitleData.mFileModel.cmEvents as Array)) + .bindMenu(BaseMenu(FileMenuData)) .type(ButtonType.Normal) .backgroundColor('#f3f3f0') @@ -58,12 +44,6 @@ export struct TitleTab { this.titleBarTabs.changeIndex(index); this.titleBarFocusIndex = index; }) - .onAxisEvent((event?: AxisEvent) => { - if (event?.hasAxis(AxisType.VERTICAL_AXIS)) { - this.titleBarTabs.changeIndex(index); - this.titleBarFocusIndex = index; - } - }) }) } } diff --git a/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets b/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets index 8219edce..021bea2d 100644 --- a/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets +++ b/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets @@ -3,7 +3,7 @@ import { TitleButton} from '../LayoutInterface/Interface/ButtonInterface'; import { TitleGroup} from '../LayoutInterface/Interface/GroupInterface'; import {GroupTextEventMenu} from '../CustomStyle/Menu' import {EventBtn,MenuBtn} from '../CustomStyle/Button' -import { TitleModel } from '../LayoutInterface/Layout/TabContent'; +import { TitleModel } from '../LayoutInterface/Layout/TitleTabData'; import { mwInfo } from '../AppStorageV2Class'; @ComponentV2