v1.0.0-rc.5

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "npmClient": "npm",
   "packages": [
     "packages/*",

packages/core/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/core",
   "sideEffects": [
     "dist/*"
@@ -33,7 +33,7 @@
     "vue"
   ],
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
     "events": "^3.3.0"
   },
   "devDependencies": {

packages/editor/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/editor",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

packages/editor/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -45,11 +45,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons": "0.0.11",
-    "@tmagic/core": "^1.0.0-rc.4",
+    "@tmagic/core": "^1.0.0-rc.5",
-    "@tmagic/form": "^1.0.0-rc.4",
+    "@tmagic/form": "^1.0.0-rc.5",
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
-    "@tmagic/stage": "^1.0.0-rc.4",
+    "@tmagic/stage": "^1.0.0-rc.5",
-    "@tmagic/utils": "^1.0.0-rc.4",
+    "@tmagic/utils": "^1.0.0-rc.5",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "element-plus": "^2.2.0",

packages/editor/src/components/ContentMenu.vue

@@ -49,7 +49,7 @@ export default defineComponent({
 
     onMounted(() => {
       globalThis.addEventListener(
-        'mousedown',
+        'mouseup',
         (e: MouseEvent) => {
           if (!visible.value || (e.target && menu.value?.contains(e.target as HTMLElement))) {
             return;
@@ -82,7 +82,7 @@ export default defineComponent({
 
           menuStyle.value = {
             top: `${top}px`,
-            left: `${e.clientX}px`,
+            left: `${e.clientX + 2}px`,
           };
         });
       },

packages/editor/src/utils/editor.ts

@@ -142,9 +142,13 @@ export const toRelative = (node: MNode) => {
 
 const setTop2Middle = (node: MNode, parentNode: MNode, stage: StageCore) => {
   const style = node.style || {};
-  const height = style.height || 0;
+  let height = style.height || 0;
 
-  if (!stage || typeof style.top !== 'undefined' || !parentNode.style || !isNumber(height)) return style;
+  if (!stage || typeof style.top !== 'undefined' || !parentNode.style) return style;
+
+  if (!isNumber(height)) {
+    height = 0;
+  }
 
   const { height: parentHeight } = parentNode.style;
 

packages/form/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/form",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

packages/form/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/form",
   "sideEffects": [
     "dist/*",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/utils": "^1.0.0-rc.4",
+    "@tmagic/utils": "^1.0.0-rc.5",
     "element-plus": "^2.2.0",
     "lodash-es": "^4.17.21",
     "moment": "^2.29.2",

packages/schema/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/schema",
   "sideEffects": false,
   "main": "dist/tmagic-schema.umd.js",

packages/stage/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/stage",
   "sideEffects": [
     "dist/*"
@@ -27,9 +27,9 @@
   },
   "dependencies": {
     "@scena/guides": "^0.17.0",
-    "@tmagic/core": "^1.0.0-rc.4",
+    "@tmagic/core": "^1.0.0-rc.5",
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
-    "@tmagic/utils": "^1.0.0-rc.4",
+    "@tmagic/utils": "^1.0.0-rc.5",
     "events": "^3.3.0",
     "lodash-es": "^4.17.21",
     "moveable": "^0.29.4",

packages/stage/src/StageDragResize.ts

@@ -23,7 +23,7 @@ import type { MoveableOptions } from 'moveable';
 import Moveable from 'moveable';
 import MoveableHelper from 'moveable-helper';
 
-import { DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, GuidesType, Mode } from './const';
+import { DRAG_EL_ID_PREFIX, GHOST_EL_ID_PREFIX, GuidesType, Mode, ZIndex } from './const';
 import StageCore from './StageCore';
 import type { Offset, SortEventData, StageDragResizeConfig } from './types';
 import { getAbsolutePosition, getGuideLineFromCache, getMode, getOffset } from './util';
@@ -166,16 +166,12 @@ export default class StageDragResize extends EventEmitter {
 
     this.updateDragEl(el);
 
-    this.setElementGuidelines(el);
-
     this.moveableOptions = this.getOptions({
       target: this.dragEl,
     });
   }
 
-  private setElementGuidelines(el: HTMLElement) {
+  private setElementGuidelines(nodes: HTMLElement[]) {
-    const nodes = el.parentElement?.children || [];
-
     this.elementGuidelines.forEach((node) => {
       node.remove();
     });
@@ -186,7 +182,7 @@ export default class StageDragResize extends EventEmitter {
 
       for (const node of nodes) {
         const { width, height } = node.getBoundingClientRect();
-        if (node === el) continue;
+        if (node === this.target) continue;
         const { left, top } = getOffset(node as HTMLElement);
         const elementGuideline = document.createElement('div');
         elementGuideline.style.cssText = `position: absolute;width: ${width}px;height: ${height}px;top: ${top}px;left: ${left}px`;
@@ -358,7 +354,7 @@ export default class StageDragResize extends EventEmitter {
     const ghostEl = el.cloneNode(true) as HTMLElement;
     const { top, left } = getAbsolutePosition(el, getOffset(el));
     ghostEl.id = `${GHOST_EL_ID_PREFIX}${el.id}`;
-    ghostEl.style.zIndex = '5';
+    ghostEl.style.zIndex = ZIndex.GHOST_EL;
     ghostEl.style.opacity = '.5';
     ghostEl.style.position = 'absolute';
     ghostEl.style.left = `${left}px`;
@@ -382,7 +378,7 @@ export default class StageDragResize extends EventEmitter {
       top: ${offset.top}px;
       width: ${width}px;
       height: ${height}px;
-      z-index: 9;
+      z-index: ${ZIndex.DRAG_EL};
     `;
 
     this.dragEl.id = `${DRAG_EL_ID_PREFIX}${el.id}`;
@@ -404,6 +400,14 @@ export default class StageDragResize extends EventEmitter {
       moveableOptions = moveableOptions(this.core);
     }
 
+    const elementGuidelines: any = moveableOptions.elementGuidelines || this.target.parentElement?.children || [];
+
+    this.setElementGuidelines(elementGuidelines);
+
+    if (moveableOptions.elementGuidelines) {
+      delete moveableOptions.elementGuidelines;
+    }
+
     return {
       origin: false,
       rootContainer: this.core.container,

packages/stage/src/const.ts

@@ -42,6 +42,8 @@ export enum ZIndex {
   MASK = '99999',
   /** 选中的节点 */
   SELECTED_EL = '666',
+  GHOST_EL = '700',
+  DRAG_EL = '9',
 }
 
 /** 鼠标按键 */

packages/table/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/table",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

packages/table/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/table",
   "sideEffects": [
     "dist/*"
@@ -30,7 +30,7 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/form": "^1.0.0-rc.4",
+    "@tmagic/form": "^1.0.0-rc.5",
     "element-plus": "^2.2.0",
     "lodash-es": "^4.17.21",
     "vue": "^3.2.0"

packages/ui-react/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/ui-react",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

packages/ui-react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tmagic/ui-react",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "main": "src/index.ts",
   "engines": {
     "node": ">=14"
@@ -13,7 +13,7 @@
     "react:build": "tsc && vite build"
   },
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
     "qrcode": "^1.5.0",
     "react": "^17.0.0",
     "react-dom": "^17.0.0"

packages/ui-vue2/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/ui-vue2",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

packages/ui-vue2/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/ui-vue2",
   "main": "src/index.ts",
   "scripts": {
@@ -13,7 +13,7 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
     "@vue/composition-api": "1.0.5",
     "qrcode": "^1.5.0",
     "vue": "^2.6.14"

packages/ui/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tmagic/ui",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

packages/ui/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/ui",
   "main": "src/index.ts",
   "engines": {
@@ -11,7 +11,7 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
     "delegate": "^3.2.0",
     "qrcode": "^1.5.0",
     "tiny-emitter": "^2.1.0",

packages/utils/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "name": "@tmagic/utils",
   "main": "dist/tmagic-utils.umd.js",
   "module": "dist/tmagic-utils.es.js",
@@ -24,7 +24,7 @@
     "url": "https://github.com/Tencent/tmagic-editor.git"
   },
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
     "moment": "^2.29.2"
   },
   "devDependencies": {

playground/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "tmagic-playground",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

playground/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmagic-playground",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "private": true,
   "scripts": {
     "dev": "vite --mode vue3",
@@ -11,11 +11,11 @@
   },
   "dependencies": {
     "@element-plus/icons": "0.0.11",
-    "@tmagic/editor": "^1.0.0-rc.4",
+    "@tmagic/editor": "^1.0.0-rc.5",
-    "@tmagic/form": "^1.0.0-rc.4",
+    "@tmagic/form": "^1.0.0-rc.5",
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
-    "@tmagic/stage": "^1.0.0-rc.4",
+    "@tmagic/stage": "^1.0.0-rc.5",
-    "@tmagic/utils": "^1.0.0-rc.4",
+    "@tmagic/utils": "^1.0.0-rc.5",
     "element-plus": "^2.2.0",
     "monaco-editor": "^0.32.1",
     "serialize-javascript": "^6.0.0",

runtime/react/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "runtime-react",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

runtime/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtime-react",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "private": true,
   "scripts": {
     "dev:react": "npm run build && npm run serve",
@@ -9,8 +9,8 @@
     "serve": "vite preview --port 8076"
   },
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
-    "@tmagic/stage": "^1.0.0-rc.4",
+    "@tmagic/stage": "^1.0.0-rc.5",
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
   },

runtime/vue2/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "runtime-vue2",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

runtime/vue2/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtime-vue2",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "private": true,
   "scripts": {
     "dev:vue2": "npm run build && npm run serve",
@@ -9,8 +9,8 @@
     "serve": "vite preview --port 8077"
   },
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
-    "@tmagic/stage": "^1.0.0-rc.4",
+    "@tmagic/stage": "^1.0.0-rc.5",
     "@vue/composition-api": "1.0.5",
     "vue": "^2.6.14"
   },

runtime/vue3/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "runtime-vue3",
-	"version": "1.0.0-rc.4",
+	"version": "1.0.0-rc.5",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {

runtime/vue3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "runtime-vue3",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.5",
   "private": true,
   "scripts": {
     "dev": "npm run build && npm run serve",
@@ -9,8 +9,8 @@
     "serve": "vite preview --port 8078"
   },
   "dependencies": {
-    "@tmagic/schema": "^1.0.0-rc.4",
+    "@tmagic/schema": "^1.0.0-rc.5",
-    "@tmagic/stage": "^1.0.0-rc.4",
+    "@tmagic/stage": "^1.0.0-rc.5",
     "axios": "^0.25.0",
     "vue": "^3.2.0"
   },