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

package/dist/tmagic-editor.js

@@ -8,7 +8,7 @@ import { createValues, MFormDialog, MForm } from '@tmagic/form';
 import { MagicTable } from '@tmagic/table';
 import * as monaco from 'monaco-editor';
 import Gesto from 'gesto';
-import { isPop, getNodePath, isNumber, isPage, toLine, guid, datetimeFormatter, removeClassNameByClassName } from '@tmagic/utils';
+import { isPop, getNodePath, isNumber, isPage, toLine, guid, datetimeFormatter, removeClassNameByClassName, getNodes } from '@tmagic/utils';
 import KeyController from 'keycon';
 import StageCore, { GuidesType, getOffset, calcValueByFontsize, CONTAINER_HIGHLIGHT_CLASS_NAME, ContainerHighlightType } from '@tmagic/stage';
 import { EventEmitter } from 'events';
@@ -450,7 +450,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
           {
             validator: ({ value, callback }, { model, parent }) => {
               const index = parent.findIndex((item) => item.name === value);
-              if (model.index === -1 && index > -1 || model.index > -1 && index !== model.index) {
+              if (model.index === -1 && index > -1 || model.index > -1 && index > -1 && index !== model.index) {
                 return callback(`属性key（${value}）已存在`);
               }
               callback();
@@ -7089,6 +7089,7 @@ class Watcher extends EventEmitter {
         });
       });
     });
