@tmagic/editor 1.5.10 → 1.5.12

package/dist/tmagic-editor.js

@@ -13,7 +13,7 @@ import { throttle, isEmpty, isObject, cloneDeep, mergeWith, uniq, get, map, has,
 import serialize from 'serialize-javascript';
 import { emmetHTML, emmetCSS } from 'emmet-monaco-es';
 import * as monaco from 'monaco-editor';
-import { HookCodeType, HookType, NODE_CONDS_KEY, Target, Watcher, NodeType, ActionType, DepTargetType, createCodeBlockTarget, createDataSourceTarget, createDataSourceMethodTarget, createDataSourceCondTarget } from '@tmagic/core';
+import { HookCodeType, HookType, NODE_CONDS_KEY, Target, Watcher, NodeType, ActionType, DepTargetType, createCodeBlockTarget, createDataSourceTarget, createDataSourceCondTarget, createDataSourceMethodTarget } from '@tmagic/core';
 export { DepTargetType } from '@tmagic/core';
 import { isPage, isPageFragment, isPop, getNodePath, isNumber, getElById, calcValueByFontsize, isValueIncludeDataSource, toLine, guid, getValueByKeyPath, setValueByKeyPath, getNodeInfo, dataSourceTemplateRegExp, getKeysArray, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, getKeys, convertToNumber, getIdFromEl, traverseNode, getDefaultValueFromFields, DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, removeClassName, addClassName, removeClassNameByClassName, getNodes } from '@tmagic/utils';
 export * from '@tmagic/utils';
@@ -13930,7 +13930,7 @@ class Dep extends BaseService {
     const targets = this.watcher.getTargets(type);
     if (!targets) return;
     for (const target of Object.values(targets)) {
-      this.emit("remove-target", target.id);
+      this.emit("remove-target", target.id, type);
     }
   }
   getTargets(type = DepTargetType.DEFAULT) {
@@ -13945,7 +13945,7 @@ class Dep extends BaseService {
   }
   removeTarget(id, type = DepTargetType.DEFAULT) {
     this.watcher.removeTarget(id, type);
-    this.emit("remove-target", id);
+    this.emit("remove-target", id, type);
   }
   clearTargets() {
     this.watcher.clearTargets();
@@ -14080,7 +14080,7 @@ class Events extends BaseService {
     methodMap[toLine(type)] = [...method];
   }
   getMethod(type) {
-    return cloneDeep(methodMap[toLine(type)]);
+    return cloneDeep(methodMap[toLine(type)]) || [];
   }
   resetState() {
     eventMap = reactive({});
@@ -14823,7 +14823,7 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
       if (!changeRecord.propPath) {
         continue;
       }
-      isModifyField = changeRecord.propPath === "fields" || /fields.(\d)+.name/.test(changeRecord.propPath) || /fields.(\d)+$/.test(changeRecord.propPath);
+      isModifyField = changeRecord.propPath === "fields" || /fields.(\d)+.name/.test(changeRecord.propPath) || /fields.(\d)+.defaultValue/.test(changeRecord.propPath) || /fields.(\d)+$/.test(changeRecord.propPath);
       isModifyMock = changeRecord.propPath === "mocks";
       isModifyMethod = changeRecord.propPath === "methods" || /methods.(\d)+.name/.test(changeRecord.propPath) || /methods.(\d)+$/.test(changeRecord.propPath);
       needRecollectDep = isModifyField || isModifyMock || isModifyMethod;
@@ -14835,24 +14835,26 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
     if (needRecollectDep) {
       if (Array.isArray(root?.items)) {
         depService.clearIdleTasks();
-        removeDataSourceTarget(config.id);
-        initDataSourceDepTarget(config);
         let collectIdlePromises = [];
         if (isModifyField) {
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE);
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE_COND);
+          depService.addTarget(createDataSourceTarget(config, reactive({})));
+          depService.addTarget(createDataSourceCondTarget(config, reactive({})));
           collectIdlePromises = [
             collectIdle(root.items, true, DepTargetType.DATA_SOURCE),
             collectIdle(root.items, true, DepTargetType.DATA_SOURCE_COND)
           ];
         } else if (isModifyMock) {
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE);
+          depService.addTarget(createDataSourceTarget(config, reactive({})));
           collectIdlePromises = [collectIdle(root.items, true, DepTargetType.DATA_SOURCE)];
         } else if (isModifyMethod) {
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE_METHOD);
+          depService.addTarget(createDataSourceMethodTarget(config, reactive({})));
           collectIdlePromises = [collectIdle(root.items, true, DepTargetType.DATA_SOURCE_METHOD)];
         }
-        Promise.all(collectIdlePromises).then(() => {
-          updateDataSourceSchema();
-          updateDsData();
-          updateStageNodes(root.items);
-        });
+        Promise.all(collectIdlePromises).then(() => updateDataSourceSchema()).then(() => updateDsData()).then(() => updateStageNodes(root.items));
       }
     } else if (root?.dataSources) {
       updateDsData();
@@ -14911,16 +14913,25 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
       }
       root.dataSourceCondDeps[target.id] = target.deps;
     }
