diff --git a/packages/editor/src/components/CodeBlockEditor.vue b/packages/editor/src/components/CodeBlockEditor.vue index e3820d0c..dd2af131 100644 --- a/packages/editor/src/components/CodeBlockEditor.vue +++ b/packages/editor/src/components/CodeBlockEditor.vue @@ -252,7 +252,7 @@ const closedHandler = () => { changedValue.value = undefined; }; -const parentFloating = inject>('parentFloating'); +const parentFloating = inject>('parentFloating', ref(null)); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); defineExpose({ diff --git a/packages/editor/src/fields/DataSourceFields.vue b/packages/editor/src/fields/DataSourceFields.vue index 1cfa3dea..395e9c85 100644 --- a/packages/editor/src/fields/DataSourceFields.vue +++ b/packages/editor/src/fields/DataSourceFields.vue @@ -318,6 +318,6 @@ const addDialogVisible = defineModel('visible', { default: false }); const addFromJsonDialogVisible = defineModel('visible1', { default: false }); const { height: editorHeight } = useEditorContentHeight(); -const parentFloating = inject>('parentFloating'); +const parentFloating = inject>('parentFloating', ref(null)); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); diff --git a/packages/editor/src/fields/DataSourceMocks.vue b/packages/editor/src/fields/DataSourceMocks.vue index 854f8fef..ca715b84 100644 --- a/packages/editor/src/fields/DataSourceMocks.vue +++ b/packages/editor/src/fields/DataSourceMocks.vue @@ -250,6 +250,6 @@ const toggleValue = (row: MockSchema, key: 'enable' | 'useInEditor', value: bool const addDialogVisible = defineModel('visible', { default: false }); const { height: editorHeight } = useEditorContentHeight(); -const parentFloating = inject>('parentFloating'); +const parentFloating = inject>('parentFloating', ref(null)); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); diff --git a/packages/editor/src/hooks/use-next-float-box-position.ts b/packages/editor/src/hooks/use-next-float-box-position.ts index 67034e8f..b4eb98f4 100644 --- a/packages/editor/src/hooks/use-next-float-box-position.ts +++ b/packages/editor/src/hooks/use-next-float-box-position.ts @@ -2,7 +2,7 @@ import { Ref, ref } from 'vue'; import { UiService } from '@editor/services/ui'; -export const useNextFloatBoxPosition = (uiService?: UiService, parent?: Ref) => { +export const useNextFloatBoxPosition = (uiService?: UiService, parent?: Ref) => { const boxPosition = ref({ left: 0, top: 0, diff --git a/packages/editor/src/layouts/sidebar/Sidebar.vue b/packages/editor/src/layouts/sidebar/Sidebar.vue index 2b99821c..48e895ab 100644 --- a/packages/editor/src/layouts/sidebar/Sidebar.vue +++ b/packages/editor/src/layouts/sidebar/Sidebar.vue @@ -111,8 +111,8 @@ :key="config.$key ?? index" v-if="floatBoxStates[config.$key]?.status" v-model:visible="floatBoxStates[config.$key].status" - v-model:width="columnLeftWidth" v-model:height="columnLeftHeight" + :width="columnLeftWidth" :title="config.text" :position="{ left: floatBoxStates[config.$key].left, diff --git a/packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue b/packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue index 6cf7661a..b6b050ec 100644 --- a/packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue +++ b/packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue @@ -55,13 +55,12 @@ const dataSourceConfig = ref([]); const { height: editorHeight } = useEditorContentHeight(); -const parentFloating = inject>('parentFloating'); +const parentFloating = inject>('parentFloating', ref(null)); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); watchEffect(() => { initValues.value = props.values; dataSourceConfig.value = services?.dataSourceService.getFormConfig(initValues.value.type) || []; - console.log(dataSourceConfig.value); }); const submitHandler = (values: any) => { diff --git a/packages/editor/src/theme/sidebar.scss b/packages/editor/src/theme/sidebar.scss index 63625706..766df31a 100644 --- a/packages/editor/src/theme/sidebar.scss +++ b/packages/editor/src/theme/sidebar.scss @@ -68,9 +68,6 @@ } .m-editor-slide-list-box { - display: flex; - min-width: 240px; - min-height: 500px; > div { &:first-child { min-width: 240px;