Merge branch 'StableVersion' into dev_vite

This commit is contained in:
2026-03-13 14:05:39 +08:00
6 changed files with 14 additions and 11 deletions

View File

@@ -7,7 +7,7 @@
:enabledRedGreenMode="false"
/>
</div>
<div class="btn">123
<div class="btn">
<div class="gallery_btn" @click="exportElement">Export</div>
</div>
</div>

View File

@@ -7,6 +7,7 @@
:get-container="() => $refs.upgradePlan"
width="35%"
height="auto"
zIndex="9999999"
:maskClosable="false"
:centered="true"
:closable="false"

View File

@@ -271,7 +271,7 @@ export default defineComponent({
allCollectionStr.forEach((itemStr:any)=>{
let list = [] as any
allCollection[itemStr.value].forEach((imgItem)=>{
list.push({url:imgItem.url || imgItem.imgUrl})
list.push({url:imgItem?.url || imgItem?.imgUrl})
})
let obj = {
value:itemStr.value,

View File

@@ -352,7 +352,8 @@ export default defineComponent({
props: {
isDesignPage: {
type: Boolean,
default: false
default: false,
required:false
},
source: {
type: String,
@@ -773,7 +774,7 @@ export default defineComponent({
data.lastSelectImg = res.data
}
}
// 同步尾帧文件列表到全局 store
// 同步尾帧文件列表到全局 store(使用专门的 lastFrameList
store.commit('setPoseTransferLastFrameList', {
str: 'set',
list: [file]
@@ -989,6 +990,7 @@ export default defineComponent({
if (data.lastSelectImg?.id === item.id) {
data.lastSelectImg = {}
}
// 使用专门的 lastFrameList mutation 清空列表
store.commit('setPoseTransferLastFrameList')
} else {
// 如果删除的是当前选中的首帧,清空选中状态
@@ -1176,10 +1178,10 @@ export default defineComponent({
firstFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
item => item.frameType === 'first'
)
lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
item => item.frameType === 'last'
)
// 注意:尾帧通过专门的 watch (lastFrameList) 监听,不需要从这里过滤
// lastFrameList.value = store.state.HomeStoreModule.uploadElement.filter(
// item => item.frameType === 'last'
// )
// 更新 showFirstFrameList 中项的选中状态
showFirstFrameList.value.forEach((listItem: any) => {
if (listItem.id == data.selectImg.id) {

View File

@@ -74,7 +74,7 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
},
setPoseTransferLastFrameList(state,data){
// 支持两种方式set 替换整个列表add/删除与 uploadElement 一致
if(data.str === 'set'){
if(data?.str === 'set'){
state.lastFrameList = data.list || []
return
}else{

View File

@@ -77,7 +77,7 @@ const userHabit : Module<UserHabit,RootState> = {
followeeCount: '-',
followerCount: '-',
accountExtendList:null,
systemList:[],
systemList:[1],
expireTime:null,
language:'',
organizationId: null,
@@ -194,7 +194,7 @@ const userHabit : Module<UserHabit,RootState> = {
followeeCount: '-',
followerCount: '-',
accountExtendList:null,
systemList:[],
systemList:[1],
expireTime:null,
language:'',
organizationId: null,