Browse Source

feat(editor): 添加批量复制功能

- 新增 BulkCopy 组件用于批量复制操作
- 在 Model2DEditor 中集成批量复制功能
- 实现了行数、列数、行间距、列间距等配置选项
- 添加了批量复制的逻辑,包括复制对象的坐标计算
master
lizw-2015 6 months ago
parent
commit
a2e0c3fa40
  1. 127
      src/editor/BulkCopy.vue
  2. 61
      src/editor/Model2DEditor.vue
  3. 136
      src/editor/widgets/property/PropertyPanel.vue

127
src/editor/BulkCopy.vue

@ -0,0 +1,127 @@
<script setup lang="ts">
import { reactive } from "vue";
import DataForm from "@/components/data-form/DataForm.vue";
import type { FormField } from "@/components/data-form/DataFormTypes.ts";
defineOptions({
name: 'BulkCopy',
});
interface BulkCopyConfig {
/** 行数 */
numberOfRows?: number;
/** 列数 */
numberOfColumns?: number;
/** 行间距 */
rowSpace?: number;
/** 列间距 */
columnSpacing?: number;
/** 双排 */
doubleRow?: boolean;
}
// Props
interface BulkCopyProps {
config: BulkCopyConfig;
}
// props
const props = withDefaults(defineProps<BulkCopyProps>(), {});
// State
interface BulkCopyState {
}
// state
const state = reactive<BulkCopyState>({});
// Data
interface BulkCopyData {
formFields?: Array<FormField>;
}
//
const data: BulkCopyData = {
formFields: [
{
dataPath: 'numberOfRows', label: '行数', input: 'InputNumber',
inputProps: {
placeholder: '请输入',
controlsPosition: 'right',
min: 1,
precision: 0,
},
},
{
dataPath: 'numberOfColumns', label: '列数', input: 'InputNumber',
inputProps: {
placeholder: '请输入',
controlsPosition: 'right',
min: 1,
precision: 0,
},
},
{
dataPath: 'rowSpace', label: '行间距', input: 'InputNumber',
inputProps: {
placeholder: '请输入',
controlsPosition: 'right',
min: 0,
// precision:
},
},
{
dataPath: 'columnSpacing', label: '列间距', input: 'InputNumber',
inputProps: {
placeholder: '请输入',
controlsPosition: 'right',
min: 0,
// precision:
},
},
{
dataPath: 'doubleRow', label: '单双排', input: 'Switch',
inputProps: {
// trueValue: true,
// falseValue: false,
inlinePrompt: true,
inactiveText: "单排",
activeText: "双排",
},
},
],
};
interface BulkCopyExpose {
state: BulkCopyState;
data: BulkCopyData;
}
const expose: BulkCopyExpose = {
state,
data,
};
//
defineExpose(expose);
export type {
BulkCopyConfig,
BulkCopyProps,
BulkCopyState,
}
</script>
<template>
<DataForm
:data="props.config"
:formFields="data.formFields"
:columnCount="2"
layout="onlyLabelFixed"
labelWidth="80px"
inputWidth=""
/>
</template>
<style scoped>
</style>

61
src/editor/Model2DEditor.vue