+    this.emit("collected", nodes, deep);
   }
   /**
    * 清除依赖
@@ -7117,6 +7118,7 @@ class Watcher extends EventEmitter {
         const fullKey = prop ? `${prop}.${key}` : key;
         if (target.isTarget(key, value)) {
           target.updateDep(node, fullKey);
+          this.emit("update-dep", node, fullKey);
         } else if (!keyIsItems && Array.isArray(value)) {
           value.forEach((item, index) => {
             collectTarget(item, `${fullKey}.${index}`);
@@ -7391,6 +7393,42 @@ const initServiceState = (props, {
   });
 };
 const initServiceEvents = (props, emit, { editorService, codeBlockService, dataSourceService, depService }) => {
+  const getApp = () => {
+    const stage = editorService.get("stage");
+    return stage?.renderer.runtime?.getApp?.();
+  };
+  const updateDataSoucreSchema = () => {
+    const root = editorService.get("root");
+    if (root?.dataSources) {
+      getApp()?.dataSourceManager?.updateSchema(root.dataSources);
+    }
+  };
+  const upateNodeWhenDataSourceChange = (nodes) => {
+    const root = editorService.get("root");
+    const stage = editorService.get("stage");
+    if (!root || !stage)
+      return;
+    const app = getApp();
+    if (!app)
+      return;
+    if (app.dsl) {
+      app.dsl.dataSourceDeps = root.dataSourceDeps;
+      app.dsl.dataSources = root.dataSources;
+    }
+    updateDataSoucreSchema();
+    nodes.forEach((node) => {
+      const deps = Object.values(root.dataSourceDeps || {});
+      deps.forEach((dep) => {
+        if (dep[node.id]) {
+          stage.update({
+            config: cloneDeep(node),
+            parentId: editorService.getParentById(node.id)?.id,
+            root: cloneDeep(root)
+          });
+        }
+      });
+    });
+  };
   const targetAddHandler = (target) => {
     if (target.type !== "data-source")
       return;
@@ -7408,8 +7446,16 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
       return;
     delete root.dataSourceDeps[id];
   };
+  const depUpdateHandler = (node) => {
+    upateNodeWhenDataSourceChange([node]);
+  };
+  const collectedHandler = (nodes) => {
+    upateNodeWhenDataSourceChange(nodes);
+  };
   depService.on("add-target", targetAddHandler);
   depService.on("remove-target", targetRemoveHandler);
+  depService.on("dep-update", depUpdateHandler);
+  depService.on("collected", collectedHandler);
   const rootChangeHandler = async (value, preValue) => {
     const nodeId = editorService.get("node")?.id || props.defaultSelected;
     let node;
@@ -7477,14 +7523,20 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
   codeBlockService.on("remove", codeBlockRemoveHandler);
   const dataSourceAddHandler = (config) => {
     depService.addTarget(createDataSourceTarget(config.id, config));
+    getApp()?.dataSourceManager?.addDataSource(config);
   };
   const dataSourceUpdateHandler = (config) => {
     if (config.title) {
       depService.getTarget(config.id).name = config.title;
     }
+    const root = editorService.get("root");
+    const targets = depService.getTargets("data-source");
+    const nodes = getNodes(Object.keys(targets[config.id].deps), root?.items);
+    upateNodeWhenDataSourceChange(nodes);
   };
   const dataSourceRemoveHandler = (id) => {
     depService.removeTarget(id);
+    getApp()?.dataSourceManager?.removeDataSource(id);
   };
   dataSourceService.on("add", dataSourceAddHandler);
   dataSourceService.on("update", dataSourceUpdateHandler);
@@ -7492,6 +7544,8 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
   onUnmounted(() => {
     depService.off("add-target", targetAddHandler);
     depService.off("remove-target", targetRemoveHandler);
+    depService.off("dep-update", depUpdateHandler);
+    depService.off("collected", collectedHandler);
     editorService.off("history-change", historyChangeHandler);
     editorService.off("root-change", rootChangeHandler);
     editorService.off("add", nodeAddHandler);
@@ -7664,5 +7718,5 @@ const index = {
   }
 };
 
-export { CODE_DRAFT_STORAGE_KEY, COPY_STORAGE_KEY, _sfc_main$g as CodeBlockList, CodeDeleteErrorType, _sfc_main$B as CodeSelect, _sfc_main$z as CodeSelectCol, ColumnLayout, _sfc_main$d as ComponentListPanel, _sfc_main$c as ContentMenu, _sfc_main$y as DataSourceFields, _sfc_main$x as EventSelect, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$A as Icon, _sfc_main$w as KeyValue, Keys, LayerOffset, _sfc_main$a as LayerPanel, Layout, _sfc_main$s as LayoutContainer, _sfc_main$n as PropsPanel, _sfc_main$u as TMagicCodeEditor, Editor as TMagicEditor, _sfc_main$p as ToolButton, V_GUIDE_LINE_STORAGE_KEY, beforePaste, change2Fixed, codeBlockService, debug, index as default, depService, editorService, error, eventsService, fillConfig$1 as fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getAddParent, getConfig, getDefaultConfig, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, historyService, info, isFixed, log, propsService, serializeConfig, setConfig, setLayout, storageService, uiService, useStage, warn };
+export { CODE_DRAFT_STORAGE_KEY, COPY_STORAGE_KEY, _sfc_main$g as CodeBlockList, CodeDeleteErrorType, _sfc_main$B as CodeSelect, _sfc_main$z as CodeSelectCol, ColumnLayout, _sfc_main$d as ComponentListPanel, _sfc_main$c as ContentMenu, _sfc_main$y as DataSourceFields, _sfc_main$x as EventSelect, Fixed2Other, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$A as Icon, _sfc_main$w as KeyValue, Keys, LayerOffset, _sfc_main$a as LayerPanel, Layout, _sfc_main$s as LayoutContainer, _sfc_main$n as PropsPanel, _sfc_main$u as TMagicCodeEditor, Editor as TMagicEditor, _sfc_main$p as ToolButton, V_GUIDE_LINE_STORAGE_KEY, beforePaste, change2Fixed, codeBlockService, dataSourceService, debug, index as default, depService, editorService, error, eventsService, fillConfig$1 as fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getAddParent, getConfig, getDefaultConfig, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, historyService, info, isFixed, log, propsService, serializeConfig, setConfig, setLayout, storageService, uiService, useStage, warn };
 //# sourceMappingURL=tmagic-editor.js.map