@tmagic/editor 1.5.16 → 1.5.17

package/src/type.ts

@@ -21,27 +21,8 @@ import type EventEmitter from 'events';
 import Sortable, { type Options, type SortableEvent } from 'sortablejs';
 import type { PascalCasedProperties } from 'type-fest';
 
-import type {
-  CodeBlockContent,
-  CodeBlockDSL,
-  DataSourceFieldType,
-  DataSourceSchema,
-  Id,
-  MApp,
-  MContainer,
-  MNode,
-  MPage,
-  MPageFragment,
-} from '@tmagic/core';
-import type {
-  ChildConfig,
-  FilterFunction,
-  FormConfig,
-  FormItem,
-  FormState,
-  Input,
-  TableColumnConfig,
-} from '@tmagic/form';
+import type { CodeBlockContent, CodeBlockDSL, Id, MApp, MContainer, MNode, MPage, MPageFragment } from '@tmagic/core';
+import type { FormConfig, TableColumnConfig } from '@tmagic/form';
 import type StageCore from '@tmagic/stage';
 import type {
   ContainerHighlightType,
@@ -562,25 +543,6 @@ export interface HistoryState {
   canUndo: boolean;
 }
 
-export interface EventSelectConfig {
-  name: string;
-  type: 'event-select';
-  src: 'datasource' | 'component';
-  labelWidth?: string;
-  /** 事件名称表单配置 */
-  eventNameConfig?: FormItem;
-  /** 动作类型配置 */
-  actionTypeConfig?: FormItem;
-  /** 联动组件配置 */
-  targetCompConfig?: FormItem;
-  /** 联动组件动作配置 */
-  compActionConfig?: FormItem;
-  /** 联动代码配置 */
-  codeActionConfig?: FormItem;
-  /** 联动数据源配置 */
-  dataSourceActionConfig?: FormItem;
-}
-
 export enum KeyBindingCommand {
   /** 复制 */
   COPY_NODE = 'tmagic-system-copy-node',
@@ -636,69 +598,6 @@ export interface KeyBindingCacheItem {
   bound: boolean;
 }
 
-export interface CodeSelectColConfig extends FormItem {
-  type: 'code-select-col';
-  /** 是否可以编辑代码块，disable表示的是是否可以选择代码块 */
-  notEditable?: boolean | FilterFunction;
-}
-
-export interface PageFragmentSelectConfig extends FormItem {
-  type: 'page-fragment-select';
-}
-
-export interface DataSourceSelect extends FormItem, Input {
-  type: 'data-source-select';
-  /** 数据源类型: base、http... */
-  dataSourceType?: string;
-  /** 是否要编译成数据源的data。
-   * id: 不编译，就是要数据源id;
-   * value: 要编译（数据源data）
-   * */
-  value?: 'id' | 'value';
-  /** 是否可以编辑数据源，disable表示的是是否可以选择数据源 */
-  notEditable?: boolean | FilterFunction;
-}
-
-export interface DataSourceMethodSelectConfig extends FormItem {
-  type: 'data-source-method-select';
-  /** 是否可以编辑数据源，disable表示的是是否可以选择数据源 */
-  notEditable?: boolean | FilterFunction;
-}
-
-export interface DataSourceFieldSelectConfig extends FormItem {
-  type: 'data-source-field-select';
-  /**
-   * 是否要编译成数据源的data。
-   * key: 不编译，就是要数据源id和field name;
-   * value: 要编译（数据源data[`${filed}`]）
-   * */
-  value?: 'key' | 'value';
-  /** 是否严格的遵守父子节点不互相关联 */
-  checkStrictly?:
-    | boolean
-    | ((
-        mForm: FormState | undefined,
-        data: {
-          model: Record<any, any>;
-          values: Record<any, any>;
-          parent?: Record<any, any>;
-          formValue: Record<any, any>;
-          prop: string;
-          config: DataSourceFieldSelectConfig;
-          dataSource?: DataSourceSchema;
-        },
-      ) => boolean);
-  dataSourceFieldType?: DataSourceFieldType[];
-  fieldConfig?: ChildConfig;
-  /** 是否可以编辑数据源，disable表示的是是否可以选择数据源 */
-  notEditable?: boolean | FilterFunction;
-}
-
-export interface CondOpSelectConfig extends FormItem {
-  type: 'cond-op';
-  parentFields?: string[];
-}
-
 /** 可新增的数据源类型选项 */
 export interface DatasourceTypeOption {
   /** 数据源类型 */

package/src/utils/data-source/formConfigs/base.ts

@@ -1,7 +1,7 @@
-import type { FormConfig } from '@tmagic/form';
+import { defineFormConfig } from '@tmagic/form';
 
-export default function (): FormConfig {
-  return [
+export default () =>
+  defineFormConfig([
     {
       name: 'id',
       type: 'hidden',
@@ -26,5 +26,4 @@ export default function (): FormConfig {
       name: 'description',
       text: '描述',
     },
-  ];
-}
+  ]);

package/src/utils/data-source/formConfigs/http.ts

@@ -1,6 +1,6 @@
-import { FormConfig } from '@tmagic/form';
+import { defineFormConfig } from '@tmagic/form';
 
-export default [
+export default defineFormConfig([
   {
     name: 'autoFetch',
     text: '自动请求',
@@ -59,4 +59,4 @@ export default [
       },
     ],
   },
-] as FormConfig;
+]);

package/src/utils/dep/worker.ts

@@ -0,0 +1,63 @@
+import {
+  createCodeBlockTarget,
+  createDataSourceCondTarget,
+  createDataSourceMethodTarget,
+  createDataSourceTarget,
+  type DepData,
+  DepTargetType,
+  type Id,
+  type MApp,
+  traverseTarget,
+  Watcher,
+} from '@tmagic/core';
+
+import { error } from '../logger';
+
+onmessage = (e) => {
+  const watcher = new Watcher({ initialTargets: {} });
+
+  const { dsl } = e.data;
+
+  try {
+    // eslint-disable-next-line no-eval
+    const mApp: MApp = eval(`(${dsl})`);
+
+    if (!mApp) {
+      postMessage({});
+    }
+
+    if (mApp.codeBlocks) {
+      for (const [id, code] of Object.entries(mApp.codeBlocks)) {
+        watcher.addTarget(createCodeBlockTarget(id, code));
+      }
+    }
+
+    if (mApp.dataSources) {
+      for (const ds of mApp.dataSources) {
+        watcher.addTarget(createDataSourceTarget(ds, {}));
+        watcher.addTarget(createDataSourceMethodTarget(ds, {}));
+        watcher.addTarget(createDataSourceCondTarget(ds, {}));
+      }
+    }
+
+    watcher.collectByCallback(mApp.items, undefined, ({ node, target }) => {
+      watcher.collectItem(node, target, { pageId: node.id }, true);
+    });
+
+    const data: Record<string, Record<Id, DepData>> = {
+      [DepTargetType.DATA_SOURCE]: {},
+      [DepTargetType.DATA_SOURCE_METHOD]: {},
+      [DepTargetType.DATA_SOURCE_COND]: {},
+      [DepTargetType.CODE_BLOCK]: {},
+    };
+
+    traverseTarget(watcher.getTargetsList(), (target) => {
+      data[target.type][target.id] = target.deps;
+    });
+
+    postMessage(data);
+  } catch (e: any) {
+    error(e);
+    postMessage({});
+  }
+};

package/src/utils/index.ts

@@ -22,7 +22,7 @@ export * from './logger';
 export * from './editor';
 export * from './operator';
 export * from './data-source';
-export * from './idle-task';
+export * from './dep/idle-task';
 export * from './scroll-viewer';
 export * from './tree';
 export * from './undo-redo';