aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

Browse Source
This commit is contained in:
X1627315083
2026-01-20 15:29:06 +08:00
parent 033950babe dbd1651a37
commit 248732b085
4 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/component/Canvas/CanvasEditor/components/SelectMenuPanel/RepeatSetting.vue
View File

@@ -32,8 +32,8 @@
is-input is-input
:tipFormatter="(v) => `${v}px`" :tipFormatter="(v) => `${v}px`"
:value="gapX" :value="gapX"
@input="(e) => emit('inputFill_Gap', e, gapY)" @input="(e) => emit('inputFillGap', e, gapY)"
@change="(e) => emit('changeFill_Gap', e, gapY)" @change="(e) => emit('changeFillGap', e, gapY)"
/> />
</div> </div>
<div class="repeat-setting-item"> <div class="repeat-setting-item">
@@ -45,8 +45,8 @@
is-input is-input
:tipFormatter="(v) => `${v}px`" :tipFormatter="(v) => `${v}px`"
:value="gapY" :value="gapY"
@input="(e) => emit('inputFill_Gap', gapX, e)" @input="(e) => emit('inputFillGap', gapX, e)"
@change="(e) => emit('changeFill_Gap', gapX, e)" @change="(e) => emit('changeFillGap', gapX, e)"
/> />
</div> </div>
<div class="repeat-setting-item"> <div class="repeat-setting-item">
@@ -109,8 +109,8 @@
"changeFillOffset", "changeFillOffset",
"inputFillScale", "inputFillScale",
"changeFillScale", "changeFillScale",
"inputFill_Gap", "inputFillGap",
"changeFill_Gap", "changeFillGap",
]); ]);
const inputFillScale = (e) => { const inputFillScale = (e) => {
const scale = e / 100; const scale = e / 100;

12
src/component/Canvas/CanvasEditor/components/SelectMenuPanel/index.vue
View File

@@ -155,11 +155,11 @@
@changeFillScale=" @changeFillScale="
(e) => changeFillScale(e, v) (e) => changeFillScale(e, v)
" "
@inputFill_Gap=" @inputFillGap="
(x, y) => inputFill_Gap(x, y, v) (x, y) => inputFillGap(x, y, v)
" "
@changeFill_Gap=" @changeFillGap="
(x, y) => changeFill_Gap(x, y, v) (x, y) => changeFillGap(x, y, v)
" "
/> />
</template> </template>
@@ -484,7 +484,7 @@
props.commandManager.execute(cmd); props.commandManager.execute(cmd);
}; };
// 改变填充间隙 // 改变填充间隙
const inputFill_Gap = (gapX, gapY, obj) => { const inputFillGap = (gapX, gapY, obj) => {
const cmd = new FillRepeatGapChangeCommand({ const cmd = new FillRepeatGapChangeCommand({
canvas: props.canvas, canvas: props.canvas,
layers: layers, layers: layers,
@@ -497,7 +497,7 @@
}); });
cmd.execute(); cmd.execute();
}; };
const changeFill_Gap = (gapX, gapY, obj) => { const changeFillGap = (gapX, gapY, obj) => {
if (obj.oldFill_) { if (obj.oldFill_) {
obj.fill_ = { ...obj.oldFill_ }; obj.fill_ = { ...obj.oldFill_ };
delete obj.oldFill_; delete obj.oldFill_;

8
src/component/Detail/detailRight/editPrintElement.vue
View File

@@ -63,8 +63,8 @@
@inputFillOffset="inputFillOffset" @inputFillOffset="inputFillOffset"
@inputFillScale="inputFillScale" @inputFillScale="inputFillScale"
:sketchPath="selectDetail.path" :sketchPath="selectDetail.path"
@inputFill_Gap=" @inputFillGap="
(x, y) => inputFill_Gap(x, y)" (x, y) => inputFillGap(x, y)"
/> />
</template> </template>
<div class="btn"> <div class="btn">
@@ -931,7 +931,7 @@ export default defineComponent({
}, },
]); ]);
} }
const inputFill_Gap = (x:any,y:any)=>{ const inputFillGap = (x:any,y:any)=>{
let arr = editPrintElementData.printStyleList[props.type].overall let arr = editPrintElementData.printStyleList[props.type].overall
arr[editPrintElementData.imgDomIndex].object.gapX = x arr[editPrintElementData.imgDomIndex].object.gapX = x
arr[editPrintElementData.imgDomIndex].object.gapY = y arr[editPrintElementData.imgDomIndex].object.gapY = y
@@ -991,7 +991,7 @@ export default defineComponent({
inputFillAngle, inputFillAngle,
inputFillOffset, inputFillOffset,
inputFillScale, inputFillScale,
inputFill_Gap, inputFillGap,
overallSetIndex, overallSetIndex,
} }
}, },

12
src/component/Detail/detailRight/overallSetting/RepeatSetting.vue
View File

@@ -32,8 +32,8 @@
is-input is-input
:tipFormatter="(v) => `${v}px`" :tipFormatter="(v) => `${v}px`"
:value="gapX" :value="gapX"
@input="(e) => emit('inputFill_Gap', e, gapY)" @input="(e) => emit('inputFillGap', e, gapY)"
@change="(e) => emit('changeFill_Gap', e, gapY)" @change="(e) => emit('changeFillGap', e, gapY)"
/> />
</div> </div>
<p></p> <p></p>
@@ -46,8 +46,8 @@
is-input is-input
:tipFormatter="(v) => `${v}px`" :tipFormatter="(v) => `${v}px`"
:value="gapY" :value="gapY"
@input="(e) => emit('inputFill_Gap', gapX, e)" @input="(e) => emit('inputFillGap', gapX, e)"
@change="(e) => emit('changeFill_Gap', gapX, e)" @change="(e) => emit('changeFillGap', gapX, e)"
/> />
</div> </div>
<p></p> <p></p>
@@ -115,8 +115,8 @@
"changeFillOffset", "changeFillOffset",
"inputFillScale", "inputFillScale",
"changeFillScale", "changeFillScale",
"inputFill_Gap", "inputFillGap",
"changeFill_Gap", "changeFillGap",
]); ]);
const inputFillScale = (e) => { const inputFillScale = (e) => {
const scale = e / 100; const scale = e / 100;