diff --git a/packages/core/src/helpers/prototype.ts b/packages/core/src/helpers/prototype.ts index b59a52c..710f107 100644 --- a/packages/core/src/helpers/prototype.ts +++ b/packages/core/src/helpers/prototype.ts @@ -20,6 +20,7 @@ export function prototype2importDeclarationData( relativeFilepath?: string, ): { source: string; specifiers: IImportSpecifierData[] } { let source = prototype.package; + const isSnippet = prototype.type === 'snippet'; if (relativeFilepath && isFilepath(source)) { source = getRelativePath(relativeFilepath, source); } @@ -35,12 +36,15 @@ export function prototype2importDeclarationData( type: 'ImportDefaultSpecifier', }); } else { - [prototype.name, ...(prototype.relatedImports || [])].forEach((item) => { - specifiers.push({ - localName: item, - type: 'ImportSpecifier', - }); - }); + // 忽略代码片段 name + [...(isSnippet ? [] : [prototype.name]), ...(prototype.relatedImports || [])].forEach( + (item) => { + specifiers.push({ + localName: item, + type: 'ImportSpecifier', + }); + }, + ); } return { diff --git a/packages/core/src/models/history.ts b/packages/core/src/models/history.ts index e0b1689..1576303 100644 --- a/packages/core/src/models/history.ts +++ b/packages/core/src/models/history.ts @@ -58,7 +58,7 @@ export class TangoHistory { } get couldBack() { - return this._records.length > 0 && this._index > -1; + return this._records.length > 0 && this._index > 0; } get couldForward() { diff --git a/packages/designer/src/editor.tsx b/packages/designer/src/editor.tsx index b208f54..084f951 100644 --- a/packages/designer/src/editor.tsx +++ b/packages/designer/src/editor.tsx @@ -1,7 +1,7 @@ import React, { useRef, useEffect, useCallback } from 'react'; import { Box } from 'coral-system'; import { MultiEditor, MultiEditorProps } from '@music163/tango-ui'; -import { observer, useWorkspace } from '@music163/tango-context'; +import { observer, useDesigner, useWorkspace } from '@music163/tango-context'; import { isValidCode } from '@music163/tango-core'; import { Modal } from 'antd'; @@ -32,6 +32,7 @@ export const CodeEditor = observer( ({ autoRemoveUnusedImports = true, ...rest }: CodeEditorProps) => { const editorRef = useRef(null); const workspace = useWorkspace(); + const designer = useDesigner(); const files = workspace.listFiles(); const activeFile = workspace.activeFile; @@ -101,8 +102,15 @@ export const CodeEditor = observer( [workspace], ); + const borderStyle = + designer.activeView === 'dual' + ? { + borderLeft: 'solid 1px var(--tango-colors-line2)', + } + : {}; + return ( - + {title}