JLNTV_IPD/tmagic-editor
4
0
Fork 0
mirror of https://github.com/Tencent/tmagic-editor.git synced 2025-11-04 02:28:04 +08:00
Code Issues Projects Releases Wiki Activity

chore(editor): 解决warning

Browse Source
This commit is contained in:
roymondchen 2024-03-19 19:18:03 +08:00
parent 96149bd2ae
commit b3cf919273
7 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/editor/src/components/CodeBlockEditor.vue
View File

@ -252,7 +252,7 @@ const closedHandler = () => {
changedValue.value = undefined; changedValue.value = undefined;
}; };
const parentFloating = inject<Ref<HTMLDivElement>>('parentFloating'); const parentFloating = inject<Ref<HTMLDivElement | null>>('parentFloating', ref(null));
const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating);
defineExpose({ defineExpose({

2
packages/editor/src/fields/DataSourceFields.vue
View File

@ -318,6 +318,6 @@ const addDialogVisible = defineModel<boolean>('visible', { default: false });
const addFromJsonDialogVisible = defineModel<boolean>('visible1', { default: false }); const addFromJsonDialogVisible = defineModel<boolean>('visible1', { default: false });
const { height: editorHeight } = useEditorContentHeight(); const { height: editorHeight } = useEditorContentHeight();
const parentFloating = inject<Ref<HTMLDivElement>>('parentFloating'); const parentFloating = inject<Ref<HTMLDivElement | null>>('parentFloating', ref(null));
const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating);
</script> </script>

2
packages/editor/src/fields/DataSourceMocks.vue
View File

@ -250,6 +250,6 @@ const toggleValue = (row: MockSchema, key: 'enable' | 'useInEditor', value: bool
const addDialogVisible = defineModel<boolean>('visible', { default: false }); const addDialogVisible = defineModel<boolean>('visible', { default: false });
const { height: editorHeight } = useEditorContentHeight(); const { height: editorHeight } = useEditorContentHeight();
const parentFloating = inject<Ref<HTMLDivElement>>('parentFloating'); const parentFloating = inject<Ref<HTMLDivElement | null>>('parentFloating', ref(null));
const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating);
</script> </script>

2
packages/editor/src/hooks/use-next-float-box-position.ts
View File

@ -2,7 +2,7 @@ import { Ref, ref } from 'vue';
import { UiService } from '@editor/services/ui'; import { UiService } from '@editor/services/ui';
export const useNextFloatBoxPosition = (uiService?: UiService, parent?: Ref<HTMLDivElement>) => { export const useNextFloatBoxPosition = (uiService?: UiService, parent?: Ref<HTMLDivElement | null>) => {
const boxPosition = ref({ const boxPosition = ref({
left: 0, left: 0,
top: 0, top: 0,

2
packages/editor/src/layouts/sidebar/Sidebar.vue
View File

@ -111,8 +111,8 @@
:key="config.$key ?? index" :key="config.$key ?? index"
v-if="floatBoxStates[config.$key]?.status" v-if="floatBoxStates[config.$key]?.status"
v-model:visible="floatBoxStates[config.$key].status" v-model:visible="floatBoxStates[config.$key].status"
v-model:width="columnLeftWidth"
v-model:height="columnLeftHeight" v-model:height="columnLeftHeight"
:width="columnLeftWidth"
:title="config.text" :title="config.text"
:position="{ :position="{
left: floatBoxStates[config.$key].left, left: floatBoxStates[config.$key].left,

3
packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue
View File

@ -55,13 +55,12 @@ const dataSourceConfig = ref<FormConfig>([]);
const { height: editorHeight } = useEditorContentHeight(); const { height: editorHeight } = useEditorContentHeight();
const parentFloating = inject<Ref<HTMLDivElement>>('parentFloating'); const parentFloating = inject<Ref<HTMLDivElement | null>>('parentFloating', ref(null));
const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating); const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating);
watchEffect(() => { watchEffect(() => {
initValues.value = props.values; initValues.value = props.values;
dataSourceConfig.value = services?.dataSourceService.getFormConfig(initValues.value.type) || []; dataSourceConfig.value = services?.dataSourceService.getFormConfig(initValues.value.type) || [];
console.log(dataSourceConfig.value);
}); });
const submitHandler = (values: any) => { const submitHandler = (values: any) => {

3
packages/editor/src/theme/sidebar.scss
View File

@ -68,9 +68,6 @@
} }
.m-editor-slide-list-box { .m-editor-slide-list-box {
display: flex;
min-width: 240px;
min-height: 500px;
> div { > div {
&:first-child { &:first-child {
min-width: 240px; min-width: 240px;