|
@@ -102,45 +102,15 @@ export class scene_page extends Component {
|
|
return tools.showToast(`错误的动画配置!id:${this.mData.att.id}-请检查`)
|
|
return tools.showToast(`错误的动画配置!id:${this.mData.att.id}-请检查`)
|
|
}
|
|
}
|
|
}else if(event.type===config.event_type.delete_drag_other_data){
|
|
}else if(event.type===config.event_type.delete_drag_other_data){
|
|
- let wd = event.event_item_delete_drag_other_data.widget_id
|
|
|
|
- let index = event.event_item_delete_drag_other_data.delete_drag_other_index
|
|
|
|
- let other_widget_list = event.event_item_delete_drag_other_data.widget_list
|
|
|
|
- if(other_widget_list.length==0) {
|
|
|
|
- item = this.mWidgetList.get(wd)
|
|
|
|
- if(item){
|
|
|
|
- item.getComponent(widget_drag).deleteOtherDrag(index)
|
|
|
|
- }else{
|
|
|
|
- // tools.showToast("删除拖拽目标配置错误!")
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- let data_list:event_item_delete_drag_other[] = JSON.parse(JSON.stringify(other_widget_list))
|
|
|
|
- let first_data = new event_item_delete_drag_other
|
|
|
|
- first_data.widget_id = wd
|
|
|
|
- first_data.delete_drag_other_index = index
|
|
|
|
- data_list.unshift(first_data)
|
|
|
|
- var data_map:Map<number,number> = new Map;
|
|
|
|
- for(let i=0;i<data_list.length;i++) {
|
|
|
|
- const element = data_list[i]
|
|
|
|
- let wd = element.widget_id
|
|
|
|
- let index = element.delete_drag_other_index
|
|
|
|
- if(index!=-1) {
|
|
|
|
- let e_item = this.mWidgetList.get(wd)
|
|
|
|
- if(e_item){
|
|
|
|
- let minus_index = 0
|
|
|
|
- if(data_map.get(wd)==null) {
|
|
|
|
- data_map.set(wd,0)
|
|
|
|
- } else {
|
|
|
|
- let v = data_map.get(wd)
|
|
|
|
- minus_index = v+1
|
|
|
|
- data_map.set(wd,minus_index)
|
|
|
|
- }
|
|
|
|
- // console.log('minus_index=',minus_index)
|
|
|
|
- let c_index = index - minus_index
|
|
|
|
- e_item.getComponent(widget_drag).deleteOtherDrag(c_index)
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ // let wd = event.event_item_delete_drag_other_data.widget_id
|
|
|
|
+ // let index = event.event_item_delete_drag_other_data.delete_drag_other_index
|
|
|
|
+ // item = this.mWidgetList.get(wd)
|
|
|
|
+ // if(item){
|
|
|
|
+ // item.getComponent(widget_drag).deleteOtherDrag(index)
|
|
|
|
+ // }else{
|
|
|
|
+ // tools.showToast("删除拖拽目标配置错误!")
|
|
|
|
+ // }
|
|
|
|
+ this.eventDeleteDragOtherData(event)
|
|
}else if(event.type===config.event_type.active_event) {
|
|
}else if(event.type===config.event_type.active_event) {
|
|
let data = event.event_item_active_event_data
|
|
let data = event.event_item_active_event_data
|
|
this.eventMoreBindingWidgetList(data, event)
|
|
this.eventMoreBindingWidgetList(data, event)
|
|
@@ -152,6 +122,47 @@ export class scene_page extends Component {
|
|
this.eventMoreBindingWidgetList(data, event)
|
|
this.eventMoreBindingWidgetList(data, event)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ eventDeleteDragOtherData(event:event_item){
|
|
|
|
+ let wd = event.event_item_delete_drag_other_data.widget_id
|
|
|
|
+ let index = event.event_item_delete_drag_other_data.delete_drag_other_index
|
|
|
|
+ let other_widget_list = event.event_item_delete_drag_other_data.widget_list
|
|
|
|
+ if(other_widget_list.length==0) {
|
|
|
|
+ let item = this.mWidgetList.get(wd)
|
|
|
|
+ if(item){
|
|
|
|
+ item.getComponent(widget_drag).deleteOtherDrag(index)
|
|
|
|
+ }else{
|
|
|
|
+ // tools.showToast("删除拖拽目标配置错误!")
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ let data_list:event_item_delete_drag_other[] = JSON.parse(JSON.stringify(other_widget_list))
|
|
|
|
+ let first_data = new event_item_delete_drag_other
|
|
|
|
+ first_data.widget_id = wd
|
|
|
|
+ first_data.delete_drag_other_index = index
|
|
|
|
+ data_list.unshift(first_data)
|
|
|
|
+ var data_map:Map<number,number> = new Map;
|
|
|
|
+ for(let i=0;i<data_list.length;i++) {
|
|
|
|
+ const element = data_list[i]
|
|
|
|
+ let wd = element.widget_id
|
|
|
|
+ let index = element.delete_drag_other_index
|
|
|
|
+ if(index!=-1) {
|
|
|
|
+ let e_item = this.mWidgetList.get(wd)
|
|
|
|
+ if(e_item){
|
|
|
|
+ let minus_index = 0
|
|
|
|
+ if(data_map.get(wd)==null) {
|
|
|
|
+ data_map.set(wd,0)
|
|
|
|
+ } else {
|
|
|
|
+ let v = data_map.get(wd)
|
|
|
|
+ minus_index = v+1
|
|
|
|
+ data_map.set(wd,minus_index)
|
|
|
|
+ }
|
|
|
|
+ // console.log('minus_index=',minus_index)
|
|
|
|
+ let c_index = index - minus_index
|
|
|
|
+ e_item.getComponent(widget_drag).deleteOtherDrag(c_index)
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
eventMoreBindingWidgetList(data, event:event_item) {
|
|
eventMoreBindingWidgetList(data, event:event_item) {
|
|
if(data!=null) {
|
|
if(data!=null) {
|
|
if(data.binding_widget_list==null||data.binding_widget_list.length==0) {
|
|
if(data.binding_widget_list==null||data.binding_widget_list.length==0) {
|