@tmagic/editor 1.5.0-beta.1 → 1.5.0-beta.2

package/dist/style.css

@@ -432,12 +432,13 @@
   width: 100%;
 }
 .m-editor-page-bar-tabs .tmagic-design-button.m-editor-page-bar-switch-type-button {
-  margin-left: 7px;
+  margin-left: 10px;
   position: relative;
   top: 1px;
   border-radius: 3px 3px 0 0;
   border: 1px solid #d9dbdd;
   border-bottom: 1px solid transparent;
+  padding: 5px 10px;
 }
 .m-editor-page-bar-tabs .tmagic-design-button.m-editor-page-bar-switch-type-button.active {
   background-color: #f3f3f3;

package/dist/tmagic-editor.js

@@ -4798,7 +4798,7 @@ const _sfc_main$N = /* @__PURE__ */ defineComponent({
           "last-values": _ctx.lastValues,
           "init-values": _ctx.initValues,
           values: _ctx.values,
-          prop: `${_ctx.prop}${_ctx.prop ? "." : ""}${_ctx.name}`,
+          prop: _ctx.prop,
           onChange: onChangeHandler
         }, null, 40, ["config", "model", "name", "disabled", "size", "last-values", "init-values", "values", "prop"])),
         _ctx.config.fieldConfig ? (openBlock(), createBlock(unref(TMagicTooltip), {
@@ -7385,8 +7385,9 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
         createVNode(unref(TMagicPopover), {
           "popper-class": "page-bar-popover",
           placement: "top",
+          trigger: "hover",
           width: 160,
-          trigger: "hover"
+          "destroy-on-close": true
         }, {
           reference: withCtx(() => [
             createVNode(unref(TMagicIcon), { class: "m-editor-page-list-menu-icon" }, {
@@ -7583,8 +7584,9 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
                 createVNode(unref(TMagicPopover), {
                   "popper-class": "page-bar-popover",
                   placement: "top",
+                  trigger: "hover",
                   width: 160,
-                  trigger: "hover"
+                  "destroy-on-close": true
                 }, {
                   reference: withCtx(() => [
                     createVNode(unref(TMagicIcon), { class: "m-editor-page-bar-menu-icon" }, {
@@ -8897,7 +8899,8 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
                 key: 0,
                 placement: "right",
                 trigger: "hover",
-                "popper-class": "data-source-list-panel-add-menu"
+                "popper-class": "data-source-list-panel-add-menu",
+                "destroy-on-close": true
               }, {
                 reference: withCtx(() => [
                   createVNode(unref(TMagicButton), {

package/dist/tmagic-editor.umd.cjs

@@ -4802,7 +4802,7 @@
             "last-values": _ctx.lastValues,
             "init-values": _ctx.initValues,
             values: _ctx.values,
-            prop: `${_ctx.prop}${_ctx.prop ? "." : ""}${_ctx.name}`,
+            prop: _ctx.prop,
             onChange: onChangeHandler
           }, null, 40, ["config", "model", "name", "disabled", "size", "last-values", "init-values", "values", "prop"])),
           _ctx.config.fieldConfig ? (vue.openBlock(), vue.createBlock(vue.unref(design.TMagicTooltip), {
@@ -7389,8 +7389,9 @@
           vue.createVNode(vue.unref(design.TMagicPopover), {
             "popper-class": "page-bar-popover",
             placement: "top",
+            trigger: "hover",
             width: 160,
-            trigger: "hover"
+            "destroy-on-close": true
           }, {
             reference: vue.withCtx(() => [
               vue.createVNode(vue.unref(design.TMagicIcon), { class: "m-editor-page-list-menu-icon" }, {
@@ -7587,8 +7588,9 @@
                   vue.createVNode(vue.unref(design.TMagicPopover), {
                     "popper-class": "page-bar-popover",
                     placement: "top",
+                    trigger: "hover",
                     width: 160,
-                    trigger: "hover"
+                    "destroy-on-close": true
                   }, {
                     reference: vue.withCtx(() => [
                       vue.createVNode(vue.unref(design.TMagicIcon), { class: "m-editor-page-bar-menu-icon" }, {
@@ -8901,7 +8903,8 @@
                   key: 0,
                   placement: "right",
                   trigger: "hover",
-                  "popper-class": "data-source-list-panel-add-menu"
+                  "popper-class": "data-source-list-panel-add-menu",
+                  "destroy-on-close": true
                 }, {
                   reference: vue.withCtx(() => [
                     vue.createVNode(vue.unref(design.TMagicButton), {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.0-beta.1",
+  "version": "1.5.0-beta.2",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -55,8 +55,8 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^6.0.0",
     "sortablejs": "^1.15.2",
-    "@tmagic/table": "1.5.0-beta.1",
-    "@tmagic/dep": "1.5.0-beta.1"
+    "@tmagic/dep": "1.5.0-beta.2",
+    "@tmagic/table": "1.5.0-beta.2"
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
@@ -77,12 +77,12 @@
     "monaco-editor": "^0.48.0",
     "typescript": "*",
     "vue": "^3.4.35",
-    "@tmagic/core": "1.5.0-beta.1",
-    "@tmagic/design": "1.5.0-beta.1",
-    "@tmagic/form": "1.5.0-beta.1",
-    "@tmagic/schema": "1.5.0-beta.1",
-    "@tmagic/stage": "1.5.0-beta.1",
-    "@tmagic/utils": "1.5.0-beta.1"
+    "@tmagic/form": "1.5.0-beta.2",
+    "@tmagic/schema": "1.5.0-beta.2",
+    "@tmagic/design": "1.5.0-beta.2",
+    "@tmagic/stage": "1.5.0-beta.2",
+    "@tmagic/core": "1.5.0-beta.2",
+    "@tmagic/utils": "1.5.0-beta.2"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/Editor.vue

@@ -141,7 +141,15 @@ import uiService from './services/ui';
 import keybindingConfig from './utils/keybinding-config';
 import { defaultEditorProps, EditorProps } from './editorProps';
 import { initServiceEvents, initServiceState } from './initService';
-import type { EventBus, FrameworkSlots, PropsPanelSlots, Services, SidebarSlots, WorkspaceSlots } from './type';
+import type {
+  EventBus,
+  FrameworkSlots,
+  PropsPanelSlots,
+  Services,
+  SidebarSlots,
+  StageOptions,
+  WorkspaceSlots,
+} from './type';
 
 defineSlots<
   FrameworkSlots &
@@ -186,7 +194,7 @@ initServiceState(props, services);
 keybindingService.register(keybindingConfig);
 keybindingService.registerEl('global');
 
-const stageOptions = {
+const stageOptions: StageOptions = {
   runtimeUrl: props.runtimeUrl,
   autoScrollIntoView: props.autoScrollIntoView,
   render: props.render,

package/src/editorProps.ts

@@ -82,7 +82,7 @@ export interface EditorProps {
   /** 禁用属性配置面板右下角显示源码的按钮 */
   disabledShowSrc?: boolean;
   /** 中间工作区域中画布渲染的内容 */
-  render?: (stage: StageCore) => HTMLDivElement | Promise<HTMLDivElement>;
+  render?: (stage: StageCore) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
   /** 选中时会在画布上复制出一个大小相同的dom，实际拖拽的是这个dom，此方法用于干预这个dom的生成方式 */
   updateDragEl?: UpdateDragEl;
   /** 用于设置画布上的dom是否可以被选中 */

package/src/fields/DataSourceFieldSelect/Index.vue

@@ -22,7 +22,7 @@
       :last-values="lastValues"
       :init-values="initValues"
       :values="values"
-      :prop="`${prop}${prop ? '.' : ''}${name}`"
+      :prop="prop"
       @change="onChangeHandler"
     ></component>
 

package/src/layouts/page-bar/PageBar.vue

@@ -24,7 +24,13 @@
           </slot>
         </div>
 
-        <TMagicPopover popper-class="page-bar-popover" placement="top" :width="160" trigger="hover">
+        <TMagicPopover
+          popper-class="page-bar-popover"
+          placement="top"
+          trigger="hover"
+          :width="160"
+          :destroy-on-close="true"
+        >
           <div>
             <slot name="page-bar-popover" :page="item">
               <ToolButton

package/src/layouts/page-bar/PageList.vue

@@ -4,7 +4,13 @@
     id="m-editor-page-bar-list-icon"
     class="m-editor-page-bar-item m-editor-page-bar-item-icon"
   >
-    <TMagicPopover popper-class="page-bar-popover" placement="top" :width="160" trigger="hover">
+    <TMagicPopover
+      popper-class="page-bar-popover"
+      placement="top"
+      trigger="hover"
+      :width="160"
+      :destroy-on-close="true"
+    >
       <div>
         <slot name="page-list-popover" :list="list">
           <ToolButton

package/src/layouts/sidebar/data-source/DataSourceListPanel.vue

@@ -2,7 +2,13 @@
   <TMagicScrollbar class="data-source-list-panel m-editor-layer-panel">
     <div class="search-wrapper">
       <SearchInput @search="filterTextChangeHandler"></SearchInput>
-      <TMagicPopover v-if="editable" placement="right" trigger="hover" popper-class="data-source-list-panel-add-menu">
+      <TMagicPopover
+        v-if="editable"
+        placement="right"
+        trigger="hover"
+        popper-class="data-source-list-panel-add-menu"
+        :destroy-on-close="true"
+      >
         <template #reference>
           <TMagicButton type="primary" size="small">新增</TMagicButton>
         </template>

package/src/theme/page-bar.scss

@@ -5,12 +5,13 @@
   width: 100%;
 
   .tmagic-design-button.m-editor-page-bar-switch-type-button {
-    margin-left: 7px;
+    margin-left: 10px;
     position: relative;
     top: 1px;
     border-radius: 3px 3px 0 0;
     border: 1px solid $--border-color;
     border-bottom: 1px solid transparent;
+    padding: 5px 10px;
 
     &.active {
       background-color: #f3f3f3;

package/src/type.ts

@@ -145,7 +145,7 @@ export interface StageOptions {
   containerHighlightDuration?: number;
   containerHighlightType?: ContainerHighlightType;
   disabledDragStart?: boolean;
-  render?: (stage: StageCore) => HTMLDivElement | Promise<HTMLDivElement>;
+  render?: (stage: StageCore) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
   moveableOptions?: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions);
   canSelect?: (el: HTMLElement) => boolean | Promise<boolean>;
   isContainer?: (el: HTMLElement) => boolean | Promise<boolean>;

package/types/index.d.ts

@@ -916,7 +916,7 @@ interface StageOptions {
     containerHighlightDuration?: number;
     containerHighlightType?: ContainerHighlightType;
     disabledDragStart?: boolean;
-    render?: (stage: StageCore__default) => HTMLDivElement | Promise<HTMLDivElement>;
+    render?: (stage: StageCore__default) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
     moveableOptions?: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions);
     canSelect?: (el: HTMLElement) => boolean | Promise<boolean>;
     isContainer?: (el: HTMLElement) => boolean | Promise<boolean>;
@@ -2694,7 +2694,7 @@ interface EditorProps {
     /** 禁用属性配置面板右下角显示源码的按钮 */
     disabledShowSrc?: boolean;
     /** 中间工作区域中画布渲染的内容 */
-    render?: (stage: StageCore__default) => HTMLDivElement | Promise<HTMLDivElement>;
+    render?: (stage: StageCore__default) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
     /** 选中时会在画布上复制出一个大小相同的dom，实际拖拽的是这个dom，此方法用于干预这个dom的生成方式 */
     updateDragEl?: UpdateDragEl;
     /** 用于设置画布上的dom是否可以被选中 */