diff --git a/src/designer/Designer.ts b/src/designer/Designer.ts index 6c868d1..1c91c3b 100644 --- a/src/designer/Designer.ts +++ b/src/designer/Designer.ts @@ -1,3 +1,27 @@ +import Example1 from './example1' +import { markRaw, reactive } from 'vue' + +/** + * 全局设计器 + */ export default class Designer { + data: any = null + allLevels: any = null + currentFloor: string = null + + constructor() { + this.init() + this.open() + } + + init() { + window['designer'] = this + } + + open() { + system.msg('打开成功') + this.data = markRaw(Example1) + this.allLevels = reactive(this.data.allLevels) + } } \ No newline at end of file diff --git a/src/designer/ModelEditor.vue b/src/designer/ModelEditor.vue index b9ca4f0..a517723 100644 --- a/src/designer/ModelEditor.vue +++ b/src/designer/ModelEditor.vue @@ -3,13 +3,7 @@
- - - 尺寸 - - 图层 - - 设置 +
@@ -25,7 +19,15 @@
- 清空选择 + + + + + 1 + + 0
X=14.091,Y=12.397
@@ -43,6 +45,8 @@ export default { }, data() { return { + currentLevel: '', + searchKeyword: '', sectionLeftSearch: '', sectionRightSize: 0, sectionBottomSize: 0, @@ -54,6 +58,11 @@ export default { }, methods: { renderIcon + }, + computed: { + allLevels() { + return designer.allLevels + } } } \ No newline at end of file diff --git a/src/designer/example1.js b/src/designer/example1.js new file mode 100644 index 0000000..b7ac2da --- /dev/null +++ b/src/designer/example1.js @@ -0,0 +1,67 @@ +export default { + Tool: { + Group: [], + GlobalVariables: [], + UserCommand: [], + ProcessFlow: [], + Dashboard: [], + DataTable: [], + Trigger: [ + { name: 'OnOpen', fn: '' }, + { name: 'OnReset', fn: '' }, + { name: 'OnStart', fn: '' }, + { name: 'OnStop', fn: '' } + ] + }, + item: [ + { + name: 'f1', + items: [] + } + ], + elevator: [], + wall: [], + pillar: [], + allLevels: [ + { + value: 'F', label: '仓库楼层', + children: [ + { value: '-f1', label: '地下室 (-f1)' }, + { value: 'f1', label: '一楼 (f1)' }, + { value: 'f2', label: '二楼 (f2)' }, + { value: 'OUT', label: '外场 (OUT)' }, + { value: 'fe', label: '楼层电梯 (fe)' } + ] + }, + { + value: 'M', label: '密集库区域', + children: [ + { value: 'm1', label: 'M1 (m1)' }, + { value: 'm2', label: 'M2 (m2)' }, + { value: 'm3', label: 'M3 (m3)' }, + { value: 'm4', label: 'M4 (m4)' }, + { value: 'me', label: '提升机 (me)' } + ] + }, + { + value: 'D', label: '多穿库A', + children: [ + { value: 'd1', label: 'D1 (d1)' }, + { value: 'd2', label: 'D2 (d2)' }, + { value: 'd3', label: 'D3 (d3)' }, + { value: 'd4', label: 'D4 (d4)' }, + { value: 'de1', label: '提升机 (de1)' } + ] + }, + { + value: 'E', label: '多穿库B', + children: [ + { value: 'e1', label: 'E1 (e1)' }, + { value: 'e2', label: 'E2 (e2)' }, + { value: 'e3', label: 'E3 (e3)' }, + { value: 'e4', label: 'E4 (e4)' }, + { value: 'ee1', label: '提升机 (ee1)' } + ] + } + ] +} \ No newline at end of file diff --git a/src/designer/viewWidgets/modeltree/ModeltreeView.vue b/src/designer/viewWidgets/modeltree/ModeltreeView.vue index a286bd3..084cc18 100644 --- a/src/designer/viewWidgets/modeltree/ModeltreeView.vue +++ b/src/designer/viewWidgets/modeltree/ModeltreeView.vue @@ -1,6 +1,6 @@