diff --git a/src/views/interface/ThemeList.vue b/src/views/interface/ThemeList.vue
index 5235fb5bb..511230e02 100644
--- a/src/views/interface/ThemeList.vue
+++ b/src/views/interface/ThemeList.vue
@@ -16,20 +16,20 @@
             :alt="theme.properties.name"
             :src="'http://localhost:8090/' + theme.key + '/screenshot.png'"
             slot="cover"
-          >
+          />
           <a-divider></a-divider>
           <div class="theme-control">
             <span class="theme-title">{{ theme.properties.name }}</span>
             <a-button-group class="theme-button">
               <a-button type="primary" v-if="activatedTheme == theme.key" disabled>已启用</a-button>
               <a-button type="primary" @click="activeTheme(theme.key)" v-else>启用</a-button>
-              <a-button @click="optionModal(theme.key)" v-if="activatedTheme == theme.key">设置</a-button>
+              <a-button @click="optionDrawer(theme.key)" v-if="activatedTheme == theme.key && theme.hasOptions">设置</a-button>
               <a-popconfirm
                 :title="'确定删除【' + theme.properties.name + '】主题？'"
                 @confirm="deleteTheme(theme.key)"
                 okText="确定"
                 cancelText="取消"
-                v-else
+                v-else-if="activatedTheme != theme.key"
               >
                 <a-button type="dashed">删除</a-button>
               </a-popconfirm>
@@ -38,60 +38,57 @@
         </a-card>
       </a-col>
     </a-row>
-    <a-modal :title="optionTheme + ' 主题设置'" width="90%" v-model="visible" centered>
-      <a-row>
-        <a-col :xl="24" :lg="24" :md="24" :sm="24" :xs="24">
-          <div class="card-container">
-            <a-tabs type="card">
-              <a-tab-pane
-                v-for="(group,index) in themeConfiguration"
-                :key="index"
-                :tab="group.label"
-              >
-                <a-form layout="vertical">
-                  <a-form-item
-                    v-for="(item,index1) in group.items"
-                    :label="item.label + '：'"
-                    :key="index1"
-                    :wrapper-col="wrapperCol"
+    <a-drawer :title="optionTheme + ' 主题设置'" width="100%" :closable="true" @close="onClose" :visible="visible">
+      <a-row :gutter="12" type="flex">
+        <a-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <img
+            :alt="activatedTheme"
+            :src="'http://localhost:8090/' + activatedTheme + '/screenshot.png'"
+            width="100%"
+          />
+        </a-col>
+        <a-col :xl="12" :lg="12" :md="12" :sm="24" :xs="24">
+          <a-tabs>
+            <a-tab-pane v-for="(group, index) in themeConfiguration" :key="index" :tab="group.label">
+              <a-form layout="vertical">
+                <a-form-item
+                  v-for="(item, index1) in group.items"
+                  :label="item.label + '：'"
+                  :key="index1"
+                  :wrapper-col="wrapperCol"
+                >
+                  <a-input v-model="themeOptions[item.name]" v-if="item.type == 'text'" />
+                  <a-input
+                    type="textarea"
+                    :autosize="{ minRows: 5 }"
+                    v-model="themeOptions[item.name]"
+                    v-else-if="item.type == 'textarea'"
+                  />
+                  <a-radio-group
+                    v-decorator="['radio-group']"
+                    defaultValue="false"
+                    v-model="themeOptions[item.name]"
+                    v-else-if="item.type == 'radio'"
                   >
-                    <a-input v-model="themeOptions[item.name]" v-if="item.type=='text'"/>
-                    <a-input
-                      type="textarea"
-                      :autosize="{ minRows: 5 }"
-                      v-model="themeOptions[item.name]"
-                      v-else-if="item.type=='textarea'"
-                    />
-                    <a-radio-group
-                      v-decorator="['radio-group']"
-                      defaultValue="false"
-                      v-model="themeOptions[item.name]"
-                      v-else-if="item.type=='radio'"
-                    >
-                      <a-radio
-                        v-for="(option,index2) in item.options"
-                        :key="index2"
-                        :value="option.value"
-                      >{{ option.label }}</a-radio>
-                    </a-radio-group>
-                    <a-select v-model="themeOptions[item.name]" v-else-if="item.type=='select'">
-                      <a-select-option
-                        v-for="(option,index3) in item.options"
-                        :key="index3"
-                        :value="option.value"
-                      >{{ option.label }}</a-select-option>
-                    </a-select>
-                  </a-form-item>
-                  <a-form-item>
-                    <a-button type="primary" @click="saveOptions">保存</a-button>
-                  </a-form-item>
-                </a-form>
-              </a-tab-pane>
-            </a-tabs>
-          </div>
+                    <a-radio v-for="(option, index2) in item.options" :key="index2" :value="option.value">{{
+                      option.label
+                    }}</a-radio>
+                  </a-radio-group>
+                  <a-select v-model="themeOptions[item.name]" v-else-if="item.type == 'select'">
+                    <a-select-option v-for="(option, index3) in item.options" :key="index3" :value="option.value">{{
+                      option.label
+                    }}</a-select-option>
+                  </a-select>
+                </a-form-item>
+                <a-form-item>
+                  <a-button type="primary" @click="saveOptions">保存</a-button>
+                </a-form-item>
+              </a-form>
+            </a-tab-pane>
+          </a-tabs>
         </a-col>
       </a-row>
-    </a-modal>
+    </a-drawer>
   </div>
 </template>
 
@@ -102,8 +99,9 @@ export default {
   data() {
     return {
       wrapperCol: {
-        xl: { span: 8 },
-        sm: { span: 8 },
+        xl: { span: 12 },
+        lg: { span: 12 },
+        sm: { span: 24 },
         xs: { span: 24 }
       },
       themes: [],
@@ -126,11 +124,11 @@ export default {
         this.themes = response.data.data
       })
     },
-    optionModal(theme) {
-      themeApi.listOptions('anatole').then(response => {
+    optionDrawer(theme) {
+      themeApi.listOptions(theme).then(response => {
+        this.visible = true
         this.themeConfiguration = response.data.data
         this.optionTheme = theme
-        this.visible = true
         this.loadOptions()
       })
     },
@@ -157,6 +155,9 @@ export default {
       optionApi.listAll().then(response => {
         this.options = response.data.data
       })
+    },
+    onClose() {
+      this.visible = false
     }
   }
 }
diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue
index 58364f731..a3c081cbc 100644
--- a/src/views/system/OptionForm.vue
+++ b/src/views/system/OptionForm.vue
@@ -313,7 +313,8 @@ export default {
     return {
       wrapperCol: {
         xl: { span: 8 },
-        sm: { span: 8 },
+        lg: { span: 8 },
+        sm: { span: 12 },
         xs: { span: 24 }
       },
       upyunFormHidden: false,