@gedit/editor-2d 0.1.114 → 0.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gedit/editor-2d",
-  "version": "0.1.114",
+  "version": "0.1.115",
   "license": "MIT",
   "main": "lib/browser/index",
   "typings": "lib/browser/index.d.ts",
@@ -9,11 +9,11 @@
     "src"
   ],
   "dependencies": {
-    "@gedit/app-config": "^0.1.109",
-    "@gedit/editor": "^0.1.82",
-    "@gedit/playground": "^0.1.91",
-    "@gedit/render-engine-ide": "^0.1.113",
-    "@gedit/workspace-2d": "^0.1.88",
+    "@gedit/app-config": "^0.1.110",
+    "@gedit/editor": "^0.1.83",
+    "@gedit/playground": "^0.1.92",
+    "@gedit/render-engine-ide": "^0.1.114",
+    "@gedit/workspace-2d": "^0.1.89",
     "json-stringify-pretty-compact": "^2.0.0",
     "nanoid": "^3.3.2"
   },
@@ -35,5 +35,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "38955d50985d4822295450aa6531b86760f7f43e"
+  "gitHead": "8bdf36b3a3898da871ec15be92760865fc6a182a"
 }

package/src/browser/editor2d-label-provider.ts

@@ -1,4 +1,4 @@
-import { inject, injectable, postConstruct } from 'inversify';
+import { inject, injectable } from 'inversify';
 import {
   DidChangeLabelEvent,
   LabelProvider,
@@ -22,15 +22,6 @@ export class Editor2dLabelProvider implements LabelProviderContribution {
   protected readonly treeLabelProvider: TreeLabelProvider;
   @inject(AppConfigService) protected appConfig: AppConfigService;
 
-  @postConstruct()
-  protected init(): void {
-    this.appConfig.onConfigChange(() => {
-      this.onDidChangeEmitter.fire({
-        affects: (element: object) => !!this.canHandle(element)
-      });
-    });
-  }
-
   canHandle(element: object): number {
     return Editor2dNode.is(element) ?
       this.treeLabelProvider.canHandle(element) + 1 :
@@ -38,11 +29,6 @@ export class Editor2dLabelProvider implements LabelProviderContribution {
   }
 
   getIcon(node: Editor2dNode | Editor2dContainerNode): string {
-    if (node.tags && node.tags.length > 0) {
-      const tagId = node.tags[0].id;
-      const tagIcon = this.appConfig.getTagIconClass(tagId);
-      if (tagIcon) return tagIcon;
-    }
     // TODO 后边需要支持多引擎适配
     const register = this.renderEngineService.getGameObjectIDERegister(this.appConfig.engineName, node.displayType);
     if (register && register.decoration && register.decoration.iconClass) {

package/src/browser/model/editor2d-document.ts

@@ -250,11 +250,15 @@ export class Editor2dDocument extends TreeImpl<Editor2dNode, Editor2dContainerNo
   /**
    * 检测节点名字，保证唯一
    * @param siblings
-   * @param newName
+   * @param name
    * @protected
    */
   protected getUniqueName(siblings: Editor2dNode[], name: string, i: number = 0): string {
-    const newName =  i ? `${name}(${i})` : name;
+    const numMatched = name.match(/[0-9]+$/);
+    let newName = i ? `${name}${i}` : name;
+    if (numMatched) {
+      newName = name.slice(0, numMatched.index) + (parseInt(numMatched[0]) + i);
+    }
     if (siblings.some(n => n.name === newName)) {
       return this.getUniqueName(siblings, name, i + 1);
     }

package/src/browser/playground/playground-context.ts

@@ -13,6 +13,7 @@ import { SelectionService } from '@gedit/application-common';
 import { Editor2dContextKeyService } from '../editor2d-context-key-service';
 import type { CanvasDraw } from './canvas-draw';
 import SelectionType = TreeSelection.SelectionType;
+import { FormService } from '@gedit/ui';
 
 export const Editor2dPlayGround = Symbol('Editor2dPlayGround');
 
@@ -32,6 +33,7 @@ export class PlaygroundContext2d {
     @inject(SelectionService) readonly selectionService: SelectionService,
     @inject(AppConfigService) readonly appConfig: AppConfigService,
     @inject(Editor2dModelOptions) readonly options: Editor2dModelOptions,
+    @inject(FormService) readonly formService: FormService,
     @inject(Editor2dContextKeyService) readonly contextKeyService: Editor2dContextKeyService
   ) {
     this.document.toDispose.push(this.onCanvasDataChangedEmitter);

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}