diff --git a/entry/src/main/ets/pages/CustomStyle/Button.ets b/entry/src/main/ets/pages/CustomStyle/Button.ets new file mode 100644 index 00000000..204b3b15 --- /dev/null +++ b/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 | 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') + } +} + + + + diff --git a/entry/src/main/ets/pages/CustomStyle/StyleComboBox.ets b/entry/src/main/ets/pages/CustomStyle/ComboBox.ets similarity index 94% rename from entry/src/main/ets/pages/CustomStyle/StyleComboBox.ets rename to entry/src/main/ets/pages/CustomStyle/ComboBox.ets index 675c5909..cf4b5c26 100644 --- a/entry/src/main/ets/pages/CustomStyle/StyleComboBox.ets +++ b/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 { diff --git a/entry/src/main/ets/pages/CustomStyle/StyleDialog.ets b/entry/src/main/ets/pages/CustomStyle/Dialog.ets similarity index 67% rename from entry/src/main/ets/pages/CustomStyle/StyleDialog.ets rename to entry/src/main/ets/pages/CustomStyle/Dialog.ets index 092781f1..6b05ab38 100644 --- a/entry/src/main/ets/pages/CustomStyle/StyleDialog.ets +++ b/entry/src/main/ets/pages/CustomStyle/Dialog.ets @@ -1,5 +1,5 @@ -import { TitleButton } from "../LayoutInterface/Interface/TitleButtonInterface"; -import {TitleViewMenu} from "../LayoutInterface/Layout/TitleViewData" +import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; +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)) diff --git a/entry/src/main/ets/pages/CustomStyle/Menu.ets b/entry/src/main/ets/pages/CustomStyle/Menu.ets new file mode 100644 index 00000000..97d948ff --- /dev/null +++ b/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) { + 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 | 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) + } + } +} + diff --git a/entry/src/main/ets/pages/CustomStyle/StyleButton.ets b/entry/src/main/ets/pages/CustomStyle/StyleButton.ets deleted file mode 100644 index e15e0188..00000000 --- a/entry/src/main/ets/pages/CustomStyle/StyleButton.ets +++ /dev/null @@ -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|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|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) - } - } -} - diff --git a/entry/src/main/ets/pages/CustomStyle/StyleMenu.ets b/entry/src/main/ets/pages/CustomStyle/StyleMenu.ets deleted file mode 100644 index 45f2f1ec..00000000 --- a/entry/src/main/ets/pages/CustomStyle/StyleMenu.ets +++ /dev/null @@ -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) { - 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) - } -} - diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index e1cc4593..ed72aed4 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/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 { diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleButtonInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets similarity index 54% rename from entry/src/main/ets/pages/LayoutInterface/Interface/TitleButtonInterface.ets rename to entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets index 9e983acb..6c875939 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleButtonInterface.ets +++ b/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 + eModel:Array eName:string eNamed:string eIcon:string diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleGroupInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets similarity index 64% rename from entry/src/main/ets/pages/LayoutInterface/Interface/TitleGroupInterface.ets rename to entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets index 1b558b08..c879493e 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleGroupInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets @@ -1,5 +1,5 @@ -import { TitleMenu } from "./TitleMenuInterface"; -import { TitleButton } from "./TitleButtonInterface"; +import { TitleMenu } from "./MenuInterface"; +import { TitleButton } from "./ButtonInterface"; //功能组 export interface TitleGroup{ diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets similarity index 78% rename from entry/src/main/ets/pages/LayoutInterface/Interface/TitleInterface.ets rename to entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets index 5feed05a..bbf62a76 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleInterface.ets +++ b/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{ diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleMenuInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets similarity index 100% rename from entry/src/main/ets/pages/LayoutInterface/Interface/TitleMenuInterface.ets rename to entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleModelInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets similarity index 80% rename from entry/src/main/ets/pages/LayoutInterface/Interface/TitleModelInterface.ets rename to entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets index 0341f838..f9d2c4d9 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/TitleModelInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets @@ -1,5 +1,5 @@ -import { TitleButton } from "./TitleButtonInterface" -import { TitleGroup } from "./TitleGroupInterface" +import { TitleButton } from "./ButtonInterface" +import { TitleGroup } from "./GroupInterface" export interface TitleModel{ //模块名 diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleGroupMenu.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/ActionOption.ets similarity index 67% rename from entry/src/main/ets/pages/LayoutInterface/Layout/TitleGroupMenu.ets rename to entry/src/main/ets/pages/LayoutInterface/Layout/ActionOption.ets index 6bba1c35..7433a064 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleGroupMenu.ets +++ b/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=[ +//功能布局数据 +export let ActionOption:Array=[ {mName:'增功能',mIcon:'',mTips:"",mEvent:''}, {mName:'编辑组',mIcon:'',mTips:"",mEvent:''}, {mName:'改图标',mIcon:'',mTips:"",mEvent:''}, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets new file mode 100644 index 00000000..e32aa183 --- /dev/null +++ b/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=[ + 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 + ] + ]}, + {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 + ] + ]}, + {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 + ] + ]}, + {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 + ] + ]}, + {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 + ] + ]}, + {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 + ] + ]}, + {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 + ] + ]}, + MatrixModel +] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets new file mode 100644 index 00000000..8b889173 --- /dev/null +++ b/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=[ + 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, + {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 + ] + ]}, + MatrixModel +] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets new file mode 100644 index 00000000..4442af9b --- /dev/null +++ b/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=[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, + {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 + ] + ]},MatrixModel] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets new file mode 100644 index 00000000..fb75da22 --- /dev/null +++ b/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=[ + {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:""}, +] \ 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 new file mode 100644 index 00000000..bcfa8faa --- /dev/null +++ b/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:""}, +]} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleRowMenu.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/GroupOption.ets similarity index 61% rename from entry/src/main/ets/pages/LayoutInterface/Layout/TitleRowMenu.ets rename to entry/src/main/ets/pages/LayoutInterface/Layout/GroupOption.ets index 057e8cc0..17a86d7f 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleRowMenu.ets +++ b/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=[ +//功能主的操作功能布局数据 +export let GroupOption:Array=[ {mName:'增加功能',mIcon:'',mTips:"",mEvent:''}, {mName:'编辑功能组',mIcon:'',mTips:"",mEvent:''}, {mName:'删除功能组',mIcon:'',mTips:"",mEvent:''}, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutOption.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutOption.ets new file mode 100644 index 00000000..53fb3cda --- /dev/null +++ b/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=[ + {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:""}, +] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MainPage.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/MainPage.ets new file mode 100644 index 00000000..70569afb --- /dev/null +++ b/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= + [{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, + {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]]}, + MatrixModel + ] diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets new file mode 100644 index 00000000..7110a9ec --- /dev/null +++ b/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 + ]] +} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/ModelType.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/ModelType.ets new file mode 100644 index 00000000..b3304f6f --- /dev/null +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/ModelType.ets @@ -0,0 +1,6 @@ +export enum ModelType{ + CAD, + CAM, + CAE, + BASE +}; \ 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/SelectionMode.ets new file mode 100644 index 00000000..4b0f3ac5 --- /dev/null +++ b/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=[ + {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:""}, +] + diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets new file mode 100644 index 00000000..343502d8 --- /dev/null +++ b/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=[ + {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:""}, +] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TabContent.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TabContent.ets new file mode 100644 index 00000000..20f0fc86 --- /dev/null +++ b/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>([ + [0,TitleMainPage], + [1,TitleCAD], + [2,TitleCAM], + [3,TitleCAE] + ]) +} +export { TitleInterface, TitleModel } diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAD.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAD.ets deleted file mode 100644 index c2ce370b..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAD.ets +++ /dev/null @@ -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=[ - 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 - ] - ]}, - {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 - ] - ]}, - {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 - ] - ]}, - {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 - ] - ]}, - {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 - ] - ]}, - {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 - ] - ]}, - {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 - ] - ]}, - MatrixModel -] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAE.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAE.ets deleted file mode 100644 index 4d89b793..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAE.ets +++ /dev/null @@ -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=[ - 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, - {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 - ] - ]}, - MatrixModel -] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAM.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAM.ets deleted file mode 100644 index 85419b21..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleCAM.ets +++ /dev/null @@ -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=[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, - {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 - ] - ]},MatrixModel] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleFileModel.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleFileModel.ets deleted file mode 100644 index f51f6160..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleFileModel.ets +++ /dev/null @@ -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:""}, -]} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleMainPage.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleMainPage.ets deleted file mode 100644 index b75ad24c..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleMainPage.ets +++ /dev/null @@ -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= - [{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, - {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]]}, - MatrixModel - ] diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleMatrixModel.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleMatrixModel.ets deleted file mode 100644 index 99660f0e..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleMatrixModel.ets +++ /dev/null @@ -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 - ]] -} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleModelType.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleModelType.ets deleted file mode 100644 index a4b67c12..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleModelType.ets +++ /dev/null @@ -1,6 +0,0 @@ -export enum TitleModelType{ - CAD, - CAM, - CAE, - BASE -}; \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleSelectionMode.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleSelectionMode.ets deleted file mode 100644 index d680cb4e..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleSelectionMode.ets +++ /dev/null @@ -1,15 +0,0 @@ -import { TitleButton } from "../Interface/TitleButtonInterface"; -import { TitleModelType } from "./TitleModelType"; - -export let SelectionMode:Array=[ - {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:""}, -] - diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabContent.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabContent.ets deleted file mode 100644 index 6804f98a..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabContent.ets +++ /dev/null @@ -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>([ - [0,TitleMainPage], - [1,TitleCAD], - [2,TitleCAM], - [3,TitleCAE] - ]) -} -export { TitleInterface, TitleModel } diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleViewData.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleViewData.ets deleted file mode 100644 index 3c6e1732..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleViewData.ets +++ /dev/null @@ -1,15 +0,0 @@ -import { TitleButton } from "../Interface/TitleButtonInterface"; -import { TitleModelType } from "./TitleModelType"; - -export let TitleViewMenu:Array=[ - {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:""}, -] \ No newline at end of file diff --git a/entry/src/main/ets/pages/TitleTabLayout/TitleColumnSub.ets b/entry/src/main/ets/pages/TitleTabLayout/TitleColumnSub.ets index 81e5e655..b8e1cf10 100644 --- a/entry/src/main/ets/pages/TitleTabLayout/TitleColumnSub.ets +++ b/entry/src/main/ets/pages/TitleTabLayout/TitleColumnSub.ets @@ -1,8 +1,13 @@ -import { TextComboBox,TextInputComboBox } from "../CustomStyle/StyleComboBox"; -import { TitleButton } from "../LayoutInterface/Interface/TitleButtonInterface"; -import { ViewDialog } from "../CustomStyle/StyleDialog" -import { TitleViewMenu } from "../LayoutInterface/Layout/TitleViewData"; -import {SelectionMode} from "../LayoutInterface/Layout/TitleSelectionMode" +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 {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) { + 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)) + .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('坐标轴') - Image($r('app.media.' + TitleViewMenu[0].eIcon)).onClick((event) => { + Button() + .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 }) } } \ 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 c24ef669..0fdd2a0f 100644 --- a/entry/src/main/ets/pages/TitleTabLayout/TitleTab.ets +++ b/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 { TitleButton } from '../LayoutInterface/Interface/TitleButtonInterface' -import { TitleGroup } from '../LayoutInterface/Interface/TitleGroupInterface' +import {TitleData, TitleModel} from '../LayoutInterface/Layout/TabContent' +import { TitleButton } from '../LayoutInterface/Interface/ButtonInterface' +import { TitleGroup } from '../LayoutInterface/Interface/GroupInterface' import {TitleTabContent} from './TitleTabContent' @ComponentV2 diff --git a/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets b/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets index a356ef80..0a6bea31 100644 --- a/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets +++ b/entry/src/main/ets/pages/TitleTabLayout/TitleTabContent.ets @@ -1,8 +1,8 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; -import { TitleButton} from '../LayoutInterface/Interface/TitleButtonInterface'; -import { TitleGroup} from '../LayoutInterface/Interface/TitleGroupInterface'; -import {GroupTextEventMenu} from '../CustomStyle/StyleMenu' -import {EventBtn,MenuBtn} from '../CustomStyle/StyleButton' +import { TitleButton} from '../LayoutInterface/Interface/ButtonInterface'; +import { TitleGroup} from '../LayoutInterface/Interface/GroupInterface'; +import {GroupTextEventMenu,MenuBtn} from '../CustomStyle/Menu' +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}) } diff --git a/entry/src/main/resources/base/media/display_hidden_line_dashed.bmp b/entry/src/main/resources/base/media/display_hidden_line_dashed.bmp new file mode 100644 index 00000000..16d26047 Binary files /dev/null and b/entry/src/main/resources/base/media/display_hidden_line_dashed.bmp differ diff --git a/entry/src/main/resources/base/media/display_hidden_line_dim.bmp b/entry/src/main/resources/base/media/display_hidden_line_dim.bmp new file mode 100644 index 00000000..cc10234b Binary files /dev/null and b/entry/src/main/resources/base/media/display_hidden_line_dim.bmp differ diff --git a/entry/src/main/resources/base/media/display_hidden_line_invisible.bmp b/entry/src/main/resources/base/media/display_hidden_line_invisible.bmp new file mode 100644 index 00000000..de248fd7 Binary files /dev/null and b/entry/src/main/resources/base/media/display_hidden_line_invisible.bmp differ diff --git a/entry/src/main/resources/base/media/display_hidden_line_normal.bmp b/entry/src/main/resources/base/media/display_hidden_line_normal.bmp new file mode 100644 index 00000000..d4d162b6 Binary files /dev/null and b/entry/src/main/resources/base/media/display_hidden_line_normal.bmp differ diff --git a/entry/src/main/resources/base/media/display_select_hidden_faces.bmp b/entry/src/main/resources/base/media/display_select_hidden_faces.bmp new file mode 100644 index 00000000..dafde61c Binary files /dev/null and b/entry/src/main/resources/base/media/display_select_hidden_faces.bmp differ diff --git a/entry/src/main/resources/base/media/display_select_hidden_wireframe.bmp b/entry/src/main/resources/base/media/display_select_hidden_wireframe.bmp new file mode 100644 index 00000000..1eb23048 Binary files /dev/null and b/entry/src/main/resources/base/media/display_select_hidden_wireframe.bmp differ diff --git a/entry/src/main/resources/base/media/display_shade.bmp b/entry/src/main/resources/base/media/display_shade.bmp new file mode 100644 index 00000000..298305be Binary files /dev/null and b/entry/src/main/resources/base/media/display_shade.bmp differ diff --git a/entry/src/main/resources/base/media/display_shade_show_edges.bmp b/entry/src/main/resources/base/media/display_shade_show_edges.bmp new file mode 100644 index 00000000..e6e88080 Binary files /dev/null and b/entry/src/main/resources/base/media/display_shade_show_edges.bmp differ diff --git a/entry/src/main/resources/base/media/display_shade_show_facet_edges.bmp b/entry/src/main/resources/base/media/display_shade_show_facet_edges.bmp new file mode 100644 index 00000000..f0fb74d9 Binary files /dev/null and b/entry/src/main/resources/base/media/display_shade_show_facet_edges.bmp differ diff --git a/entry/src/main/resources/base/media/layer_category.bmp b/entry/src/main/resources/base/media/layer_category.bmp new file mode 100644 index 00000000..c0ac8243 Binary files /dev/null and b/entry/src/main/resources/base/media/layer_category.bmp differ diff --git a/entry/src/main/resources/base/media/layer_copy_to.bmp b/entry/src/main/resources/base/media/layer_copy_to.bmp new file mode 100644 index 00000000..62d70294 Binary files /dev/null and b/entry/src/main/resources/base/media/layer_copy_to.bmp differ diff --git a/entry/src/main/resources/base/media/layer_move_to.bmp b/entry/src/main/resources/base/media/layer_move_to.bmp new file mode 100644 index 00000000..c7a0d73c Binary files /dev/null and b/entry/src/main/resources/base/media/layer_move_to.bmp differ diff --git a/entry/src/main/resources/base/media/layer_settings.bmp b/entry/src/main/resources/base/media/layer_settings.bmp new file mode 100644 index 00000000..0a17e8fb Binary files /dev/null and b/entry/src/main/resources/base/media/layer_settings.bmp differ diff --git a/entry/src/main/resources/base/media/layer_vis_in_view.bmp b/entry/src/main/resources/base/media/layer_vis_in_view.bmp new file mode 100644 index 00000000..f0cb3c08 Binary files /dev/null and b/entry/src/main/resources/base/media/layer_vis_in_view.bmp differ