diff --git a/packages/editor/src/Editor.vue b/packages/editor/src/Editor.vue index 9e40876d..89812c3a 100644 --- a/packages/editor/src/Editor.vue +++ b/packages/editor/src/Editor.vue @@ -277,8 +277,6 @@ export default defineComponent({ }, ); - uiService.initColumnWidth(); - onUnmounted(() => { editorService.destroy(); historyService.destroy(); diff --git a/packages/editor/src/layouts/Framework.vue b/packages/editor/src/layouts/Framework.vue index 734086e4..83582f92 100644 --- a/packages/editor/src/layouts/Framework.vue +++ b/packages/editor/src/layouts/Framework.vue @@ -10,77 +10,96 @@ @save="saveCode" > -
-
+ + - diff --git a/packages/editor/src/layouts/Layout.vue b/packages/editor/src/layouts/Layout.vue new file mode 100644 index 00000000..72a7e5bf --- /dev/null +++ b/packages/editor/src/layouts/Layout.vue @@ -0,0 +1,100 @@ + + + diff --git a/packages/editor/src/layouts/Resizer.vue b/packages/editor/src/layouts/Resizer.vue index c36b21fe..fab00158 100644 --- a/packages/editor/src/layouts/Resizer.vue +++ b/packages/editor/src/layouts/Resizer.vue @@ -4,58 +4,29 @@ - diff --git a/packages/editor/src/services/ui.ts b/packages/editor/src/services/ui.ts index 97fd4627..33b8e0e4 100644 --- a/packages/editor/src/services/ui.ts +++ b/packages/editor/src/services/ui.ts @@ -16,28 +16,15 @@ * limitations under the License. */ -import { reactive, toRaw } from 'vue'; +import { reactive } from 'vue'; import type StageCore from '@tmagic/stage'; import editorService from '../services/editor'; -import type { GetColumnWidth, SetColumnWidth, StageRect, UiState } from '../type'; +import type { StageRect, UiState } from '../type'; import BaseService from './BaseService'; -const DEFAULT_LEFT_COLUMN_WIDTH = 310; -const MIN_LEFT_COLUMN_WIDTH = 45; -const DEFAULT_RIGHT_COLUMN_WIDTH = 480; -const MIN_RIGHT_COLUMN_WIDTH = 1; - -const COLUMN_WIDTH_STORAGE_KEY = '$MagicEditorColumnWidthData'; - -const defaultColumnWidth = { - left: DEFAULT_LEFT_COLUMN_WIDTH, - center: globalThis.document.body.clientWidth - DEFAULT_LEFT_COLUMN_WIDTH - DEFAULT_RIGHT_COLUMN_WIDTH, - right: DEFAULT_RIGHT_COLUMN_WIDTH, -}; - const state = reactive({ uiSelectMode: false, showSrc: false, @@ -50,7 +37,7 @@ const state = reactive({ width: 375, height: 817, }, - columnWidth: defaultColumnWidth, + columnWidth: {}, showGuides: true, showRule: true, propsPanelSize: 'small', @@ -59,7 +46,7 @@ const state = reactive({ class Ui extends BaseService { constructor() { - super(['initColumnWidth', 'zoom', 'calcZoom']); + super(['zoom', 'calcZoom']); globalThis.addEventListener('resize', () => { this.setColumnWidth({ center: 'auto', @@ -70,11 +57,6 @@ class Ui extends BaseService { public set(name: keyof UiState, value: T) { const mask = editorService.get('stage')?.mask; - if (name === 'columnWidth') { - this.setColumnWidth(value as unknown as SetColumnWidth); - return; - } - if (name === 'stageRect') { this.setStageRect(value as unknown as StageRect); return; @@ -95,18 +77,6 @@ class Ui extends BaseService { return (state as any)[name]; } - public async initColumnWidth() { - const columnWidthCacheData = globalThis.localStorage.getItem(COLUMN_WIDTH_STORAGE_KEY); - if (columnWidthCacheData) { - try { - const columnWidthCache = JSON.parse(columnWidthCacheData); - this.setColumnWidth(columnWidthCache); - } catch (e) { - console.error(e); - } - } - } - public async zoom(zoom: number) { this.set('zoom', (this.get('zoom') * 100 + zoom * 100) / 100); if (this.get('zoom') < 0.1) this.set('zoom', 0.1); @@ -132,36 +102,6 @@ class Ui extends BaseService { this.removeAllListeners(); } - private setColumnWidth({ left, center, right }: SetColumnWidth) { - const columnWidth = { - ...toRaw(this.get('columnWidth')), - }; - - if (left) { - columnWidth.left = Math.max(left, MIN_LEFT_COLUMN_WIDTH); - } - - if (right) { - columnWidth.right = Math.max(right, MIN_RIGHT_COLUMN_WIDTH); - } - - if (!center || center === 'auto') { - const bodyWidth = globalThis.document.body.clientWidth; - columnWidth.center = bodyWidth - (columnWidth?.left || 0) - (columnWidth?.right || 0); - if (columnWidth.center <= 0) { - columnWidth.left = defaultColumnWidth.left; - columnWidth.center = defaultColumnWidth.center; - columnWidth.right = defaultColumnWidth.right; - } - } else { - columnWidth.center = center; - } - - globalThis.localStorage.setItem(COLUMN_WIDTH_STORAGE_KEY, JSON.stringify(columnWidth)); - - state.columnWidth = columnWidth; - } - private async setStageRect(value: StageRect) { state.stageRect = { ...state.stageRect,