From b1322f090d1a064f76f87c021bc44e2d432892c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A5=9D=E6=A2=A6=E5=9B=AD?= <zhumengyua@qq.com>
Date: Tue, 20 Feb 2024 14:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-=E4=B8=93?=
 =?UTF-8?q?=E9=A2=98=E7=AE=A1=E7=90=86-=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=9B=BE=E7=89=87=E8=A3=81=E5=89=AA=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/ImgCropper.vue            |   1 +
 pages/admin/topic/_topic_uri.vue     |   6 +-
 pages/admin/topic/post/_topic_id.vue | 169 ++++++++++-----------------
 pages/admin/topics.vue               |  17 ++-
 pages/user/settings/account.vue      |   3 +-
 5 files changed, 75 insertions(+), 121 deletions(-)

diff --git a/components/ImgCropper.vue b/components/ImgCropper.vue
index b127bcd..92854fb 100644
--- a/components/ImgCropper.vue
+++ b/components/ImgCropper.vue
@@ -75,6 +75,7 @@ export default {
   methods: {
     onSubmit() {
       this.$refs.cropper.getCropData(data => {
+        console.log(data)
         this.$emit('onSubmit',data)
       });
 
diff --git a/pages/admin/topic/_topic_uri.vue b/pages/admin/topic/_topic_uri.vue
index 3bcb61a..99d419f 100644
--- a/pages/admin/topic/_topic_uri.vue
+++ b/pages/admin/topic/_topic_uri.vue
@@ -12,7 +12,7 @@
         <img :src="topic.topicIconPath" :alt="topic.topicTitle" class="topic-brand-img">
       </el-col>
       <el-col :span="20">
-        <el-col>
+        <el-row :gutter="20">
           <el-col :span="20">
             <span class="topic-title">{{ topic.topicTitle }}</span>
             <span class="text-muted" v-if="topic.topicTagCount">{{ topic.topicTagCount }} 引用</span>
@@ -28,9 +28,9 @@
             </el-dropdown>
           </el-col>
           <el-col>
-            <p>{{ topic.topicDescription }}</p>
+            <span v-html="topic.topicDescriptionHtml"></span>
           </el-col>
-        </el-col>
+        </el-row>
       </el-col>
       <el-col v-for="tag in tags.list" :key="tag.idTag">
         <el-card style="margin: .5rem;">
diff --git a/pages/admin/topic/post/_topic_id.vue b/pages/admin/topic/post/_topic_id.vue
index 7a3a1ac..673054f 100644
--- a/pages/admin/topic/post/_topic_id.vue
+++ b/pages/admin/topic/post/_topic_id.vue
@@ -23,71 +23,38 @@
         <el-form-item label="图标">
           <el-row>
             <el-col :span="24">
-<!--              <vue-cropper-->
-<!--                ref="cropper"-->
-<!--                :aspect-ratio="1 / 1"-->
-<!--                :src="topicIconPath"-->
-<!--                :checkCrossOrigin="false"-->
-<!--                :checkOrientation="false"-->
-<!--                :imgStyle="{width: '480px', height: '480px'}"-->
-<!--                :autoCropArea="1"-->
-<!--                :autoCrop="autoCrop"-->
-<!--                preview=".preview"-->
-<!--              />-->
-              {{topicIconPath}}
-                            <vue-cropper
-                              :autoCrop="autoCrop"
-                              :img="topicIconPath"
-                              ref="cropper"
-                              :fixed="true"
-                            />
-            </el-col>
-            <el-col :span="24" style="margin-top: 2rem;">
-              <el-col :span="8">
-                <el-card>
-                  <div class="card-body d-flex flex-column">
-                    <el-col :span="4" style="text-align: right;">
-                      <div v-if="topicIconPath" class="preview preview-large topic-brand-img"/>
-
-                      <el-image v-else class="topic-brand-img" />
-                    </el-col>
-                    <el-col :span="20">
-                      <el-col>
-                        <el-col>
-                          <el-link rel="nofollow" :underline="false">
-                            <h4>{{ topic.topicTitle }}</h4>
-                          </el-link>
-                        </el-col>
-                        <el-col>
-                          <div class="text-muted article-summary-md">{{ topic.topicDescription }}</div>
-                        </el-col>
-                      </el-col>
-                    </el-col>
-                  </div>
-                </el-card>
-              </el-col>
-            </el-col>
-            <el-col :span="24" style="margin-top: 2rem;">
-              <el-upload
-                class="avatar-uploader"
-                action=""
-                :multiple="true"
-                :show-file-list="false"
-                :on-success="handleAvatarSuccess"
-                :before-upload="beforeAvatarUpload">
-                <div>
-                  <el-button type="primary" round plain>上传</el-button>
-                </div>
-              </el-upload>
-              <el-button style="margin-top: 1rem;" type="primary" round plain @click.prevent="reset">重置</el-button>
-              <el-button type="primary" round plain @click.prevent="cropImage">裁剪</el-button>
-              <el-col>
-                <span style="color: red;padding-right: 5px;">*</span>
-                <span>上传图片调整至最佳效果后,请点击裁剪按钮截取</span>
-              </el-col>
+              <img @click="cropperVisible=true" :src="topicIconPath" style="width: 80px;height: 80px"/>
             </el-col>
           </el-row>
         </el-form-item>
+        <el-form-item label="描述">
+          <div id="contentEditor" @blur="blurData"></div>
+        </el-form-item>
+<!--        <el-form-item>-->
+<!--          <el-row >-->
+<!--            <el-col :span="8">-->
+<!--              <el-card>-->
+<!--                <div class="card-body d-flex flex-column">-->
+<!--                  <el-card shadow="never">-->
+<!--                    <div class="card-body d-flex flex-column">-->
+<!--                      <el-row :gutter="20">-->
+<!--                        <el-col :span="5" style="text-align: right;">-->
+<!--                          <img :src="topicIconPath" :alt="topic.topicTitle"-->
+<!--                               style="display: block;width:60px;height: 60px" class="topic-brand-img">-->
+<!--                        </el-col>-->
+<!--                        <el-col :span="18">-->
+<!--                          <span style="font-size: 18px;font-weight: bold"> {{ topic.topicTitle }}</span>-->
+<!--                          <div class="text-muted article-summary-md text-content">{{ topic.topicDescription }}</div>-->
+<!--                        </el-col>-->
+<!--                      </el-row>-->
+<!--                    </div>-->
+<!--                  </el-card>-->
+<!--                </div>-->
+<!--              </el-card>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+
+<!--        </el-form-item>-->
         <el-form-item label="导航主题">
           <el-switch
             v-model="topic.topicNva"
@@ -112,14 +79,14 @@
         <el-form-item label="标签数">
           <el-input v-model="topic.topicTagCount" :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="描述">
-          <div id="contentEditor"></div>
-        </el-form-item>
+
         <el-form-item class="text-right">
           <el-button @click="updateTopic" :loading="loading" plain>提交</el-button>
         </el-form-item>
       </el-form>
     </el-col>
+    <ImgCropper @onSubmit="updateUser" :visible.sync='cropperVisible' :avatarUrl="topicIconPath||''"></ImgCropper>
+
   </el-row>
 </template>
 
@@ -128,12 +95,13 @@ import Vue from 'vue';
 import {mapState} from 'vuex';
 import VueCropper from 'vue-cropper';
 import apiConfig from '~/config/api.config';
+import ImgCropper from "~/components/ImgCropper.vue";
 
 export default {
   name: "adminTopicPost",
   middleware: 'auth',
   components: {
-    VueCropper
+    VueCropper, ImgCropper
   },
   computed: {
     ...mapState({
@@ -170,13 +138,31 @@ export default {
       topicIconPath: '',
       isEdit: false,
       autoCrop: true,
-      notificationFlag: true
+      notificationFlag: true,
+      cropperVisible: false,
+      contentEditor:{}
+
     }
   },
   methods: {
+    blurData(){
+
+      console.log(this.contentEditor)
+      if(this.contentEditor!={}){
+        console.log(this.contentEditor.getValue())
+
+        this.topic.topicDescription=this.contentEditor.getValue();
+      }
+
+    },
+    updateUser(data) {
+      this.topic.topicIconPath = data
+      this.topicIconPath = data
+      this.cropperVisible = false
+
+    },
     _initEditor(data) {
       let _ts = this;
-
       let toolbar = [
         'emoji',
         'headings',
@@ -265,43 +251,6 @@ export default {
         placeholder: data.placeholder,
       })
     },
-    handleAvatarSuccess(res) {
-      let _ts = this;
-      if (res && res.data && res.data.url) {
-        let topic = _ts.topic;
-        topic.topicIconPath = res.data.url;
-        _ts.$set(_ts, 'topic', topic);
-        _ts.$set(_ts, 'topicIconPath', res.data.url);
-      } else {
-        _ts.$message.error('上传失败!');
-      }
-    },
-    beforeAvatarUpload(file) {
-      const isJPG = file.type === 'image/jpeg';
-      const isPNG = file.type === 'image/png';
-      const isLt2M = file.size / 1024 / 1024 < 2;
-
-      if (!(isJPG || isPNG)) {
-        this.$message.error('上传图标只能是 JPG 或者 PNG 格式!');
-        return false;
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图标大小不能超过 2MB!');
-        return false;
-      }
-
-      this.fileToBase64(file);
-      return false;
-    },
-    fileToBase64(file) {
-      let _ts = this;
-      let reader = new FileReader();
-      reader.readAsDataURL(file);
-      reader.onload = function () {
-        _ts.$set(_ts, 'topicIconPath', this.result);
-        _ts.$refs.cropper.replace(this.result);
-      }
-    },
     async updateTopic() {
       let _ts = this;
       _ts.$set(_ts, 'loading', true);
@@ -409,12 +358,16 @@ export default {
     _ts.contentEditor = _ts._initEditor({
       id: 'contentEditor',
       mode: 'both',
-      height: 480,
+      height: 300,
       placeholder: '', //this.$t('inputContent', this.$store.state.locale)
       resize: false,
-      value: articleContent
+      value: articleContent,
     });
-  }
+    setTimeout(()=>{
+      _ts.contentEditor.blur()
+    })
+  },
+
 }
 </script>
 
diff --git a/pages/admin/topics.vue b/pages/admin/topics.vue
index 8d7631e..c684c60 100644
--- a/pages/admin/topics.vue
+++ b/pages/admin/topics.vue
@@ -16,24 +16,23 @@
         <el-card shadow="never">
           <div class="card-body d-flex flex-column">
             <el-row :gutter="20">
-              <el-col :span="4" style="text-align: right;">
-                <img style="margin-right: 10px;" :src="topic.topicIconPath" :alt="topic.topicTitle"
-                     class="topic-brand-img">
+              <el-col :span="5" style="text-align: right;">
+                <img :src="topic.topicIconPath" :alt="topic.topicTitle"
+                   style="display: block;width:60px;height: 60px"  class="topic-brand-img">
               </el-col>
-              <el-col :span="20">
+              <el-col :span="18">
                 <el-link rel="nofollow" @click="onRouter('admin-topic-detail',topic.topicUri)" :underline="false">
-              <span style="font-size: 20px;font-weight: bold"> {{ topic.topicTitle }}</span>
+              <span style="font-size: 18px;font-weight: bold"> {{ topic.topicTitle }}</span>
             </el-link>
             <div class="text-muted article-summary-md text-content">{{ topic.topicDescription }}</div>
           </el-col>
         </el-row>
-
-
       </div>
     </el-card>
 
   </el-col>
-</el-row> </div>
+</el-row>
+  </div>
 </template>
 
 <script>
@@ -73,7 +72,7 @@ export default {
 
 <style scoped>
 .topic-brand-img {
-  margin-top: 40%;
+  /*margin-top: 40%;*/
 }
 
 .text-content {
diff --git a/pages/user/settings/account.vue b/pages/user/settings/account.vue
index e02d6aa..e32a48e 100644
--- a/pages/user/settings/account.vue
+++ b/pages/user/settings/account.vue
@@ -130,8 +130,9 @@ export default {
   },
   methods: {
     updateUser(data) {
+      let _ts = this;
+
       if (data) {
-        let _ts = this;
         let user = _ts.user;
         user.avatarUrl = data
         user.avatarType = 1