增加字栏目得图标

entry/src/main/ets/pages/CustomStyle/Button.ets

@@ -0,0 +1,66 @@
+import { hilog } from '@kit.PerformanceAnalysisKit';
+import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
+import { TitleModel } from "../LayoutInterface/Interface/ModelInterface";
+import { TitleData } from '../LayoutInterface/Layout/TabContent';
+
+//单一功能按钮
+//图片->文本
+//不能用于模块切换
+@ComponentV2
+export struct EventBtn {
+  @Param eventBtn: TitleButton | undefined = undefined;
+  build() {
+    Column({ space: 2 }) {
+      if (this.eventBtn != undefined) {
+        Button()
+          .width('35vp')
+          .height('35vp')
+          .backgroundImage($r('app.media.' + this.eventBtn.eIcon))
+          .backgroundImagePosition({ x: '10%', y: '10%' })
+          .backgroundColor(Color.Transparent)
+          .backgroundImageSize({
+            width: '80%', // 图片宽度占满按钮
+            height: '80%' // 图片高度占满按钮
+          })
+        Text(this.eventBtn.eName)
+          .fontSize('10fp')
+          .width('45vp')
+          .height('10vp')
+          .textAlign(TextAlign.Center)
+      }
+    }
+    .height('50vp')
+    .width('50vp')
+    .padding('1vp')
+  }
+}
+
+
+//仅仅用于模块切换
+@ComponentV2
+export struct SwitchModelBtn {
+  @Param eventBtn: TitleButton | undefined = undefined;
+  @Consumer('curtModel') curtModel: Array<TitleModel> | undefined = TitleData.mModels.get(0)
+  build() {
+    Column({ space: 2 }) {
+      if (this.eventBtn != undefined) {
+        EventBtn({eventBtn:this.eventBtn}).onClick(() => {
+          if (this.eventBtn?.eEvent == 'Switch_Model_CAD') {
+            this.curtModel = TitleData.mModels.get(1)
+          } else if (this.eventBtn?.eEvent == 'Switch_Model_CAM') {
+            this.curtModel = TitleData.mModels.get(2)
+          } else if (this.eventBtn?.eEvent == 'Switch_Model_CAE') {
+            this.curtModel = TitleData.mModels.get(3)
+          }
+        })
+      }
+    }
+    .height('50vp')
+    .width('50vp')
+    .padding('1vp')
+  }
+}
+
+
+
+

entry/src/main/ets/pages/CustomStyle/ComboBox.ets

