liwei 1 年之前
父节点
当前提交
338ec57ad4

+ 4 - 1
src/modules/editor/components/CompUI/basicUI/View.tsx

@@ -29,6 +29,9 @@ export const View = defineComponent({
       const m = obj.worldTransform.clone();
       m.invert();
 
+      let isFocus = store.isEditMode && store.selected.length > 1 && store.lastSelected == props.compId;
+      isFocus = isFocus || store.currCompId == props.compId;
+       
       return (
         <div
           ref={compRef}
@@ -37,7 +40,7 @@ export const View = defineComponent({
             store.isEditMode && controls.selectCtrl._state != 0 && editCompStyle,
             isGroupComp && groupCompCls,
             store.currStreamCardId == props.compId && CurrCompStyle,
-            store.isEditMode && store.selected.length > 1 && store.lastSelected == props.compId && AnchorCompStyle
+            isFocus  && AnchorCompStyle
           ]}
           style={helper.createStyle(comp.layout)}
           onClick={(e) => {

+ 4 - 2
src/modules/editor/components/Viewport/Slider/SliderRight/CompTree.tsx

@@ -27,7 +27,9 @@ export const CompTree = defineComponent({
       treeData() {
         const rootComp = helper.findRootComp();
 
-        function getCompChildren(ids: string[]): TreeItem[] {
+        function getCompChildren(ids: string[], revert = false): TreeItem[] {
+          if (revert) ids = ids.reverse();
+          
           return ids.map((id) => {
             const comp = helper.findComp(id) as DesignComp;
             return {
@@ -37,7 +39,7 @@ export const CompTree = defineComponent({
                 compUICtrl.state.components.get(comp.compKey)?.name ||
                 "未命名",
               value: comp.id,
-              children: getCompChildren(comp.getChildIds()),
+              children: getCompChildren(comp.getChildIds(), true),
             };
           });
         }

+ 1 - 3
src/modules/editor/module/actions/edit.tsx

@@ -816,8 +816,6 @@ export const editActions = EditorModule.action({
   },
   // 取消打组
   cancelGroupComps(groupComp: DesignComp) {
-    console.log("cancel group");
-
     const childs = groupComp.children.default || [];
     const objC = this.controls.selectCtrl.objContainer as ObjsContainer;
     const parentMtrx = objC.parent.worldTransform.clone();
@@ -831,7 +829,7 @@ export const editActions = EditorModule.action({
     const card = paths[1];
     const parentChilds = (card.children.default || []).filter(item=>item != groupComp.id);
     parentChilds.push(...childs);
-    card.children.default = childs;
+    card.children.default = parentChilds;
 
     this.actions.selectObjs([childs[0]]);
   },