From 329a9c60c557fb37d68ae956e2547a839042b750 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 14:38:47 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E5=BE=AE=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                              |   3 +-
 src/apps/AppContentManager/contentAdd.vue |   4 +-
 src/components/AiEditor.vue               | 265 ++++++++++++++++++++++
 3 files changed, 270 insertions(+), 2 deletions(-)
 create mode 100644 src/components/AiEditor.vue

diff --git a/package.json b/package.json
index f8674b53..6772f3f0 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,8 @@
     "vue": "^2.6.11",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.2.0",
-    "vuex-persistedstate": "^4.0.0-beta.3"
+    "vuex-persistedstate": "^4.0.0-beta.3",
+    "wangeditor": "^4.7.10"
   },
   "devDependencies": {
     "@babel/runtime": "~7.12.0",
diff --git a/src/apps/AppContentManager/contentAdd.vue b/src/apps/AppContentManager/contentAdd.vue
index df593106..c8843bec 100644
--- a/src/apps/AppContentManager/contentAdd.vue
+++ b/src/apps/AppContentManager/contentAdd.vue
@@ -5,7 +5,7 @@
         <u-input v-model="form.title" placeholder="请输入，最多30字" maxlength="30"/>
       </u-form-item>
       <u-form-item label="详情描述" prop="content">
-        <AiTextarea v-model="form.content" placeholder="请输入，最多500字" :maxlength="500"/>
+        <AiEditor v-model="form.content" placeholder="请输入，最多500字" :maxlength="500"/>
       </u-form-item>
       <u-form-item label="图片（最多9张）" class="files">
         <AiUploader multiple :limit="9" :def.sync="form.fileList" action="/admin/file/add2"/>
@@ -16,8 +16,10 @@
 </template>
 
 <script>
+import AiEditor from "../../components/AiEditor";
 export default {
   name: "contentAdd",
+  components: {AiEditor},
   computed: {
     isEdit() {
       return !!this.$route.query?.id
diff --git a/src/components/AiEditor.vue b/src/components/AiEditor.vue
new file mode 100644
index 00000000..3f5d779b
--- /dev/null
+++ b/src/components/AiEditor.vue
@@ -0,0 +1,265 @@
+<template>
+  <div class="AiEditor" @click="editing=true">
+    <div ref="AiEditorInstance"/>
+    <div class="bottomPanel" :class="{fixed:isFullScreen}">
+      <slot v-if="$slots.bottom" name="bottom"/>
+      <div v-else-if="maxlength" class="fontCount">{{ [editorText.length, maxlength].join(" / ") }}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+/**
+ * 原组件wangeditor封装
+ * 修改者:Kubbo
+ */
+import E from 'wangeditor'
+
+export default {
+  name: "AiEditor",
+  inject: {
+    elFormItem: {default: ""},
+    elForm: {default: ''},
+  },
+  model: {
+    prop: "value",
+    event: "change"
+  },
+  props: {
+    value: {type: String, required: true, default: ""},
+    placeholder: {default: '请输入正文'},
+    conf: Object,
+    instance: {type: Function},
+    maxlength: Number,
+    valid: {type: Boolean, default: true}
+  },
+  data() {
+    return {
+      ins: null,
+      isFullScreen: false,
+      isPasteStyle: true,//粘贴是否携带格式
+      origin: "",
+      editorText: "",
+      editing: false//自动赋值问题,
+    }
+  },
+  computed: {
+    validateState() {
+      return ['', 'success'].includes(this.elFormItem?.validateState)
+    },
+    extra() {
+      return {
+        fullscreen(editor) {
+          if (editor?.ins.$toolbarElem) {
+            let btn = E.$(`<div class="w-e-menu" data-title="全屏"><i class="w-e-icon-fullscreen"/></div>`)
+            btn.on("click", () => {
+              editor.isFullScreen = !editor.isFullScreen
+              editor.isFullScreen ? editor.ins.fullScreen() : editor.ins.unFullScreen()
+            })
+            editor.ins.$toolbarElem.append(btn)
+          }
+        },
+        preview(editor) {
+          if (editor?.ins.$toolbarElem) {
+            let btn = E.$(`<div class="w-e-menu" data-title="预览"><i class="el-icon-monitor"/></div>`)
+            btn.on("click", () => {
+              editor.$refs.preview.dialog = true
+            })
+            editor.ins.$toolbarElem.append(btn)
+          }
+        },
+        pasteWithStyle(editor) {
+          if (editor?.ins.$toolbarElem) {
+            let btn = E.$(`<div class="w-e-menu w-e-active" data-title="粘贴格式"><i class="iconfont iconCopy"/></div>`)
+            editor.origin = JSON.parse(JSON.stringify(editor.value))
+            btn.on("click", () => {
+              editor.isPasteStyle = !editor.isPasteStyle
+              if (editor.isPasteStyle) {
+                editor.setContent(editor.origin)
+                btn.addClass("w-e-active")
+              } else {
+                editor.origin = JSON.parse(JSON.stringify(editor.value))
+                editor.setContent(editor.editorText)
+                btn.removeClass("w-e-active")
+              }
+            })
+            editor.ins.$toolbarElem.append(btn)
+          }
+        }
+      }
+    },
+    customConfig() {
+      let init = ["fullscreen", "preview", "pasteWithStyle"]
+      if (this.maxlength > 0) init = init.slice(0, 2)
+      return {
+        debug: true,
+        pasteFilterStyle: !this.isPasteStyle,
+        showFullScreen: false,
+        zIndexFullScreen: 1000,
+        zIndex: 98,
+        focus: false,
+        menus: [],
+        init,
+        customUploadImg: (files, insert) => {
+          this.uploadFile(files, insert)
+        },
+        customUploadVideo: (files, insert) => {
+          this.uploadFile(files, insert)
+        },
+        onfocus: () => {
+          this.editing = true
+        },
+        onblur: () => {
+          this.editing = false
+        },
+        onchange: html => {
+          if (this.maxlength > 0) {
+            this.editorText = html?.replace(/<\/?.+?\/?>/g, '')
+            if (this.editorText.length > this.maxlength) {
+              this.ins.history.revoke()
+              // this.editorText = this.editorText.substring(0, this.maxlength)
+              // this.setContent(this.editorText)
+            }
+          } else {
+            this.editorText = html
+          }
+          this.$emit("change", this.editorText)
+        },
+        pasteTextHandle: str => this.isPasteStyle ? str : str?.replace(/<\/?.+?\/?>/g, ''),
+        ...this.conf
+      }
+    }
+  },
+
+  methods: {
+    initEditor() {
+      let {placeholder, customConfig} = this
+      this.ins = new E(this.$refs.AiEditorInstance)
+      this.ins.config = {...this.ins.config, ...customConfig, placeholder}
+      this.ins.create()
+      customConfig.init.map(e => this.extra?.[e]?.(this))
+    },
+    setContent(data) {
+      if (this.ins) {
+        this.ins.txt.html(data)
+        this.editing = false
+      }
+    },
+    uploadFile(files, insert) {
+      files && files.map(e => {
+        let formData = new FormData()
+        formData.append('file', e)
+        this?.instance?.post(`/admin/file/add`, formData).then(res => {
+          if (res && res.data) {
+            res.data.map(m => {
+              let item = m.split(";")
+              insert(item[0])
+            })
+          }
+        })
+      })
+    },
+    /**
+     * 表单验证
+     * @param componentName
+     * @param eventName
+     * @param params
+     */
+    dispatch(componentName, eventName, params) {
+      let parent = this.$parent || this.$root;
+      let name = parent.$options.componentName;
+
+      while (parent && (!name || name !== componentName)) {
+        parent = parent.$parent;
+
+        if (parent) {
+          name = parent.$options.componentName;
+        }
+      }
+      if (parent) {
+        parent.$emit.apply(parent, [eventName].concat(params));
+      }
+    },
+  },
+  watch: {
+    value(v) {
+      this.dispatch('ElFormItem', 'el.form.change', [v]);
+      if (v && !this.editing) {
+        this.setContent(v)
+      }
+    },
+    placeholder(v) {
+      if (this.ins) {
+        document.querySelector('.AiEditor .placeholder').innerHTML = v
+      }
+    },
+    editing(v) {
+    }
+  },
+  mounted() {
+    !this.ins && this.initEditor()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep.AiEditor {
+  width: 100%;
+  position: relative;
+
+  /* 菜单区 */
+  .w-e-toolbar {
+    align-items: center;
+    flex-wrap: wrap;
+    -webkit-box-lines: multiple;
+
+    .w-e-menu {
+      line-height: 24px;
+
+      a {
+        text-decoration: none;
+      }
+
+      &:hover {
+        z-index: 10002 !important;
+      }
+    }
+  }
+
+  /* 编辑区 */
+  .w-e-text {
+    overflow: auto;
+    padding: 10px;
+
+    p {
+      margin: 0;
+    }
+  }
+
+  .fontCount {
+    pointer-events: none;
+    color: #999;
+  }
+
+  .bottomPanel {
+    position: absolute;
+    bottom: 8px;
+    right: 24px;
+    z-index: 1999;
+
+    &.fixed {
+      position: fixed;
+    }
+  }
+
+  &.invalid {
+    .w-e-text-container, .w-e-toolbar {
+      border-color: red !important;
+    }
+
+    .fontCount {
+      color: red
+    }
+  }
+}
+</style>

From 4bbbfa995460968db8b31692c6d9d0b7c72d4965 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 14:40:32 +0800
Subject: [PATCH 2/3] BUG 25982

---
 src/components/AiAreaPicker.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/AiAreaPicker.vue b/src/components/AiAreaPicker.vue
index f2c2bb43..a64152e4 100644
--- a/src/components/AiAreaPicker.vue
+++ b/src/components/AiAreaPicker.vue
@@ -60,7 +60,7 @@ export default {
   },
   data() {
     return {
-      fullArea: [{name: '全国', id: 0}],
+      fullArea: [{name: '全部', id: 0}],
       index: '',
       list: [],
     }
@@ -86,7 +86,7 @@ export default {
           } else {
             this.fullArea = res.data
           }
-          this.fullArea.unshift({name: '全国', id: 0})
+          this.fullArea.unshift({name: '全部', id: 0})
         }
       })
     },

From a47ff9a28b03ff10fddd287c39f6589691403bfa Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 24 Dec 2021 14:43:03 +0800
Subject: [PATCH 3/3] BUG 25982

---
 src/apps/AppContentManager/contentAdd.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/apps/AppContentManager/contentAdd.vue b/src/apps/AppContentManager/contentAdd.vue
index c8843bec..4587d051 100644
--- a/src/apps/AppContentManager/contentAdd.vue
+++ b/src/apps/AppContentManager/contentAdd.vue
@@ -16,10 +16,8 @@
 </template>
 
 <script>
-import AiEditor from "../../components/AiEditor";
 export default {
   name: "contentAdd",
-  components: {AiEditor},
   computed: {
     isEdit() {
       return !!this.$route.query?.id