@tmagic/editor 1.3.0-alpha.2 → 1.3.0-alpha.21

package/types/services/codeBlock.d.ts

@@ -1,4 +1,5 @@
-import { CodeBlockContent, CodeBlockDSL, Id } from '@tmagic/schema';
+import type { ColumnConfig } from '@tmagic/form';
+import type { CodeBlockContent, CodeBlockDSL, Id } from '@tmagic/schema';
 import BaseService from './BaseService';
 declare class CodeBlock extends BaseService {
     private state;
@@ -28,36 +29,13 @@ declare class CodeBlock extends BaseService {
      * @param {CodeBlockContent} codeConfig 代码块内容配置信息
      * @returns {void}
      */
-    setCodeDslById(id: Id, codeConfig: CodeBlockContent): Promise<void>;
+    setCodeDslById(id: Id, codeConfig: Partial<CodeBlockContent>): Promise<void>;
     /**
      * 根据代码块id数组获取代码dsl
      * @param {string[]} ids 代码块id数组
      * @returns {CodeBlockDSL}
      */
     getCodeDslByIds(ids: string[]): CodeBlockDSL;
-    /**
-     * 设置代码编辑面板展示状态
-     * @param {boolean} status 是否展示代码编辑面板
-     * @returns {void}
-     */
-    setCodeEditorShowStatus(status: boolean): Promise<void>;
-    /**
-     * 获取代码编辑面板展示状态
-     * @returns {boolean} 是否展示代码编辑面板
-     */
-    getCodeEditorShowStatus(): boolean;
-    /**
-     * 设置代码编辑面板展示状态及展示内容
-     * @param {boolean} status 是否展示代码编辑面板
-     * @param {Id} id 代码块id
-     * @returns {void}
-     */
-    setCodeEditorContent(status: boolean, id: Id): void;
-    /**
-     * 获取当前选中的代码块内容
-     * @returns {CodeBlockContent | null}
-     */
-    getCurrentDsl(): CodeBlockContent | null;
     /**
      * 获取编辑状态
      * @returns {boolean} 是否可编辑
@@ -69,17 +47,6 @@ declare class CodeBlock extends BaseService {
      * @returns {void}
      */
     setEditStatus(status: boolean): Promise<void>;
-    /**
-     * 设置当前选中的代码块ID
-     * @param {Id} id 代码块id
-     * @returns {void}
-     */
-    setId(id: Id): void;
-    /**
-     * 获取当前选中的代码块ID
-     * @returns {Id} id 代码块id
-     */
-    getId(): Id;
     /**
      * 设置当前选中组件已关联绑定的代码块id数组
      * @param {string[]} ids 代码块id数组
@@ -119,11 +86,13 @@ declare class CodeBlock extends BaseService {
      * @param {Id[]} codeIds 需要删除的代码块id数组
      */
     deleteCodeDslByIds(codeIds: Id[]): Promise<void>;
+    setParamsColConfig(config: ColumnConfig): void;
+    getParamsColConfig(): ColumnConfig | undefined;
     /**
      * 生成代码块唯一id
      * @returns {Id} 代码块唯一id
      */
-    getUniqueId(): Promise<Id>;
+    getUniqueId(): Promise<string>;
     resetState(): void;
     destroy(): void;
 }

package/types/services/dataSource.d.ts

@@ -1,9 +1,13 @@
 import type { FormConfig } from '@tmagic/form';
-import { DataSourceSchema } from '@tmagic/schema';
+import type { DataSourceSchema } from '@tmagic/schema';
+import type { DatasourceTypeOption } from '../type';
 import BaseService from './BaseService';
 interface State {
+    datasourceTypeList: DatasourceTypeOption[];
     dataSources: DataSourceSchema[];
+    editable: boolean;
     configs: Record<string, FormConfig>;
+    values: Record<string, Partial<DataSourceSchema>>;
 }
 type StateKey = keyof State;
 declare class DataSource extends BaseService {
@@ -12,6 +16,8 @@ declare class DataSource extends BaseService {
     get<K extends StateKey>(name: K): State[K];
     getFormConfig(type?: string): FormConfig;
     setFormConfig(type: string, config: FormConfig): void;
+    getFormValue(type?: string): Partial<DataSourceSchema>;
+    setFormValue(type: string, value: Partial<DataSourceSchema>): void;
     add(config: DataSourceSchema): void;
     update(config: DataSourceSchema): void;
     remove(id: string): void;

package/types/services/dep.d.ts

@@ -1,23 +1,14 @@
 /// <reference types="node" />
 import { EventEmitter } from 'events';
-import { MNode } from '@tmagic/schema';
+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?: string;
-    name: string;
-}
-interface Dep {
-    [key: string | number]: {
-        name: string;
-        keys: (string | number)[];
-    };
-}
-interface TargetList {
-    [key: string]: {
-        [key: string | number]: Target;
-    };
+    /** 类型，数据源、代码块或其他 */
+    type?: DepTargetType | string;
+    name?: string;
 }
 /**
  * 需要收集依赖的目标
@@ -36,11 +27,11 @@ export declare class Target extends EventEmitter {
     /**
      * 目标名称，用于显示在依赖列表中
      */
-    name: string;
+    name?: string;
     /**
      * 不同的目标可以进行分类，例如代码块，数据源可以为两个不同的type
      */
-    type: string;
+    type: DepTargetType | string;
     /**
      * 依赖详情
      * 实例：{ 'node_id': { name: 'node_name', keys: [ created, mounted ] } }
@@ -70,15 +61,15 @@ export declare class Target extends EventEmitter {
     destroy(): void;
 }
 export declare class Watcher extends EventEmitter {
-    targets: TargetList;
+    private targets;
     /**
      * 获取指定类型中的所有target
      * @param type 分类
      * @returns Target[]
      */
-    getTargets(type?: string): {
-        [key: string]: Target;
-        [key: number]: Target;
+    getTargets(type?: DepTargetType | string): {
+        [targetId: string]: Target;
+        [targetId: number]: Target;
     };
     /**
      * 添加新的目标
@@ -107,7 +98,7 @@ export declare class Watcher extends EventEmitter {
      * @param type 分类
      * @returns void
      */
-    removeTargets(type?: string): void;
+    removeTargets(type?: DepTargetType | string): void;
     /**
      * 删除所有target
      */

package/types/services/editor.d.ts

@@ -42,7 +42,7 @@ declare class Editor extends BaseService {
     /**
      * 只有容器拥有布局
      */
-    getLayout(parent: MNode, node?: MNode): Promise<Layout>;
+    getLayout(parent: MNode, node?: MNode | null): Promise<Layout>;
     /**
      * 选中指定节点（将指定节点设置成当前选中状态）
      * @param config 指定节点配置或者ID

package/types/services/keybinding.d.ts

@@ -0,0 +1,20 @@
+import { KeyBindingItem } from '../type';
+import BaseService from './BaseService';
+declare class Keybinding extends BaseService {
+    ctrlKey: string;
+    private controllers;
+    private bindingList;
+    private commands;
+    registeCommand(command: string, handler: (e: KeyboardEvent) => void | Promise<void>): void;
+    unregisteCommand(command: string): void;
+    registeEl(name: string, el?: HTMLElement): void;
+    unregisteEl(name: string): void;
+    registe(maps: KeyBindingItem[]): void;
+    reset(): void;
+    destroy(): void;
+    private bind;
+    private getKeyconKeys;
+}
+export type KeybindingService = Keybinding;
+declare const _default: Keybinding;
+export default _default;

package/types/services/props.d.ts

@@ -7,120 +7,15 @@ declare class Props extends BaseService {
     setPropsConfigs(configs: Record<string, FormConfig>): void;
     fillConfig(config: FormConfig): Promise<{
         type: string;
-        items: ({
+        items: {
+            [x: string]: any;
+            status?: string | undefined;
             title: string;
-            labelWidth: string;
-            items: import("@tmagic/form").ChildConfig[];
-            lazy?: undefined;
-        } | {
-            title: string;
-            labelWidth: string;
-            items: {
-                name: string;
-                items: ({
-                    type: string;
-                    legend: string;
-                    items: ({
-                        name: string;
-                        type: string;
-                        activeValue: string; /**
-                         * 为指定类型组件设置组件属性表单配置
-                         * @param type 组件类型
-                         * @param config 组件属性表单配置
-                         */
-                        inactiveValue: string;
-                        defaultValue: string;
-                        text: string;
-                        disabled?: undefined;
-                    } | {
-                        name: string;
-                        text: string;
-                        type?: undefined;
-                        activeValue?: undefined; /**
-                         * 为指定类型组件设置组件属性表单配置
-                         * @param type 组件类型
-                         * @param config 组件属性表单配置
-                         */
-                        inactiveValue?: undefined;
-                        defaultValue?: undefined;
-                        disabled?: undefined;
-                    } | {
-                        name: string;
-                        text: string;
-                        disabled: (vm: import("@tmagic/form").FormState, { model }: any) => boolean;
-                        type?: undefined;
-                        activeValue?: undefined; /**
-                         * 为指定类型组件设置组件属性表单配置
-                         * @param type 组件类型
-                         * @param config 组件属性表单配置
-                         */
-                        inactiveValue?: undefined;
-                        defaultValue?: undefined;
-                    })[];
-                    name?: undefined;
-                } | {
-                    type: string;
-                    legend: string;
-                    items: ({
-                        name: string;
-                        text: string;
-                        type?: undefined;
-                        defaultValue?: undefined;
-                        options?: undefined;
-                    } | {
-                        name: string;
-                        text: string;
-                        type: string;
-                        defaultValue?: undefined;
-                        options?: undefined;
-                    } | {
-                        name: string;
-                        text: string;
-                        type: string;
-                        defaultValue: string;
-                        options: {
-                            text: string;
-                            value: string;
-                        }[];
-                    } | {
-                        name: string;
-                        text: string;
-                        defaultValue: string;
-                        type?: undefined;
-                        options?: undefined;
-                    })[];
-                    name?: undefined;
-                } | {
-                    type: string;
-                    legend: string;
-                    name: string;
-                    items: {
-                        name: string;
-                        text: string;
-                    }[];
-                })[];
-            }[];
-            lazy?: undefined;
-        } | {
-            title: string;
-            items: {
-                name: string;
-                type: string;
-                labelWidth: number;
-            }[];
-            labelWidth?: undefined;
-            lazy?: undefined;
-        } | {
-            title: string;
-            lazy: boolean;
-            items: {
-                name: string;
-                text: string;
-                labelWidth: string;
-                type: string;
-            }[];
-            labelWidth?: undefined;
-        })[];
+            lazy?: boolean | undefined;
+            labelWidth?: string | undefined;
+            items: FormConfig;
+            onTabClick?: ((mForm: import("@tmagic/form").FormState | undefined, tab: any, data: any) => void) | undefined;
+        }[];
     }[]>;
     /**
      * 为指定类型组件设置组件属性表单配置
@@ -134,13 +29,13 @@ declare class Props extends BaseService {
      * @returns 组件属性表单配置
      */
     getPropsConfig(type: string): Promise<FormConfig>;