+    if (target.type === DepTargetType.DATA_SOURCE_METHOD) {
+      if (!root.dataSourceMethodDeps) {
+        root.dataSourceMethodDeps = {};
+      }
+      root.dataSourceMethodDeps[target.id] = target.deps;
+    }
   };
-  const targetRemoveHandler = (id) => {
+  const targetRemoveHandler = (id, type) => {
     const root = editorService.get("root");
     if (!root) return;
-    if (root.dataSourceDeps) {
+    if (root.dataSourceDeps && type === DepTargetType.DATA_SOURCE) {
       delete root.dataSourceDeps[id];
     }
-    if (root.dataSourceCondDeps) {
+    if (root.dataSourceCondDeps && type === DepTargetType.DATA_SOURCE_COND) {
       delete root.dataSourceCondDeps[id];
     }
+    if (root.dataSourceMethodDeps && type === DepTargetType.DATA_SOURCE_METHOD) {
+      delete root.dataSourceMethodDeps[id];
+    }
   };
   depService.on("add-target", targetAddHandler);
   depService.on("remove-target", targetRemoveHandler);

package/dist/tmagic-editor.umd.cjs

@@ -18817,7 +18817,7 @@
       const targets = this.watcher.getTargets(type);
       if (!targets) return;
       for (const target of Object.values(targets)) {
-        this.emit("remove-target", target.id);
+        this.emit("remove-target", target.id, type);
       }
     }
     getTargets(type = core.DepTargetType.DEFAULT) {
@@ -18832,7 +18832,7 @@
     }
     removeTarget(id, type = core.DepTargetType.DEFAULT) {
       this.watcher.removeTarget(id, type);
-      this.emit("remove-target", id);
+      this.emit("remove-target", id, type);
     }
     clearTargets() {
       this.watcher.clearTargets();
@@ -18967,7 +18967,7 @@
       methodMap[utils.toLine(type)] = [...method];
     }
     getMethod(type) {
-      return cloneDeep(methodMap[utils.toLine(type)]);
+      return cloneDeep(methodMap[utils.toLine(type)]) || [];
     }
     resetState() {
       eventMap = vue.reactive({});
@@ -19710,7 +19710,7 @@
         if (!changeRecord.propPath) {
           continue;
         }
-        isModifyField = changeRecord.propPath === "fields" || /fields.(\d)+.name/.test(changeRecord.propPath) || /fields.(\d)+$/.test(changeRecord.propPath);
+        isModifyField = changeRecord.propPath === "fields" || /fields.(\d)+.name/.test(changeRecord.propPath) || /fields.(\d)+.defaultValue/.test(changeRecord.propPath) || /fields.(\d)+$/.test(changeRecord.propPath);
         isModifyMock = changeRecord.propPath === "mocks";
         isModifyMethod = changeRecord.propPath === "methods" || /methods.(\d)+.name/.test(changeRecord.propPath) || /methods.(\d)+$/.test(changeRecord.propPath);
         needRecollectDep = isModifyField || isModifyMock || isModifyMethod;
@@ -19722,24 +19722,26 @@
       if (needRecollectDep) {
         if (Array.isArray(root?.items)) {
           depService.clearIdleTasks();
-          removeDataSourceTarget(config.id);
-          initDataSourceDepTarget(config);
           let collectIdlePromises = [];
           if (isModifyField) {
+            depService.removeTarget(config.id, core.DepTargetType.DATA_SOURCE);
+            depService.removeTarget(config.id, core.DepTargetType.DATA_SOURCE_COND);
+            depService.addTarget(core.createDataSourceTarget(config, vue.reactive({})));
+            depService.addTarget(core.createDataSourceCondTarget(config, vue.reactive({})));
             collectIdlePromises = [
               collectIdle(root.items, true, core.DepTargetType.DATA_SOURCE),
               collectIdle(root.items, true, core.DepTargetType.DATA_SOURCE_COND)
             ];
           } else if (isModifyMock) {
+            depService.removeTarget(config.id, core.DepTargetType.DATA_SOURCE);
+            depService.addTarget(core.createDataSourceTarget(config, vue.reactive({})));
             collectIdlePromises = [collectIdle(root.items, true, core.DepTargetType.DATA_SOURCE)];
           } else if (isModifyMethod) {
+            depService.removeTarget(config.id, core.DepTargetType.DATA_SOURCE_METHOD);
+            depService.addTarget(core.createDataSourceMethodTarget(config, vue.reactive({})));
             collectIdlePromises = [collectIdle(root.items, true, core.DepTargetType.DATA_SOURCE_METHOD)];
           }
-          Promise.all(collectIdlePromises).then(() => {
-            updateDataSourceSchema();
-            updateDsData();
-            updateStageNodes(root.items);
-          });
+          Promise.all(collectIdlePromises).then(() => updateDataSourceSchema()).then(() => updateDsData()).then(() => updateStageNodes(root.items));
         }
       } else if (root?.dataSources) {
         updateDsData();
@@ -19798,16 +19800,25 @@
         }
         root.dataSourceCondDeps[target.id] = target.deps;
       }
+      if (target.type === core.DepTargetType.DATA_SOURCE_METHOD) {
+        if (!root.dataSourceMethodDeps) {
+          root.dataSourceMethodDeps = {};
+        }
+        root.dataSourceMethodDeps[target.id] = target.deps;
+      }
     };
-    const targetRemoveHandler = (id) => {
+    const targetRemoveHandler = (id, type) => {
       const root = editorService.get("root");
       if (!root) return;
-      if (root.dataSourceDeps) {
+      if (root.dataSourceDeps && type === core.DepTargetType.DATA_SOURCE) {
         delete root.dataSourceDeps[id];
       }
-      if (root.dataSourceCondDeps) {
+      if (root.dataSourceCondDeps && type === core.DepTargetType.DATA_SOURCE_COND) {
         delete root.dataSourceCondDeps[id];
       }
+      if (root.dataSourceMethodDeps && type === core.DepTargetType.DATA_SOURCE_METHOD) {
+        delete root.dataSourceMethodDeps[id];
+      }
     };
     depService.on("add-target", targetAddHandler);
     depService.on("remove-target", targetRemoveHandler);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.10",
+  "version": "1.5.12",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^6.0.0",
     "sortablejs": "^1.15.2",
-    "@tmagic/design": "1.5.10",
-    "@tmagic/form": "1.5.10",
-    "@tmagic/table": "1.5.10",
-    "@tmagic/utils": "1.5.10",
-    "@tmagic/stage": "1.5.10"
+    "@tmagic/design": "1.5.12",
+    "@tmagic/form": "1.5.12",
+    "@tmagic/stage": "1.5.12",
+    "@tmagic/table": "1.5.12",
+    "@tmagic/utils": "1.5.12"
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
@@ -76,7 +76,7 @@
     "monaco-editor": "^0.48.0",
     "typescript": "*",
     "vue": ">=3.5.0",
-    "@tmagic/core": "1.5.10"
+    "@tmagic/core": "1.5.12"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/initService.ts

@@ -502,6 +502,7 @@ export const initServiceEvents = (
       isModifyField =
         changeRecord.propPath === 'fields' ||
         /fields.(\d)+.name/.test(changeRecord.propPath) ||
+        /fields.(\d)+.defaultValue/.test(changeRecord.propPath) ||
         /fields.(\d)+$/.test(changeRecord.propPath);
 
       isModifyMock = changeRecord.propPath === 'mocks';
@@ -523,25 +524,35 @@ export const initServiceEvents = (
       if (Array.isArray(root?.items)) {
         depService.clearIdleTasks();
 
-        removeDataSourceTarget(config.id);
-        initDataSourceDepTarget(config);
-
         let collectIdlePromises: Promise<void[]>[] = [];
         if (isModifyField) {
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE);
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE_COND);
+
+          depService.addTarget(createDataSourceTarget(config, reactive({})));
+          depService.addTarget(createDataSourceCondTarget(config, reactive({})));
+
           collectIdlePromises = [
             collectIdle(root.items, true, DepTargetType.DATA_SOURCE),
             collectIdle(root.items, true, DepTargetType.DATA_SOURCE_COND),
           ];
         } else if (isModifyMock) {
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE);
+
+          depService.addTarget(createDataSourceTarget(config, reactive({})));
+
           collectIdlePromises = [collectIdle(root.items, true, DepTargetType.DATA_SOURCE)];
         } else if (isModifyMethod) {
+          depService.removeTarget(config.id, DepTargetType.DATA_SOURCE_METHOD);
+
+          depService.addTarget(createDataSourceMethodTarget(config, reactive({})));
+
           collectIdlePromises = [collectIdle(root.items, true, DepTargetType.DATA_SOURCE_METHOD)];
         }
-        Promise.all(collectIdlePromises).then(() => {
-          updateDataSourceSchema();
-          updateDsData();
-          updateStageNodes(root.items);
-        });
+        Promise.all(collectIdlePromises)
+          .then(() => updateDataSourceSchema())
+          .then(() => updateDsData())
+          .then(() => updateStageNodes(root.items));
       }
     } else if (root?.dataSources) {
       updateDsData();
@@ -616,20 +627,31 @@ export const initServiceEvents = (
       }
       root.dataSourceCondDeps[target.id] = target.deps;
     }
+
+    if (target.type === DepTargetType.DATA_SOURCE_METHOD) {
+      if (!root.dataSourceMethodDeps) {
+        root.dataSourceMethodDeps = {};
+      }
+      root.dataSourceMethodDeps[target.id] = target.deps;
+    }
   };
 
-  const targetRemoveHandler = (id: string | number) => {
+  const targetRemoveHandler = (id: string | number, type: DepTargetType) => {
     const root = editorService.get('root');
 
     if (!root) return;
 
-    if (root.dataSourceDeps) {
+    if (root.dataSourceDeps && type === DepTargetType.DATA_SOURCE) {
       delete root.dataSourceDeps[id];
     }
 
-    if (root.dataSourceCondDeps) {
+    if (root.dataSourceCondDeps && type === DepTargetType.DATA_SOURCE_COND) {
       delete root.dataSourceCondDeps[id];
     }
+
+    if (root.dataSourceMethodDeps && type === DepTargetType.DATA_SOURCE_METHOD) {
+      delete root.dataSourceMethodDeps[id];
+    }
   };
 
   depService.on('add-target', targetAddHandler);

package/src/services/dep.ts

@@ -28,7 +28,7 @@ import BaseService from './BaseService';
 
 export interface DepEvents {
   'add-target': [target: Target];
-  'remove-target': [id: string | number];
+  'remove-target': [id: string | number, type: string | DepTargetType];
   collected: [nodes: MNode[], deep: boolean];
   'ds-collected': [nodes: MNode[], deep: boolean];
 }
@@ -77,7 +77,7 @@ class Dep extends BaseService {
     if (!targets) return;
 
     for (const target of Object.values(targets)) {
-      this.emit('remove-target', target.id);
+      this.emit('remove-target', target.id, type);
     }
   }
 
@@ -96,7 +96,7 @@ class Dep extends BaseService {
 
   public removeTarget(id: Id, type: string = DepTargetType.DEFAULT) {
     this.watcher.removeTarget(id, type);
-    this.emit('remove-target', id);
+    this.emit('remove-target', id, type);
   }
 
   public clearTargets() {

package/src/services/events.ts

@@ -57,7 +57,7 @@ class Events extends BaseService {
   }
 
   public getMethod(type: string) {
-    return cloneDeep(methodMap[toLine(type)]);
+    return cloneDeep(methodMap[toLine(type)]) || [];
   }
 
   public resetState() {

package/types/index.d.ts

@@ -295,7 +295,7 @@ declare const _default$G: DataSource;
 
 interface DepEvents {
     'add-target': [target: Target];
-    'remove-target': [id: string | number];
+    'remove-target': [id: string | number, type: string | DepTargetType];
     collected: [nodes: MNode[], deep: boolean];
     'ds-collected': [nodes: MNode[], deep: boolean];
 }