release 1.1.0-beta.2

halo-dev · Sep 1, 2019 · 884964e · 884964e
1 parent 9e43dfd
commit 884964e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/src/api/theme.js b/src/api/theme.js
@@ -136,10 +136,10 @@ themeApi.getContent = path => {
 themeApi.saveContent = (path, content) => {
   return service({
     url: `${baseUrl}/files/content`,
-    params: {
-      path: path
+    data: {
+      path: path,
+      content: content
     },
-    data: content,
     method: 'put'
   })
 }

diff --git a/src/components/global.less b/src/components/global.less
@@ -689,15 +689,17 @@ body {
   }
 }
 
-.post-thumb,.sheet-thumb {
+.post-thumb,
+.sheet-thumb {
   .img {
     width: 100%;
     cursor: pointer;
     border-radius: 4px;
   }
 }
 
-.post-thumb-remove,.sheet-thumb-remove {
+.post-thumb-remove,
+.sheet-thumb-remove {
   margin-top: 16px;
 }
 
@@ -719,6 +721,7 @@ body {
   overflow: hidden;
   float: left;
   cursor: pointer;
+
   img {
     width: 100%;
     height: 100%;

diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
@@ -520,12 +520,12 @@ export default {
 }
 </script>
 
-<style scoped="scoped">
-.more-options-btn {
+<style lang="less" scoped>
+/* .more-options-btn {
   margin-left: 15px;
   text-decoration: none;
 }
 a {
   text-decoration: none;
-}
+} */
 </style>
diff --git a/src/views/interface/components/ThemeSetting.vue b/src/views/interface/components/ThemeSetting.vue
@@ -167,6 +167,7 @@
         :sm="24"
         :xs="24"
         v-if="viewMode"
+        style="padding-bottom: 50px;"
       >
         <a-card
           :bordered="true"
@@ -179,7 +180,8 @@
             scrolling="auto"
             border="0"
             :src="options.blog_url"
-            style="width:100%;height:1000px;overflow-y:hidden;"
+            width="100%"
+            :height="clientHeight-165"
           > </iframe>
         </a-card>
       </a-col>
@@ -196,14 +198,14 @@
       :style="{ width : '100%'}"
     >
       <a-button
-        v-if="theme.activated && viewMode"
+        v-if="!this.isMobile() && theme.activated && viewMode"
         type="primary"
         @click="toggleViewMode"
         style="marginRight: 8px"
         ghost
       >普通模式</a-button>
       <a-button
-        v-else-if="theme.activated && !viewMode"
+        v-else-if="!this.isMobile() && theme.activated && !viewMode"
         type="dashed"
         @click="toggleViewMode"
         style="marginRight: 8px"
@@ -248,7 +250,8 @@ export default {
       viewMode: false,
       formColValue: 12,
       options: [],
-      keys: ['blog_url']
+      keys: ['blog_url'],
+      clientHeight: document.documentElement.clientHeight
     }
   },
   model: {
@@ -285,6 +288,11 @@ export default {
         this.settingLoading = false
       }, 500)
     },
+    loadOptions() {
+      optionApi.listAll(this.keys).then(response => {
+        this.options = response.data.data
+      })
+    },
     initData() {
       this.settingLoading = true
 
@@ -318,7 +326,8 @@ export default {
       this.attachmentDrawerVisible = false
     },
     toggleViewMode() {
-      if (!this.viewMode) {
+      this.viewMode = !this.viewMode
+      if (this.viewMode) {
         this.formColValue = 4
         this.wrapperCol = {
           xl: { span: 24 },
@@ -335,12 +344,6 @@ export default {
           xs: { span: 24 }
         }
       }
-      this.viewMode = !this.viewMode
-    },
-    loadOptions() {
-      optionApi.listAll(this.keys).then(response => {
-        this.options = response.data.data
-      })
     }
   }
 }

diff --git a/src/views/post/components/CategoryTree.vue b/src/views/post/components/CategoryTree.vue
@@ -6,10 +6,6 @@
     :checkedKeys="categoryIds"
     @check="onCheck"
   >
-    <span
-      slot="title0010"
-      style="color: #1890ff"
-    >sss</span>
   </a-tree>
 </template>