@tmagic/editor 1.3.1 → 1.3.2

package/types/layouts/sidebar/layer/use-click.d.ts

@@ -5,53 +5,14 @@ export declare const useClick: (services: Services | undefined, isCtrlKeyDown: R
     menu: Ref<({
         $: import("vue").ComponentInternalInstance;
         $data: {};
-        $props: {
-            key?: string | number | symbol | undefined;
-            ref?: import("vue").VNodeRef | undefined;
-            ref_for?: boolean | undefined;
-            ref_key?: string | undefined;
-            onVnodeBeforeMount?: ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void)[] | undefined;
-            onVnodeMounted?: ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void)[] | undefined;
-            onVnodeBeforeUpdate?: ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>, oldVNode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>, oldVNode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void)[] | undefined;
-            onVnodeUpdated?: ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>, oldVNode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>, oldVNode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void)[] | undefined;
-            onVnodeBeforeUnmount?: ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void)[] | undefined;
-            onVnodeUnmounted?: ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void) | ((vnode: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
-                [key: string]: any;
-            }>) => void)[] | undefined;
-            class?: unknown;
-            style?: unknown;
+        $props: Partial<{}> & Omit<{
             readonly layerContentMenu: (import("../../../type").MenuButton | import("../../../type").MenuComponent)[];
-        };
+        } & import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
+            layerContentMenu: {
+                type: import("vue").PropType<(import("../../../type").MenuButton | import("../../../type").MenuComponent)[]>;
+                required: true;
+            };
+        }>>, never>;
         $attrs: {
             [x: string]: unknown;
         };

package/types/services/dataSource.d.ts

