@tmagic/editor 1.1.0-beta.4 → 1.1.0-beta.5

package/dist/types/src/services/props.d.ts

@@ -35,7 +35,25 @@ declare class Props extends BaseService {
      * 将组件与组件的子元素配置中的id都设置成一个新的ID
      * @param {Object} config 组件配置
      */
-    setNewItemId(config: MNode, parent?: MPage): Promise<void>;
+    setNewItemId(config: MNode, parent?: MPage): Promise<MNode>;
+    /**
+     * 获取默认属性配置
+     * @param type 组件类型
+     * @returns Object
+     */
+    getDefaultPropsValue(type: string): Promise<{
+        type: string;
+        layout: string;
+        style: {};
+        name: string;
+        items: never[];
+    } | {
+        type: string;
+        style: {};
+        name: string;
+        layout?: undefined;
+        items?: undefined;
+    }>;
 }
 export declare type PropsService = Props;
 declare const _default: Props;

package/dist/types/src/utils/props.d.ts

@@ -36,23 +36,3 @@ export declare const fillConfig: (config?: FormConfig) => {
     })[];
 }[];
 export declare const DEFAULT_CONFIG: FormConfig;
-/**
- * 获取默认属性配置
- * @param type 组件类型
- * @returns Object
- */
-export declare const getDefaultPropsValue: (type: string, id: string) => {
-    type: string;
-    id: string;
-    layout: string;
-    style: {};
-    name: string;
-    items: never[];
-} | {
-    type: string;
-    id: string;
-    style: {};
-    name: string;
-    layout?: undefined;
-    items?: undefined;
-};

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.0-beta.4",
+  "version": "1.1.0-beta.5",
   "name": "@tmagic/editor",
   "sideEffects": [
     "dist/*",
@@ -43,11 +43,11 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@element-plus/icons-vue": "^2.0.6",
-    "@tmagic/core": "1.1.0-beta.4",
-    "@tmagic/form": "1.1.0-beta.4",
-    "@tmagic/schema": "1.1.0-beta.4",
-    "@tmagic/stage": "1.1.0-beta.4",
-    "@tmagic/utils": "1.1.0-beta.4",
+    "@tmagic/core": "1.1.0-beta.5",
+    "@tmagic/form": "1.1.0-beta.5",
+    "@tmagic/schema": "1.1.0-beta.5",
+    "@tmagic/stage": "1.1.0-beta.5",
+    "@tmagic/utils": "1.1.0-beta.5",
     "buffer": "^6.0.3",
     "color": "^3.1.3",
     "element-plus": "^2.2.6",
@@ -60,7 +60,7 @@
     "vue": "^3.2.0"
   },
   "peerDependencies": {
-    "@tmagic/form": "1.1.0-beta.4",
+    "@tmagic/form": "1.1.0-beta.5",
     "element-plus": "^2.2.6",
     "monaco-editor": "^0.32.1",
     "vue": "^3.2.0"

package/src/layouts/sidebar/LayerPanel.vue

@@ -61,11 +61,12 @@ import type { ElTree } from 'element-plus';
 import { throttle } from 'lodash-es';
 
 import type { MNode, MPage } from '@tmagic/schema';
-import { NodeType } from '@tmagic/schema';
+import { MContainer, NodeType } from '@tmagic/schema';
 import StageCore from '@tmagic/stage';
 
 import type { EditorService } from '@editor/services/editor';
 import type { Services } from '@editor/type';
+import { Layout } from '@editor/type';
 
 import LayerMenu from './LayerMenu.vue';
 
@@ -104,8 +105,16 @@ const useDrop = (tree: Ref<InstanceType<typeof ElTree> | undefined>, editorServi
     return false;
   },
 
-  handleDragEnd() {
+  async handleDragEnd(e: any) {
     if (!tree.value) return;
+    const { data: node } = e;
+    const parent = editorService?.getParentById(node.id, false) as MContainer;
+    const layout = await editorService?.getLayout(parent);
+    node.style.position = layout;
+    if (layout === Layout.RELATIVE) {
+      node.style.top = 0;
+      node.style.left = 0;
+    }
     const { data } = tree.value;
     const [page] = data as [MPage];
     editorService?.update(page);

package/src/services/editor.ts

@@ -321,10 +321,11 @@ class Editor extends BaseService {
       this.pushHistoryState();
     }
 
-    stage?.select(newNode.id);
-
     if (isPage) {
       this.state.pageLength += 1;
+    } else {
+      // 新增页面，这个时候页面还有渲染出来，此时select会出错，在runtime-ready的时候回去select
+      stage?.select(newNode.id);
     }
 
     this.emit('add', newNode);
@@ -506,7 +507,7 @@ class Editor extends BaseService {
       return;
     }
 
-    await propsService.setNewItemId(config, this.get('root'));
+    config = await propsService.setNewItemId(config, this.get('root'));
     if (config.style) {
       config.style = {
         ...config.style,

package/src/services/props.ts

@@ -25,7 +25,7 @@ import { NodeType } from '@tmagic/schema';
 import { isPop, toLine } from '@tmagic/utils';
 
 import type { PropsState } from '@editor/type';
-import { DEFAULT_CONFIG, fillConfig, getDefaultPropsValue } from '@editor/utils/props';
+import { DEFAULT_CONFIG, fillConfig } from '@editor/utils/props';
 
 import BaseService from './BaseService';
 
@@ -36,7 +36,15 @@ class Props extends BaseService {
   });
 
   constructor() {
-    super(['setPropsConfig', 'getPropsConfig', 'setPropsValue', 'getPropsValue', 'createId', 'setNewItemId']);
+    super([
+      'setPropsConfig',
+      'getPropsConfig',
+      'setPropsValue',
+      'getPropsValue',
+      'createId',
+      'setNewItemId',
+      'getDefaultPropsValue',
+    ]);
   }
 
   public setPropsConfigs(configs: Record<string, FormConfig>) {
@@ -99,12 +107,20 @@ class Props extends BaseService {
       return value;
     }
 
-    const data = cloneDeep(defaultValue as any);
-
-    await this.setNewItemId(data);
+    const [id, defaultPropsValue, data] = await Promise.all([
+      this.createId(type),
+      this.getDefaultPropsValue(type),
+      this.setNewItemId(
+        cloneDeep({
+          type,
+          ...defaultValue,
+        } as any),
+      ),
+    ]);
 
     return {
-      ...getDefaultPropsValue(type, await this.createId(type)),
+      id,
+      ...defaultPropsValue,
       ...mergeWith(cloneDeep(this.state.propsValueMap[type] || {}), data),
     };
   }
@@ -133,6 +149,29 @@ class Props extends BaseService {
         await this.setNewItemId(item, config as MPage);
       }
     }
+
+    return config;
+  }
+
+  /**
+   * 获取默认属性配置
+   * @param type 组件类型
+   * @returns Object
+   */
+  public async getDefaultPropsValue(type: string) {
+    return ['page', 'container'].includes(type)
+      ? {
+          type,
+          layout: 'absolute',
+          style: {},
+          name: type,
+          items: [],
+        }
+      : {
+          type,
+          style: {},
+          name: type,
+        };
   }
 }
 

package/src/utils/props.ts

@@ -237,25 +237,3 @@ export const fillConfig = (config: FormConfig = []) => [
 
 // 默认组件属性表单配置
 export const DEFAULT_CONFIG: FormConfig = fillConfig([]);
-
-/**
- * 获取默认属性配置
- * @param type 组件类型
- * @returns Object
- */
-export const getDefaultPropsValue = (type: string, id: string) =>
-  ['page', 'container'].includes(type)
-    ? {
-        type,
-        id,
-        layout: 'absolute',
-        style: {},
-        name: type,
-        items: [],
-      }
-    : {
-        type,
-        id,
-        style: {},
-        name: type,
-      };