@ -17,6 +17,9 @@
:type="state?.view3DMode===Constract.Mode3D?'primary':''" :type="state?.view3DMode===Constract.Mode3D?'primary':''"
@click="state.view3DMode = Constract.Mode3D">3D @click="state.view3DMode = Constract.Mode3D">3D
</el-button> </el-button>
<el-button :icon="renderIcon('element Files')" link @click="showBulkCopy" :disabled="!selectedObject">
批量复制
</el-button>
</el-button-group> </el-button-group>
</div> </div>
<div class="section-content"> <div class="section-content">
@ -92,13 +95,14 @@
</template> </template>
<script> <script>
import * as THREE from 'three' import * as THREE from 'three'
import $ from 'jquery' import { renderIcon, setQueryParam } from '@/utils/webutils'
import { getQueryParams, renderIcon, setQueryParam } from '@/utils/webutils' import { createVNode, defineComponent, markRaw } from 'vue'
import { defineComponent, markRaw } from 'vue'
import Viewport from '@/core/engine/Viewport' import Viewport from '@/core/engine/Viewport'
import Constract from '@/core/Constract' import Constract from '@/core/Constract'
import EventBus from '@/runtime/EventBus' import EventBus from '@/runtime/EventBus'
import SceneHelp from '@/core/engine/SceneHelp' import SceneHelp from '@/core/engine/SceneHelp'
import BulkCopy from './BulkCopy.vue'
import lodash from "lodash";
export default defineComponent({ export default defineComponent({
name: 'Model2DEditor', name: 'Model2DEditor',
@ -242,7 +246,51 @@ export default defineComponent({
}) })
} },
showBulkCopy() {
const viewport = this.viewport;
const selectedItem = viewport?.state?.selectedItem;
if(!viewport || !selectedItem) return;
const config = {
numberOfRows: 1,
numberOfColumns: 1,
rowSpace: 0,
columnSpacing: 0,
doubleRow: false,
};
system.showDialog(createVNode(BulkCopy, {
config,
}), {
title: '批量复制',
width: 520,
height: 240,
showClose: true,
showMax: true,
showCancelButton: false,
showOkButton: true,
}).then(() => {
if(!config.numberOfRows || !config.numberOfColumns) return;
viewport.stateManager.update(({ getEntity, addEntity }) => {
const xAxle = selectedItem.tf[0][0];
const zAxle = selectedItem.tf[0][2];
const xSize = selectedItem.tf[2][0];
const zSize = selectedItem.tf[2][2];
console.log("item", JSON.stringify(selectedItem.tf));
for (let rCount = 0; rCount < config.numberOfRows; rCount++) {
for (let cCount = 0; cCount < config.numberOfColumns; cCount++) {
if(rCount===0 && cCount===0) continue;
const item = lodash.cloneDeep(selectedItem);
item.id = system.createUUID();
item.tf[0][0] = xAxle + cCount * (xSize + config.columnSpacing);
item.tf[0][2] = zAxle + rCount * (zSize + config.rowSpace);
addEntity(item);
console.log("item", JSON.stringify(item.tf));
}
}
});
console.log("config", config, selectedItem);
}).finally();
},
}, },
computed: { computed: {
state() { state() {
@ -268,7 +316,10 @@ export default defineComponent({
label: item.label label: item.label
})) }))
})) }))
} },
selectedObject() {
return this.state?.selectedObject;
},
} }
}) })
</script> </script>

136
src/editor/widgets/property/PropertyPanel.vue