-    setPropsValues(values: Record<string, MNode>): void;
+    setPropsValues(values: Record<string, Partial<MNode>>): void;
     /**
      * 为指点类型组件设置组件初始值
      * @param type 组件类型
      * @param value 组件初始值
      */
-    setPropsValue(type: string, value: MNode): Promise<void>;
+    setPropsValue(type: string, value: Partial<MNode>): Promise<void>;
     /**
      * 获取指定类型的组件初始值
      * @param type 组件类型

package/types/type.d.ts

@@ -1,15 +1,16 @@
 import type { Component } from 'vue';
-import type { FormConfig, FormItem } from '@tmagic/form';
+import type { ColumnConfig, FilterFunction, FormConfig, FormItem } from '@tmagic/form';
 import type { CodeBlockContent, CodeBlockDSL, Id, MApp, MContainer, MNode, MPage } from '@tmagic/schema';
 import type StageCore from '@tmagic/stage';
 import type { ContainerHighlightType, CustomizeMoveableOptionsCallbackConfig, MoveableOptions, UpdateDragEl } from '@tmagic/stage';
 import type { CodeBlockService } from './services/codeBlock';
 import type { ComponentListService } from './services/componentList';
-import { DataSourceService } from './services/dataSource';
+import type { DataSourceService } from './services/dataSource';
 import type { DepService } from './services/dep';
 import type { EditorService } from './services/editor';
 import type { EventsService } from './services/events';
 import type { HistoryService } from './services/history';
+import type { KeybindingService } from './services/keybinding';
 import type { PropsService } from './services/props';
 import type { StorageService } from './services/storage';
 import type { UiService } from './services/ui';
@@ -17,6 +18,7 @@ import type { UndoRedo } from './utils/undo-redo';
 export type BeforeAdd = (config: MNode, parent: MContainer) => Promise<MNode> | MNode;
 export type GetConfig = (config: FormConfig) => Promise<FormConfig> | FormConfig;
 export interface InstallOptions {
+    parseDSL: <T = any>(dsl: string) => T;
     [key: string]: any;
 }
 export interface Services {
@@ -30,6 +32,7 @@ export interface Services {
     codeBlockService: CodeBlockService;
     depService: DepService;
     dataSourceService: DataSourceService;
+    keybindingService: KeybindingService;
 }
 export interface StageOptions {
     runtimeUrl: string;
@@ -58,7 +61,7 @@ export interface StoreState {
 export type StoreStateKey = keyof StoreState;
 export interface PropsState {
     propsConfigMap: Record<string, FormConfig>;
-    propsValueMap: Record<string, MNode>;
+    propsValueMap: Record<string, Partial<MNode>>;
 }
 export interface ComponentGroupState {
     list: ComponentGroup[];
@@ -260,18 +263,15 @@ export interface ScrollViewerEvent {
     scrollWidth: number;
 }
 export type CodeState = {
-    /** 是否展示代码块编辑区 */
-    isShowCodeEditor: boolean;
     /** 代码块DSL数据源 */
     codeDsl: CodeBlockDSL | null;
