refactor!: 窗口宽度改为配置文件全局设置

one-step-admin · Jul 10, 2024 · fa5c5e2 · fa5c5e2
1 parent 4385140
commit fa5c5e2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss
@@ -10,8 +10,6 @@
   --g-sidebar-logo-height: 50px;
   // 顶栏高度
   --g-topbar-height: 50px;
-  // 窗口宽度
-  --g-window-width: 1000px;
   // 窗口高度（仅在窗口预览时使用）
   --g-window-height: 800px;
   // 窗口预览缩放系数

diff --git a/src/settings.default.ts b/src/settings.default.ts
@@ -25,6 +25,7 @@ const globalSettingsDefault: RecursiveRequired<Settings.all> = {
     enableHotkeys: true,
   },
   window: {
+    defaultWidth: 1000,
     enableHotkeys: true,
   },
   copyright: {

diff --git a/src/types/global.d.ts b/src/types/global.d.ts
@@ -100,6 +100,11 @@ declare namespace Settings {
     enableHotkeys?: boolean
   }
   interface window {
+    /**
+     * 窗口默认宽度，设置为数字时单位为 px
+     * @默认值 `1000`
+     */
+    defaultWidth?: string | number
     /**
      * 是否开启窗口快捷键
      * @默认值 `true`

diff --git a/src/views/components/Dashboard/index.vue b/src/views/components/Dashboard/index.vue
@@ -109,7 +109,7 @@ function maskClick(windowName: string) {
       </div>
     </div>
     <TransitionGroup v-show="windowStore.list.length > 0" name="window" tag="div" class="dashboard-container">
-      <div v-for="element in windowStore.list" :key="element.name" :ref="setWindowItemRef" class="window">
+      <div v-for="element in windowStore.list" :key="element.name" :ref="setWindowItemRef" class="window" :style="`--g-window-width: ${typeof settingsStore.settings.window.defaultWidth === 'string' ? settingsStore.settings.window.defaultWidth : `${settingsStore.settings.window.defaultWidth}px`};`">
         <div
           class="window-container" :class="{
             preview: settingsStore.previewAllWindows,