@ -9,23 +9,23 @@ import { defDataFormProps } from '@/editor/widgets/property/PropertyPanelConstan
import Viewport, { type ViewportState } from '@/core/engine/Viewport.ts' import Viewport, { type ViewportState } from '@/core/engine/Viewport.ts'
defineOptions({ defineOptions({
name: 'PropertyPanel' name: 'PropertyPanel'
}) })
// Props // Props
interface PropertyPanelProps { interface PropertyPanelProps {
/** 待编辑数据 */ /** 待编辑数据 */
data?: any; data?: any;
/** Viewport */ /** Viewport */
viewport: Viewport; viewport: Viewport;
/** ViewportState */ /** ViewportState */
viewportState: ViewportState; viewportState: ViewportState;
/** 默认的DataFormProps */ /** 默认的DataFormProps */
defDataFormProps?: DataFormProps; defDataFormProps?: DataFormProps;
/** 最上面平铺的设置器 */ /** 最上面平铺的设置器 */
flatten?: PropertyFlattenSetter; flatten?: PropertyFlattenSetter;
/** 设置器分组集合 */ /** 设置器分组集合 */
groups?: Array<PropertySetterGroup>; groups?: Array<PropertySetterGroup>;
} }
// props // props
@ -33,16 +33,16 @@ const props = withDefaults(defineProps<PropertyPanelProps>(), {})
// State // State
interface PropertyPanelState { interface PropertyPanelState {
/** 待编辑数据 */ /** 待编辑数据 */
data?: any; data?: any;
/** 已展开的分组 */ /** 已展开的分组 */
expandGroups: Array<string>; expandGroups: Array<string>;
} }
// state // state
const state = reactive<PropertyPanelState>({ const state = reactive<PropertyPanelState>({
data: lodash.cloneDeep(props.data), data: lodash.cloneDeep(props.data),
expandGroups: [] expandGroups: []
}) })
// Data // Data
@ -54,84 +54,84 @@ const data: PropertyPanelData = {}
const flattenFormProps = computed(() => getDefFormProps(props.flatten)) const flattenFormProps = computed(() => getDefFormProps(props.flatten))
function getDefFormProps(setter?: PropertyFlattenSetter) { function getDefFormProps(setter?: PropertyFlattenSetter) {
const formProps: DataFormProps = { const formProps: DataFormProps = {
...defDataFormProps, ...defDataFormProps,
...props.defDataFormProps ...props.defDataFormProps
} }
fillFormProps(setter) fillFormProps(setter)
return formProps return formProps
} }
function fillFormProps(formProps: DataFormProps, setter?: PropertyFlattenSetter) { function fillFormProps(formProps: DataFormProps, setter?: PropertyFlattenSetter) {
if (!setter) return if (!setter) return
if (setter.size) formProps.size = setter.size if (setter.size) formProps.size = setter.size
if (setter.labelWidth) formProps.labelWidth = setter.labelWidth if (setter.labelWidth) formProps.labelWidth = setter.labelWidth
} }
function getCollapseItemId(group: PropertySetterGroup, idx: number) { function getCollapseItemId(group: PropertySetterGroup, idx: number) {
return `_${idx}_${group.title}` return `_${idx}_${group.title}`
} }
function onDataChange(newData: any) { function onDataChange(newData: any) {
const viewport = props.viewport const viewport = props.viewport
if (!viewport) return if (!viewport) return
viewport.stateManager.update(({ getEntity, putEntity }) => { viewport.stateManager.update(({ getEntity, putEntity }) => {
const data = getEntity(props.data.id) const data = getEntity(props.data.id);
lodash.assign(data, newData) lodash.assign(data, newData);
// console.log('onDataChange@1', JSON.stringify(data.dt)) // console.log('onDataChange@1', JSON.stringify(data.dt))
putEntity(data) putEntity(data);
}) });
} }
interface PropertyPanelExpose { interface PropertyPanelExpose {
state: PropertyPanelState; state: PropertyPanelState;
data: PropertyPanelData; data: PropertyPanelData;
} }
const expose: PropertyPanelExpose = { const expose: PropertyPanelExpose = {
state, state,
data data
} }
// //
defineExpose(expose) defineExpose(expose)
export type { export type {
PropertyPanelProps, PropertyPanelProps,
PropertyPanelState PropertyPanelState
} }
</script> </script>
<template> <template>
<div class="property-panel"> <div class="property-panel">
<DataForm
v-if="props.flatten"
class="property-panel-form"
v-bind="flattenFormProps"
:data="state.data"
:formFields="props.flatten.fields"
@dataChange="onDataChange"
/>
<ElCollapse v-if="props.groups" v-model="state.expandGroups">
<ElCollapseItem
v-for="(group, idx) in props.groups"
:name="getCollapseItemId(group, idx)"
:title="group.title"
>
<DataForm <DataForm
v-if="group" v-if="props.flatten"
class="property-panel-form" class="property-panel-form"
v-bind="getDefFormProps(group)" v-bind="flattenFormProps"
:data="state.data" :data="state.data"
:formFields="props.flatten.fields" :formFields="props.flatten.fields"
@dataChange="onDataChange" @dataChange="onDataChange"
/> />
</ElCollapseItem> <ElCollapse v-if="props.groups" v-model="state.expandGroups">
</ElCollapse> <ElCollapseItem
</div> v-for="(group, idx) in props.groups"
:name="getCollapseItemId(group, idx)"
:title="group.title"
>
<DataForm
v-if="group"
class="property-panel-form"
v-bind="getDefFormProps(group)"
:data="state.data"
:formFields="props.flatten.fields"
@dataChange="onDataChange"
/>
</ElCollapseItem>
</ElCollapse>
</div>
</template> </template>
<style scoped> <style scoped>
.property-panel { .property-panel {
padding: 8px 12px 16px 4px; padding: 8px 12px 16px 4px;
} }
</style> </style>

Loading…
Cancel
Save