@tmagic/editor 1.7.11 → 1.7.13

package/dist/es/services/editor.js

@@ -334,7 +334,7 @@ var Editor = class extends BaseService_default {
 		if (removedItems.length > 0 && pageForOp) this.pushOpHistory("remove", { removedItems }, pageForOp);
 		this.emit("remove", nodes);
 	}
-	async doUpdate(config, { changeRecords = [] } = {}) {
+	async doUpdate(config, { changeRecords = [], selectedAfterUpdate = true } = {}) {
 		const root = this.get("root");
 		if (!root) throw new Error("root为空");
 		if (!config?.id) throw new Error("没有配置或者配置缺少id值");
@@ -361,10 +361,12 @@ var Editor = class extends BaseService_default {
 		const layout = await this.getLayout(node);
 		if (Array.isArray(newConfig.items) && newLayout !== layout) newConfig = setChildrenLayout(newConfig, newLayout);
 		parentNodeItems[index] = newConfig;
-		const nodes = this.get("nodes");
-		const targetIndex = nodes.findIndex((nodeItem) => `${nodeItem.id}` === `${newConfig.id}`);
-		nodes.splice(targetIndex, 1, newConfig);
-		this.set("nodes", [...nodes]);
+		if (selectedAfterUpdate) {
+			const nodes = this.get("nodes");
+			const targetIndex = nodes.findIndex((nodeItem) => `${nodeItem.id}` === `${newConfig.id}`);
+			nodes.splice(targetIndex, 1, newConfig);
+			this.set("nodes", [...nodes]);
+		}
 		if (isPage(newConfig) || isPageFragment(newConfig)) this.set("page", newConfig);
 		this.addModifiedNodeId(newConfig.id);
 		return {

package/dist/es/utils/data-source/index.js

@@ -1,9 +1,8 @@
 import base_default from "./formConfigs/base.js";
 import http_default from "./formConfigs/http.js";
-import { defineFormItem } from "@tmagic/form";
 import { dataSourceTemplateRegExp, getKeysArray, isNumber } from "@tmagic/utils";
 //#region packages/editor/src/utils/data-source/index.ts
-var dataSourceFormConfig = defineFormItem({
+var dataSourceFormConfig = {
 	type: "tab",
 	items: [
 		{
@@ -65,7 +64,7 @@ var dataSourceFormConfig = defineFormItem({
 			}]
 		}
 	]
-});
+};
 var fillConfig = (config) => [
 	...base_default(),
 	...config,

package/dist/tmagic-editor.umd.cjs

@@ -6103,7 +6103,7 @@
 			if (removedItems.length > 0 && pageForOp) this.pushOpHistory("remove", { removedItems }, pageForOp);
 			this.emit("remove", nodes);
 		}
-		async doUpdate(config, { changeRecords = [] } = {}) {
+		async doUpdate(config, { changeRecords = [], selectedAfterUpdate = true } = {}) {
 			const root = this.get("root");
 			if (!root) throw new Error("root为空");
 			if (!config?.id) throw new Error("没有配置或者配置缺少id值");
@@ -6130,10 +6130,12 @@
 			const layout = await this.getLayout(node);
 			if (Array.isArray(newConfig.items) && newLayout !== layout) newConfig = setChildrenLayout(newConfig, newLayout);
 			parentNodeItems[index] = newConfig;
-			const nodes = this.get("nodes");
-			const targetIndex = nodes.findIndex((nodeItem) => `${nodeItem.id}` === `${newConfig.id}`);
-			nodes.splice(targetIndex, 1, newConfig);
-			this.set("nodes", [...nodes]);
+			if (selectedAfterUpdate) {
+				const nodes = this.get("nodes");
+				const targetIndex = nodes.findIndex((nodeItem) => `${nodeItem.id}` === `${newConfig.id}`);
+				nodes.splice(targetIndex, 1, newConfig);
+				this.set("nodes", [...nodes]);
+			}
 			if ((0, _tmagic_utils.isPage)(newConfig) || (0, _tmagic_utils.isPageFragment)(newConfig)) this.set("page", newConfig);
 			this.addModifiedNodeId(newConfig.id);
 			return {
@@ -7100,7 +7102,7 @@
 	]);
 	//#endregion
 	//#region packages/editor/src/utils/data-source/index.ts
-	var dataSourceFormConfig = (0, _tmagic_form.defineFormItem)({
+	var dataSourceFormConfig = {
 		type: "tab",
 		items: [
 			{
@@ -7162,7 +7164,7 @@
 				}]
 			}
 		]
-	});
+	};
 	var fillConfig$1 = (config) => [
 		...base_default(),
 		...config,

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.7.11",
+  "version": "1.7.13",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^7.0.0",
     "sortablejs": "^1.15.6",
-    "@tmagic/design": "1.7.11",
-    "@tmagic/stage": "1.7.11",
-    "@tmagic/table": "1.7.11",
-    "@tmagic/form": "1.7.11",
-    "@tmagic/utils": "1.7.11"
+    "@tmagic/form": "1.7.13",
+    "@tmagic/stage": "1.7.13",
+    "@tmagic/design": "1.7.13",
+    "@tmagic/table": "1.7.13",
+    "@tmagic/utils": "1.7.13"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -76,7 +76,7 @@
     "type-fest": "^5.2.0",
     "typescript": "^6.0.3",
     "vue": "^3.5.33",
-    "@tmagic/core": "1.7.11"
+    "@tmagic/core": "1.7.13"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/services/editor.ts

@@ -509,7 +509,10 @@ class Editor extends BaseService {
 
   public async doUpdate(
     config: MNode,
-    { changeRecords = [] }: { changeRecords?: ChangeRecord[] } = {},
+    {
+      changeRecords = [],
+      selectedAfterUpdate = true,
+    }: { changeRecords?: ChangeRecord[]; selectedAfterUpdate?: boolean } = {},
   ): Promise<{ newNode: MNode; oldNode: MNode; changeRecords?: ChangeRecord[] }> {
     const root = this.get('root');
     if (!root) throw new Error('root为空');
@@ -554,10 +557,12 @@ class Editor extends BaseService {
     parentNodeItems[index] = newConfig;
 
     // 将update后的配置更新到nodes中
-    const nodes = this.get('nodes');
-    const targetIndex = nodes.findIndex((nodeItem: MNode) => `${nodeItem.id}` === `${newConfig.id}`);
-    nodes.splice(targetIndex, 1, newConfig);
-    this.set('nodes', [...nodes]);
+    if (selectedAfterUpdate) {
+      const nodes = this.get('nodes');
+      const targetIndex = nodes.findIndex((nodeItem: MNode) => `${nodeItem.id}` === `${newConfig.id}`);
+      nodes.splice(targetIndex, 1, newConfig);
+      this.set('nodes', [...nodes]);
+    }
 
     if (isPage(newConfig) || isPageFragment(newConfig)) {
       this.set('page', newConfig as MPage | MPageFragment);
@@ -580,7 +585,7 @@ class Editor extends BaseService {
    */
   public async update(
     config: MNode | MNode[],
-    data: { changeRecords?: ChangeRecord[] } = {},
+    data: { changeRecords?: ChangeRecord[]; selectedAfterUpdate?: boolean } = {},
   ): Promise<MNode | MNode[]> {
     this.captureSelectionBeforeOp();
 

package/src/utils/data-source/index.ts

@@ -1,11 +1,11 @@
 import type { DataSchema, DataSourceFieldType, DataSourceSchema } from '@tmagic/core';
-import { type CascaderOption, defineFormItem, type FormConfig } from '@tmagic/form';
+import { type CascaderOption, type FormConfig, type TabConfig } from '@tmagic/form';
 import { dataSourceTemplateRegExp, getKeysArray, isNumber } from '@tmagic/utils';
 
 import BaseFormConfig from './formConfigs/base';
 import HttpFormConfig from './formConfigs/http';
 
-const dataSourceFormConfig = defineFormItem({
+const dataSourceFormConfig: TabConfig = {
   type: 'tab',
   items: [
     {
@@ -73,9 +73,13 @@ const dataSourceFormConfig = defineFormItem({
       ],
     },
   ],
-});
+};
 
-const fillConfig = (config: FormConfig): FormConfig => [...BaseFormConfig(), ...config, dataSourceFormConfig];
+const fillConfig = <T = never>(config: FormConfig<T>): FormConfig<T> => [
+  ...BaseFormConfig(),
+  ...config,
+  dataSourceFormConfig,
+];
 
 export const getFormConfig = (type: string, configs: Record<string, FormConfig>): FormConfig => {
   switch (type) {

package/types/index.d.ts

@@ -422,9 +422,11 @@ declare class Editor extends export_default {
    */
   remove(nodeOrNodeList: MNode | MNode[]): Promise<void>;
   doUpdate(config: MNode, {
-    changeRecords
+    changeRecords,
+    selectedAfterUpdate
   }?: {
     changeRecords?: ChangeRecord[];
+    selectedAfterUpdate?: boolean;
   }): Promise<{
     newNode: MNode;
     oldNode: MNode;
@@ -438,6 +440,7 @@ declare class Editor extends export_default {
    */
   update(config: MNode | MNode[], data?: {
     changeRecords?: ChangeRecord[];
+    selectedAfterUpdate?: boolean;
   }): Promise<MNode | MNode[]>;
   /**
    * 将id为id1的组件移动到id为id2的组件位置上，例如：[1,2,3,4] -> sort(1,3) -> [2,1,3,4]