diff --git a/entry/src/main/ets/pages/CustomController/Button.ets b/entry/src/main/ets/pages/CustomController/Button.ets index fd743ad4..d3ff6d76 100644 --- a/entry/src/main/ets/pages/CustomController/Button.ets +++ b/entry/src/main/ets/pages/CustomController/Button.ets @@ -1,5 +1,5 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; -import { ExecuteCommand } from '../EventSubWin/ExCom'; +import { Execute } from '../EventSubWin/ExCom'; import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; import { TitleModel } from "../LayoutInterface/Interface/ModelInterface"; import { TitleTabData } from '../LayoutInterface/Layout/TitleTabData'; @@ -34,7 +34,7 @@ export struct EventBtn { Button() .width(ebWidth) .height(ebHeigth) - .backgroundImage($r('app.media.' + this.eventBtn.eIcon)) + .backgroundImage($r('app.media.' + this.eventBtn.btnIcon)) .backgroundImagePosition({ x: '10%', y: '10%' }) .backgroundColor(Color.Transparent) .backgroundImageSize({ @@ -43,13 +43,13 @@ export struct EventBtn { }) .onClick(()=>{ if(!this.eventBtnType){ - ExecuteCommand(this.eventBtn as TitleButton); + Execute(this.eventBtn as TitleButton); }else{ - if (this.eventBtn?.eEvent == 'Switch_Model_CAD') { + if (this.eventBtn?.btnEvent.command == 'Switch_Model_CAD') { this.curtModel = TitleTabData.mModels.get(1) - } else if (this.eventBtn?.eEvent == 'Switch_Model_CAM') { + } else if (this.eventBtn?.btnEvent.command == 'Switch_Model_CAM') { this.curtModel = TitleTabData.mModels.get(2) - } else if (this.eventBtn?.eEvent == 'Switch_Model_CAE') { + } else if (this.eventBtn?.btnEvent.command == 'Switch_Model_CAE') { this.curtModel = TitleTabData.mModels.get(3) } } @@ -59,7 +59,7 @@ export struct EventBtn { Blank() .width('auto') .height(edHeigth) - Text(this.eventBtn.eName) + Text(this.eventBtn.btnName) .fontSize(16) .width('auto') .textAlign(TextAlign.Center) @@ -84,10 +84,10 @@ export struct MenuBtn { ForEach(this.menus, (item: TitleButton, index: number) => { //如果是功能组则 if(!Array.isArray(item)){ - MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName }) + MenuItem({ startIcon: $r('app.media.'+item.btnIcon), content: item.btnName }) .onClick(()=> { this.curtIndex=index; - ExecuteCommand(item as TitleButton); + Execute(item as TitleButton); }) .size({height: ebWidth}) } @@ -102,20 +102,20 @@ export struct MenuBtn { .width(ebWidth) .height(ebHeigth) .backgroundColor(Color.Transparent) - .backgroundImage($r('app.media.' + this.menus[this.curtIndex].eIcon)) + .backgroundImage($r('app.media.' + this.menus[this.curtIndex].btnIcon)) .backgroundImagePosition({ x: '10%', y: '10%' }) .backgroundImageSize({ width: '80%', // 图片宽度占满按钮 height: '80%' // 图片高度占满按钮 }).onClick(()=> { - ExecuteCommand((this.menus as Array)[this.curtIndex] as TitleButton); + Execute((this.menus as Array)[this.curtIndex] as TitleButton); }) Button(){ Column(){ Image($r('app.media.base_chevron_down')).scale({ centerX: '50%', centerY: '50%' }) .height(edHeigth) - Text((this.menus[this.curtIndex].eName)) + Text((this.menus[this.curtIndex].btnName)) .fontSize(16) .textAlign(TextAlign.Center) }.height('100%') @@ -147,11 +147,11 @@ export struct SubColumnMenu { Menu() { ForEach(subMenu, (subItem: TitleButton, index: number) => { MenuItem({ - startIcon: $r('app.media.' + subItem.eIcon), - content: subItem.eName, + startIcon: $r('app.media.' + subItem.btnIcon), + content: subItem.btnName, }) .onClick(() => { - ExecuteCommand(subItem as TitleButton); + Execute(subItem as TitleButton); }) .size({ height: ebWidth }) }) @@ -163,16 +163,16 @@ export struct SubColumnMenu { ForEach(this.menus, (item: TitleButton|Array, index: number) => { //如果是功能组则 if(!Array.isArray(item)){ - MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName }) + MenuItem({ startIcon: $r('app.media.'+item.btnIcon), content: item.btnName }) .onClick(()=> { this.curtIndex=index; - ExecuteCommand(item as TitleButton); + Execute(item as TitleButton); }) .size({height: ebWidth}) }else{ MenuItem({ - startIcon: $r('app.media.' + item[0].eIcon), - content: item[0].eName, + startIcon: $r('app.media.' + item[0].btnIcon), + content: item[0].btnName, builder: this.SubMenu(item) }) } @@ -184,7 +184,7 @@ export struct SubColumnMenu { Row(){ Button(){ Row(){ - Image($r('app.media.'+(this.icon!=undefined ? this.icon:(this.menus[this.curtIndex]as TitleButton).eIcon))) + Image($r('app.media.'+(this.icon!=undefined ? this.icon:(this.menus[this.curtIndex]as TitleButton).btnIcon))) .width(mwInfo.width*0.012) .scale({ centerX: '50%', centerY: '50%' }) .backgroundImagePosition({ x: '10%', y: '10%' }) diff --git a/entry/src/main/ets/pages/CustomController/ComboBox.ets b/entry/src/main/ets/pages/CustomController/ComboBox.ets index 53a720d5..b12f79e2 100644 --- a/entry/src/main/ets/pages/CustomController/ComboBox.ets +++ b/entry/src/main/ets/pages/CustomController/ComboBox.ets @@ -18,7 +18,7 @@ export struct TextComboBox { EventMenu() { Menu() { ForEach(this.menu, (item: TitleButton, index: number) => { - MenuItem({ content: item.eName }) + MenuItem({ content: item.btnName }) .size({height: ebHeigth}) .onClick(()=>{ this.selectIndex=index; @@ -32,7 +32,7 @@ export struct TextComboBox { Text(this.name!=undefined?this.name:'') .fontSize(16) .width(this.nWidth=='0'?'auto':this.nWidth) - Text(this.menu[this.selectIndex].eName) + Text(this.menu[this.selectIndex].btnName) .bindMenu(this.EventMenu) .fontSize(16) .backgroundColor($r('sys.color.search_container_focus_color')) @@ -50,7 +50,7 @@ export struct TextInputComboBox { EventMenu() { Menu() { ForEach(this.menu, (item: TitleButton, index: number) => { - MenuItem({ content: item.eName }) + MenuItem({ content: item.btnName }) .size({height: ebHeigth}) .onClick(()=>{ this.selectIndex=index; diff --git a/entry/src/main/ets/pages/CustomController/Dialog.ets b/entry/src/main/ets/pages/CustomController/Dialog.ets index 3027acd4..8caf1951 100644 --- a/entry/src/main/ets/pages/CustomController/Dialog.ets +++ b/entry/src/main/ets/pages/CustomController/Dialog.ets @@ -1,5 +1,5 @@ import { mwInfo } from '../DispWinInfo/DispWinInfo' -import { ExecuteCommand } from "../EventSubWin/ExCom"; +import { Execute } from "../EventSubWin/ExCom"; import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; import {SwitchView} from "../LayoutInterface/Layout/SwitchView" @@ -18,14 +18,14 @@ export struct ViewDialog { Row() { Button() .backgroundColor(Color.Transparent) - .backgroundImage($r('app.media.' + item.eIcon)) + .backgroundImage($r('app.media.' + item.btnIcon)) .backgroundImagePosition({ x: '10%', y: '10%' }) .backgroundImageSize({ width: '80%', // 图片宽度占满按钮 height: '80%' // 图片高度占满按钮 }).width(ebWidth).height(ebWidth) .onClick(()=>{ - ExecuteCommand(item); + Execute(item); }) } } diff --git a/entry/src/main/ets/pages/CustomController/Menu.ets b/entry/src/main/ets/pages/CustomController/Menu.ets index f1837840..1e66ced4 100644 --- a/entry/src/main/ets/pages/CustomController/Menu.ets +++ b/entry/src/main/ets/pages/CustomController/Menu.ets @@ -1,6 +1,6 @@ import { TitleGroup } from "../LayoutInterface/Interface/GroupInterface"; import { TitleButton } from "../LayoutInterface/Interface/ButtonInterface"; -import { ExecuteCommand } from "../EventSubWin/ExCom"; +import { Execute } from "../EventSubWin/ExCom"; import { mwInfo } from '../DispWinInfo/DispWinInfo' import { BaseMenuData } from "../LayoutInterface/Interface/MenuInterface"; @@ -16,14 +16,14 @@ export function BaseMenu(indexMenu:BaseMenuData) { //如果是功能组则 if(Array.isArray(item)){ MenuItem({ - startIcon: $r('app.media.' + item[0].eIcon), - content: item[0].eName, + startIcon: $r('app.media.' + item[0].btnIcon), + content: item[0].btnName, builder: SubMenu(item) }) }else{ - MenuItem({ startIcon: $r('app.media.'+item.eIcon), content: item.eName }) + MenuItem({ startIcon: $r('app.media.'+item.btnIcon), content: item.btnName }) .onClick(()=> { - ExecuteCommand(item as TitleButton); + Execute(item as TitleButton); }) .size({height: ebWidth}) } @@ -36,11 +36,11 @@ export function SubMenu(subMenu:Array){ Menu() { ForEach(subMenu, (subItem: TitleButton, index: number) => { MenuItem({ - startIcon: $r('app.media.' + subItem.eIcon), - content: subItem.eName, + startIcon: $r('app.media.' + subItem.btnIcon), + content: subItem.btnName, }) .onClick(() => { - ExecuteCommand(subItem as TitleButton); + Execute(subItem as TitleButton); }) .size({ height: ebWidth }) }) diff --git a/entry/src/main/ets/pages/EventSubWin/ExCom.ets b/entry/src/main/ets/pages/EventSubWin/ExCom.ets index 099f2029..96670f8a 100644 --- a/entry/src/main/ets/pages/EventSubWin/ExCom.ets +++ b/entry/src/main/ets/pages/EventSubWin/ExCom.ets @@ -4,6 +4,7 @@ import NativeOpenCAX from 'libopencax.so'; import { mwInfo } from '../DispWinInfo/DispWinInfo' import { AppStorageV2, NodeContent} from '@kit.ArkUI'; import { ModelViewTab } from '../ModelViewTab'; +import {EventType} from '../LayoutInterface/Interface/BaseTypeInterface' @ObservedV2 export class XCompInfo{ @@ -76,61 +77,76 @@ export function CurrentXCompIndex(id:number):XCompInfo{ const xcIs:XCompInfos = AppStorageV2.connect(XCompInfos, () => new XCompInfos)!; return ctInfo=(xcIs.infos as Array)[id]; } -//执行命令 + +//执行事件 +export function Execute(event:TitleButton){ + if(event.btnEvent.type==EventType.EVENT){ + ExecuteCommand(event); + }else{ + ExecutePage(event); + } +} +//事件类型:页面 +export function ExecutePage(event:TitleButton){ + //打开文件 + if(event?.btnEvent.command=='Execute_OpenFile') { + const winInfo: WinInfo = new WinInfo(event.btnName, event.btnEvent.page, mwInfo.width * 0.5, mwInfo.height * 0.3); + CreateAndShowSubWindow(winInfo); + } + //窗体打开 + if(event?.btnEvent.command=='Execute_CreateSubWindow'){ + const winInfo:WinInfo=new WinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.3,mwInfo.height*0.9); + CreateAndShowSubWindow(winInfo); + }else if(event?.btnEvent.command=='Execute_ExitSubWindow'){ + CloseSubWindow(); + } else if(event?.btnEvent.command=='Execute_CreateSubWindow_Options'){ + const winInfo:WinInfo=new WinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.6,mwInfo.height*0.9); + CreateAndShowSubWindow(winInfo); + } else if(event?.btnEvent.command=='Execute_NewFileWindow'){ + const winInfo:WinInfo=new WinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4); + CreateAndShowSubWindow(winInfo); + }else if(event?.btnEvent.command=='Execute_SaveAsFileWindow'){ + const winInfo:WinInfo=new WinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4); + CreateAndShowSubWindow(winInfo); + }else if(event?.btnEvent.command=='Execute_ImportFileWindow'){ + const winInfo:WinInfo=new WinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4); + CreateAndShowSubWindow(winInfo); + }else if(event?.btnEvent.command=='Execute_ExportFileWindow'){ + const winInfo:WinInfo=new WinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.4,mwInfo.height*0.4); + CreateAndShowSubWindow(winInfo); + } else if(event?.btnEvent.command=='Open_NewModel'){ + const winInfo:WinInfo=new WinInfo(event.btnName,event.btnEvent.page,mwInfo.width*0.6,mwInfo.height*0.9); + CreateAndShowSubWindow(winInfo); + } else if(event?.btnEvent.command=='Execute_ExitSubWindow_Options'){ + CloseSubWindow(); + } +} +//事件类型:纯指令 export function ExecuteCommand(event:TitleButton){ + //事件处理 - if(event?.eEvent=='Execute_LoadModel'){ + if(event?.btnEvent.command=='Execute_LoadModel'){ NativeOpenCAX.loadModel("/data/storage/el2/base/haps/entry/files/example/2027.stp"); } - if(event?.eEvent=='Create_New'){ + if(event?.btnEvent.command=='Create_New'){ CreateXCompNode(""); } - - //窗体打开 - if(event?.eEvent=='Execute_CreateSubWindow'){ - const winInfo:WinInfo=new WinInfo(event.eName,event.ePage,mwInfo.width*0.3,mwInfo.height*0.9); - CreateAndShowSubWindow(winInfo); - - }else if(event?.eEvent=='Execute_ExitSubWindow'){ - CloseSubWindow(); - } else if(event?.eEvent=='Execute_CreateSubWindow_Options'){ - const winInfo:WinInfo=new WinInfo(event.eName,event.ePage,mwInfo.width*0.6,mwInfo.height*0.9); - CreateAndShowSubWindow(winInfo); - } else if(event?.eEvent=='Execute_NewFileWindow'){ - const winInfo:WinInfo=new WinInfo(event.eName,event.ePage,mwInfo.width*0.4,mwInfo.height*0.4); - CreateAndShowSubWindow(winInfo); - }else if(event?.eEvent=='Execute_SaveAsFileWindow'){ - const winInfo:WinInfo=new WinInfo(event.eName,event.ePage,mwInfo.width*0.4,mwInfo.height*0.4); - CreateAndShowSubWindow(winInfo); - }else if(event?.eEvent=='Execute_ImportFileWindow'){ - const winInfo:WinInfo=new WinInfo(event.eName,event.ePage,mwInfo.width*0.4,mwInfo.height*0.4); - CreateAndShowSubWindow(winInfo); - }else if(event?.eEvent=='Execute_ExportFileWindow'){ - const winInfo:WinInfo=new WinInfo(event.eName,event.ePage,mwInfo.width*0.4,mwInfo.height*0.4); - CreateAndShowSubWindow(winInfo); - } else if(event?.eEvent=='Open_NewModel'){ - const winInfo:WinInfo=new WinInfo(event.eName,event.ePage,mwInfo.width*0.6,mwInfo.height*0.9); - CreateAndShowSubWindow(winInfo); - } else if(event?.eEvent=='Execute_ExitSubWindow_Options'){ - CloseSubWindow(); - } - //视图切换 - if(event?.eEvent=='CMD_VIEW_FRONT'){ + if(event?.btnEvent.command=='CMD_VIEW_FRONT'){ NativeOpenCAX.switchView("CMD_VIEW_FRONT"); - }else if(event?.eEvent=='CMD_VIEW_TOP'){ + }else if(event?.btnEvent.command=='CMD_VIEW_TOP'){ NativeOpenCAX.switchView("CMD_VIEW_TOP"); - }else if(event?.eEvent=='CMD_VIEW_LEFT_SIDE'){ + }else if(event?.btnEvent.command=='CMD_VIEW_LEFT_SIDE'){ NativeOpenCAX.switchView("CMD_VIEW_LEFT_SIDE"); - }else if(event?.eEvent=='CMD_VIEW_RIGHT_SIDE'){ + }else if(event?.btnEvent.command=='CMD_VIEW_RIGHT_SIDE'){ NativeOpenCAX.switchView("CMD_VIEW_RIGHT_SIDE"); - }else if(event?.eEvent=='CMD_VIEW_BOTTOM'){ + }else if(event?.btnEvent.command=='CMD_VIEW_BOTTOM'){ NativeOpenCAX.switchView("CMD_VIEW_BOTTOM"); - }else if(event?.eEvent=='CMD_VIEW_REAR'){ + }else if(event?.btnEvent.command=='CMD_VIEW_REAR'){ NativeOpenCAX.switchView("CMD_VIEW_REAR"); - }else if(event?.eEvent=='CMD_VIEW_ISO'){ + }else if(event?.btnEvent.command=='CMD_VIEW_ISO'){ NativeOpenCAX.switchView("CMD_VIEW_ISO"); - }else if(event?.eEvent=='CMD_VIEW_DIM'){ + }else if(event?.btnEvent.command=='CMD_VIEW_DIM'){ NativeOpenCAX.switchView("CMD_VIEW_DIM"); } } \ No newline at end of file diff --git a/entry/src/main/ets/pages/EventSubWin/File/FileStr.ets b/entry/src/main/ets/pages/EventSubWin/File/FileStr.ets index 81a541cc..10e319f3 100644 --- a/entry/src/main/ets/pages/EventSubWin/File/FileStr.ets +++ b/entry/src/main/ets/pages/EventSubWin/File/FileStr.ets @@ -1,18 +1,17 @@ import { FileInter } from "./FileInter"; -import { ModelType } from "../../LayoutInterface/Layout/ModelType"; -import { TitleButton } from "../../LayoutInterface/Interface/ButtonInterface"; +import { TitleButton,ModelType,EventType } from "../../LayoutInterface/Interface/ButtonInterface"; //创建模块类型 export let CreateModelType:Array=[ - {eModel:[ModelType.BASE],eName:"BASE(基础模式)",eNamed:"",ePage:'',eIcon:"",eTips:"基础建模",eEvent:""}, - {eModel:[ModelType.BASE],eName:"CAD(制图模式)",eNamed:"",ePage:'',eIcon:"",eTips:"制图模块",eEvent:""}, - {eModel:[ModelType.BASE],eName:"CAM(加工模式)",eNamed:"",ePage:'',eIcon:"",eTips:"加工模块",eEvent:""}, - {eModel:[ModelType.BASE],eName:"CAE(仿真模式)",eNamed:"",ePage:'',eIcon:"",eTips:"仿真模块",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"BASE(基础模式)",btnNamed:"",btnIcon:"",btnTips:"基础建模",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"CAD(制图模式)",btnNamed:"",btnIcon:"",btnTips:"制图模块",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"CAM(加工模式)",btnNamed:"",btnIcon:"",btnTips:"加工模块",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"CAE(仿真模式)",btnNamed:"",btnIcon:"",btnTips:"仿真模块",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] export let DocUnitsType:Array=[ - {eModel:[ModelType.BASE],eName:"mm(米制:毫米)",eNamed:"",ePage:'',eIcon:"",eTips:"毫米",eEvent:""}, - {eModel:[ModelType.BASE],eName:"m(米制:米)",eNamed:"",ePage:'',eIcon:"",eTips:"米",eEvent:""}, - {eModel:[ModelType.BASE],eName:"inch(英制:英寸)",eNamed:"",ePage:'',eIcon:"",eTips:"英制",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"mm(米制:毫米)",btnNamed:"",btnIcon:"",btnTips:"毫米",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"m(米制:米)",btnNamed:"",btnIcon:"",btnTips:"米",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"inch(英制:英寸)",btnNamed:"",btnIcon:"",btnTips:"英制",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] export let FileStr:Array=[ @@ -23,31 +22,31 @@ export let FileStr:Array=[ sOptions:[ {exName:'新建文件',exIcon:'',exOtions: [ - {eModel:[ModelType.BASE],eName:"目录:",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"单位:",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"文件名:",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"新建",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"目录:",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"单位:",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"文件名:",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"新建",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] }, {exName:'另存为文件',exIcon:'',exOtions: [ - {eModel:[ModelType.BASE],eName:"导入用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"恢复默认用户布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"导入用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"导出用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"恢复默认用户布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] }, {exName:'导入模型',exIcon:'',exOtions: [ - {eModel:[ModelType.BASE],eName:"导入用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"恢复默认用户布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"导入用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"导出用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"恢复默认用户布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] }, {exName:'导出模型',exIcon:'',exOtions: [ - {eModel:[ModelType.BASE],eName:"导入用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"恢复默认用户布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"导入用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"导出用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"恢复默认用户布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] } ] diff --git a/entry/src/main/ets/pages/EventSubWin/File/SWOpenFile.ets b/entry/src/main/ets/pages/EventSubWin/File/SWOpenFile.ets index b905b135..347b9f5c 100644 --- a/entry/src/main/ets/pages/EventSubWin/File/SWOpenFile.ets +++ b/entry/src/main/ets/pages/EventSubWin/File/SWOpenFile.ets @@ -1,18 +1,41 @@ +import { picker } from '@kit.CoreFileKit'; +import { common } from '@kit.AbilityKit'; +import NativeOpenCAX from 'libopencax.so'; @Entry @ComponentV2 export struct SWOpenFile { - + @Local modelFileTarget:string=''; build() { Column({ space: 5 }) { Row(){ - Text('文件路径:').width('10%') - TextInput().width('80%') - Button('选择文件').width('10%') - }.height('5%') + Text('模型文件路径:') + TextInput() + Button('选择文件') + .onClick(() => { + let context = getContext(this) as common.Context; + try { + let fileSelectOptions = new picker.DocumentSelectOptions(); + let filePicker = new picker.DocumentViewPicker(context); + fileSelectOptions.selectMode = picker.DocumentSelectMode.FILE; + fileSelectOptions.fileSuffixFilters=['step','stp']; + filePicker.select(fileSelectOptions,(err: BusinessError,fileSelectResult: Array) => { + if (fileSelectResult.length === 0) { + return; + } + this.modelFileTarget =fileSelectResult.toString(); + }) + } catch (error) { + const err: BusinessError = error as BusinessError; + console.error(`DocumentViewPicker failed with err: ${err.code}, ${err.message}`); + } + }) + }.height('10%') Blank().height('80%') Row(){ - Button('打开') + Button('打开').onClick(()=>{ + NativeOpenCAX.loadModel(this.modelFileTarget); + }) }.alignItems(VerticalAlign.Center) }.margin({ top:0, left: 5, bottom: 0, right: 5 }) } diff --git a/entry/src/main/ets/pages/EventSubWin/Opts/OptsStr.ets b/entry/src/main/ets/pages/EventSubWin/Opts/OptsStr.ets index 05f07687..11c0e0b1 100644 --- a/entry/src/main/ets/pages/EventSubWin/Opts/OptsStr.ets +++ b/entry/src/main/ets/pages/EventSubWin/Opts/OptsStr.ets @@ -1,5 +1,5 @@ import { OptsInter } from "./OptsInter"; -import { ModelType } from "../../LayoutInterface/Layout/ModelType"; +import { TitleButton,ModelType,EventType } from "../../LayoutInterface/Interface/ButtonInterface"; export let OptionsStrData:Array=[ { @@ -9,16 +9,16 @@ export let OptionsStrData:Array=[ sOptions:[ {exName:'用户基础设置',exIcon:'',exOtions: [ - {eModel:[ModelType.BASE],eName:"导入用户设置",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出用户设置",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"恢复默认用户设置",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"导入用户设置",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"导出用户设置",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"恢复默认用户设置",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] }, {exName:'用户界面布局',exIcon:'',exOtions: [ - {eModel:[ModelType.BASE],eName:"导入用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出用户界面布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"恢复默认用户布局",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"导入用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"导出用户界面布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"恢复默认用户布局",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] } ] @@ -29,25 +29,25 @@ export let OptionsStrData:Array=[ sIcon:'string', sOptions:[ {exName:'默认单位',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"英寸",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"毫米",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"自动保存间隔",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"英寸",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"毫米",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"自动保存间隔",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'目录',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"默认其实目录",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"默认文档名",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"默认其实目录",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"默认文档名",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'表达式',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"表达式前缀",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"表达式后缀",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"表达式前缀",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"表达式后缀",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'大模型接口',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"大模型地址",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"Key",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"模型选择",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"知识库设定",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"MCP设定",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"Skills",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"大模型地址",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"Key",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"模型选择",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"知识库设定",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"MCP设定",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"Skills",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, ] }, @@ -57,69 +57,69 @@ export let OptionsStrData:Array=[ sIcon:'string', sOptions:[ {exName:'默认',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'直线',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'圆弧',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'二次曲线',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'样条',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'实体',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'片体',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'基准平面',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'点',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'无限长直线',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'坐标系',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'实体和片体',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'基准坐标系',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, ] }, @@ -129,24 +129,24 @@ export let OptionsStrData:Array=[ sIcon:'string', sOptions:[ {exName:'显示',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'图形',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'光顺边',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, {exName:'收敛体',exIcon:'',exOtions:[ - {eModel:[ModelType.BASE],eName:"颜色",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线宽",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"颜色",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"线宽",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ]}, ] } diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/BaseTypeInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/BaseTypeInterface.ets new file mode 100644 index 00000000..e5e529f5 --- /dev/null +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/BaseTypeInterface.ets @@ -0,0 +1,33 @@ + + +export {ModelType,EventType} +export {EventInfo} + +//模块类型 +enum ModelType{ + CAD, + CAM, + CAE, + BASE +}; + +//事件类型 +enum EventType{ + PAGE, + EVENT +} + +//Event Interface +interface EventInfo{ + //事件唯一UID + uid:string; + //事件名 + command:string; + //事件类型 + type:EventType; + //事件页面 + page:string; + //事件参数 + args:Array|string|number|object|Map +} + diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets index cd431100..bf1bfc5a 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/ButtonInterface.ets @@ -1,11 +1,14 @@ -import { ModelType } from "../Layout/ModelType" +import { ModelType,EventType,EventInfo } from "./BaseTypeInterface" + +export {ModelType,EventType,EventInfo} +export {TitleButton} + +interface TitleButton { + btnModel:Array + btnName:string + btnNamed:string + btnIcon:string + btnTips:string + btnEvent:EventInfo +} -export interface TitleButton { - eModel:Array - eName:string - eNamed:string - eIcon:string - eTips:string - ePage:string - eEvent:string -} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets index 7ff535b7..c0f7521a 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/GroupInterface.ets @@ -1,11 +1,14 @@ import { TitleButton } from "./ButtonInterface"; +export {TitleButton} +export {TitleGroup} //功能组 -export interface TitleGroup{ +interface TitleGroup{ //功能组名字 grpName:string; //按钮列表 grpBtn:Array> //功能组菜单 grpMenu:Array -} \ No newline at end of file +} + diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets index 6248c065..c4a26d0c 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/Interface.ets @@ -1,8 +1,10 @@ import { TitleGroup } from "./GroupInterface"; import { TitleModel } from "./ModelInterface"; +export {TitleGroup,TitleModel} +export {TitleInterface} //Title配置 -export interface TitleInterface{ +interface TitleInterface{ //Title配置ID名(唯一) mId:string; //基础模块 @@ -10,3 +12,5 @@ export interface TitleInterface{ //功能模块 mModels:Map> } + + diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets index ff078448..6a718643 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/MenuInterface.ets @@ -1,6 +1,10 @@ import { TitleButton } from "./ButtonInterface" -export interface BaseMenuData { +export {TitleButton} +export {BaseMenuData} + +interface BaseMenuData { aMenus: Array> aIndex:number -} \ No newline at end of file +} + diff --git a/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets b/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets index f9d2c4d9..0e6ccc6b 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Interface/ModelInterface.ets @@ -1,7 +1,10 @@ import { TitleButton } from "./ButtonInterface" import { TitleGroup } from "./GroupInterface" -export interface TitleModel{ +export {TitleButton,TitleGroup} +export {TitleModel} + +interface TitleModel{ //模块名 cmName:string //模块路由页面 @@ -15,4 +18,4 @@ export interface TitleModel{ //Array按钮组 //Array菜单按钮 cmEvents:Array|Array>>|Array -} \ No newline at end of file +} diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets index 154d48f8..a7c7bbfc 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAD.ets @@ -1,182 +1,184 @@ -import { TitleModel } from "./TitleTabData"; -import {TitleDefaultBars} from './TitleDefaultBars' -import {ModelType} from './ModelType' +import { TitleModel } from "../Interface/ModelInterface"; +import { TitleDefaultBars } from './TitleDefaultBars' +import { ModelType,EventType } from '../Interface/BaseTypeInterface' import { GroupActionMenu } from "./GroupAction"; import { TitleGroup } from "../Interface/GroupInterface"; import { MatrixModel ,DevModel} from "./MatrixModel"; -export let TitleCAD:Array=[ +export {TitleCAD} + +let TitleCAD:Array=[ TitleDefaultBars[0], {cmName:'建模',cmPage:'',cmTips:'',cmEvents: [ //数组表示非单个BtnEvent [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'构建',grpBtn:[ - {eModel:[ModelType.BASE],eName:"草图",eNamed:"",ePage:'',eIcon:"sketch",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"草图",btnNamed:"",btnIcon:"sketch",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, [ - {eModel:[ModelType.BASE],eName:"基准平面",eNamed:"",ePage:'',eIcon:"standard_datumplane",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"基准轴",eNamed:"",ePage:'',eIcon:"standard_datumaxis",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"基准坐标系",eNamed:"",ePage:'',eIcon:"standard_datumcsys",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"基准平面栅格",eNamed:"",ePage:'',eIcon:"standard_datum_plane_grid_nonwkpt",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"调整基准坐标系大小",eNamed:"",ePage:'',eIcon:"standard_resize_datum_plane",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"打印坐标系",eNamed:"",ePage:'',eIcon:"standard_print_csys",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"基准平面",btnNamed:"",btnIcon:"standard_datumplane",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"基准轴",btnNamed:"",btnIcon:"standard_datumaxis",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"基准坐标系",btnNamed:"",btnIcon:"standard_datumcsys",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"基准平面栅格",btnNamed:"",btnIcon:"standard_datum_plane_grid_nonwkpt",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"调整基准坐标系大小",btnNamed:"",btnIcon:"standard_resize_datum_plane",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"打印坐标系",btnNamed:"",btnIcon:"standard_print_csys",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"点",eNamed:"",ePage:'',eIcon:"sketch_point",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"直线",eNamed:"",ePage:'',eIcon:"sketch_line",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆弧/圆",eNamed:"",ePage:'',eIcon:"sketch_arc",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"样条",eNamed:"",ePage:'',eIcon:"sketch_spline",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"艺术样条",eNamed:"",ePage:'',eIcon:"sketch_spline",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"文本",eNamed:"",ePage:'',eIcon:"sketch_styler_label",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"点集",eNamed:"",ePage:'',eIcon:"sketch_point_set",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"参考点云",eNamed:"",ePage:'',eIcon:"sketch_reference_point_cloud",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"点",btnNamed:"",btnIcon:"sketch_point",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"直线",btnNamed:"",btnIcon:"sketch_line",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆弧/圆",btnNamed:"",btnIcon:"sketch_arc",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"样条",btnNamed:"",btnIcon:"sketch_spline",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"艺术样条",btnNamed:"",btnIcon:"sketch_spline",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"文本",btnNamed:"",btnIcon:"sketch_styler_label",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"点集",btnNamed:"",btnIcon:"sketch_point_set",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"参考点云",btnNamed:"",btnIcon:"sketch_reference_point_cloud",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ] ],grpMenu:GroupActionMenu}] as Array, [{grpName:'基本',grpBtn:[ [ - {eModel:[ModelType.BASE],eName:"拉伸",eNamed:"",ePage:'',eIcon:"modeling_extrude",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"旋转",eNamed:"",ePage:'',eIcon:"modeling_revolution",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"拉伸",btnNamed:"",btnIcon:"modeling_extrude",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"旋转",btnNamed:"",btnIcon:"modeling_revolution",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"合并",eNamed:"",ePage:'',eIcon:"modeling_booleanunite",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"减去",eNamed:"",ePage:'',eIcon:"modeling_booleansubtract",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"求交",eNamed:"",ePage:'',eIcon:"modeling_booleanintersect",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"合并",btnNamed:"",btnIcon:"modeling_booleanunite",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"减去",btnNamed:"",btnIcon:"modeling_booleansubtract",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"求交",btnNamed:"",btnIcon:"modeling_booleanintersect",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"凸起",eNamed:"",ePage:'',eIcon:"modeling_edit_emboss",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"凸起体",eNamed:"",ePage:'',eIcon:"modeling_edit_emboss_body",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"组合",eNamed:"",ePage:'',eIcon:"modeling_edit_combine_sheets",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"缝合",eNamed:"",ePage:'',eIcon:"modeling_edit_sew",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"补片",eNamed:"",ePage:'',eIcon:"modeling_edit_patch",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"拼合",eNamed:"",ePage:'',eIcon:"modeling_edit_quilt",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"偏置凸起",eNamed:"",ePage:'',eIcon:"modeling_edit_offsetemboss",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"装配切割",eNamed:"",ePage:'',eIcon:"modeling_edit_assembly_cut",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"取消缝合",eNamed:"",ePage:'',eIcon:"modeling_edit_unsew",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"连接面",eNamed:"",ePage:'',eIcon:"modeling_edit_joinface",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"凸起",btnNamed:"",btnIcon:"modeling_edit_emboss",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"凸起体",btnNamed:"",btnIcon:"modeling_edit_emboss_body",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"组合",btnNamed:"",btnIcon:"modeling_edit_combine_sheets",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"缝合",btnNamed:"",btnIcon:"modeling_edit_sew",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"补片",btnNamed:"",btnIcon:"modeling_edit_patch",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"拼合",btnNamed:"",btnIcon:"modeling_edit_quilt",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"偏置凸起",btnNamed:"",btnIcon:"modeling_edit_offsetemboss",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"装配切割",btnNamed:"",btnIcon:"modeling_edit_assembly_cut",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"取消缝合",btnNamed:"",btnIcon:"modeling_edit_unsew",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"连接面",btnNamed:"",btnIcon:"modeling_edit_joinface",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"孔",eNamed:"",ePage:'',eIcon:"modeling_feature_hole",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"腔",eNamed:"",ePage:'',eIcon:"modeling_feature_pocket",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"槽",eNamed:"",ePage:'',eIcon:"modeling_feature_groove",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"凸台",eNamed:"",ePage:'',eIcon:"modeling_feature_boss",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"垫块",eNamed:"",ePage:'',eIcon:"modeling_feature_pdw_backing_pad",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"筋板",eNamed:"",ePage:'',eIcon:"modeling_feature_rib",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"螺纹",eNamed:"",ePage:'',eIcon:"modeling_feature_thread",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"剪口",eNamed:"",ePage:'',eIcon:"modeling_feature_bdtool_dart",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"轮廓筋板",eNamed:"",ePage:'',eIcon:"modeling_feature_contour_rib",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"算法特征",eNamed:"",ePage:'',eIcon:"modeling_feature_algorithmic_feature",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"用户定义",eNamed:"",ePage:'',eIcon:"modeling_feature_userdefined",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"拓扑优化",eNamed:"",ePage:'',eIcon:"modeling_feature_topopt_task_environment",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"按方程创建体",eNamed:"",ePage:'',eIcon:"modeling_feature_surface_general",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"孔",btnNamed:"",btnIcon:"modeling_feature_hole",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"腔",btnNamed:"",btnIcon:"modeling_feature_pocket",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"槽",btnNamed:"",btnIcon:"modeling_feature_groove",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"凸台",btnNamed:"",btnIcon:"modeling_feature_boss",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"垫块",btnNamed:"",btnIcon:"modeling_feature_pdw_backing_pad",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"筋板",btnNamed:"",btnIcon:"modeling_feature_rib",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"螺纹",btnNamed:"",btnIcon:"modeling_feature_thread",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"剪口",btnNamed:"",btnIcon:"modeling_feature_bdtool_dart",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"轮廓筋板",btnNamed:"",btnIcon:"modeling_feature_contour_rib",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"算法特征",btnNamed:"",btnIcon:"modeling_feature_algorithmic_feature",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"用户定义",btnNamed:"",btnIcon:"modeling_feature_userdefined",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"拓扑优化",btnNamed:"",btnIcon:"modeling_feature_topopt_task_environment",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"按方程创建体",btnNamed:"",btnIcon:"modeling_feature_surface_general",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ], [ - {eModel:[ModelType.BASE],eName:"边倒圆",eNamed:"",ePage:'',eIcon:"modeling_edit_blend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"面倒圆",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_faceblend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"样式倒圆",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_aesthetic_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"美学面倒圆",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_styled_blend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"桥接曲面",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_bridge_sheet",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"倒圆拐角",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_sm_corner",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"样式拐角",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_styled_corner",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球形拐角",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_spherical_corner",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"倒斜角",eNamed:"",ePage:'',eIcon:"modeling_edit_blend_solid_chamfer",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"拔模",eNamed:"",ePage:'',eIcon:"modeling_edit_taper",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"拔模体",eNamed:"",ePage:'',eIcon:"modeling_edit_draft_body",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"边倒圆",btnNamed:"",btnIcon:"modeling_edit_blend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"面倒圆",btnNamed:"",btnIcon:"modeling_edit_blend_faceblend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"样式倒圆",btnNamed:"",btnIcon:"modeling_edit_blend_aesthetic_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"美学面倒圆",btnNamed:"",btnIcon:"modeling_edit_blend_styled_blend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"桥接曲面",btnNamed:"",btnIcon:"modeling_edit_blend_bridge_sheet",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"倒圆拐角",btnNamed:"",btnIcon:"modeling_edit_blend_sm_corner",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"样式拐角",btnNamed:"",btnIcon:"modeling_edit_blend_styled_corner",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"球形拐角",btnNamed:"",btnIcon:"modeling_edit_blend_spherical_corner",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"倒斜角",btnNamed:"",btnIcon:"modeling_edit_blend_solid_chamfer",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"拔模",btnNamed:"",btnIcon:"modeling_edit_taper",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"拔模体",btnNamed:"",btnIcon:"modeling_edit_draft_body",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ], [ - {eModel:[ModelType.BASE],eName:"修剪体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_trim",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"拆分体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_split",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"删除体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_delete_body",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"分割面",eNamed:"",ePage:'',eIcon:"modeling_edit_body_subdivideface",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"修剪片体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_trimmed_sheet",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"延伸片体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_extend_sheet",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"修剪和延伸",eNamed:"",ePage:'',eIcon:"modeling_edit_body_trim_and_extend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"取消修剪",eNamed:"",ePage:'',eIcon:"modeling_edit_body_untrim",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"修剪体",btnNamed:"",btnIcon:"modeling_edit_body_trim",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"拆分体",btnNamed:"",btnIcon:"modeling_edit_body_split",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"删除体",btnNamed:"",btnIcon:"modeling_edit_body_delete_body",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"分割面",btnNamed:"",btnIcon:"modeling_edit_body_subdivideface",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"修剪片体",btnNamed:"",btnIcon:"modeling_edit_body_trimmed_sheet",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"延伸片体",btnNamed:"",btnIcon:"modeling_edit_body_extend_sheet",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"修剪和延伸",btnNamed:"",btnIcon:"modeling_edit_body_trim_and_extend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"取消修剪",btnNamed:"",btnIcon:"modeling_edit_body_untrim",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"抽壳",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_hollow",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"加厚",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_thicken",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"缩放体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_scale",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"包容体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_mw_tools_box",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"包裹几何体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_wrap_geom",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"抽壳",btnNamed:"",btnIcon:"modeling_edit_body_face_hollow",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"加厚",btnNamed:"",btnIcon:"modeling_edit_body_face_thicken",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"缩放体",btnNamed:"",btnIcon:"modeling_edit_body_face_scale",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"包容体",btnNamed:"",btnIcon:"modeling_edit_body_face_mw_tools_box",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"包裹几何体",btnNamed:"",btnIcon:"modeling_edit_body_face_wrap_geom",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"抽取几何体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_extractfeat",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"阵列特征",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_pattern_feature",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"阵列面",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_pattern_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"阵列几何特征",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_pattern_geometry",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"阵列体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_pattern_body_2",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"镜像面",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_mirror_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"镜像几何特征",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_mirror_feature",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"镜像几何体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_mirror_geometry",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"提升体",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_promotion",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"隔离特征对象",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_isolate",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"抽取几何体",btnNamed:"",btnIcon:"modeling_edit_body_face_extractfeat",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"阵列特征",btnNamed:"",btnIcon:"modeling_edit_body_face_pattern_feature",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"阵列面",btnNamed:"",btnIcon:"modeling_edit_body_face_pattern_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"阵列几何特征",btnNamed:"",btnIcon:"modeling_edit_body_face_pattern_geometry",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"阵列体",btnNamed:"",btnIcon:"modeling_edit_body_face_pattern_body_2",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"镜像面",btnNamed:"",btnIcon:"modeling_edit_body_face_mirror_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"镜像几何特征",btnNamed:"",btnIcon:"modeling_edit_body_face_mirror_feature",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"镜像几何体",btnNamed:"",btnIcon:"modeling_edit_body_face_mirror_geometry",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"提升体",btnNamed:"",btnIcon:"modeling_edit_body_face_promotion",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"隔离特征对象",btnNamed:"",btnIcon:"modeling_edit_body_face_isolate",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"偏置面",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_offset_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"偏置曲面",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_offset_face_variable",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"可变偏置",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_variable_offset",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"变距偏置面",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_offset_face_variable",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"大致偏置",eNamed:"",ePage:'',eIcon:"modeling_edit_body_face_rough_offset",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"偏置面",btnNamed:"",btnIcon:"modeling_edit_body_face_offset_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"偏置曲面",btnNamed:"",btnIcon:"modeling_edit_body_face_offset_face_variable",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"可变偏置",btnNamed:"",btnIcon:"modeling_edit_body_face_variable_offset",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"变距偏置面",btnNamed:"",btnIcon:"modeling_edit_body_face_offset_face_variable",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"大致偏置",btnNamed:"",btnIcon:"modeling_edit_body_face_rough_offset",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ] ],grpMenu:GroupActionMenu}] as Array, [{grpName:'同步建模',grpBtn:[ [ - {eModel:[ModelType.BASE],eName:"移动",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_move_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"删除",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_delete_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"替换",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_replace_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"替换圆角",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_replace_blend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"偏置",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_offset_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"调整圆角大小",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_resize_blend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"局部比例",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_local_scale",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"移动",btnNamed:"",btnIcon:"modeling_edit_sync_build_move_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"删除",btnNamed:"",btnIcon:"modeling_edit_sync_build_delete_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"替换",btnNamed:"",btnIcon:"modeling_edit_sync_build_replace_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"替换圆角",btnNamed:"",btnIcon:"modeling_edit_sync_build_replace_blend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"偏置",btnNamed:"",btnIcon:"modeling_edit_sync_build_offset_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"调整圆角大小",btnNamed:"",btnIcon:"modeling_edit_sync_build_resize_blend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"局部比例",btnNamed:"",btnIcon:"modeling_edit_sync_build_local_scale",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"复制面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_copy_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"剪切面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_cut_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"粘贴面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_paste_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"镜像面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_mirror_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"阵列面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_pattern_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"辐射面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_radiate_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"拉动面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_lift_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"编辑横截面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_edit_cross_section",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"复制面",btnNamed:"",btnIcon:"modeling_edit_sync_build_copy_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"剪切面",btnNamed:"",btnIcon:"modeling_edit_sync_build_cut_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"粘贴面",btnNamed:"",btnIcon:"modeling_edit_sync_build_paste_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"镜像面",btnNamed:"",btnIcon:"modeling_edit_sync_build_mirror_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"阵列面",btnNamed:"",btnIcon:"modeling_edit_sync_build_pattern_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"辐射面",btnNamed:"",btnIcon:"modeling_edit_sync_build_radiate_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"拉动面",btnNamed:"",btnIcon:"modeling_edit_sync_build_lift_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"编辑横截面",btnNamed:"",btnIcon:"modeling_edit_sync_build_edit_cross_section",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"线性尺寸",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_linear_dimension",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"角度尺寸",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_angular_dimension",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"径向尺寸",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_radial_dimension",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"特征尺寸",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_feature_dimension",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"线性尺寸",btnNamed:"",btnIcon:"modeling_edit_sync_build_linear_dimension",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"角度尺寸",btnNamed:"",btnIcon:"modeling_edit_sync_build_angular_dimension",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"径向尺寸",btnNamed:"",btnIcon:"modeling_edit_sync_build_radial_dimension",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"特征尺寸",btnNamed:"",btnIcon:"modeling_edit_sync_build_feature_dimension",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"标记凹口圆角",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_label_notch_blend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆角重新排序",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_reorder_blend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"调整倒角大小",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_resize_blend",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"标记为倒斜角",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_resize_chamfer",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"调整孔大小",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_resize_hole",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"调整阵列大小",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_resize_pattern",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"编辑实体密度",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_editsoliddensity",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"移除参数",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_removeparams",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"替换为独立草图",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_replacelinkedsketch",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"从边倒圆移除缺失的父项",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_delete",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"标记凹口圆角",btnNamed:"",btnIcon:"modeling_edit_sync_build_label_notch_blend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆角重新排序",btnNamed:"",btnIcon:"modeling_edit_sync_build_reorder_blend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"调整倒角大小",btnNamed:"",btnIcon:"modeling_edit_sync_build_resize_blend",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"标记为倒斜角",btnNamed:"",btnIcon:"modeling_edit_sync_build_resize_chamfer",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"调整孔大小",btnNamed:"",btnIcon:"modeling_edit_sync_build_resize_hole",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"调整阵列大小",btnNamed:"",btnIcon:"modeling_edit_sync_build_resize_pattern",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"编辑实体密度",btnNamed:"",btnIcon:"modeling_edit_sync_build_editsoliddensity",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"移除参数",btnNamed:"",btnIcon:"modeling_edit_sync_build_removeparams",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"替换为独立草图",btnNamed:"",btnIcon:"modeling_edit_sync_build_replacelinkedsketch",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"从边倒圆移除缺失的父项",btnNamed:"",btnIcon:"modeling_edit_sync_build_delete",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"设为共面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_make_coplanar",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设为共轴",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_make_coaxial",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设为相切",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_make_tangent",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设为对称",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_make_symmetrical",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设为平行",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_make_parallel",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设为垂直",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_make_perpendicular",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设为偏置",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_offset_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"组合面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_group_face",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"优化面",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_optimize_face",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"设为共面",btnNamed:"",btnIcon:"modeling_edit_sync_build_make_coplanar",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设为共轴",btnNamed:"",btnIcon:"modeling_edit_sync_build_make_coaxial",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设为相切",btnNamed:"",btnIcon:"modeling_edit_sync_build_make_tangent",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设为对称",btnNamed:"",btnIcon:"modeling_edit_sync_build_make_symmetrical",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设为平行",btnNamed:"",btnIcon:"modeling_edit_sync_build_make_parallel",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设为垂直",btnNamed:"",btnIcon:"modeling_edit_sync_build_make_perpendicular",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设为偏置",btnNamed:"",btnIcon:"modeling_edit_sync_build_offset_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"组合面",btnNamed:"",btnIcon:"modeling_edit_sync_build_group_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"优化面",btnNamed:"",btnIcon:"modeling_edit_sync_build_optimize_face",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"移动边",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_move_edge",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"偏置边",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_offset_edge",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"移动边",btnNamed:"",btnIcon:"modeling_edit_sync_build_move_edge",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"偏置边",btnNamed:"",btnIcon:"modeling_edit_sync_build_offset_edge",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"替换特征",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_replace_feature",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"延迟模型更新",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_delayupdatemodel",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"更新模型",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_updatemodel",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"更新特征",eNamed:"",ePage:'',eIcon:"modeling_edit_sync_build_renew_feature",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"替换特征",btnNamed:"",btnIcon:"modeling_edit_sync_build_replace_feature",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"延迟模型更新",btnNamed:"",btnIcon:"modeling_edit_sync_build_delayupdatemodel",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"更新模型",btnNamed:"",btnIcon:"modeling_edit_sync_build_updatemodel",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"更新特征",btnNamed:"",btnIcon:"modeling_edit_sync_build_renew_feature",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] ],grpMenu:GroupActionMenu}] as Array ] @@ -186,11 +188,11 @@ export let TitleCAD:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'基础模型',grpBtn:[ - {eModel:[ModelType.BASE],eName:"块",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆柱",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"块",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆柱",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆锥",btnNamed:"",btnIcon:"base_close_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"球",btnNamed:"",btnIcon:"base_import_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"管道",btnNamed:"",btnIcon:"base_export_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ],grpMenu:GroupActionMenu}] as Array ] ]}, @@ -199,11 +201,11 @@ export let TitleCAD:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'基础模型',grpBtn:[ - {eModel:[ModelType.BASE],eName:"块",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆柱",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"块",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆柱",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆锥",btnNamed:"",btnIcon:"base_close_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"球",btnNamed:"",btnIcon:"base_import_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"管道",btnNamed:"",btnIcon:"base_export_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ],grpMenu:GroupActionMenu}] as Array ] ]}, @@ -212,11 +214,11 @@ export let TitleCAD:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'基础模型',grpBtn:[ - {eModel:[ModelType.BASE],eName:"块",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆柱",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"块",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆柱",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆锥",btnNamed:"",btnIcon:"base_close_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"球",btnNamed:"",btnIcon:"base_import_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"管道",btnNamed:"",btnIcon:"base_export_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ],grpMenu:GroupActionMenu}] as Array ] ]}, @@ -225,11 +227,11 @@ export let TitleCAD:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'基础模型',grpBtn:[ - {eModel:[ModelType.BASE],eName:"块",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆柱",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"块",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆柱",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆锥",btnNamed:"",btnIcon:"base_close_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"球",btnNamed:"",btnIcon:"base_import_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"管道",btnNamed:"",btnIcon:"base_export_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ],grpMenu:GroupActionMenu}] as Array ] ]}, @@ -238,11 +240,11 @@ export let TitleCAD:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'基础模型',grpBtn:[ - {eModel:[ModelType.BASE],eName:"块",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆柱",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"块",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆柱",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆锥",btnNamed:"",btnIcon:"base_close_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"球",btnNamed:"",btnIcon:"base_import_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"管道",btnNamed:"",btnIcon:"base_export_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ],grpMenu:GroupActionMenu}] as Array ] ]}, @@ -251,11 +253,11 @@ export let TitleCAD:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'基础模型',grpBtn:[ - {eModel:[ModelType.BASE],eName:"块",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆柱",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"圆锥",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"球",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"管道",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""} + {btnModel:[ModelType.BASE],btnName:"块",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆柱",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"圆锥",btnNamed:"",btnIcon:"base_close_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"球",btnNamed:"",btnIcon:"base_import_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"管道",btnNamed:"",btnIcon:"base_export_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ],grpMenu:GroupActionMenu}] as Array ] ]}, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets index 004d0b24..91ec28b1 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAE.ets @@ -1,10 +1,9 @@ -import { TitleModel } from "./TitleTabData"; +import { TitleModel } from "../Interface/ModelInterface"; import {TitleDefaultBars} from './TitleDefaultBars' -import {ModelType} from './ModelType' import { GroupActionMenu } from "./GroupAction"; import { TitleGroup } from "../Interface/GroupInterface"; import { MatrixModel ,DevModel} from "./MatrixModel"; -import { TitleButton } from "../Interface/ButtonInterface"; +import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface"; export let TitleCAE:Array=[ TitleDefaultBars[0], @@ -13,16 +12,16 @@ export let TitleCAE:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'初始化仿真',grpBtn:[ - {eModel:[ModelType.BASE],eName:"导入模型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出模型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设定仿真环境",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"导入模型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"导出模型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设定仿真环境",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, [ - {eModel:[ModelType.BASE],eName:"环境参数",eNamed:"",ePage:'',eIcon:"base_save_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"力学参数",eNamed:"",ePage:'',eIcon:"base_saveas_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"化学参数",eNamed:"",ePage:'',eIcon:"base_saveall_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"环境参数",btnNamed:"",btnIcon:"base_save_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"力学参数",btnNamed:"",btnIcon:"base_saveas_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"化学参数",btnNamed:"",btnIcon:"base_saveall_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] as Array, - {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"选项",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"帮助",btnNamed:"",btnIcon:"base_help_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ],grpMenu:GroupActionMenu}] as Array ] ]}, @@ -35,16 +34,16 @@ export let TitleCAM:Array=[TitleDefaultBars[0], [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'初始化仿真',grpBtn:[ - {eModel:[ModelType.BASE],eName:"导入模型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出模型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"设定仿真环境",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"导入模型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"导出模型",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"设定仿真环境",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, [ - {eModel:[ModelType.BASE],eName:"环境参数",eNamed:"",ePage:'',eIcon:"base_save_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"力学参数",eNamed:"",ePage:'',eIcon:"base_saveas_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"化学参数",eNamed:"",ePage:'',eIcon:"base_saveall_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"环境参数",btnNamed:"",btnIcon:"base_save_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"力学参数",btnNamed:"",btnIcon:"base_saveas_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"化学参数",btnNamed:"",btnIcon:"base_saveall_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] as Array, - {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"选项",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"帮助",btnNamed:"",btnIcon:"base_help_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ],grpMenu:GroupActionMenu}] as Array ] ]}, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets index a1acd1a2..de1e8ce2 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/CAM.ets @@ -1,10 +1,9 @@ -import { TitleModel } from "./TitleTabData"; +import { TitleModel } from "../Interface/ModelInterface"; import {TitleDefaultBars} from './TitleDefaultBars' -import {ModelType} from './ModelType' import { GroupActionMenu } from "./GroupAction"; import { TitleGroup } from "../Interface/GroupInterface"; import { MatrixModel,DevModel } from "./MatrixModel"; -import { TitleButton } from "../Interface/ButtonInterface"; +import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface"; export let TitleCAM:Array=[ TitleDefaultBars[0], @@ -13,17 +12,17 @@ export let TitleCAM:Array=[ [ //数组成员区别是GroupEvent还是BtnEvent [{grpName:'加工环境',grpBtn:[ - {eModel:[ModelType.BASE],eName:"重置环境",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"工艺",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"重置环境",btnNamed:"",btnIcon:"base_new_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"工艺",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, [ - {eModel:[ModelType.BASE],eName:"切削参数",eNamed:"",ePage:'',eIcon:"base_save_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"切削速度",eNamed:"",ePage:'',eIcon:"base_saveas_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"主轴参数",eNamed:"",ePage:'',eIcon:"base_saveall_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"切削参数",btnNamed:"",btnIcon:"base_save_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"切削速度",btnNamed:"",btnIcon:"base_saveas_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"主轴参数",btnNamed:"",btnIcon:"base_saveall_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] as Array, - {eModel:[ModelType.BASE],eName:"显示刀路",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"新建工序",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"新建刀具",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:"显示刀路",btnNamed:"",btnIcon:"base_close_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"新建工序",btnNamed:"",btnIcon:"base_import_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"新建刀具",btnNamed:"",btnIcon:"base_export_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"选项",btnNamed:"",btnIcon:"base_open_file",btnTips:"",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ],grpMenu:GroupActionMenu}] as Array ] ]}, diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets index 637a02c7..0e5a13ed 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/DisplayMode.ets @@ -1,15 +1,16 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { ModelType } from "./ModelType"; +import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface"; //视图选择布局数据 export let DisplayMode:Array=[ - {eModel:[ModelType.BASE],eName:"线框",eNamed:"",ePage:'',eIcon:"display_hidden_line_invisible",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"静态线框",eNamed:"",ePage:'',eIcon:"display_hidden_line_normal",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"淡化边界线",eNamed:"",ePage:'',eIcon:"display_hidden_line_dim",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"隐藏虚线",eNamed:"",ePage:'',eIcon:"display_hidden_line_dashed",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"显示面边界线",eNamed:"",ePage:'',eIcon:"display_shade_show_edges",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"显示小平面边界线",eNamed:"",ePage:'',eIcon:"display_shade_show_facet_edges",eTips:"俯视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"显示选择隐藏面",eNamed:"",ePage:'',eIcon:"display_select_hidden_faces",eTips:"左视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"显示选择隐藏线框",eNamed:"",ePage:'',eIcon:"display_select_hidden_wireframe",eTips:"前视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"着色",eNamed:"",ePage:'',eIcon:"display_shade",eTips:"正等测图",eEvent:""}, -] \ No newline at end of file + {btnModel:[ModelType.BASE],btnName:"线框",btnNamed:"",btnIcon:"display_hidden_line_invisible",btnTips:"正三轴测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"静态线框",btnNamed:"",btnIcon:"display_hidden_line_normal",btnTips:"正三轴测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"淡化边界线",btnNamed:"",btnIcon:"display_hidden_line_dim",btnTips:"正三轴测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"隐藏虚线",btnNamed:"",btnIcon:"display_hidden_line_dashed",btnTips:"正三轴测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"显示面边界线",btnNamed:"",btnIcon:"display_shade_show_edges",btnTips:"正三轴测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"显示小平面边界线",btnNamed:"",btnIcon:"display_shade_show_facet_edges",btnTips:"俯视图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"显示选择隐藏面",btnNamed:"",btnIcon:"display_select_hidden_faces",btnTips:"左视图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"显示选择隐藏线框",btnNamed:"",btnIcon:"display_select_hidden_wireframe",btnTips:"前视图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"着色",btnNamed:"",btnIcon:"display_shade",btnTips:"正等测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, +] + +export {TitleButton ,ModelType,EventType} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets index 7381ed74..5eee56a6 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/GroupAction.ets @@ -1,9 +1,10 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { ModelType } from "./ModelType"; +import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface"; //功能主的操作功能布局数据 export let GroupActionMenu:Array=[ -{eModel:[ModelType.BASE],eName:"增加功能",eNamed:"",ePage:'',eIcon:"",eTips:"正三轴测图",eEvent:""}, -{eModel:[ModelType.BASE],eName:"编辑功能组",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, -{eModel:[ModelType.BASE],eName:"删除功能组",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, -{eModel:[ModelType.BASE],eName:"移动功能组",eNamed:"",ePage:'',eIcon:"",eTips:"正等测图",eEvent:""} -] \ No newline at end of file +{btnModel:[ModelType.BASE],btnName:"增加功能",btnNamed:"",btnIcon:"",btnTips:"正三轴测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, +{btnModel:[ModelType.BASE],btnName:"编辑功能组",btnNamed:"",btnIcon:"",btnTips:"前视图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, +{btnModel:[ModelType.BASE],btnName:"删除功能组",btnNamed:"",btnIcon:"",btnTips:"前视图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, +{btnModel:[ModelType.BASE],btnName:"移动功能组",btnNamed:"",btnIcon:"",btnTips:"正等测图",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} +] + +export {TitleButton ,ModelType,EventType} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets index 27ba1840..c4b2e15f 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/LayoutSwitch.ets @@ -1,11 +1,12 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { ModelType } from "./ModelType"; +import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface"; //视图选择布局数据 export let LayoutSwitch:Array=[ - {eModel:[ModelType.BASE],eName:"图层设置",eNamed:"",ePage:'',eIcon:"layer_settings",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"视图中可见图层",eNamed:"",ePage:'',eIcon:"layer_vis_in_view",eTips:"俯视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"图层类别",eNamed:"",ePage:'',eIcon:"layer_category",eTips:"正等测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"移至图层",eNamed:"",ePage:'',eIcon:"layer_move_to",eTips:"左视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"复制至图层",eNamed:"",ePage:'',eIcon:"layer_copy_to",eTips:"前视图",eEvent:""}, -] \ No newline at end of file + {btnModel:[ModelType.BASE],btnName:"图层设置",btnNamed:"",btnIcon:"layer_settings",btnTips:"图层设置",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"视图中可见图层",btnNamed:"",btnIcon:"layer_vis_in_view",btnTips:"视图中可见图层",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"图层类别",btnNamed:"",btnIcon:"layer_category",btnTips:"图层类别",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"移至图层",btnNamed:"",btnIcon:"layer_move_to",btnTips:"移至图层",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"复制至图层",btnNamed:"",btnIcon:"layer_copy_to",btnTips:"复制至图层",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} +] + +export {TitleButton ,ModelType,EventType} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/LeftSideBar.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/LeftSideBar.ets index 7480a876..75015bdb 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/LeftSideBar.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/LeftSideBar.ets @@ -1,8 +1,10 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { ModelType } from "./ModelType"; +import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface"; + export let LeftSideBars:Array=[ - {eModel:[ModelType.BASE],eName:"装配导航器",eNamed:"",ePage:'',eIcon:"left_side_assembly",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"约束导航器",eNamed:"",ePage:'',eIcon:"left_side_mate_components",eTips:"前视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"部件导航器",eNamed:"",ePage:'',eIcon:"base_model_cad",eTips:"前视图",eEvent:""}, -] \ No newline at end of file + {btnModel:[ModelType.BASE],btnName:"装配导航器",btnNamed:"",btnIcon:"left_side_assembly",btnTips:"装配导航器",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"约束导航器",btnNamed:"",btnIcon:"left_side_mate_components",btnTips:"约束导航器",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"部件导航器",btnNamed:"",btnIcon:"base_model_cad",btnTips:"部件导航器",btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, +] + +export {TitleButton ,ModelType,EventType} \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets index 6b5c7951..e7efaf30 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/MatrixModel.ets @@ -1,46 +1,47 @@ import { TitleGroup } from '../Interface/GroupInterface' -import {TitleModel} from '../Interface/ModelInterface' +import { TitleModel } from '../Interface/ModelInterface' import { GroupActionMenu } from './GroupAction' -import { ModelType } from './ModelType' - +import { ModelType,EventType } from '../Interface/BaseTypeInterface' //模块矩阵布局数据 export let MatrixModel:TitleModel= { - cmName:"应用模块",cmPage:"",cmTips:"",cmEvents:[ + cmName:'应用模块',cmPage:'',cmTips:'',cmEvents:[ [[{grpName:'模块矩阵',grpBtn:[ - {eModel:[ModelType.BASE],eName:"建模",eNamed:"",ePage:'',eIcon:"base_model_cad",eTips:"",eEvent:"Switch_Model_CAD"}, - {eModel:[ModelType.BASE],eName:"加工",eNamed:"",ePage:'',eIcon:"base_model_cam",eTips:"",eEvent:"Switch_Model_CAM"}, - {eModel:[ModelType.BASE],eName:"仿真",eNamed:"",ePage:'',eIcon:"base_model_cae",eTips:"",eEvent:"Switch_Model_CAE"}, + {btnModel:[ModelType.BASE],btnName:'建模',btnNamed:'',btnIcon:'base_model_cad',btnTips:'建模',btnEvent:{uid:'',command:'Switch_Model_CAD',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'加工',btnNamed:'',btnIcon:'base_model_cam',btnTips:'加工',btnEvent:{uid:'',command:'Switch_Model_CAM',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'仿真',btnNamed:'',btnIcon:'base_model_cae',btnTips:'仿真',btnEvent:{uid:'',command:'Switch_Model_CAE',page:'',type:EventType.EVENT,args:[]}}, ],grpMenu:GroupActionMenu}] as Array ]] } + //模块矩阵布局数据 export let DevModel:TitleModel= { - cmName:"开发模式",cmPage:"",cmTips:"",cmEvents:[ + cmName:'开发模式',cmPage:'',cmTips:'',cmEvents:[ [[{grpName:'工具矩阵',grpBtn:[ - {eModel:[ModelType.BASE],eName:"新建建模实例",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"Create_New"}, + {btnModel:[ModelType.BASE],btnName:'新建建模实例',btnNamed:'',btnIcon:'base_new_file',btnTips:'新建建模实例',btnEvent:{uid:'',command:'Create_New',page:'',type:EventType.EVENT,args:[]}}, [ - {eModel:[ModelType.BASE],eName:"加载模型",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"Execute_LoadModel"}, - {eModel:[ModelType.BASE],eName:"选择加载模型",eNamed:"",ePage:'pages/EventSubWin/File/SWOpenFile',eIcon:"base_new_file",eTips:"",eEvent:"Open_NewModel"}, + {btnModel:[ModelType.BASE],btnName:'加载模型',btnNamed:'',btnIcon:'base_new_file',btnTips:'加载模型',btnEvent:{uid:'',command:'Execute_LoadModel',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'选择加载模型',btnNamed:'',btnIcon:'base_new_file',btnTips:'选择加载模型',btnEvent:{uid:'',command:'Execute_OpenFile',page:'pages/EventSubWin/File/SWOpenFile',type:EventType.PAGE,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"正等轴测图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_ISO"}, - {eModel:[ModelType.BASE],eName:"正二等轴测图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_DIM"}, - {eModel:[ModelType.BASE],eName:"前视图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_FRONT"}, - {eModel:[ModelType.BASE],eName:"后视图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_REAR"}, - {eModel:[ModelType.BASE],eName:"左视图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_LEFT_SIDE"}, - {eModel:[ModelType.BASE],eName:"右视图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_RIGHT_SIDE"}, - {eModel:[ModelType.BASE],eName:"俯视图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_TOP"}, - {eModel:[ModelType.BASE],eName:"仰视图",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:"CMD_VIEW_BOTTOM"}, + {btnModel:[ModelType.BASE],btnName:'正等轴测图',btnNamed:'',btnIcon:'base_new_file',btnTips:'正等轴测图',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'正二等轴测图',btnNamed:'',btnIcon:'base_new_file',btnTips:'正二等轴测图',btnEvent:{uid:'',command:'CMD_VIEW_DIM',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'前视图',btnNamed:'',btnIcon:'base_new_file',btnTips:'前视图',btnEvent:{uid:'',command:'CMD_VIEW_FRONT',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'后视图',btnNamed:'',btnIcon:'base_new_file',btnTips:'后视图',btnEvent:{uid:'',command:'CMD_VIEW_REAR',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'左视图',btnNamed:'',btnIcon:'base_new_file',btnTips:'左视图',btnEvent:{uid:'',command:'CMD_VIEW_LEFT_SIDE',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'右视图',btnNamed:'',btnIcon:'base_new_file',btnTips:'右视图',btnEvent:{uid:'',command:'CMD_VIEW_RIGHT_SIDE',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'俯视图',btnNamed:'',btnIcon:'base_new_file',btnTips:'俯视图',btnEvent:{uid:'',command:'CMD_VIEW_TOP',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'仰视图',btnNamed:'',btnIcon:'base_new_file',btnTips:'仰视图',btnEvent:{uid:'',command:'CMD_VIEW_BOTTOM',page:'',type:EventType.EVENT,args:[]}}, ], [ - {eModel:[ModelType.BASE],eName:"创建文件",eNamed:"",ePage:'pages/EventSubWin/File/SWNewFile',eIcon:"base_new_file",eTips:"",eEvent:"Execute_NewFileWindow"}, - {eModel:[ModelType.BASE],eName:"另存为",eNamed:"",ePage:'pages/EventSubWin/File/SWSaveAsFile',eIcon:"base_new_file",eTips:"",eEvent:"Execute_SaveAsFileWindow"}, - {eModel:[ModelType.BASE],eName:"导入文件",eNamed:"",ePage:'pages/EventSubWin/File/SWImportFile',eIcon:"base_new_file",eTips:"",eEvent:"Execute_ImportFileWindow"}, - {eModel:[ModelType.BASE],eName:"导出文件",eNamed:"",ePage:'pages/EventSubWin/File/SWExportFile',eIcon:"base_new_file",eTips:"",eEvent:"Execute_ExportFileWindow"}, - {eModel:[ModelType.BASE],eName:"创建子窗体",eNamed:"",ePage:'pages/EventSubWin/SWExtrude',eIcon:"base_new_file",eTips:"",eEvent:"Execute_CreateSubWindow"}, - {eModel:[ModelType.BASE],eName:"关闭子窗体",eNamed:"",ePage:'pages/EventSubWin/SWExtrude',eIcon:"base_new_file",eTips:"",eEvent:"Execute_ExitSubWindow"}, - {eModel:[ModelType.BASE],eName:"首选项",eNamed:"",ePage:'pages/EventSubWin/Options',eIcon:"base_new_file",eTips:"",eEvent:"Execute_CreateSubWindow_Options"}, - {eModel:[ModelType.BASE],eName:"关闭",eNamed:"",ePage:'pages/EventSubWin/Options',eIcon:"base_new_file",eTips:"",eEvent:"Execute_ExitSubWindow_Options"}, + {btnModel:[ModelType.BASE],btnName:'创建文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'创建文件',btnEvent:{uid:'',command:'Execute_NewFileWindow',page:'pages/EventSubWin/File/SWNewFile',type:EventType.PAGE,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'另存为',btnNamed:'',btnIcon:'base_new_file',btnTips:'另存为',btnEvent:{uid:'',command:'Execute_SaveAsFileWindow',page:'pages/EventSubWin/File/SWSaveAsFile',type:EventType.PAGE,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'导入文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'导入文件',btnEvent:{uid:'',command:'Execute_ImportFileWindow',page:'pages/EventSubWin/File/SWImportFile',type:EventType.PAGE,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'导出文件',btnNamed:'',btnIcon:'base_new_file',btnTips:'导出文件',btnEvent:{uid:'',command:'Execute_ExportFileWindow',page:'pages/EventSubWin/File/SWExportFile',type:EventType.PAGE,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'创建子窗体',btnNamed:'',btnIcon:'base_new_file',btnTips:'创建子窗体',btnEvent:{uid:'',command:'Execute_CreateSubWindow',page:'pages/EventSubWin/SWExtrude',type:EventType.PAGE,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'关闭子窗体',btnNamed:'',btnIcon:'base_new_file',btnTips:'关闭子窗体',btnEvent:{uid:'',command:'Execute_ExitSubWindow',page:'pages/EventSubWin/SWExtrude',type:EventType.PAGE,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'首选项',btnNamed:'',btnIcon:'base_new_file',btnTips:'首选项',btnEvent:{uid:'',command:'Execute_CreateSubWindow_Options',page:'pages/EventSubWin/Options',type:EventType.PAGE,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'关闭',btnNamed:'',btnIcon:'base_new_file',btnTips:'关闭',btnEvent:{uid:'',command:'Execute_ExitSubWindow_Options',page:'pages/EventSubWin/Options',type:EventType.PAGE,args:[]}}, + ] ],grpMenu:GroupActionMenu}] as Array ]] diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets index 3b575632..627014f0 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/MenuAction.ets @@ -1,10 +1,9 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { ModelType } from "./ModelType"; +import { TitleButton ,ModelType,EventType} from "../Interface/ButtonInterface"; //功能布局数据 export let MenuAction:Array=[ - {eModel:[ModelType.BASE],eName:"增功能",eNamed:"",ePage:'',eIcon:"",eTips:"增功能",eEvent:""}, - {eModel:[ModelType.BASE],eName:"编辑组",eNamed:"",ePage:'',eIcon:"",eTips:"编辑组",eEvent:""}, - {eModel:[ModelType.BASE],eName:"改图标",eNamed:"",ePage:'',eIcon:"",eTips:"改图标",eEvent:""}, - {eModel:[ModelType.BASE],eName:"重命名",eNamed:"",ePage:'',eIcon:"",eTips:"重命名",eEvent:""}, - {eModel:[ModelType.BASE],eName:"移动到",eNamed:"",ePage:'',eIcon:"",eTips:"移动到",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:'增功能',btnNamed:'',btnIcon:'',btnTips:'增功能',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'编辑组',btnNamed:'',btnIcon:'',btnTips:'编辑组',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'改图标',btnNamed:'',btnIcon:'',btnTips:'改图标',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'重命名',btnNamed:'',btnIcon:'',btnTips:'重命名',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'移动到',btnNamed:'',btnIcon:'',btnTips:'移动到',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, ] \ 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 deleted file mode 100644 index b3304f6f..00000000 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/ModelType.ets +++ /dev/null @@ -1,6 +0,0 @@ -export enum ModelType{ - CAD, - CAM, - CAE, - BASE -}; \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets index 577b4c22..e05138d7 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/SelectionFilter.ets @@ -1,16 +1,15 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { ModelType } from "./ModelType"; +import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface"; //拾取器过滤布局数据 export let SelectionFilter:Array=[ - {eModel:[ModelType.BASE],eName:"实体特征",eNamed:"",ePage:'',eIcon:"",eTips:"正三轴测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"曲线特征",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"加工特征",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"基准",eNamed:"",ePage:'',eIcon:"",eTips:"正等测图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"边",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"面",eNamed:"",ePage:'',eIcon:"",eTips:"左视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"线",eNamed:"",ePage:'',eIcon:"",eTips:"右视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"视图",eNamed:"",ePage:'',eIcon:"",eTips:"前视图",eEvent:""}, - {eModel:[ModelType.BASE],eName:"图像",eNamed:"",ePage:'',eIcon:"",eTips:"俯视图",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:'实体特征',btnNamed:'',btnIcon:'',btnTips:'实体特征',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'曲线特征',btnNamed:'',btnIcon:'',btnTips:'曲线特征',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'加工特征',btnNamed:'',btnIcon:'',btnTips:'加工特征',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'基准',btnNamed:'',btnIcon:'',btnTips:'基准',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'边',btnNamed:'',btnIcon:'',btnTips:'边',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'面',btnNamed:'',btnIcon:'',btnTips:'面',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'线',btnNamed:'',btnIcon:'',btnTips:'线',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'视图',btnNamed:'',btnIcon:'',btnTips:'视图',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'图像',btnNamed:'',btnIcon:'',btnTips:'图像',btnEvent:{uid:'',command:'',page:'',type:EventType.EVENT,args:[]}} ] diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets index 50813b9a..fd3e3b96 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/SwitchView.ets @@ -1,16 +1,15 @@ -import { TitleButton } from "../Interface/ButtonInterface"; -import { ModelType } from "./ModelType"; +import { TitleButton,ModelType,EventType } from "../Interface/ButtonInterface"; //视图选择布局数据 export let SwitchView:Array=[ - {eModel:[ModelType.BASE],eName:"正等测图",eNamed:"",ePage:'',eIcon:"base_view_tfr_iso",eTips:"正等测图",eEvent:"CMD_VIEW_ISO"}, - {eModel:[ModelType.BASE],eName:"俯视图",eNamed:"",ePage:'',eIcon:"base_view_top",eTips:"俯视图",eEvent:"CMD_VIEW_TOP"}, - {eModel:[ModelType.BASE],eName:"正二轴测图",eNamed:"",ePage:'',eIcon:"base_view_tfr_tri",eTips:"正二轴测图",eEvent:"CMD_VIEW_DIM"}, + {btnModel:[ModelType.BASE],btnName:"正等测图",btnNamed:"",btnIcon:"base_view_tfr_iso",btnTips:"正等测图",btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"俯视图",btnNamed:"",btnIcon:"base_view_top",btnTips:"俯视图",btnEvent:{uid:'',command:'CMD_VIEW_TOP',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"正二轴测图",btnNamed:"",btnIcon:"base_view_tfr_tri",btnTips:"正二轴测图",btnEvent:{uid:'',command:'CMD_VIEW_DIM',page:'',type:EventType.EVENT,args:[]}}, - {eModel:[ModelType.BASE],eName:"左视图",eNamed:"",ePage:'',eIcon:"base_view_left",eTips:"左视图",eEvent:"CMD_VIEW_LEFT_SIDE"}, - {eModel:[ModelType.BASE],eName:"前视图",eNamed:"",ePage:'',eIcon:"base_view_front",eTips:"前视图",eEvent:"CMD_VIEW_FRONT"}, - {eModel:[ModelType.BASE],eName:"右视图",eNamed:"",ePage:'',eIcon:"base_view_right",eTips:"右视图",eEvent:"CMD_VIEW_RIGHT_SIDE"}, + {btnModel:[ModelType.BASE],btnName:"左视图",btnNamed:"",btnIcon:"base_view_left",btnTips:"左视图",btnEvent:{uid:'',command:'CMD_VIEW_LEFT_SIDE',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"前视图",btnNamed:"",btnIcon:"base_view_front",btnTips:"前视图",btnEvent:{uid:'',command:'CMD_VIEW_FRONT',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"右视图",btnNamed:"",btnIcon:"base_view_right",btnTips:"右视图",btnEvent:{uid:'',command:'CMD_VIEW_RIGHT_SIDE',page:'',type:EventType.EVENT,args:[]}}, - {eModel:[ModelType.BASE],eName:"后视图",eNamed:"",ePage:'',eIcon:"base_view_back",eTips:"后视图",eEvent:"CMD_VIEW_REAR"}, - {eModel:[ModelType.BASE],eName:"仰视图",eNamed:"",ePage:'',eIcon:"base_view_bottom",eTips:"仰视图",eEvent:"CMD_VIEW_BOTTOM"}, + {btnModel:[ModelType.BASE],btnName:"后视图",btnNamed:"",btnIcon:"base_view_back",btnTips:"后视图",btnEvent:{uid:'',command:'CMD_VIEW_REAR',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:"仰视图",btnNamed:"",btnIcon:"base_view_bottom",btnTips:"仰视图",btnEvent:{uid:'',command:'CMD_VIEW_BOTTOM',page:'',type:EventType.EVENT,args:[]}}, ] \ No newline at end of file diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets index 090e15a7..ca64db75 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleDefaultBars.ets @@ -1,9 +1,8 @@ -import { TitleButton } from "../Interface/ButtonInterface"; +import { TitleButton,ModelType,EventType} from "../Interface/ButtonInterface"; import { TitleGroup } from "../Interface/GroupInterface"; import { DevModel, MatrixModel } from "./MatrixModel"; -import { ModelType } from "./ModelType"; import { GroupActionMenu } from "./GroupAction"; -import { TitleModel } from "./TitleTabData"; +import { TitleModel } from "../Interface/ModelInterface"; //主页栏目布局数据 export let TitleDefaultBars:Array= @@ -11,18 +10,18 @@ export let TitleDefaultBars:Array= {cmName:'主页',cmPage:'',cmTips:'',cmEvents: [[[{ grpName:'文件', grpBtn: [ - {eModel:[ModelType.BASE],eName:"新建",eNamed:"",ePage:'',eIcon:"base_new_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"打开",eNamed:"",ePage:'',eIcon:"base_open_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:'新建',btnNamed:'',btnIcon:'base_new_file',btnTips:'新建',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'打开',btnNamed:'',btnIcon:'base_open_file',btnTips:'打开',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, [ - {eModel:[ModelType.BASE],eName:"保存",eNamed:"",ePage:'',eIcon:"base_save_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"另存为",eNamed:"",ePage:'',eIcon:"base_saveas_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"保存全部",eNamed:"",ePage:'',eIcon:"base_saveall_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:'保存',btnNamed:'',btnIcon:'base_save_file',btnTips:'保存',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'另存为',btnNamed:'',btnIcon:'base_saveas_file',btnTips:'另存为',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'保存全部',btnNamed:'',btnIcon:'base_saveall_file',btnTips:'保存全部',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, ] as Array, - {eModel:[ModelType.BASE],eName:"关闭",eNamed:"",ePage:'',eIcon:"base_close_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导入",eNamed:"",ePage:'',eIcon:"base_import_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"导出",eNamed:"",ePage:'',eIcon:"base_export_file",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"选项",eNamed:"",ePage:'',eIcon:"base_properties",eTips:"",eEvent:""}, - {eModel:[ModelType.BASE],eName:"帮助",eNamed:"",ePage:'',eIcon:"base_help_file",eTips:"",eEvent:""}, + {btnModel:[ModelType.BASE],btnName:'关闭',btnNamed:'',btnIcon:'base_close_file',btnTips:'关闭',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'导入',btnNamed:'',btnIcon:'base_import_file',btnTips:'导入',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'导出',btnNamed:'',btnIcon:'base_export_file',btnTips:'导出',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'选项',btnNamed:'',btnIcon:'base_properties',btnTips:'选项',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, + {btnModel:[ModelType.BASE],btnName:'帮助',btnNamed:'',btnIcon:'base_help_file',btnTips:'帮助',btnEvent:{uid:'',command:'CMD_VIEW_ISO',page:'',type:EventType.EVENT,args:[]}}, ], grpMenu:GroupActionMenu }] as Array]]}, MatrixModel, DevModel diff --git a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets index 0f25c567..f3ae7022 100644 --- a/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets +++ b/entry/src/main/ets/pages/LayoutInterface/Layout/TitleTabData.ets @@ -17,4 +17,4 @@ export let TitleTabData:TitleInterface= { [3,TitleCAE] ]) } -export { TitleInterface, TitleModel } +export { TitleInterface } diff --git a/entry/src/main/ets/pages/LeftSideLayout/LeftSideTab.ets b/entry/src/main/ets/pages/LeftSideLayout/LeftSideTab.ets index 3a0a8a8a..238184f7 100644 --- a/entry/src/main/ets/pages/LeftSideLayout/LeftSideTab.ets +++ b/entry/src/main/ets/pages/LeftSideLayout/LeftSideTab.ets @@ -38,7 +38,7 @@ export struct LeftSideTab { width: '90%', // 图片宽度占满按钮 height: '90%' // 图片高度占满按钮 }) - .backgroundImage($r('app.media.'+item.eIcon)) + .backgroundImage($r('app.media.'+item.btnIcon)) .fontWeight(index === this.leftSideBarFocusIndex ? FontWeight.Bold : FontWeight.Normal) .width(mwInfo.width*0.013) .height(mwInfo.width*0.013) diff --git a/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets b/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets index 71180ae7..bf4c4cea 100644 --- a/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets +++ b/entry/src/main/ets/pages/TitleLayout/TitleColumnSub.ets @@ -55,7 +55,7 @@ export struct TitleColumnSub { }).width(mwInfo.width*0.012) .height(mwInfo.width*0.012) .backgroundColor(Color.Transparent) - .backgroundImage($r('app.media.' + SwitchView[0].eIcon)) + .backgroundImage($r('app.media.' + SwitchView[0].btnIcon)) .backgroundImagePosition({ x: '10%', y: '10%' }) .backgroundImageSize({ width: '80%', // 图片宽度占满按钮 diff --git a/entry/src/main/ets/pages/TitleLayout/TitleTab.ets b/entry/src/main/ets/pages/TitleLayout/TitleTab.ets index 4d75fa6a..b6797d35 100644 --- a/entry/src/main/ets/pages/TitleLayout/TitleTab.ets +++ b/entry/src/main/ets/pages/TitleLayout/TitleTab.ets @@ -1,5 +1,6 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; -import {TitleTabData, TitleModel} from '../LayoutInterface/Layout/TitleTabData' +import {TitleModel} from '../LayoutInterface/Interface/ModelInterface' +import {TitleTabData} from '../LayoutInterface/Layout/TitleTabData' import { FileMenuData } from "../LayoutInterface/Layout/FileMenuData"; import {TitleTabContent} from './TitleTabContent' import { mwInfo } from '../DispWinInfo/DispWinInfo' @@ -22,7 +23,7 @@ export struct TitleTab { Flex({ direction: FlexDirection.Column }){ Scroll() { Row({space:0}) { - Button((FileMenuData.aMenus[0] as TitleButton).eName) + Button((FileMenuData.aMenus[0] as TitleButton).btnName) .width('7%') .fontSize(18) .fontColor($r('sys.color.font')) diff --git a/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets b/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets index e9d7b9dd..e1768a7e 100644 --- a/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets +++ b/entry/src/main/ets/pages/TitleLayout/TitleTabContent.ets @@ -3,7 +3,7 @@ import { TitleButton} from '../LayoutInterface/Interface/ButtonInterface'; import { TitleGroup} from '../LayoutInterface/Interface/GroupInterface'; import {GroupTextEventMenu} from '../CustomController/Menu' import {EventBtn,MenuBtn} from '../CustomController/Button' -import { TitleModel } from '../LayoutInterface/Layout/TitleTabData'; +import {TitleModel} from '../LayoutInterface/Interface/ModelInterface' @ComponentV2 export struct TitleTabContent { @@ -53,7 +53,7 @@ export struct TitleTabContent { }else{ //菜单按钮 Column(){ - Button((row_item as Array)[0].eName) + Button((row_item as Array)[0].btnName) .height('95%') .width('50') .padding('1')