-    /** 当前选中的代码块id */
-    id: Id;
     /** 代码块是否可编辑 */
     editable: boolean;
     /** list模式下左侧展示的代码列表 */
     combineIds: string[];
     /** 为业务逻辑预留的不可删除的代码块列表，由业务逻辑维护（如代码块上线后不可删除） */
     undeletableList: Id[];
+    paramsColConfig?: ColumnConfig;
 };
 export type HookData = {
     /** 代码块id */
@@ -343,4 +343,94 @@ export interface EventSelectConfig {
     compActionConfig?: FormItem;
     /** 联动代码配置 */
     codeActionConfig?: FormItem;
+    /** 联动数据源配置 */
+    dataSourceActionConfig?: FormItem;
+}
+export declare enum KeyBindingCommand {
+    /** 复制 */
+    COPY_NODE = "tmagic-system-copy-node",
+    /** 粘贴 */
+    PASTE_NODE = "tmagic-system-paste-node",
+    /** 删除 */
+    DELETE_NODE = "tmagic-system-delete-node",
+    /** 剪切 */
+    CUT_NODE = "tmagic-system-cut-node",
+    /** 撤销 */
+    UNDO = "tmagic-system-undo",
+    /** 重做 */
+    REDO = "tmagic-system-redo",
+    /** 放大 */
+    ZOOM_IN = "tmagic-system-zoom-in",
+    /** 缩小 */
+    ZOOM_OUT = "tmagic-system-zoom-out",
+    /** 缩放到实际大小 */
+    ZOOM_RESET = "tmagic-system-zoom-reset",
+    /** 缩放以适应 */
+    ZOOM_FIT = "tmagic-system-zoom-fit",
+    /** 向上移动1px */
+    MOVE_UP_1 = "tmagic-system-move-up-1",
+    /** 向下移动1px */
+    MOVE_DOWN_1 = "tmagic-system-move-down-1",
+    /** 向左移动1px */
+    MOVE_LEFT_1 = "tmagic-system-move-left-1",
+    /** 向右移动1px */
+    MOVE_RIGHT_1 = "tmagic-system-move-right-1",
+    /** 向上移动10px */
+    MOVE_UP_10 = "tmagic-system-move-up-10",
+    /** 向下移动10px */
+    MOVE_DOWN_10 = "tmagic-system-move-down-10",
+    /** 向左移动10px */
+    MOVE_LEFT_10 = "tmagic-system-move-left-10",
+    /** 向右移动10px */
+    MOVE_RIGHT_10 = "tmagic-system-move-right-10",
+    /** 切换组件 */
+    SWITCH_NODE = "tmagic-system-switch-node"
+}
+export interface KeyBindingItem {
+    command: KeyBindingCommand | string;
+    keybinding?: string | string[];
+    when: [string, 'keyup' | 'keydown'][];
+}
+export interface KeyBindingCacheItem {
+    type: string;
+    command: KeyBindingCommand | string;
+    keybinding?: string | string[];
+    eventType: 'keyup' | 'keydown';
+    binded: boolean;
+}
+export interface CodeSelectColConfig {
+    type: 'code-select-col';
+    name: string;
+    labelWidth?: number | string;
+    disabled?: boolean | FilterFunction;
+    display?: boolean | FilterFunction;
+}
+export interface DataSourceMethodSelectConfig {
+    type: 'data-source-method-select';
+    name: string;
+    labelWidth?: number | string;
+    disabled?: boolean | FilterFunction;
+    display?: boolean | FilterFunction;
+}
+export interface DataSourceFieldSelectConfig {
+    type: 'data-source-field-select';
+    name: string;
+    labelWidth?: number | string;
+    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 {
+    type: string;
+    text: string;
 }

package/types/utils/config.d.ts

@@ -1,4 +1,4 @@
 import { InstallOptions } from '../type';
 declare const setConfig: (option: InstallOptions) => void;
-declare const getConfig: (key: keyof InstallOptions) => unknown;
+declare const getConfig: <K extends keyof InstallOptions>(key: K) => InstallOptions[K];
 export { getConfig, setConfig };

package/types/utils/content-menu.d.ts

@@ -0,0 +1,7 @@
+import { Ref } from 'vue';
+import ContentMenu from '../components/ContentMenu.vue';
+import type { MenuButton, Services } from '../type';
+export declare const useDeleteMenu: () => MenuButton;
+export declare const useCopyMenu: () => MenuButton;
+export declare const usePasteMenu: (menu?: Ref<InstanceType<typeof ContentMenu> | undefined>) => MenuButton;
+export declare const useMoveToMenu: (services?: Services) => MenuButton;

package/types/utils/data-source/formConfigs/base.d.ts

@@ -1,3 +1,3 @@
 import type { FormConfig } from '@tmagic/form';
-declare const _default: FormConfig;
-export default _default;
+import type { DatasourceTypeOption } from '../../../type';
+export default function (datasourceTypeList?: DatasourceTypeOption[]): FormConfig;

package/types/utils/data-source/index.d.ts

@@ -1,2 +1,8 @@
 import { FormConfig } from '@tmagic/form';
-export declare const getFormConfig: (type: string, configs: Record<string, FormConfig>) => FormConfig;
+import { DataSourceSchema } from '@tmagic/schema';
+import { DatasourceTypeOption } from '../../type';
+export declare const getFormConfig: (type: string, datasourceTypeList: DatasourceTypeOption[], configs: Record<string, FormConfig>) => FormConfig;
+export declare const getDisplayField: (dataSources: DataSourceSchema[], key: string) => {
+    value: string;
+    type: 'var' | 'text';
+}[];

package/types/utils/dep.d.ts

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

package/types/utils/index.d.ts

@@ -2,5 +2,5 @@ export * from './config';
 export * from './props';
 export * from './logger';
 export * from './editor';
-export * from './stage';
 export * from './operator';
+export * from './data-source';

package/types/utils/keybinding-config.d.ts

@@ -0,0 +1,3 @@
+import { KeyBindingItem } from '../type';
+declare const _default: KeyBindingItem[];
+export default _default;