@gedit/editor-2d 0.1.111 → 0.1.115

package/src/browser/playground/selection-entity-manager.tsx

@@ -155,12 +155,13 @@ export class SelectionEntityManager {
     entity.update(register.getSelectionData(gameObject));
     entity.ignoreTransformChanged = false;
     const sizeVisible = !this.isHidden(entity.node); // && (entity.transform.size.width > 0 && entity.transform.size.height > 0 || !!deco.isContainer);
+    const opacityZero = this.isOpacityZero(node);
     // 图层节点无法被选中
     entity.selectable = entity.selectableInit && sizeVisible;
     // 锁定状态的节点无法通过鼠标点击
-    entity.mouseSelect = (deco.mouseSelect === undefined ? true : deco.mouseSelect) && !this.isLocked(node);
+    entity.mouseSelect = (deco.mouseSelect === undefined ? true : deco.mouseSelect) && !opacityZero && !this.isLocked(node);
     // 是否支持吸附
-    entity.adsorbable = entity.adsorbableInit && sizeVisible && (deco.adsorbable === undefined ? true : deco.adsorbable);
+    entity.adsorbable = entity.adsorbableInit && sizeVisible && !opacityZero && (deco.adsorbable === undefined ? true : deco.adsorbable);
     // 同步选中状态
     entity.selected = !!node?.selected;
     // 更新zIndex, 每次都要更新，因为节点拖拽会导致所有的zIndex顺序错乱
@@ -190,7 +191,7 @@ export class SelectionEntityManager {
       }
     }
     if (!this.isVisible()) return;
-    this.context.syncToSelectionService(this);
+    // this.context.syncToSelectionService(this);
     if (entitiesScrollTo.length > 0) {
       // 滚动画布到选中的节点
       this.entityManager.getEntity<PlaygroundConfigEntity>(PlaygroundConfigEntity)!.scrollToView({entities: entitiesScrollTo});
@@ -209,6 +210,11 @@ export class SelectionEntityManager {
     }
     return Rectangle.enlarge(rects);
   }
+  isOpacityZero(node: Editor2dNode | undefined): boolean {
+    if (!node) return false;
+    if (node.opacity === 0) return true;
+    return this.isOpacityZero(node.parent as Editor2dNode);
+  }
   isHidden(node: Editor2dNode | undefined): boolean {
     if (!node) return false;
     if (node.canvasHide) return true;

package/src/browser/playground/selector-extend-renderer.tsx

@@ -1,19 +1,20 @@
 import * as React from 'react';
 
 import clsx from 'clsx';
-import { Form, Popover, Tooltip } from '@gedit/ui';
+import { Popover, Tooltip } from '@gedit/ui';
 
 import { selectIcon, SelectorExtendType } from './selector-extend-icons';
 import { GameObjectIDERegister, GameObjectSelectorExtend as SelectorExtend } from '@gedit/render-engine-ide';
-import { PlaygroundContext, SelectorEntityRendererProps, } from '@gedit/playground';
+import { SelectorEntityRendererProps, } from '@gedit/playground';
 import type { Editor2dEntity } from './entities/editor2d-entity';
 import { Editor2dNode } from '../model';
+import { PlaygroundContext2d } from './playground-context';
 
 const getClassName = (str: string) => `gedit-selector-extend-${str}`;
 
 export interface SelectorExtendProps extends SelectorEntityRendererProps {
   register?: GameObjectIDERegister;
-  context?: PlaygroundContext;
+  context: PlaygroundContext2d;
 }
 
 const defaultExtends: SelectorExtend[] = [
@@ -24,14 +25,38 @@ const defaultExtends: SelectorExtend[] = [
     order: 0,
     visible: (node: Editor2dNode, register: GameObjectIDERegister) => register?.getDisableKeys().indexOf('link') === -1,
     event: {
-      title: '跳转链接配置',
+      title: '跳转配置',
       type: 'selectorExtendAttr',
       children: [
+        {
+          type: 'radio',
+          key: 'linkType',
+          label: '类型',
+          renderProps: {
+            defaultValue: 'url',
+            items: [{value: 'url', label: 'URL'}, {value: 'scene', label: '场景'}]
+          }
+        },
         {
           type: 'text',
           key: 'link',
+          visible: (v, key, node: Editor2dNode) => (
+            node && !node.linkType || node.linkType === 'url'
+          ),
           label: '链接',
-          placeholder: '请输出 url 地址',
+          placeholder: '请输入 url 地址',
+        },
+        {
+          type: 'mindmapSelect',
+          key: 'link',
+          visible: (v, key, node: Editor2dNode) => (
+            node && node.linkType === 'scene'
+          ),
+          renderProps: {
+            filterTypes: ['scene']
+          },
+          label: '场景',
+          placeholder: '请选择场景',
         },
       ],
     },
@@ -89,6 +114,7 @@ const sortData = (data: SelectorExtend[]) => {
 const SelectorIcon = (props: {
   item: SelectorExtend;
   onChange: (type: SelectorExtendType | 'updateData', value?: any) => void;
+  context: PlaygroundContext2d,
   node: any;
 }) => {
   const {item, onChange, node} = props;
@@ -110,7 +136,7 @@ const SelectorIcon = (props: {
   if (item.event) {
     return (
       <Popover
-        content={Form.renderBySchema({
+        content={props.context.formService.renderSchema({
           ...item.event,
           context: {
             node,
@@ -144,6 +170,8 @@ export const SelectorExtendRender = (props: SelectorExtendProps) => {
   const {entity, register, context} = props;
   const {node} = entity as Editor2dEntity;
   const {selectorExtends = []} = register?.decoration || {};
+  const [t, update] = React.useState(0);
+  if (!node) return <></>;
 
   const childData = sortData(
     ([] as SelectorExtend[])
@@ -151,7 +179,7 @@ export const SelectorExtendRender = (props: SelectorExtendProps) => {
       .filter(c => (c.visible ? c.visible(node, register) : true))
   );
   const onChange = (type: SelectorExtendType | 'updateData', value?: any) => {
-    const {document} = context;
+    const {document} = context!;
     switch (type) {
       case SelectorExtendType.TO_TOP:
         document.moveUp(node);
@@ -162,14 +190,14 @@ export const SelectorExtendRender = (props: SelectorExtendProps) => {
       case SelectorExtendType.FLIP_X:
         document.updateNode(
           node,
-          {flip: {...node?.flip, x: !node?.flip?.x}},
+          {flip: {...node.flip!, x: !node?.flip?.x}},
           true
         );
         break;
       case SelectorExtendType.FLIP_Y:
         document.updateNode(
           node,
-          {flip: {...node?.flip, y: !node?.flip?.y}},
+          {flip: {...node.flip!, y: !node?.flip?.y}},
           true
         );
         break;
@@ -177,8 +205,12 @@ export const SelectorExtendRender = (props: SelectorExtendProps) => {
         document.delNodes(node);
         break;
       case 'updateData':
-        console.log(value);
+        // 修改linkType则清空link
+        if (value.linkType) {
+          value.link = '';
+        }
         document.updateNode(node, value, true);
+        update(t + 1);
         break;
       default:
         console.warn(`无效类型: ${type}.`);
@@ -199,6 +231,7 @@ export const SelectorExtendRender = (props: SelectorExtendProps) => {
             {c.map(item => (
               <SelectorIcon
                 item={item}
+                context={context}
                 onChange={onChange}
                 node={node}
                 key={item.type}