@@ -1,4 +1,4 @@
-import { TitleButton } from "../LayoutInterface/Interface/TitleButtonInterface";
+import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
 
 @ComponentV2
 export struct TextComboBox {

entry/src/main/ets/pages/CustomStyle/Dialog.ets

@@ -1,5 +1,5 @@
-import { TitleButton } from "../LayoutInterface/Interface/TitleButtonInterface";
+import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
-import {TitleViewMenu} from "../LayoutInterface/Layout/TitleViewData"
+import {SwitchView} from "../LayoutInterface/Layout/SwitchView"
 import { Popup } from "@kit.ArkUI";
 
 //视图切换弹窗
@@ -9,7 +9,7 @@ export struct ViewDialog {
   build(){
     Row({ space:2 }) {
       GridRow({ columns: 3 ,gutter: 5 }) {
-        ForEach(TitleViewMenu, (item: TitleButton, index?: number | undefined) => {
+        ForEach(SwitchView, (item: TitleButton, index?: number | undefined) => {
           GridCol({ span: 1 }) {
             Row() {
               Image($r('app.media.' + item.eIcon))

entry/src/main/ets/pages/CustomStyle/Menu.ets

@@ -0,0 +1,75 @@
+import { TitleMenu } from "../LayoutInterface/Interface/MenuInterface";
+import { TitleGroup } from "../LayoutInterface/Interface/GroupInterface";
+import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
+import { EventBtn } from "./Button";
+
+//菜单按钮
+//主要用于功能组操作菜单.文件下拉菜单等.
+@ComponentV2
+export struct GroupTextEventMenu {
+  @Param grpEvent:TitleGroup|undefined=undefined;
+  @Builder
+  GroupMenu(menus: Array<TitleMenu>) {
+      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
+          })
+      })
+  }
+  build(){
+    Row(){
+      if(this.grpEvent!=undefined){
+        //功能组名文本
+        Blank().width('auto')
+        Text(this.grpEvent.grpName)
+          .fontSize(8)
+          .fontColor(Color.Gray)
+        Blank().width('auto')
+        Button()
+          .height(15)
+          .width(15)
+          .padding(1)
+          .backgroundImage($r('app.media.base_seetings'))
+          .backgroundImagePosition({ x: '10%', y: '10%' })
+          .backgroundImageSize({
+            width: '80%', // 图片宽度占满按钮
+            height: '80%' // 图片高度占满按钮
+          })
+          .bindMenu(this.GroupMenu(this.grpEvent.grpMenu))
+          .backgroundColor(Color.Transparent)
+      }
+    }.align(Alignment.BottomEnd)
+  }
+}
+
+//菜单目录按钮
+//功能目录菜单,主要用于针对单一按钮多个功能形式
+@ComponentV2
+export struct MenuBtn {
+  @Param menuBtn: Array<TitleButton> | undefined = undefined;
+  @Param iconState: boolean = false;
+
+  @Builder
+  EventMenu() {
+    Menu() {
+      ForEach(this.menuBtn, (item: TitleButton, index: number) => {
+        MenuItem({ startIcon: $r('app.media.' + item.eIcon), content: item.eName })
+          .width('150')
+          .margin({
+            top: 0,
+            left: 0,
+            bottom: 0,
+            right: 0
+          })
+      })
+    }
+  }
+
+  build() {
+    if (this.menuBtn != undefined) {
+      EventBtn({ eventBtn: this.menuBtn[0] }).bindMenu(this.EventMenu)
+    }
+  }
+}
+

entry/src/main/ets/pages/CustomStyle/StyleButton.ets

@@ -1,71 +0,0 @@
-import { hilog } from '@kit.PerformanceAnalysisKit';
-import { TitleButton } from "../LayoutInterface/Interface/TitleButtonInterface";
-import { TitleModel} from "../LayoutInterface/Interface/TitleModelInterface";
-import { TitleData } from '../LayoutInterface/Layout/TitleTabContent';
-
-//单一功能按钮
-@ComponentV2
-export struct EventBtn {
-  @Param eventBtn:TitleButton|undefined=undefined;
-  @Param modelType:number|undefined=0;
-  @Consumer('curtModel') curtModel:Array<TitleModel>|undefined= TitleData.mModels.get(0)
-  build() {
-    Column({ space: 2 }) {
-      if(this.eventBtn!=undefined){
-         if(this.modelType==1){
-           Image($r('app.media.' + this.eventBtn.eIcon))
-             .width('45vp')
-             .height('35vp')
-             .objectFit(ImageFit.Contain)
-             .onClick(()=>{
-               if(this.eventBtn?.eEvent=='Switch_Model_CAD'){
-                   this.curtModel=TitleData.mModels.get(1)
-               }else if(this.eventBtn?.eEvent=='Switch_Model_CAM'){
-                  this.curtModel=TitleData.mModels.get(2)
-               }else if(this.eventBtn?.eEvent=='Switch_Model_CAE'){
-                  this.curtModel=TitleData.mModels.get(3)
-               }
-             })
-         }else{
-           Image($r('app.media.' + this.eventBtn.eIcon))
-             .width('45vp')
-             .height('35vp')
-             .objectFit(ImageFit.Contain)
-         }
-      Text(this.eventBtn.eName)
-        .fontSize('10fp')
-        .width('45vp')
-        .height('10vp')
-        .textAlign(TextAlign.Center)
-      }
-    }
-    .height('50vp')
-    .width('50vp')
-    .padding('1vp')
-  }
-}
-
-
-//菜单目录按钮
-//功能目录菜单,主要用于针对单一按钮多个功能形式
-@ComponentV2
-export struct MenuBtn {
-  @Param menuBtn: Array<TitleButton>|undefined=undefined;
-  @Local iconState:boolean=false;
-  @Builder
-  EventMenu(){
-    Menu() {
-      ForEach(this.menuBtn, (item: TitleButton, index: number) => {
-        MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName })
-          .width('150')
-          .margin({ top: 0, left: 0, bottom: 0, right: 0 })
-      })
-    }
-  }
-  build() {
-    if(this.menuBtn!=undefined){
-      EventBtn({eventBtn:this.menuBtn[0]}).bindMenu(this.EventMenu)
-    }
-  }
-}
-

entry/src/main/ets/pages/CustomStyle/StyleMenu.ets

@@ -1,37 +0,0 @@
-import { TitleMenu } from "../LayoutInterface/Interface/TitleMenuInterface";
-import { TitleGroup } from "../LayoutInterface/Interface/TitleGroupInterface";
-
-//菜单按钮
-//主要用于功能组操作菜单.文件下拉菜单等.
-@ComponentV2
-export struct GroupTextEventMenu {
-  @Param grpEvent:TitleGroup|undefined=undefined;
-  @Builder
-  GroupMenu(menus: Array<TitleMenu>) {
-      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
-          })
-      })
-  }
-  build(){
-    Row(){
-      if(this.grpEvent!=undefined){
-        //功能组名文本
-        Blank().width('auto')
-        Text(this.grpEvent.grpName)
-          .fontSize(8)
-          .fontColor(Color.Gray)
-        Blank().width('auto')
-        Image($r('app.media.base_seetings'))
-          .height(15)
-          .width(15)
-          .padding(1)
-          .bindMenu(this.GroupMenu(this.grpEvent.grpMenu))
-          .backgroundColor(Color.Transparent)
-      }
-    }.align(Alignment.BottomEnd)
-  }
-}
-

entry/src/main/ets/pages/Index.ets

@@ -1,11 +1,17 @@
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { edgeColors } from '@kit.ArkUI';
+import { edgeColors,display } from '@kit.ArkUI';
 import {TitleTab} from './TitleTabLayout/TitleTab'
 import {LeftSideTab} from './leftSideTab'
 import {ModelViewTab} from './modelViewTab'
 import {TitleColumnSub} from './TitleTabLayout/TitleColumnSub'
 const DOMAIN = 0x0000;
 
+let displayClass: display.Display | null = null;
+try {
+  displayClass = display.getDefaultDisplaySync();
+} catch (exception) {
+  console.error('Failed to obtain the default display object. Code: ' + JSON.stringify(exception));
+}
 @Entry
 @Component
 struct Index {

entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets

@@ -1,7 +1,7 @@
-import { TitleModelType } from "../Layout/TitleModelType"
+import { ModelType } from "../Layout/ModelType"
 
 export interface TitleButton {
-  eModel:Array<TitleModelType>
+  eModel:Array<ModelType>
   eName:string
   eNamed:string
   eIcon:string

entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets

@@ -1,5 +1,5 @@
-import { TitleMenu } from "./TitleMenuInterface";
+import { TitleMenu } from "./MenuInterface";
-import { TitleButton } from "./TitleButtonInterface";
+import { TitleButton } from "./ButtonInterface";
 
 //功能组
 export interface TitleGroup{

entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets

@@ -1,4 +1,4 @@
-import { TitleModel } from "./TitleModelInterface";
+import { TitleModel } from "./ModelInterface";
 
 //Title配置
 export interface TitleInterface{

entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets

@@ -1,5 +1,5 @@
-import { TitleButton } from "./TitleButtonInterface"
+import { TitleButton } from "./ButtonInterface"
-import { TitleGroup } from "./TitleGroupInterface"
+import { TitleGroup } from "./GroupInterface"
 
 export interface TitleModel{
   //模块名

entry/src/main/ets/pages/LayoutInterface/Layout/ActionOption.ets

@@ -1,6 +1,7 @@
-import { TitleMenu } from "../Interface/TitleMenuInterface";
+import { TitleMenu } from "../Interface/MenuInterface";
 
-export let GroupMenu:Array<TitleMenu>=[
+//功能布局数据
+export let ActionOption:Array<TitleMenu>=[
   {mName:'增功能',mIcon:'',mTips:"",mEvent:''},
   {mName:'编辑组',mIcon:'',mTips:"",mEvent:''},
   {mName:'改图标',mIcon:'',mTips:"",mEvent:''},

entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets

@@ -0,0 +1,102 @@
+import { TitleModel } from "./TabContent";
+import {TitleMainPage} from './MainPage'
+import {ModelType} from './ModelType'
+import { GroupOption } from "./GroupOption";
+import { TitleGroup } from "../Interface/GroupInterface";
+import { MatrixModel } from "./MatrixModel";
+
+export let TitleCAD:Array<TitleModel>=[
+  TitleMainPage[0],
+  {cmName:'建模',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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:""}
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  {cmName:'曲面',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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:""}
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  {cmName:'曲线',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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:""}
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  {cmName:'同步建模',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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:""}
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  {cmName:'分析',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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:""}
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  {cmName:'显示',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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:""}
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  {cmName:'首选项',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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:""}
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  MatrixModel
+]

entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets

@@ -0,0 +1,31 @@
+import { TitleModel } from "./TabContent";
+import {TitleMainPage} from './MainPage'
+import {ModelType} from './ModelType'
+import { GroupOption } from "./GroupOption";
+import { TitleGroup } from "../Interface/GroupInterface";
+import { MatrixModel } from "./MatrixModel";
+import { TitleButton } from "../Interface/ButtonInterface";
+
+export let TitleCAE:Array<TitleModel>=[
+  TitleMainPage[0],
+  {cmName:'加工',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个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_save_file",eTips:"",eEvent:""},
+          {eModel:[ModelType.BASE],eName:"切削速度",eNamed:"",eIcon:"base_saveas_file",eTips:"",eEvent:""},
+          {eModel:[ModelType.BASE],eName:"主轴参数",eNamed:"",eIcon:"base_saveall_file",eTips:"",eEvent:""},
+        ] as Array<TitleButton>,
+        {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_open_file",eTips:"",eEvent:""},
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},
+  MatrixModel
+]

entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets

@@ -0,0 +1,27 @@
+import { TitleModel } from "./TabContent";
+import {TitleMainPage} from './MainPage'
+import {ModelType} from './ModelType'
+import { GroupOption } from "./GroupOption";
+import { TitleGroup } from "../Interface/GroupInterface";
+import { MatrixModel } from "./MatrixModel";
+import { TitleButton } from "../Interface/ButtonInterface";
+
+export let TitleCAM:Array<TitleModel>=[TitleMainPage[0],
+  {cmName:'仿真',cmPage:'',cmTips:'',cmEvents: [
+    //数组表示非单个BtnEvent
+    [
+      //数组成员区别是GroupEvent还是BtnEvent
+      [{grpName:'初始化仿真',grpBtn:[
+        {eModel:[ModelType.BASE],eName:"导入模型",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
+        {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_save_file",eTips:"",eEvent:""},
+          {eModel:[ModelType.BASE],eName:"力学参数",eNamed:"",eIcon:"base_saveas_file",eTips:"",eEvent:""},
+          {eModel:[ModelType.BASE],eName:"化学参数",eNamed:"",eIcon:"base_saveall_file",eTips:"",eEvent:""},
+        ] as Array<TitleButton>,
+        {eModel:[ModelType.BASE],eName:"选项",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
+        {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help_file",eTips:"",eEvent:""},
+      ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]
+  ]},MatrixModel]

entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets

@@ -0,0 +1,15 @@
+import { TitleButton } from "../Interface/ButtonInterface";
+import { ModelType } from "./ModelType";
+
+//视图选择布局数据
+export let DisplayMode:Array<TitleButton>=[
+  {eModel:[ModelType.BASE],eName:"线框",eNamed:"",eIcon:"display_hidden_line_invisible",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"静态线框",eNamed:"",eIcon:"display_hidden_line_normal",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"淡化边界线",eNamed:"",eIcon:"display_hidden_line_dim",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"隐藏虚线",eNamed:"",eIcon:"display_hidden_line_dashed",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"显示面边界线",eNamed:"",eIcon:"display_shade_show_edges",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"显示小平面边界线",eNamed:"",eIcon:"display_shade_show_facet_edges",eTips:"俯视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"显示选择隐藏面",eNamed:"",eIcon:"display_select_hidden_faces",eTips:"左视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"显示选择隐藏线框",eNamed:"",eIcon:"display_select_hidden_wireframe",eTips:"前视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"着色",eNamed:"",eIcon:"display_shade",eTips:"正等测图",eEvent:""},
+]

entry/src/main/ets/pages/LayoutInterface/Layout/FileModel.ets

@@ -0,0 +1,15 @@
+import { TitleModel } from "../Interface/ModelInterface";
+import { ModelType } from "./ModelType";
+
+//文件模块布局数据
+export let FileModel:TitleModel={cmName:"文件",cmPage:"",cmTips:"",cmEvents:[
+  {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_save_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_preferences",eTips:"",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help",eTips:"",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"退出",eNamed:"",eIcon:"base_exit",eTips:"",eEvent:""},
+]}

entry/src/main/ets/pages/LayoutInterface/Layout/GroupOption.ets

@@ -1,6 +1,7 @@
-import { TitleMenu } from "../Interface/TitleMenuInterface";
+import { TitleMenu } from "../Interface/MenuInterface";
 
-export let TitleRowMenu:Array<TitleMenu>=[
+//功能主的操作功能布局数据
+export let GroupOption:Array<TitleMenu>=[
   {mName:'增加功能',mIcon:'',mTips:"",mEvent:''},
   {mName:'编辑功能组',mIcon:'',mTips:"",mEvent:''},
   {mName:'删除功能组',mIcon:'',mTips:"",mEvent:''},

entry/src/main/ets/pages/LayoutInterface/Layout/LayoutOption.ets

@@ -0,0 +1,11 @@
+import { TitleButton } from "../Interface/ButtonInterface";
+import { ModelType } from "./ModelType";
+
+//视图选择布局数据
+export let LayoutOption:Array<TitleButton>=[
+  {eModel:[ModelType.BASE],eName:"图层设置",eNamed:"",eIcon:"layer_settings",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"视图中可见图层",eNamed:"",eIcon:"layer_vis_in_view",eTips:"俯视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"图层类别",eNamed:"",eIcon:"layer_category",eTips:"正等测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"移至图层",eNamed:"",eIcon:"layer_move_to",eTips:"左视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"复制至图层",eNamed:"",eIcon:"layer_copy_to",eTips:"前视图",eEvent:""},
+]

entry/src/main/ets/pages/LayoutInterface/Layout/MainPage.ets

@@ -0,0 +1,26 @@
+import { TitleButton } from "../Interface/ButtonInterface";
+import { TitleGroup } from "../Interface/GroupInterface";
+import { MatrixModel } from "./MatrixModel";
+import { ModelType  } from "./ModelType";
+import { GroupOption } from "./GroupOption";
+import { TitleModel } from "./TabContent";
+
+//主页栏目布局数据
+export let TitleMainPage:Array<TitleModel>=
+  [{cmName:'主页',cmPage:'',cmTips:'',cmEvents: [[[{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_save_file",eTips:"",eEvent:""},
+            {eModel:[ModelType.BASE],eName:"另存为",eNamed:"",eIcon:"base_saveas_file",eTips:"",eEvent:""},
+            {eModel:[ModelType.BASE],eName:"保存全部",eNamed:"",eIcon:"base_saveall_file",eTips:"",eEvent:""},
+          ] as Array<TitleButton>,
+          {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_open_file",eTips:"",eEvent:""},
+          {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help_file",eTips:"",eEvent:""},
+        ],
+          grpMenu:GroupOption}] as Array<TitleGroup>]]},
+    MatrixModel
+  ]

entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets

@@ -0,0 +1,15 @@
+import { TitleGroup } from '../Interface/GroupInterface'
+import {TitleModel} from '../Interface/ModelInterface'
+import { GroupOption } from './GroupOption'
+import { ModelType } from './ModelType'
+
+//模块矩阵布局数据
+export let MatrixModel:TitleModel= {
+  cmName:"应用模块",cmPage:"",cmTips:"",cmEvents:[
+    [[{grpName:'模块矩阵',grpBtn:[
+      {eModel:[ModelType.BASE],eName:"建模",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:"Switch_Model_CAD"},
+      {eModel:[ModelType.BASE],eName:"加工",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:"Switch_Model_CAM"},
+      {eModel:[ModelType.BASE],eName:"仿真",eNamed:"",eIcon:"base_save_file",eTips:"",eEvent:"Switch_Model_CAE"},
+    ],grpMenu:GroupOption}] as Array<TitleGroup>
+    ]]
+}

entry/src/main/ets/pages/LayoutInterface/Layout/ModelType.ets

@@ -0,0 +1,6 @@
+export enum ModelType{
+  CAD,
+  CAM,
+  CAE,
+  BASE
+};

entry/src/main/ets/pages/LayoutInterface/Layout/SelectionMode.ets

@@ -0,0 +1,16 @@
+import { TitleButton } from "../Interface/ButtonInterface";
+import { ModelType } from "./ModelType";
+
+//拾取器过滤布局数据
+export let SelectionMode:Array<TitleButton>=[
+  {eModel:[ModelType.BASE],eName:"实体特征",eNamed:"",eIcon:"",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"曲线特征",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"加工特征",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"基准",eNamed:"",eIcon:"",eTips:"正等测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"边",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"面",eNamed:"",eIcon:"",eTips:"左视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"线",eNamed:"",eIcon:"",eTips:"右视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"视图",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"图像",eNamed:"",eIcon:"",eTips:"俯视图",eEvent:""},
+]
+

entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets

@@ -0,0 +1,16 @@
+import { TitleButton } from "../Interface/ButtonInterface";
+import { ModelType } from "./ModelType";
+
+//视图选择布局数据
+export let SwitchView:Array<TitleButton>=[
+  {eModel:[ModelType.BASE],eName:"正三轴测图",eNamed:"",eIcon:"base_view_tfr_tri",eTips:"正三轴测图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"俯视图",eNamed:"",eIcon:"base_view_top",eTips:"俯视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"正等测图",eNamed:"",eIcon:"base_view_tfr_iso",eTips:"正等测图",eEvent:""},
+
+  {eModel:[ModelType.BASE],eName:"左视图",eNamed:"",eIcon:"base_view_left",eTips:"左视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"前视图",eNamed:"",eIcon:"base_view_front",eTips:"前视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"右视图",eNamed:"",eIcon:"base_view_right",eTips:"右视图",eEvent:""},
+
+  {eModel:[ModelType.BASE],eName:"后视图",eNamed:"",eIcon:"base_view_back",eTips:"后视图",eEvent:""},
+  {eModel:[ModelType.BASE],eName:"仰视图",eNamed:"",eIcon:"base_view_bottom",eTips:"仰视图",eEvent:""},
+]

entry/src/main/ets/pages/LayoutInterface/Layout/TabContent.ets

@@ -0,0 +1,20 @@
+import { FileModel } from './FileModel'
+import { TitleInterface } from '../Interface/Interface'
+import { TitleModel } from '../Interface/ModelInterface'
+import { TitleMainPage } from './MainPage'
+import {TitleCAD} from './CAD'
+import {TitleCAM} from './CAM'
+import {TitleCAE} from './CAE'
+
+//Title栏得布局数据
+export let TitleData:TitleInterface= {
+  mId:"0",
+  mFileModel:FileModel,
+  mModels:new Map<number,Array<TitleModel>>([
+    [0,TitleMainPage],
+    [1,TitleCAD],
+    [2,TitleCAM],
+    [3,TitleCAE]
+  ])
+}
+export { TitleInterface, TitleModel }

entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAD.ets

@@ -1,102 +0,0 @@
-import { TitleModel } from "./TitleTabContent";
-import {TitleMainPage} from './TitleMainPage'
-import {TitleModelType} from './TitleModelType'
-import { TitleRowMenu } from "./TitleRowMenu";
-import { TitleGroup } from "../Interface/TitleGroupInterface";
-import { MatrixModel } from "./TitleMatrixModel";
-
-export let TitleCAD:Array<TitleModel>=[
-  TitleMainPage[0],
-  {cmName:'建模',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'基础模型',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  {cmName:'曲面',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'基础模型',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  {cmName:'曲线',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'基础模型',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  {cmName:'同步建模',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'基础模型',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  {cmName:'分析',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'基础模型',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  {cmName:'显示',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'基础模型',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  {cmName:'首选项',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'基础模型',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"块",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆柱",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"圆锥",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"球",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"管道",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""}
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  MatrixModel
-]

entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAE.ets

@@ -1,31 +0,0 @@
-import { TitleModel } from "./TitleTabContent";
-import {TitleMainPage} from './TitleMainPage'
-import {TitleModelType} from './TitleModelType'
-import { TitleRowMenu } from "./TitleRowMenu";
-import { TitleGroup } from "../Interface/TitleGroupInterface";
-import { MatrixModel } from "./TitleMatrixModel";
-import { TitleButton } from "../Interface/TitleButtonInterface";
-
-export let TitleCAE:Array<TitleModel>=[
-  TitleMainPage[0],
-  {cmName:'加工',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'加工环境',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"重置环境",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"工艺",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        [
-          {eModel:[TitleModelType.BASE],eName:"切削参数",eNamed:"",eIcon:"base_save_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"切削速度",eNamed:"",eIcon:"base_saveas_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"主轴参数",eNamed:"",eIcon:"base_saveall_file",eTips:"",eEvent:""},
-        ] as Array<TitleButton>,
-        {eModel:[TitleModelType.BASE],eName:"显示刀路",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"新建工序",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"新建刀具",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"选项",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},
-  MatrixModel
-]

entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAM.ets

@@ -1,27 +0,0 @@
-import { TitleModel } from "./TitleTabContent";
-import {TitleMainPage} from './TitleMainPage'
-import {TitleModelType} from './TitleModelType'
-import { TitleRowMenu } from "./TitleRowMenu";
-import { TitleGroup } from "../Interface/TitleGroupInterface";
-import { MatrixModel } from "./TitleMatrixModel";
-import { TitleButton } from "../Interface/TitleButtonInterface";
-
-export let TitleCAM:Array<TitleModel>=[TitleMainPage[0],
-  {cmName:'仿真',cmPage:'',cmTips:'',cmEvents: [
-    //数组表示非单个BtnEvent
-    [
-      //数组成员区别是GroupEvent还是BtnEvent
-      [{grpName:'初始化仿真',grpBtn:[
-        {eModel:[TitleModelType.BASE],eName:"导入模型",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"导出模型",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"设定仿真环境",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        [
-          {eModel:[TitleModelType.BASE],eName:"环境参数",eNamed:"",eIcon:"base_save_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"力学参数",eNamed:"",eIcon:"base_saveas_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"化学参数",eNamed:"",eIcon:"base_saveall_file",eTips:"",eEvent:""},
-        ] as Array<TitleButton>,
-        {eModel:[TitleModelType.BASE],eName:"选项",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-        {eModel:[TitleModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help_file",eTips:"",eEvent:""},
-      ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]
-  ]},MatrixModel]

entry/src/main/ets/pages/LayoutInterface/Layout/TitleFileModel.ets

@@ -1,15 +0,0 @@
-import { TitleModel } from "../Interface/TitleModelInterface";
-import { TitleModelType } from "./TitleModelType";
-
-//文件Bar->Menus
-export let TitleFileMenuModel:TitleModel={cmName:"文件",cmPage:"",cmTips:"",cmEvents:[
-  {eModel:[TitleModelType.BASE],eName:"新建",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"打开",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"保存",eNamed:"",eIcon:"base_save_file",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"关闭",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"导入",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"导出",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"选项",eNamed:"",eIcon:"base_preferences",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help",eTips:"",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"退出",eNamed:"",eIcon:"base_exit",eTips:"",eEvent:""},
-]}

entry/src/main/ets/pages/LayoutInterface/Layout/TitleMainPage.ets

@@ -1,26 +0,0 @@
-import { TitleButton } from "../Interface/TitleButtonInterface";
-import { TitleGroup } from "../Interface/TitleGroupInterface";
-import { MatrixModel } from "./TitleMatrixModel";
-import { TitleModelType  } from "./TitleModelType";
-import { TitleRowMenu } from "./TitleRowMenu";
-import { TitleModel } from "./TitleTabContent";
-
-//主页Bar
-export let TitleMainPage:Array<TitleModel>=
-  [{cmName:'主页',cmPage:'',cmTips:'',cmEvents: [[[{grpName:'文件功能组',grpBtn:[
-          {eModel:[TitleModelType.BASE],eName:"新建",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"打开",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-          [
-            {eModel:[TitleModelType.BASE],eName:"保存",eNamed:"",eIcon:"base_save_file",eTips:"",eEvent:""},
-            {eModel:[TitleModelType.BASE],eName:"另存为",eNamed:"",eIcon:"base_saveas_file",eTips:"",eEvent:""},
-            {eModel:[TitleModelType.BASE],eName:"保存全部",eNamed:"",eIcon:"base_saveall_file",eTips:"",eEvent:""},
-          ] as Array<TitleButton>,
-          {eModel:[TitleModelType.BASE],eName:"关闭",eNamed:"",eIcon:"base_close_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"导入",eNamed:"",eIcon:"base_import_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"导出",eNamed:"",eIcon:"base_export_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"选项",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:""},
-          {eModel:[TitleModelType.BASE],eName:"帮助",eNamed:"",eIcon:"base_help_file",eTips:"",eEvent:""},
-        ],
-          grpMenu:TitleRowMenu}] as Array<TitleGroup>]]},
-    MatrixModel
-  ]

entry/src/main/ets/pages/LayoutInterface/Layout/TitleMatrixModel.ets

@@ -1,14 +0,0 @@
-import { TitleGroup } from '../Interface/TitleGroupInterface'
-import {TitleModel} from '../Interface/TitleModelInterface'
-import { TitleRowMenu } from './TitleRowMenu'
-import { TitleModelType } from './TitleModelType'
-
-export let MatrixModel:TitleModel= {
-  cmName:"应用模块",cmPage:"",cmTips:"",cmEvents:[
-    [[{grpName:'模块矩阵',grpBtn:[
-      {eModel:[TitleModelType.BASE],eName:"建模",eNamed:"",eIcon:"base_new_file",eTips:"",eEvent:"Switch_Model_CAD"},
-      {eModel:[TitleModelType.BASE],eName:"加工",eNamed:"",eIcon:"base_open_file",eTips:"",eEvent:"Switch_Model_CAM"},
-      {eModel:[TitleModelType.BASE],eName:"仿真",eNamed:"",eIcon:"base_save_file",eTips:"",eEvent:"Switch_Model_CAE"},
-    ],grpMenu:TitleRowMenu}] as Array<TitleGroup>
-    ]]
-}

entry/src/main/ets/pages/LayoutInterface/Layout/TitleModelType.ets

@@ -1,6 +0,0 @@
-export enum TitleModelType{
-  CAD,
-  CAM,
-  CAE,
-  BASE
-};

entry/src/main/ets/pages/LayoutInterface/Layout/TitleSelectionMode.ets

@@ -1,15 +0,0 @@
-import { TitleButton } from "../Interface/TitleButtonInterface";
-import { TitleModelType } from "./TitleModelType";
-
-export let SelectionMode:Array<TitleButton>=[
-  {eModel:[TitleModelType.BASE],eName:"实体特征",eNamed:"",eIcon:"",eTips:"正三轴测图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"曲线特征",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"加工特征",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"基准",eNamed:"",eIcon:"",eTips:"正等测图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"边",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"面",eNamed:"",eIcon:"",eTips:"左视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"线",eNamed:"",eIcon:"",eTips:"右视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"视图",eNamed:"",eIcon:"",eTips:"前视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"图像",eNamed:"",eIcon:"",eTips:"俯视图",eEvent:""},
-]
-

entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabContent.ets

@@ -1,18 +0,0 @@
-import { TitleFileMenuModel } from './TitleFileModel'
-import { TitleInterface } from '../Interface/TitleInterface'
-import { TitleModel } from '../Interface/TitleModelInterface'
-import { TitleMainPage } from './TitleMainPage'
-import {TitleCAD} from './TitleCAD'
-import {TitleCAM} from './TitleCAM'
-import {TitleCAE} from './TitleCAE'
-export let TitleData:TitleInterface= {
-  mId:"0",
-  mFileModel:TitleFileMenuModel,
-  mModels:new Map<number,Array<TitleModel>>([
-    [0,TitleMainPage],
-    [1,TitleCAD],
-    [2,TitleCAM],
-    [3,TitleCAE]
-  ])
-}
-export { TitleInterface, TitleModel }

entry/src/main/ets/pages/LayoutInterface/Layout/TitleViewData.ets

@@ -1,15 +0,0 @@
-import { TitleButton } from "../Interface/TitleButtonInterface";
-import { TitleModelType } from "./TitleModelType";
-
-export let TitleViewMenu:Array<TitleButton>=[
-  {eModel:[TitleModelType.BASE],eName:"正三轴测图",eNamed:"",eIcon:"base_view_tfr_tri",eTips:"正三轴测图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"俯视图",eNamed:"",eIcon:"base_view_top",eTips:"俯视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"正等测图",eNamed:"",eIcon:"base_view_tfr_iso",eTips:"正等测图",eEvent:""},
-
-  {eModel:[TitleModelType.BASE],eName:"左视图",eNamed:"",eIcon:"base_view_left",eTips:"左视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"前视图",eNamed:"",eIcon:"base_view_front",eTips:"前视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"右视图",eNamed:"",eIcon:"base_view_right",eTips:"右视图",eEvent:""},
-
-  {eModel:[TitleModelType.BASE],eName:"后视图",eNamed:"",eIcon:"base_view_back",eTips:"后视图",eEvent:""},
-  {eModel:[TitleModelType.BASE],eName:"仰视图",eNamed:"",eIcon:"base_view_bottom",eTips:"仰视图",eEvent:""},
-]

entry/src/main/ets/pages/TitleTabLayout/TitleColumnSub.ets

@@ -1,8 +1,13 @@
-import { TextComboBox,TextInputComboBox } from "../CustomStyle/StyleComboBox";
+import { TextComboBox,TextInputComboBox } from "../CustomStyle/ComboBox";
-import { TitleButton } from "../LayoutInterface/Interface/TitleButtonInterface";
+import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface";
-import { ViewDialog } from "../CustomStyle/StyleDialog"
+import { ViewDialog } from "../CustomStyle/Dialog"
-import { TitleViewMenu } from "../LayoutInterface/Layout/TitleViewData";
+import { SwitchView } from "../LayoutInterface/Layout/SwitchView";
-import {SelectionMode} from "../LayoutInterface/Layout/TitleSelectionMode"
+import {SelectionMode} from "../LayoutInterface/Layout/SelectionMode"
+import {DisplayMode} from "../LayoutInterface/Layout/DisplayMode"
+import { MenuBtn } from "../CustomStyle/Menu";
+import { LayoutOption } from "../LayoutInterface/Layout/LayoutOption";
+import { TitleData } from "../LayoutInterface/Layout/TabContent";
+
 @ComponentV2
 export struct TitleColumnSub {
   //Title下的子行的功能
@@ -10,7 +15,21 @@ export struct TitleColumnSub {
   @Local dX:number=0;
   @Local dY:number=0;
   @Local viewDialog:CustomDialogController|undefined=undefined;
-
+  @Builder
+  DisplayModeMenu(menus: Array<TitleButton>) {
+    Menu() {
+      ForEach(menus, (item: TitleButton, index: number) => {
+        MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName })
+          .width('150')
+          .margin({
+            top: 0,
+            left: 0,
+            bottom: 0,
+            right: 0
+          })
+      })
+    }
+  }
   private ViewDialog(): CustomDialogController {
     return new CustomDialogController({
       builder: ViewDialog(), // 确保 ViewDialog 组件已正确定义
@@ -25,11 +44,21 @@ export struct TitleColumnSub {
   }
   build(){
     Row({space:5}){
-      Image($r('app.media.base_seetings'))
+      Button()
         .height(25)
         .width(25)
         .padding(1)
-      Text('拾取类型过滤器:')
+        .backgroundColor(Color.Transparent)
+        .backgroundImage($r('app.media.base_seetings'))
+        .backgroundImagePosition({ x: '10%', y: '10%' })
+        .backgroundImageSize({
+          width: '80%', // 图片宽度占满按钮
+          height: '80%' // 图片高度占满按钮
+        })
+        .bindMenu(this.DisplayModeMenu(TitleData.mFileModel.cmEvents as Array<TitleButton>))
+        .type(ButtonType.Normal)
+
+      Text('拾取类型:')
       TextComboBox({menu:SelectionMode})
         .width('100vp')
         .borderWidth(1)
@@ -37,8 +66,14 @@ export struct TitleColumnSub {
         .borderRadius(5)
       Text('图层:')
       TextInputComboBox({menu:this.layerArray}).width('10%')
-      Button('坐标轴')
+      Button()
-      Image($r('app.media.' + TitleViewMenu[0].eIcon)).onClick((event) => {
+        .height(35)
+        .width(35)
+        .padding(1)
+        .backgroundImage($r('app.media.'+LayoutOption[0].eIcon))
+        .backgroundImageSize({ width: '100%', height: '100%' })
+        .bindMenu(this.DisplayModeMenu(LayoutOption))
+      Button().onClick((event) => {
         this.dX=event.windowX
         this.dY=event.windowY
         if(this.viewDialog==undefined){
@@ -47,7 +82,18 @@ export struct TitleColumnSub {
         this.viewDialog.open();
       }).width('35vp')
         .height('35vp')
-        Button('显示类型')
+        .backgroundImage($r('app.media.' + SwitchView[0].eIcon))
+        .backgroundImageSize({
+        width: '100%', // 图片宽度占满按钮
+        height: '100%' // 图片高度占满按钮
+        })
+        Button()
+          .height(35)
+          .width(35)
+          .padding(1)
+          .backgroundImage($r('app.media.'+DisplayMode[0].eIcon))
+          .backgroundImageSize({ width: '100%', height: '100%' })
+          .bindMenu(this.DisplayModeMenu(DisplayMode))
     }.margin({ top: 1, left: 1, bottom: 1, right: 1 })
   }
 }

entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets

@@ -4,9 +4,9 @@ import { AddFormMenuItem } from '@ohos.arkui.advanced.FormMenu';
 import { SceneResourceType } from '@kit.ArkGraphics3D';
 
 //导入布局模块
-import {TitleData, TitleModel} from '../LayoutInterface/Layout/TitleTabContent'
+import {TitleData, TitleModel} from '../LayoutInterface/Layout/TabContent'
-import { TitleButton } from '../LayoutInterface/Interface/TitleButtonInterface'
+import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface'
-import { TitleGroup } from '../LayoutInterface/Interface/TitleGroupInterface'
+import { TitleGroup } from '../LayoutInterface/Interface/GroupInterface'
 import {TitleTabContent} from './TitleTabContent'
 
 @ComponentV2

entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets

@@ -1,8 +1,8 @@
 import { hilog } from '@kit.PerformanceAnalysisKit';
-import { TitleButton} from '../LayoutInterface/Interface/TitleButtonInterface';
+import { TitleButton} from '../LayoutInterface/Interface/ButtonInterface';
-import { TitleGroup} from '../LayoutInterface/Interface/TitleGroupInterface';
+import { TitleGroup} from '../LayoutInterface/Interface/GroupInterface';
-import {GroupTextEventMenu} from '../CustomStyle/StyleMenu'
+import {GroupTextEventMenu,MenuBtn} from '../CustomStyle/Menu'
-import {EventBtn,MenuBtn} from '../CustomStyle/StyleButton'
+import {EventBtn,SwitchModelBtn} from '../CustomStyle/Button'
 
 @ComponentV2
 export struct TitleTabContent {
@@ -31,7 +31,7 @@ export struct TitleTabContent {
                        }else{
                          //针对最后一个Bar特化处理.如果为最后一个Bar则在子组件Image真假onClick事件
                          if(mIndex==this.tabLayout.length-1){
-                           EventBtn({eventBtn:btn_item,modelType:1})
+                           SwitchModelBtn({eventBtn:btn_item})
                          }else{
                            EventBtn({eventBtn:btn_item})
                          }