@@ -25,8 +25,16 @@ declare class DataSource extends BaseService {
     setFormEvent(type: string, value?: EventOption[]): void;
     getFormMethod(type?: string): EventOption[];
     setFormMethod(type: string, value?: EventOption[]): void;
-    add(config: DataSourceSchema): void;
-    update(config: DataSourceSchema): void;
+    add(config: DataSourceSchema): {
+        id: string;
+        type: string;
+        title?: string | undefined;
+        description?: string | undefined;
+        fields: import("@tmagic/schema").DataSchema[];
+        methods: import("@tmagic/schema").CodeBlockContent[];
+        mocks?: import("@tmagic/schema").MockSchema[] | undefined;
+    };
+    update(config: DataSourceSchema): DataSourceSchema;
     remove(id: string): void;
     getDataSourceById(id: string): DataSourceSchema | undefined;
     resetState(): void;

package/types/services/dep.d.ts

@@ -1,121 +1,21 @@
-/// <reference types="node" />
-import { EventEmitter } from 'events';
-import type { Dep, MNode } from '@tmagic/schema';
-import { DepTargetType } from '../type';
-type IsTarget = (key: string | number, value: any) => boolean;
-interface TargetOptions {
-    isTarget: IsTarget;
-    id: string | number;
-    /** 类型，数据源、代码块或其他 */
-    type?: DepTargetType | string;
-    name?: string;
-}
-/**
- * 需要收集依赖的目标
- * 例如：一个代码块可以为一个目标
- */
-export declare class Target extends EventEmitter {
-    /**
-     * 如何识别目标
-     */
-    isTarget: IsTarget;
-    /**
-     * 目标id，不可重复
-     * 例如目标是代码块，则为代码块id
-     */
-    id: string | number;
-    /**
-     * 目标名称，用于显示在依赖列表中
-     */
-    name?: string;
-    /**
-     * 不同的目标可以进行分类，例如代码块，数据源可以为两个不同的type
-     */
-    type: DepTargetType | string;
-    /**
-     * 依赖详情
-     * 实例：{ 'node_id': { name: 'node_name', keys: [ created, mounted ] } }
-     */
-    deps: Dep;
-    constructor(options: TargetOptions);
-    /**
-     * 更新依赖
-     * @param node 节点配置
-     * @param key 哪个key配置了这个目标的id
-     */
-    updateDep(node: MNode, key: string | number): void;
-    /**
-     * 删除依赖
-     * @param node 哪个节点的依赖需要移除，如果为空，则移除所有依赖
-     * @param key 节点下哪个key需要移除，如果为空，则移除改节点下的所有依赖key
-     * @returns void
-     */
-    removeDep(node?: MNode, key?: string | number): void;
-    /**
-     * 判断指定节点下的指定key是否存在在依赖列表中
-     * @param node 哪个节点
-     * @param key 哪个key
-     * @returns boolean
-     */
-    hasDep(node: MNode, key: string | number): boolean;
-    destroy(): void;
-}
-export declare class Watcher extends EventEmitter {
-    private targets;
-    /**
-     * 获取指定类型中的所有target
-     * @param type 分类
-     * @returns Target[]
-     */
-    getTargets(type?: DepTargetType | string): {
+import { type Target } from '@tmagic/dep';
+import type { Id, MNode } from '@tmagic/schema';
+import BaseService from './BaseService';
+declare class Dep extends BaseService {
+    private watcher;
+    removeTargets(type?: string): void;
+    getTargets(type?: string): {
         [targetId: string]: Target;
         [targetId: number]: Target;
     };
-    /**
-     * 添加新的目标
-     * @param target Target
-     */
+    getTarget(id: Id): Target | undefined;
     addTarget(target: Target): void;
-    /**
-     * 获取指定id的target
-     * @param id target id
-     * @returns Target
-     */
-    getTarget(id: string | number): Target | undefined;
-    /**
-     * 判断是否存在指定id的target
-     * @param id target id
-     * @returns boolean
-     */
-    hasTarget(id: string | number): boolean;
-    /**
-     * 删除指定id的target
-     * @param id target id
-     */
-    removeTarget(id: string | number): void;
-    /**
-     * 删除指定分类的所有target
-     * @param type 分类
-     * @returns void
-     */
-    removeTargets(type?: DepTargetType | string): void;
-    /**
-     * 删除所有target
-     */
+    removeTarget(id: Id): void;
     clearTargets(): void;
-    /**
-     * 收集依赖
-     * @param nodes 需要收集的节点
-     * @param deep 是否需要收集子节点
-     */
     collect(nodes: MNode[], deep?: boolean): void;
-    /**
-     * 清除依赖
-     * @param nodes 需要清除依赖的节点
-     */
     clear(nodes?: MNode[]): void;
-    private collectItem;
+    hasTarget(id: Id): boolean;
 }
-export type DepService = Watcher;
-declare const _default: Watcher;
+export type DepService = Dep;
+declare const _default: Dep;
 export default _default;

package/types/services/ui.d.ts

@@ -24,9 +24,17 @@ declare class Ui extends BaseService {
         showRule: boolean;
         propsPanelSize: "default" | "small" | "large";
         showAddPageButton: boolean;
+        floatBox: Map<string, {
+            status: boolean;
+            zIndex: number;
+            top: number;
+            left: number;
+        }>;
+        hideSlideBar: boolean;
     }[K];
     zoom(zoom: number): Promise<void>;
     calcZoom(): Promise<number>;
+    setFloatBox(keys: string[]): Promise<void>;
     resetState(): void;
     destroy(): void;
     private setStageRect;

package/types/type.d.ts

@@ -167,6 +167,15 @@ export interface UiState {
     propsPanelSize: 'large' | 'default' | 'small';
     /** 是否显示新增页面按钮 */
     showAddPageButton: boolean;
+    /** slide 拖拽悬浮窗 state */
+    floatBox: Map<string, {
+        status: boolean;
+        zIndex: number;
+        top: number;
+        left: number;
+    }>;
+    /** 是否隐藏侧边栏 */
+    hideSlideBar: boolean;
 }
 export interface EditorNodeInfo {
     node: MNode | null;
@@ -265,6 +274,15 @@ export interface SideComponent extends MenuComponent {
     text: string;
     /** vue组件或url */
     icon: Component<{}, {}, any>;
+    /** slide 唯一标识 key */
+    $key: string;
+    /** 组件扩展参数 */
+    boxComponentConfig?: {
+        /** Vue3组件 */
+        component?: any;
+        /** 传入组件的props对象 */
+        props?: Record<string, any>;
+    };
 }
 /**
  * component-list: 组件列表
@@ -281,6 +299,11 @@ export interface SideBarData {
     /** panel列表 */
     items: SideItem[];
 }
+/**
+ * drawer 抽屉
+ * box 悬浮窗
+ */
+export type SlideType = 'drawer' | 'box';
 export interface ComponentItem {
     /** 显示文案 */
     text: string;
@@ -338,12 +361,6 @@ export type CodeState = {
     undeletableList: Id[];
     paramsColConfig?: ColumnConfig;
 };
-export type HookData = {
-    /** 代码块id */
-    codeId: Id;
-    /** 参数 */
-    params?: object;
-};
 export type CodeRelation = {
     /** 组件id:[代码id1，代码id2] */
     [compId: Id]: Id[];
@@ -489,18 +506,6 @@ export interface DataSourceFieldSelectConfig {
     disabled?: boolean | FilterFunction;
     display?: boolean | FilterFunction;
 }
-/** 依赖收集的目标类型 */
-export declare enum DepTargetType {
-    DEFAULT = "default",
-    /** 代码块 */
-    CODE_BLOCK = "code-block",
-    /** 数据源 */
-    DATA_SOURCE = "data-source",
-    /** 数据源方法 */
-    DATA_SOURCE_METHOD = "data-source-method",
-    /** 数据源条件 */
-    DATA_SOURCE_COND = "data-source-cond"
-}
 /** 可新增的数据源类型选项 */
 export interface DatasourceTypeOption {
     /** 数据源类型 */

package/src/utils/dep.ts

@@ -1,81 +0,0 @@
-import { isEmpty } from 'lodash-es';
-
-import { type CodeBlockContent, HookType, type Id } from '@tmagic/schema';
-import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX } from '@tmagic/utils';
-
-import dataSourceService from '@editor/services/dataSource';
-import { Target } from '@editor/services/dep';
-import { DepTargetType, type HookData } from '@editor/type';
-
-export const createCodeBlockTarget = (id: Id, codeBlock: CodeBlockContent) =>
-  new Target({
-    type: DepTargetType.CODE_BLOCK,
-    id,
-    name: codeBlock.name,
-    isTarget: (key: string | number, value: any) => {
-      if (id === value) {
-        return true;
-      }
-
-      if (value?.hookType === HookType.CODE && !isEmpty(value.hookData)) {
-        const index = value.hookData.findIndex((item: HookData) => item.codeId === id);
-        return Boolean(index > -1);
-      }
-
-      return false;
-    },
-  });
-
-export const createDataSourceTarget = (id: Id) =>
-  new Target({
-    type: DepTargetType.DATA_SOURCE,
-    id,
-    isTarget: (key: string | number, value: any) => {
-      // 关联数据源对象或者在模板在使用数据源
-      if ((value?.isBindDataSource && value.dataSourceId) || (typeof value === 'string' && value.includes(`${id}`))) {
-        return true;
-      }
-
-      // 关联数据源字段，格式为 [前缀+数据源ID, 字段名]
-      if (!Array.isArray(value) || typeof value[0] !== 'string') {
-        return false;
-      }
-
-      const [prefixId] = value;
-      const prefixIndex = prefixId.indexOf(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);
-
-      if (prefixIndex === -1) {
-        return false;
-      }
-
-      const dsId = prefixId.substring(prefixIndex + DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX.length);
-
-      return dsId === id && Boolean(dataSourceService.getDataSourceById(id));
-    },
-  });
-
-export const createDataSourceCondTarget = (id: string) =>
-  new Target({
-    type: DepTargetType.DATA_SOURCE_COND,
-    id,
-    isTarget: (key: string | number, value: any) => {
-      if (!Array.isArray(value) || value[0] !== id || !`${key}`.startsWith('displayConds')) return false;
-
-      const ds = dataSourceService.getDataSourceById(id);
-
-      return Boolean(ds?.fields?.find((field) => field.name === value[1]));
-    },
-  });
-
-export const createDataSourceMethodTarget = (id: string) =>
-  new Target({
-    type: DepTargetType.DATA_SOURCE_METHOD,
-    id,
-    isTarget: (key: string | number, value: any) => {
-      if (!Array.isArray(value) || value[0] !== id) return false;
-
-      const ds = dataSourceService.getDataSourceById(id);
-
-      return Boolean(ds?.methods?.find((method) => method.name === value[1]));
-    },
-  });

package/types/utils/dep.d.ts

@@ -1,6 +0,0 @@
-import { type CodeBlockContent, type Id } from '@tmagic/schema';
-import { Target } from '../services/dep';
-export declare const createCodeBlockTarget: (id: Id, codeBlock: CodeBlockContent) => Target;
-export declare const createDataSourceTarget: (id: Id) => Target;
-export declare const createDataSourceCondTarget: (id: string) => Target;
-export declare const createDataSourceMethodTarget: (id: string) => Target;