v1.0.0-beta.7

Revert "refactor(stage): 升级moveable"
This reverts commit 9b8adf874c.
2025-12-07 17:32:33 +08:00 · 2022-03-18 22:14:37 +08:00 · 2022-03-18 17:14:37 +08:00 · 2022-03-18 17:12:42 +08:00 · 2022-03-17 23:41:03 +08:00
28 changed files with 76 additions and 104 deletions
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
  "npmClient": "npm",
  "packages": [
    "packages/*",
--- a/package-lock.json
+++ b/package-lock.json
@@ -1575,12 +1575,12 @@
 		},
 		"@egjs/agent": {
 			"version": "2.3.0",
-			"resolved": "https://mirrors.tencent.com/npm/@egjs%2fagent/-/agent-2.3.0.tgz",
+			"resolved": "https://registry.npmjs.org/@egjs/agent/-/agent-2.3.0.tgz",
 			"integrity": "sha512-ENhwkOW6rnYW8IuXJwvECIAzj7nMxq+ctB8uCJ+mKnoKK8tGiv3YXtN6nuaOov2YmXdRdwafSz9rhgRNXswX/A=="
 		},
 		"@egjs/children-differ": {
 			"version": "1.0.1",
-			"resolved": "https://mirrors.tencent.com/npm/@egjs%2fchildren-differ/-/children-differ-1.0.1.tgz",
+			"resolved": "https://registry.npmjs.org/@egjs/children-differ/-/children-differ-1.0.1.tgz",
 			"integrity": "sha512-DRvyqMf+CPCOzAopQKHtW+X8iN6Hy6SFol+/7zCUiE5y4P/OB8JP8FtU4NxtZwtafvSL4faD5KoQYPj3JHzPFQ==",
 			"requires": {
 				"@egjs/list-differ": "^1.0.0"
@@ -5226,9 +5226,9 @@
 			}
 		},
 		"@scena/dragscroll": {
-			"version": "1.1.1",
-			"resolved": "https://mirrors.tencent.com/npm/@scena%2fdragscroll/-/dragscroll-1.1.1.tgz",
-			"integrity": "sha512-RnoGpQC0aJ5Z+glLzQAAAf1jmRac1yRuil4zi4HQ8GhzoxTqlgplAOGkFF/IRnUMK1uc5S6R/MEEybfyDGlEcQ==",
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/@scena/dragscroll/-/dragscroll-1.0.3.tgz",
+			"integrity": "sha512-jkQ6i9+a4mNBQRQUPtagyV5/P2NauHKp5on4pcnHIRLFG25sPFy3h/VwwgNXwtQFRS1S6taBpnA5Nk87zwg42w==",
 			"requires": {
 				"@daybrush/utils": "1.6.0",
 				"@scena/event-emitter": "^1.0.2"
@@ -15669,13 +15669,12 @@
 			}
 		},
 		"moveable": {
-			"version": "0.28.0",
-			"resolved": "https://mirrors.tencent.com/npm/moveable/-/moveable-0.28.0.tgz",
-			"integrity": "sha512-2+lUt6DTt40iSjclwXeI1TWtFTmbSGCV8XSWxhObQXV7JVnxJpqyC9u5M3GzbjltwkLqxDMd64OT1V9Je1LeCA==",
+			"version": "0.25.3",
+			"resolved": "https://registry.npmjs.org/moveable/-/moveable-0.25.3.tgz",
+			"integrity": "sha512-NsEcKzZWMy2uQeloevu5ioAFM8pmtocCZE/ZsdXizMQWUXRTas7VOUaH+ODy493NSFSqky5EDISIibuiUq0i2g==",
 			"requires": {
 				"@scena/event-emitter": "^1.0.3",
-				"react-compat-moveable": "~0.16.0",
-				"react-simple-compat": "^1.2.1"
+				"react-compat-moveable": "~0.13.3"
 			}
 		},
 		"ms": {
@@ -16450,7 +16449,7 @@
 		},
 		"overlap-area": {
 			"version": "1.0.0",
-			"resolved": "https://mirrors.tencent.com/npm/overlap-area/-/overlap-area-1.0.0.tgz",
+			"resolved": "https://registry.npmjs.org/overlap-area/-/overlap-area-1.0.0.tgz",
 			"integrity": "sha512-Oi3hxRf6Flvv1upldnjOtV7euFkc75G/wsxYfS/ssNKEZ3Z+HbIoPHkFfLH3hgwqLJKpq9wdFo7I6xcdS6k8yg==",
 			"requires": {
 				"@daybrush/utils": "^1.3.1"
@@ -17237,33 +17236,15 @@
 			}
 		},
 		"react-compat-moveable": {
-			"version": "0.16.0",
-			"resolved": "https://mirrors.tencent.com/npm/react-compat-moveable/-/react-compat-moveable-0.16.0.tgz",
-			"integrity": "sha512-h12eQ4v3lNX1zjoglatprIYOZ2DL7c7LPGkoGJwGE7alvCRyQvlDL7zUWUmXf/K1SG5fKakaIA+58bcAlL9Dfg==",
+			"version": "0.13.3",
+			"resolved": "https://registry.npmjs.org/react-compat-moveable/-/react-compat-moveable-0.13.3.tgz",
+			"integrity": "sha512-LUd7BQcgZf2joxoDBd3n5G0BEkke/l6j4yT+DSYEA99OlwWI14yba6HAcxWoMGz7xLTs/dQC1/lFqGzWGKxnnQ==",
 			"requires": {
-				"@daybrush/utils": "^1.6.0",
-				"@egjs/agent": "^2.2.1",
-				"@egjs/children-differ": "^1.0.1",
-				"@scena/dragscroll": "^1.1.1",
-				"@scena/matrix": "^1.1.1",
-				"css-to-mat": "^1.0.3",
-				"framework-utils": "^1.1.0",
-				"gesto": "^1.7.0",
-				"overlap-area": "^1.0.0",
-				"react-compat-css-styled": "^1.0.8",
-				"react-css-styled": "^1.0.3",
-				"react-moveable": "~0.31.0"
-			},
-			"dependencies": {
-				"gesto": {
-					"version": "1.7.0",
-					"resolved": "https://mirrors.tencent.com/npm/gesto/-/gesto-1.7.0.tgz",
-					"integrity": "sha512-gPwWUYVPlYATOL59Gl1g2pPtCvbYJIU2kaj85lGvGCde1jgWAh5QI/rwlLgTWpH+Nl53pmPGFmp/oGqJ9d7grw==",
-					"requires": {
-						"@daybrush/utils": "^1.0.0",
-						"@scena/event-emitter": "^1.0.2"
-					}
-				}
+				"@daybrush/utils": "^1.4.0",
+				"@scena/dragscroll": "^1.0.1",
+				"react-compat-css-styled": "^1.0.5",
+				"react-moveable": "~0.28.3",
+				"react-simple-compat": "^1.2.0"
 			}
 		},
 		"react-compat-ruler": {
@@ -17291,31 +17272,20 @@
 			"dev": true
 		},
 		"react-moveable": {
-			"version": "0.31.1",
-			"resolved": "https://mirrors.tencent.com/npm/react-moveable/-/react-moveable-0.31.1.tgz",
-			"integrity": "sha512-inqkYxv95mK5yILEY1sLYG483RTmhj/vfw+Mq3TX/LPuPGEOFyvGAagtBPncrDVhDb6ypeK6HYqMVmf/Psro+Q==",
+			"version": "0.28.3",
+			"resolved": "https://registry.npmjs.org/react-moveable/-/react-moveable-0.28.3.tgz",
+			"integrity": "sha512-gFxpjkJK7xiV+xRo90MZTTkIZVa5LdWVYAExNWmQt2vEnfaZArdiAD+OJ7qQ4EPpuNAP75waJfk8uKtdnemy2w==",
 			"requires": {
-				"@daybrush/utils": "^1.6.0",
+				"@daybrush/utils": "^1.4.0",
 				"@egjs/agent": "^2.2.1",
 				"@egjs/children-differ": "^1.0.1",
-				"@scena/dragscroll": "^1.1.1",
+				"@scena/dragscroll": "^1.0.1",
 				"@scena/matrix": "^1.1.1",
 				"css-to-mat": "^1.0.3",
 				"framework-utils": "^1.1.0",
-				"gesto": "^1.7.0",
+				"gesto": "^1.2.1",
 				"overlap-area": "^1.0.0",
-				"react-css-styled": "^1.0.3"
-			},
-			"dependencies": {
-				"gesto": {
-					"version": "1.7.0",
-					"resolved": "https://mirrors.tencent.com/npm/gesto/-/gesto-1.7.0.tgz",
-					"integrity": "sha512-gPwWUYVPlYATOL59Gl1g2pPtCvbYJIU2kaj85lGvGCde1jgWAh5QI/rwlLgTWpH+Nl53pmPGFmp/oGqJ9d7grw==",
-					"requires": {
-						"@daybrush/utils": "^1.0.0",
-						"@scena/event-emitter": "^1.0.2"
-					}
-				}
+				"react-css-styled": "^1.0.1"
 			}
 		},
 		"react-refresh": {
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "name": "@tmagic/core",
  "sideEffects": false,
  "main": "dist/tmagic-core.umd.js",
@@ -26,7 +26,7 @@
    "url": "https://github.com/Tencent/tmagic-editor.git"
  },
  "dependencies": {
-    "@tmagic/schema": "^1.0.0-beta.5",
+    "@tmagic/schema": "^1.0.0-beta.6",
    "events": "^3.3.0"
  },
  "devDependencies": {
--- a/packages/editor/package-lock.json
+++ b/packages/editor/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/editor",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.7",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
  "name": "@tmagic/editor",
  "sideEffects": false,
  "main": "dist/tmagic-editor.umd.js",
@@ -28,11 +28,11 @@
  },
  "dependencies": {
    "@element-plus/icons": "0.0.11",
-    "@tmagic/core": "^1.0.0-beta.5",
-    "@tmagic/form": "^1.0.0-beta.5",
-    "@tmagic/schema": "^1.0.0-beta.5",
-    "@tmagic/stage": "^1.0.0-beta.5",
-    "@tmagic/utils": "^1.0.0-beta.5",
+    "@tmagic/core": "^1.0.0-beta.6",
+    "@tmagic/form": "^1.0.0-beta.6",
+    "@tmagic/schema": "^1.0.0-beta.6",
+    "@tmagic/stage": "^1.0.0-beta.7",
+    "@tmagic/utils": "^1.0.0-beta.6",
    "color": "^3.1.3",
    "element-plus": "^2.0.2",
    "events": "^3.3.0",
--- a/packages/editor/src/services/editor.ts
+++ b/packages/editor/src/services/editor.ts
@@ -295,7 +295,7 @@ class Editor extends BaseService {

    let newConfig = await this.toggleFixedPosition(toRaw(config), node, this.get<MApp>('root'));

-    newConfig = mergeWith(node, newConfig, (objValue, srcValue) => {
+    newConfig = mergeWith(cloneDeep(node), newConfig, (objValue, srcValue) => {
      if (Array.isArray(srcValue)) {
        return srcValue;
      }
--- a/packages/form/package-lock.json
+++ b/packages/form/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/form",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/form/package.json
+++ b/packages/form/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "name": "@tmagic/form",
  "sideEffects": false,
  "main": "dist/tmagic-form.umd.js",
@@ -28,7 +28,7 @@
  },
  "dependencies": {
    "@element-plus/icons": "0.0.11",
-    "@tmagic/utils": "^1.0.0-beta.5",
+    "@tmagic/utils": "^1.0.0-beta.6",
    "element-plus": "^2.0.2",
    "lodash-es": "^4.17.21",
    "moment": "^2.29.1",
--- a/packages/schema/package.json
+++ b/packages/schema/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "name": "@tmagic/schema",
  "sideEffects": false,
  "main": "src/index.ts",
--- a/packages/stage/package.json
+++ b/packages/stage/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
  "name": "@tmagic/stage",
  "sideEffects": false,
  "main": "dist/tmagic-stage.umd.js",
@@ -23,11 +23,11 @@
  },
  "dependencies": {
    "@scena/guides": "^0.17.0",
-    "@tmagic/schema": "^1.0.0-beta.5",
-    "@tmagic/utils": "^1.0.0-beta.5",
+    "@tmagic/schema": "^1.0.0-beta.6",
+    "@tmagic/utils": "^1.0.0-beta.6",
    "events": "^3.3.0",
    "lodash-es": "^4.17.21",
-    "moveable": "^0.28.0"
+    "moveable": "^0.25.3"
  },
  "devDependencies": {
    "@types/events": "^3.0.0",
--- a/packages/stage/src/StageDragResize.ts
+++ b/packages/stage/src/StageDragResize.ts
@@ -246,10 +246,12 @@ export default class StageDragResize extends EventEmitter {
      (await renderer.getRuntime())?.getSnapElements ||
      (() => {
        const doc = renderer.contentWindow?.document;
-        return (doc ? Array.from(doc.querySelectorAll('[id]')) : []) as HTMLElement[];
+        const elementGuidelines = (doc ? Array.from(doc.querySelectorAll('[id]')) : [])
+          // 排除掉当前组件本身
+          .filter((element) => element !== this.target && !this.target?.contains(element));
+        return elementGuidelines as HTMLElement[];
      });
-    // 排除掉当前组件本身
-    return getSnapElements(el).filter((element) => element !== this.target && !this.target?.contains(element));
+    return getSnapElements(el);
  }

  private sort(): void {
@@ -339,8 +341,8 @@ export default class StageDragResize extends EventEmitter {
      resizable: true,
      snappable: !isSortable,
      snapGap: !isSortable,
-      snapDirections: { center: !isSortable, middle: !isSortable },
-      elementSnapDirections: { center: !isSortable, middle: !isSortable },
+      snapCenter: !isSortable,
+      container: renderer.contentWindow?.document.body,

      elementGuidelines: isSortable ? [] : await this.getSnapElements(this.target),
      horizontalGuidelines: this.horizontalGuidelines,
--- a/packages/table/package-lock.json
+++ b/packages/table/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/table",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/table/package.json
+++ b/packages/table/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "name": "@tmagic/table",
  "sideEffects": false,
  "main": "dist/tmagic-table.umd.js",
@@ -26,7 +26,7 @@
    "url": "https://github.com/Tencent/tmagic-editor.git"
  },
  "dependencies": {
-    "@tmagic/form": "^1.0.0-beta.5",
+    "@tmagic/form": "^1.0.0-beta.6",
    "element-plus": "^2.0.2",
    "lodash-es": "^4.17.21",
    "vue": "^3.2.0"
--- a/packages/ui-react/package-lock.json
+++ b/packages/ui-react/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/ui-react",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/ui-react/package.json
+++ b/packages/ui-react/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@tmagic/ui-react",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "main": "src/index.ts",
  "engines": {
    "node": ">=14"
@@ -13,7 +13,7 @@
    "react:build": "tsc && vite build"
  },
  "dependencies": {
-    "@tmagic/schema": "^1.0.0-beta.5",
+    "@tmagic/schema": "^1.0.0-beta.6",
    "react": "^17.0.0",
    "react-dom": "^17.0.0"
  },
--- a/packages/ui-vue2/package-lock.json
+++ b/packages/ui-vue2/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/ui-vue2",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/ui-vue2/package.json
+++ b/packages/ui-vue2/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "name": "@tmagic/ui-vue2",
  "main": "src/index.ts",
  "scripts": {
--- a/packages/ui/package-lock.json
+++ b/packages/ui/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/ui",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "name": "@tmagic/ui",
  "main": "src/index.ts",
  "engines": {
@@ -10,7 +10,7 @@
    "url": "https://github.com/Tencent/tmagic-editor.git"
  },
  "dependencies": {
-    "@tmagic/schema": "^1.0.0-beta.5",
+    "@tmagic/schema": "^1.0.0-beta.6",
    "delegate": "^3.2.0",
    "tiny-emitter": "^2.1.0",
    "vue": "^3.2.0"
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "name": "@tmagic/utils",
  "main": "dist/tmagic-utils.umd.js",
  "module": "dist/tmagic-utils.es.js",
--- a/playground/package-lock.json
+++ b/playground/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "tmagic-playground",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.7",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/playground/package.json
+++ b/playground/package.json
@@ -1,6 +1,6 @@
 {
  "name": "tmagic-playground",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.7",
  "private": true,
  "scripts": {
    "dev": "vite",
@@ -9,11 +9,11 @@
  },
  "dependencies": {
    "@element-plus/icons": "0.0.11",
-    "@tmagic/editor": "^1.0.0-beta.5",
-    "@tmagic/form": "^1.0.0-beta.5",
-    "@tmagic/schema": "^1.0.0-beta.5",
-    "@tmagic/stage": "^1.0.0-beta.5",
-    "@tmagic/utils": "^1.0.0-beta.5",
+    "@tmagic/editor": "^1.0.0-beta.7",
+    "@tmagic/form": "^1.0.0-beta.6",
+    "@tmagic/schema": "^1.0.0-beta.6",
+    "@tmagic/stage": "^1.0.0-beta.7",
+    "@tmagic/utils": "^1.0.0-beta.6",
    "element-plus": "^2.0.2",
    "serialize-javascript": "^6.0.0",
    "vue": "^3.2.0",
--- a/runtime/react/package-lock.json
+++ b/runtime/react/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "runtime-react",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/runtime/react/package.json
+++ b/runtime/react/package.json
@@ -1,6 +1,6 @@
 {
  "name": "runtime-react",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "private": true,
  "scripts": {
    "dev": "npm run build && npm run serve",
--- a/runtime/vue2/package-lock.json
+++ b/runtime/vue2/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "runtime-vue2",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/runtime/vue2/package.json
+++ b/runtime/vue2/package.json
@@ -1,6 +1,6 @@
 {
  "name": "runtime-vue2",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "private": true,
  "scripts": {
    "dev": "npm run build && npm run serve",
--- a/runtime/vue3/package-lock.json
+++ b/runtime/vue3/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "runtime-vue3",
-	"version": "1.0.0-beta.5",
+	"version": "1.0.0-beta.6",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
--- a/runtime/vue3/package.json
+++ b/runtime/vue3/package.json
@@ -1,6 +1,6 @@
 {
  "name": "runtime-vue3",
-  "version": "1.0.0-beta.5",
+  "version": "1.0.0-beta.6",
  "private": true,
  "scripts": {
    "dev": "npm run build && npm run serve",
Author	SHA1	Message	Date
roymondchen	bbdbc2e84d	v1.0.0-beta.7	2022-03-18 22:14:37 +08:00
roymondchen	dcb07087c5	Revert "refactor(stage): 升级moveable" This reverts commit `9b8adf874c`.	2022-03-18 17:14:37 +08:00
roymondchen	3b512d925f	fix(editor): 切换布局失效	2022-03-18 17:12:42 +08:00
roymondchen	d0febcbff7	v1.0.0-beta.6	2022-03-17 23:41:03 +08:00