From 6fbb8f9b47027b6a7dd0e9caade1edb0256a0893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=93=E5=AE=89?= <yuanzhian@cai-inc.com>
Date: Sun, 20 Mar 2022 16:47:09 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat=E2=9C=A8:=20=20Support=20vue3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 babel.config.js                |   2 +-
 example/App.vue                |   9 +-
 example/components/example.vue |  34 ++++---
 example/main.js                |   8 +-
 package.json                   |  42 ++++----
 public/favicon.ico             | Bin 1150 -> 4286 bytes
 src/index.js                   |   2 +-
 src/markdown-it-vue-light.vue  | 126 ++++++++++++-----------
 src/markdown-it-vue.vue        | 181 ++++++++++++++++++---------------
 src/utils.js                   |   9 +-
 10 files changed, 216 insertions(+), 197 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index ba17966..e955840 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,5 +1,5 @@
 module.exports = {
   presets: [
-    '@vue/app'
+    '@vue/cli-plugin-babel/preset'
   ]
 }
diff --git a/example/App.vue b/example/App.vue
index 11e086b..4bd5b34 100644
--- a/example/App.vue
+++ b/example/App.vue
@@ -4,15 +4,8 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import Example from './components/example.vue'
-
-export default {
-  name: 'app',
-  components: {
-    Example
-  }
-}
 </script>
 
 <style>
diff --git a/example/components/example.vue b/example/components/example.vue
index ba81d5a..38954ea 100644
--- a/example/components/example.vue
+++ b/example/components/example.vue
@@ -5,23 +5,26 @@
       class="md-body" 
       :content="content" 
       :options="options" 
-      @render-complete=hdlCmplete 
+      @render-complete="hdlCmplete" 
     />
   </div>
 </template>
 
 <script>
+import {defineComponent, ref} from 'vue'
 import MarkdownText from './example'
 import MarkdownItVue from '../../src'
-export default {
+
+export default defineComponent({
   components: {
     MarkdownItVue
   },
-  data () {
-    return {
-      content: MarkdownText,
-      options: {
-        markdownIt: {
+  setup() {
+
+    const options = ref(
+      {
+        markdownIt: 
+        {
           linkify: true
         },
         linkAttributes: {
@@ -31,14 +34,21 @@ export default {
           }
         }
       }
-    }
-  },
-  methods: {
-    hdlCmplete() {
+    )
+
+    const content = ref(MarkdownText)
+
+    const hdlCmplete = () => {
       console.log('reder complete')
     }
+
+    return {
+      content,
+      options,
+      hdlCmplete,
+    }
   }
-}
+})
 </script>
 
 <style scoped>
diff --git a/example/main.js b/example/main.js
index 63eb05f..01433bc 100644
--- a/example/main.js
+++ b/example/main.js
@@ -1,8 +1,4 @@
-import Vue from 'vue'
+import { createApp } from 'vue'
 import App from './App.vue'
 
-Vue.config.productionTip = false
-
-new Vue({
-  render: h => h(App),
-}).$mount('#app')
+createApp(App).mount('#app')
diff --git a/package.json b/package.json
index a445c01..f3c33b0 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,10 @@
 {
   "name": "markdown-it-vue",
-  "version": "1.1.6",
+  "version": "2.0.0",
   "private": false,
-  "description": "The vue lib for markdown-it",
+  "description": "The vue3.0 lib for markdown-it",
   "author": {
-    "name": "ravenq",
+    "name": "yauzn",
     "e-mail": "flw_dream@126.com"
   },
   "keywords": [
@@ -12,7 +12,8 @@
     "markdown-it",
     "markdown-it-plugin",
     "vue",
-    "markdown-it-vue"
+    "markdown-it-vue",
+    "vue3.0"
   ],
   "files": [
     "dist",
@@ -31,6 +32,8 @@
   },
   "main": "dist/markdown-it-vue.umd.min.js",
   "dependencies": {
+    "@iktakahiro/markdown-it-katex": "^4.0.1",
+    "core-js": "^3.6.5",
     "echarts": "^5.1.0",
     "flowchart.js": "^1.15.0",
     "font-awesome-icon-chars": "^2.6.0",
@@ -44,7 +47,7 @@
     "markdown-it-footnote": "^3.0.2",
     "markdown-it-github-toc": "^3.2.4",
     "markdown-it-ins": "^3.0.1",
-    "@iktakahiro/markdown-it-katex": "^4.0.1",
+    "markdown-it-katex": "^2.0.3",
     "markdown-it-latex": "^0.2.0",
     "markdown-it-mark": "^3.0.1",
     "markdown-it-regex": "^0.2.0",
@@ -54,18 +57,16 @@
     "markdown-it-task-lists": "^2.1.1",
     "markdown-it-toc-and-anchor": "^4.2.0",
     "mermaid": "^8.9.2",
-    "vue": "^2.6.12"
+    "vue": "^3.0.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.5.12",
-    "@vue/cli-plugin-eslint": "^4.5.12",
-    "@vue/cli-service": "^4.5.12",
+    "@vue/cli-plugin-babel": "~4.5.9",
+    "@vue/cli-plugin-eslint": "~4.5.9",
+    "@vue/cli-service": "~4.5.9",
+    "@vue/compiler-sfc": "^3.0.0",
     "babel-eslint": "^10.1.0",
-    "eslint": "^7.24.0",
-    "eslint-plugin-vue": "^7.9.0",
-    "vue-cli-plugin-component-lib": "^0.1.6",
-    "vue-cli-plugin-webpack-bundle-analyzer": "^4.0.0",
-    "vue-template-compiler": "^2.6.12"
+    "eslint": "^6.7.2",
+    "eslint-plugin-vue": "^7.0.0"
   },
   "eslintConfig": {
     "root": true,
@@ -73,23 +74,18 @@
       "node": true
     },
     "extends": [
-      "plugin:vue/essential",
+      "plugin:vue/vue3-essential",
       "eslint:recommended"
     ],
-    "rules": {},
     "parserOptions": {
       "parser": "babel-eslint"
-    }
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
+    },
+    "rules": {}
   },
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not ie <= 8"
+    "not dead"
   ],
   "bugs": {
     "url": "https://github.com/ravenq/markdown-it-vueissues"
diff --git a/public/favicon.ico b/public/favicon.ico
index c7b9a43c8cd16d0b434adaf513fcacb340809a11..df36fcfb72584e00488330b560ebcf34a41c64c2 100644
GIT binary patch
literal 4286
zcmds*O-Phc6o&64GDVCEQHxsW(p4>LW*W<827=Unuo8sGpRux(DN@jWP-e29Wl%wj
zY84_aq9}^Am9-cWTD5GGEo#+5Fi2wX_P*bo+xO!)p*7B;iKlbFd(U~_d(U?#hLj56
zPhFkj-|A6~Qk#@g^#D^U0XT1cu=c-vu1+SElX9NR;kzAUV(q0|dl0|%h|dI$%VICy
zJnu2^L*Te9JrJMGh%-P79CL0}dq92RGU6gI{v2~|)p}sG5x0U*z<8U;Ij*hB9z?ei
z@g6Xq-pDoPl=MANPiR7%172VA%r)kev<ISBgE$F{SFy+(=9Z)f)De0Se}ZDZW}Z3B
zElCeVrw;K0Fdl_Cg=gZOFXXc3pL)Q05CAuT+XucQ<8g~3dteP~|7s7c6QYP;fy;mF
zMN;>tV-_5H*QJKFmd;8yA$98zCxBZYXTNZ#QFk2(TX0;Y2dt&WitL#$96|gJY=3xX
zpCoi|YNzgO3R`f@IiEeSmKrPSf#h#Qd<$%Ej^RIeeYfsxhPMOG`S`Pz8q``=511zm
zAm)MX5AV^5xIWPyEu7u>qYs?pn$I4nL9J!=K=SGlKLXpE<5x+2cDTXq?brj?n6sp=
zphe9;_JHf40^9~}9i08r{XM$7HB!`{Ys~TK0kx<}ZQng`UPvH*11|q7&l9?@FQz;8
zx!=3<4seY*%=OlbCbcae?<QnEgvj4i?s}Yk=qA2z`-^*<eK3c)MS4JOdbsTQEOa0)
z0NWqlna2rzs>5^V_}*K>Uo6ZWV8mTyE^B=DKy7-sdLYkR5Z?paTgK-zyIkKjIcpyO
z{+uIt&YSa_$QnN_@t~L014dyK(fOOo+W*MIxbA6Ndgr=Y!f#Tokqv}n<7-9qfHkc3
z=>a|HWqcX8fzQCT=dqVbogRq!-S>H%yA{1w#2Pn;=e>JiEj7Hl;zdt-2f+j2%DeVD
zsW0Ab)ZK@0cIW%W7<X*Er!BfRbvU93$DH%#v6dRt^6HBxz1xBNHx=$&_Gv<&J}Ljk
zJN<Fzx(`Oe@KgQ0F$<14=XV#WK`o#6Ku>z}H{&~yGhn~D;aiP4=;m-HCo`BEI+Kd6
z={Xwx{T<?%b6i9IjI)Ls)S{-*mq<@~R{?$}ZKjf;^k75i_}(2MXt}^SEBVg7AI@28
zo_uPg2V)_e-`2Ois=PYoe%9u*n9({PFR)OnHJPi{dNx>Kx<YG`4QQ>D#iCLfl2<BD
h7L=-;Q>vQGDitKtN>z|-AdCN|$jTFDg0m3O`WLD4_s#$S

literal 1150
zcmchVOGsN$5QZm2NTI$erQpKHrdQX(jn+pVxKN`Ng)RzW5+8_2Xb@Y)Dkd6tq9V8u
z3WAh^C@KZ1kA;tohzs}b3NC_*QmUXr$oP*rH(2mdT{z*(KX=aj=bX$9kqMvFRKj;Q
zwI&d~A);J>5-PDega~WT5us%#Dc(Y}C4WpP?+fS;FaZ*z_CFzgiW=w{I02=q_TUz(
z?=^H2uwoIK1n%|Ay21~QgjV1emYtWttJdz^L#=DjJ@Ex*9UPc*7<=rZo*_NAh4PxA
zqkso~Ioa1y$e+3kIkXi29YNLi&lW}vY6C}ut4{8ou(7w=$_=$v{yJ$h?y!&bJfq*(
zL_NQRF37$6e>%9erGV?p^lRFD?|5J_eupXaS;QluyrOmBT>PJhirMYb*<GPW1y7aE
zons}&9sZ*4{SBXZ)4`5-`(_;6T$j)8a`;{PI@prD#aqC^`S>i?(4Tf=j~?VvnUlY_
zDCVuuk3E&T9aP~Cr-0i-MaKUjf_|U!=R&t}_CfD=d${p~HH`BPaqb9aXT}UI$iGRg
z>0^GlZ`vM4?;$*LhfI(RG|XK4GF+@-W*W}YJT5&2N_ZyZuaM_Ry=%PWx>r0P(Rc?>
jRc4}SfGA>*agjwN{7E7DEm(*)%rSx{B0<6wBoglxJAy|R

diff --git a/src/index.js b/src/index.js
index 80a2550..1edb6ac 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,4 +1,4 @@
-import MarkdownItVue from './markdown-it-vue'
+import MarkdownItVue from './markdown-it-vue-light'
 
 const install = function (Vue) {
   Vue.component(MarkdownItVue.name, MarkdownItVue)
diff --git a/src/markdown-it-vue-light.vue b/src/markdown-it-vue-light.vue
index 50db1e8..ca67e4d 100644
--- a/src/markdown-it-vue-light.vue
+++ b/src/markdown-it-vue-light.vue
@@ -1,8 +1,10 @@
 <template>
-  <div class="markdown-body" ref="markdown-it-vue-container"></div>
+  <div class="markdown-body" ref="markdownRef"></div>
 </template>
 
 <script>
+
+import {defineComponent, ref, watch, toRefs, nextTick} from 'vue'
 import MarkdownIt from 'markdown-it'
 import MarkdownItEmoji from 'markdown-it-emoji'
 import MarkdownItSubscript from 'markdown-it-sub'
@@ -47,7 +49,8 @@ const DEFAULT_OPTIONS_GITHUBTOC = {
   anchorLinkSymbolClassName: 'octicon octicon-link'
 }
 
-export default {
+
+export default defineComponent({
   name: 'markdown-it-vue-light',
   props: {
     content: {
@@ -68,50 +71,19 @@ export default {
       }
     }
   },
-  watch: {
-    content: {
-      immediate: true,
-      handler(val) {
-        this.$nextTick(() => {
-          this.$refs['markdown-it-vue-container'].innerHTML = this.md.render(
-            val
-          )
-          // render echarts
-          document.querySelectorAll('.md-echarts').forEach(element => {
-            try {
-              let options = JSON.parse(element.textContent)
-              let chart = echarts.init(element)
-              chart.setOption(options)
-            } catch (e) {
-              element.outerHTML = `<pre>echarts complains: ${e}</pre>`
-            }
-          })
-          // render flowchart
-          document.querySelectorAll('.md-flowchart').forEach(element => {
-            try {
-              let code = element.textContent
-              let chart = flowchart.parse(code)
-              element.textContent = ''
-              chart.drawSVG(element)
-            } catch (e) {
-              element.outerHTML = `<pre>flowchart complains: ${e}</pre>`
-            }
-          })
+  emits: ['render-complete'],
+  setup(props,{emit, expose}){
+    const {
+      markdownIt, 
+      linkAttributes = DEFAULT_OPTIONS_LINK_ATTRIBUTES,
+      katex = DEFAULT_OPTIONS_KATEX,
+      tasklists = DEFAULT_OPTIONS_TASKLISTS,
+      githubToc = DEFAULT_OPTIONS_GITHUBTOC,
+    } = toRefs(props);
 
-          // emit event
-          this.$emit('render-complete')
-        })
-      }
-    }
-  },
-  data() {
-    const optMarkdownIt = this.options.markdownIt
-    const linkAttributes = this.options.linkAttributes || DEFAULT_OPTIONS_LINK_ATTRIBUTES
-    const optKatex = this.options.katex || DEFAULT_OPTIONS_KATEX
-    const optTasklists = this.options.tasklists || DEFAULT_OPTIONS_TASKLISTS
-    const optGithubToc = this.options.githubToc || DEFAULT_OPTIONS_GITHUBTOC
+    const markdownRef = ref(null);
 
-    let md = new MarkdownIt(optMarkdownIt)
+    const md = new MarkdownIt(markdownIt)
       .use(MarkdownItEmoji)
       .use(MarkdownItSubscript)
       .use(MarkdownItSuperscript)
@@ -126,10 +98,10 @@ export default {
       .use(MarkdownItEcharts)
       .use(MarkdownItFlowchart)
       .use(MarkdownItLinkAttributes, linkAttributes)
-      .use(MarkdownItKatex, optKatex)
-      .use(MarkdownItTasklists, optTasklists)
+      .use(MarkdownItKatex, katex)
+      .use(MarkdownItTasklists, tasklists)
       .use(MarkdownItFontAwsome)
-      .use(MarkdownItGithubToc, optGithubToc)
+      .use(MarkdownItGithubToc, githubToc)
       .use(MarkdownItContainer, 'warning', {
         validate: function(params) {
           return params.trim() === 'warning'
@@ -182,19 +154,59 @@ export default {
           }
         }
       })
-    return {
-      md: md
+
+    watch(() => props.content,(val) => {
+      nextTick(() => {
+          markdownRef.value.innerHTML = md.render(
+            val
+          )
+          // render echarts
+          document.querySelectorAll('.md-echarts').forEach(element => {
+            try {
+              let options = JSON.parse(element.textContent)
+              let chart = echarts.init(element)
+              chart.setOption(options)
+            } catch (e) {
+              element.outerHTML = `<pre>echarts complains: ${e}</pre>`
+            }
+          })
+          // render flowchart
+          document.querySelectorAll('.md-flowchart').forEach(element => {
+            try {
+              let code = element.textContent
+              let chart = flowchart.parse(code)
+              element.textContent = ''
+              chart.drawSVG(element)
+            } catch (e) {
+              element.outerHTML = `<pre>flowchart complains: ${e}</pre>`
+            }
+          })
+
+          // emit event
+          emit('render-complete')
+        })
+    }, {immediate: true})
+
+    // methods
+    const use = (plugin, options) => {
+      md.use(plugin, options)
     }
-  },
-  methods: {
-    use(plugin, options) {
-      this.md.use(plugin, options)
-    },
-    get() {
-      return this.md
+
+    const get = () => {
+      return md
+    }
+
+    expose({
+      use,
+      get
+    })
+
+    return {
+      markdownRef,
+      md
     }
   }
-}
+})
 </script>
 
 <style lange="scss">
diff --git a/src/markdown-it-vue.vue b/src/markdown-it-vue.vue
index 32e4d53..e4f0e9a 100644
--- a/src/markdown-it-vue.vue
+++ b/src/markdown-it-vue.vue
@@ -2,19 +2,20 @@
   <div>
     <div
       class="markdown-body"
-      ref="markdown-it-vue-container"
+      ref="markdownRef"
       @click="hdlClick"
     />
     <image-viewer
       v-if="showViewer"
       :url-list="urlList"
-      :index.sync="index"
+      v-model:index="index"
       :on-close="closeViewer"
     />
   </div>
 </template>
 
 <script>
+import {defineComponent, ref, watch, toRefs, nextTick, reactive} from 'vue'
 import MarkdownIt from 'markdown-it'
 import MarkdownItEmoji from 'markdown-it-emoji'
 import MarkdownItSubscript from 'markdown-it-sub'
@@ -70,12 +71,14 @@ const DEFAULT_OPTIONS_IMAGE = {
   viewer: true
 }
 
-export default {
-  components: { ImageViewer },
+
+export default defineComponent({
   name: 'markdown-it-vue',
+  components: { ImageViewer },
   props: {
     content: {
-      type: String
+      type: String,
+      default: ''
     },
     options: {
       type: Object,
@@ -93,61 +96,29 @@ export default {
       }
     }
   },
-  watch: {
-    content: {
-      immediate: true,
-      handler(val) {
-        this.urlSet.clear()
-        this.$nextTick(() => {
-          this.$refs['markdown-it-vue-container'].innerHTML = this.md.render(
-            val
-          )
-          // render echarts
-          document.querySelectorAll('.md-echarts').forEach(element => {
-            try {
-              let options = JSON.parse(element.textContent)
-              let chart = echarts.init(element)
-              chart.setOption(options)
-            } catch (e) {
-              element.outerHTML = `<pre>echarts complains: ${e}</pre>`
-            }
-          })
-          // render mermaid
-          mermaid.init(undefined, document.querySelectorAll('.mermaid'))
-          // render flowchart
-          document.querySelectorAll('.md-flowchart').forEach(element => {
-            try {
-              let code = element.textContent
-              let chart = flowchart.parse(code)
-              element.textContent = ''
-              chart.drawSVG(element)
-            } catch (e) {
-              element.outerHTML = `<pre>flowchart complains: ${e}</pre>`
-            }
-          })
+  emits: ['render-complete'],
+  setup(props, { emit, expose }){
+    const {
+      markdownIt, 
+      linkAttributes = DEFAULT_OPTIONS_LINK_ATTRIBUTES,
+      katex = DEFAULT_OPTIONS_KATEX,
+      tasklists = DEFAULT_OPTIONS_TASKLISTS,
+      githubToc = DEFAULT_OPTIONS_GITHUBTOC,
+      image = DEFAULT_OPTIONS_IMAGE,
+    } = toRefs(props);
+
+    const markdownRef = ref(null);
+    const index = ref(0);
+    const showViewer = ref(false);
+    const optImage = image;
+    const optMermaid = props.mermaid || DEFAULT_OPTIONS_MERMAID
+    const data = reactive({
+      urlList: [],
+    });
+    optImage.urlSet = new Set();
 
-          let list = []
-          for (const i of this.urlSet) {
-            list.push(i)
-          }
-          this.urlList = list
-          // emit event
-          this.$emit('render-complete')
-        })
-      }
-    }
-  },
-  data() {
-    const optMarkdownIt = this.options.markdownIt
-    const linkAttributes = this.options.linkAttributes || DEFAULT_OPTIONS_LINK_ATTRIBUTES
-    const optKatex = this.options.katex || DEFAULT_OPTIONS_KATEX
-    const optTasklists = this.options.tasklists || DEFAULT_OPTIONS_TASKLISTS
-    const optGithubToc = this.options.githubToc || DEFAULT_OPTIONS_GITHUBTOC
-    const optMermaid = this.options.mermaid || DEFAULT_OPTIONS_MERMAID
-    const optImage = this.options.image || DEFAULT_OPTIONS_IMAGE
-    optImage.urlSet = new Set()
 
-    let md = new MarkdownIt(optMarkdownIt)
+    const md = new MarkdownIt(markdownIt)
       .use(MarkdownItEmoji)
       .use(MarkdownItSubscript)
       .use(MarkdownItSuperscript)
@@ -163,10 +134,10 @@ export default {
       .use(MarkdownItEcharts)
       .use(MarkdownItFlowchart)
       .use(MarkdownItLinkAttributes, linkAttributes)
-      .use(MarkdownItKatex, optKatex)
-      .use(MarkdownItTasklists, optTasklists)
+      .use(MarkdownItKatex, katex)
+      .use(MarkdownItTasklists, tasklists)
       .use(MarkdownItFontAwsome)
-      .use(MarkdownItGithubToc, optGithubToc)
+      .use(MarkdownItGithubToc, githubToc)
       .use(MarkdownItImage, optImage)
       .use(MarkdownItContainer, 'warning', {
         validate: function(params) {
@@ -220,33 +191,75 @@ export default {
           }
         }
       })
-    return {
-      md: md,
-      urlSet: optImage.urlSet,
-      viewer: optImage.viewer,
-      showViewer: false,
-      index: 0,
-      urlList: []
+
+    watch(() => props.content, (val)=>{
+      optImage.urlSet.clear()
+        nextTick(() => {
+          markdownRef.value.innerHTML = md.render(val)
+          // render echarts
+          document.querySelectorAll('.md-echarts').forEach(element => {
+            try {
+              let options = JSON.parse(element.textContent)
+              let chart = echarts.init(element)
+              chart.setOption(options)
+            } catch (e) {
+              element.outerHTML = `<pre>echarts complains: ${e}</pre>`
+            }
+          })
+          // render mermaid
+          mermaid.init(undefined, document.querySelectorAll('.mermaid'))
+          // render flowchart
+          document.querySelectorAll('.md-flowchart').forEach(element => {
+            try {
+              let code = element.textContent
+              let chart = flowchart.parse(code)
+              element.textContent = ''
+              chart.drawSVG(element)
+            } catch (e) {
+              element.outerHTML = `<pre>flowchart complains: ${e}</pre>`
+            }
+          })
+
+          let list = []
+          for (const i of optImage.urlSet) {
+            list.push(i)
+          }
+          data.urlList = list
+          // emit event
+          emit('render-complete')
+      })
+    },{immediate: true})
+
+    // methods
+    const use = (plugin, options) => {
+      md.use(plugin, options)
     }
-  },
-  methods: {
-    use(plugin, options) {
-      this.md.use(plugin, options)
-    },
-    get() {
-      return this.md
-    },
-    hdlClick(e) {
-      if (this.viewer && e.target.tagName == 'IMG') {
-        this.index = this.urlList.indexOf(e.target.src) || 0
-        this.showViewer = true
+
+    const get = () => {
+       return this.md
+    }
+
+    const hdlClick = (e) => {
+      if (optImage.viewer && e.target.tagName == 'IMG') {
+        index.value = data.urlList.indexOf(e.target.src) || 0
+        showViewer.value = true
       }
-    },
-    closeViewer() {
-      this.showViewer = false
+    }
+
+    expose({
+      use, 
+      get
+    })
+
+    return {
+      markdownRef,
+      showViewer,
+      index,
+      urlSet: data.urlSet,
+      hdlClick
     }
   }
-}
+})
 </script>
 
 <style lange="scss">
diff --git a/src/utils.js b/src/utils.js
index 5e7a70f..51b0369 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -1,9 +1,8 @@
-import Vue from 'vue'
-const isServer = Vue.prototype.$isServer
+
 
 /* istanbul ignore next */
 export const on = (function () {
-  if (!isServer && document.addEventListener) {
+  if (document.addEventListener) {
     return function (element, event, handler) {
       if (element && event && handler) {
         element.addEventListener(event, handler, false)
@@ -21,7 +20,7 @@ export const on = (function () {
 
 /* istanbul ignore next */
 export const off = (function () {
-  if (!isServer && document.removeEventListener) {
+  if (document.removeEventListener) {
     return function (element, event, handler) {
       if (element && event) {
         element.removeEventListener(event, handler, false)
@@ -49,5 +48,5 @@ export function rafThrottle(fn) {
 }
 
 export const isFirefox = function () {
-  return !Vue.prototype.$isServer && !!window.navigator.userAgent.match(/firefox/i)
+  return !!window.navigator.userAgent.match(/firefox/i)
 }
\ No newline at end of file

From 5b208b44992b2a407a4b5ef83e8defe6ea44e803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=93=E5=AE=89?= <yuanzhian@cai-inc.com>
Date: Sun, 20 Mar 2022 17:11:28 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix=F0=9F=90=9B:=20=20The=20default=20expor?=
 =?UTF-8?q?t=20component=20is=20markdownitvue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.js b/src/index.js
index 1edb6ac..80a2550 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,4 +1,4 @@
-import MarkdownItVue from './markdown-it-vue-light'
+import MarkdownItVue from './markdown-it-vue'
 
 const install = function (Vue) {
   Vue.component(MarkdownItVue.name, MarkdownItVue)

From e454e9b73a5048a26feb120ee6ddd61158d08795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=93=E5=AE=89?= <yuanzhian@cai-inc.com>
Date: Sun, 20 Mar 2022 17:17:55 +0800
Subject: [PATCH 3/5] =?UTF-8?q?fix=F0=9F=90=9B:=20=20Ecarts=20cannot=20be?=
 =?UTF-8?q?=20displayed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/markdown-it-vue-light.vue | 2 +-
 src/markdown-it-vue.vue       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/markdown-it-vue-light.vue b/src/markdown-it-vue-light.vue
index ca67e4d..a7d2c0e 100644
--- a/src/markdown-it-vue-light.vue
+++ b/src/markdown-it-vue-light.vue
@@ -28,7 +28,7 @@ import MarkdownItFontAwsome from './markdown-it-font-awsome'
 import 'github-markdown-css'
 import 'markdown-it-latex/dist/index.css'
 
-import echarts from 'echarts/dist/echarts.simple.min'
+import * as echarts from 'echarts/dist/echarts.simple.min'
 import flowchart from 'flowchart.js'
 
 const DEFAULT_OPTIONS_LINK_ATTRIBUTES = {
diff --git a/src/markdown-it-vue.vue b/src/markdown-it-vue.vue
index e4f0e9a..9d84b84 100644
--- a/src/markdown-it-vue.vue
+++ b/src/markdown-it-vue.vue
@@ -41,7 +41,7 @@ import MarkdownItImage from './markdown-it-image'
 import 'github-markdown-css'
 import 'markdown-it-latex/dist/index.css'
 
-import echarts from 'echarts/dist/echarts.simple.min'
+import * as echarts from 'echarts/dist/echarts.simple.min'
 import mermaid from 'mermaid'
 import flowchart from 'flowchart.js'
 import ImageViewer from './markdown-it-image/image-viewer.vue'

From 09da5d65cc02ac2c80ea205ab5d5b5b96d1abe43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=93=E5=AE=89?= <yuanzhian@cai-inc.com>
Date: Sun, 20 Mar 2022 18:08:14 +0800
Subject: [PATCH 4/5] =?UTF-8?q?perf=F0=9F=91=8C:=20=20Use=20composition=20?=
 =?UTF-8?q?api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/markdown-it-image/image-viewer.vue | 271 ++++++++++++++-----------
 src/markdown-it-vue-light.vue          |   1 -
 src/markdown-it-vue.vue                |   2 +-
 3 files changed, 152 insertions(+), 122 deletions(-)

diff --git a/src/markdown-it-image/image-viewer.vue b/src/markdown-it-image/image-viewer.vue
index 31b85c2..e4a1cd7 100644
--- a/src/markdown-it-image/image-viewer.vue
+++ b/src/markdown-it-image/image-viewer.vue
@@ -46,7 +46,7 @@
         <div v-for="(url, i) in urlList" :key="url" class="image-container">
           <img
             v-if="i === index"
-            ref="img"
+            ref="imgRef"
             class="el-image-viewer__img"
             :src="currentImg"
             :style="imgStyle"
@@ -62,6 +62,7 @@
 
 <script>
 import { on, off, rafThrottle, isFirefox } from '../utils'
+import {defineComponent, ref, watch, toRef, toRefs, nextTick, computed, reactive} from 'vue'
 
 const Mode = {
   CONTAIN: {
@@ -76,9 +77,8 @@ const Mode = {
 
 const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
 
-export default {
+export default defineComponent({
   name: 'elImageViewer',
-
   props: {
     urlList: {
       type: Array,
@@ -97,38 +97,36 @@ export default {
       default: 0,
     },
   },
+  emits: ['update:index'],
+  setup(props, { emit }){
 
-  data() {
-    return {
-      isShow: false,
-      infinite: true,
-      loading: false,
-      mode: Mode.CONTAIN,
+    const { urlList, index, onClose, onSwitch } = toRefs(props)
+
+    const imgRef = ref(null)
+    const infinite = ref(false)
+    const loading = ref(false)
+    const mode = ref(Mode.CONTAIN)
+    const zIndex = ref(2000)
+    const data = reactive({
       transform: {
         scale: 1,
         deg: 0,
         offsetX: 0,
         offsetY: 0,
         enableTransition: false,
-      },
-      zIndex: 2000,
-    }
-  },
-  computed: {
-    isSingle() {
-      return this.urlList.length <= 1
-    },
-    isFirst() {
-      return this.index === 0
-    },
-    isLast() {
-      return this.index === this.urlList.length - 1
-    },
-    currentImg() {
-      return this.urlList[this.index]
-    },
-    imgStyle() {
-      const { scale, deg, offsetX, offsetY, enableTransition } = this.transform
+      }
+    })
+    let _keyDownHandler = null
+    let _mouseWheelHandler = null
+    let _dragHandler = null
+
+    // computed
+    const isSingle = computed(()=> urlList.length <= 1);
+    const isFirst = computed(()=> index === 0);
+    const isLast = computed(()=> index === urlList.length - 1);
+    const currentImg = computed(()=> urlList[index]);
+    const imgStyle = computed(()=> {
+      const { scale, deg, offsetX, offsetY, enableTransition } = toRef(data,'transform')
       const style = {
         transform: `scale(${scale}) rotate(${deg}deg)`,
         transition: enableTransition ? 'transform .3s' : '',
@@ -139,60 +137,46 @@ export default {
         style.maxWidth = style.maxHeight = '100%'
       }
       return style
-    },
-  },
-  watch: {
-    index: {
-      handler: function (val) {
-        this.reset()
-        this.onSwitch(val)
-      },
-    },
-    currentImg() {
-      this.$nextTick(() => {
-        const $img = this.$refs.img[0]
-        if (!$img.complete) {
-          this.loading = true
-        }
-      })
-    },
-  },
-  methods: {
-    hide() {
-      this.deviceSupportUninstall()
-      this.onClose()
-    },
-    deviceSupportInstall() {
-      this._keyDownHandler = rafThrottle((e) => {
+    })
+
+    // methods
+    const hide = () => {
+      deviceSupportUninstall()
+      onClose()
+    }
+
+    const deviceSupportInstall = () => {
+      _keyDownHandler = rafThrottle((e) => {
         const keyCode = e.keyCode
         switch (keyCode) {
           // ESC
           case 27:
-            this.hide()
+            hide()
             break
           // SPACE
           case 32:
-            this.toggleMode()
+            toggleMode()
             break
           // LEFT_ARROW
           case 37:
-            this.prev()
+            prev()
             break
           // UP_ARROW
           case 38:
-            this.handleActions('zoomIn')
+            handleActions('zoomIn')
             break
           // RIGHT_ARROW
           case 39:
-            this.next()
+            next()
             break
           // DOWN_ARROW
           case 40:
-            this.handleActions('zoomOut')
+            handleActions('zoomOut')
             break
         }
       })
-      this._mouseWheelHandler = rafThrottle((e) => {
+
+      _mouseWheelHandler = rafThrottle((e) => {
         const delta = e.wheelDelta ? e.wheelDelta : -e.detail
         if (delta > 0) {
           this.handleActions('zoomIn', {
@@ -207,103 +191,150 @@ export default {
         }
       })
       on(document, 'keydown', this._keyDownHandler)
-      on(document, mousewheelEventName, this._mouseWheelHandler)
-    },
-    deviceSupportUninstall() {
-      off(document, 'keydown', this._keyDownHandler)
-      off(document, mousewheelEventName, this._mouseWheelHandler)
-      this._keyDownHandler = null
-      this._mouseWheelHandler = null
-    },
-    handleImgLoad() {
-      this.loading = false
-    },
-    handleImgError(e) {
-      this.loading = false
+      on(document, mousewheelEventName, _mouseWheelHandler)
+    }
+
+    const deviceSupportUninstall = () => {
+      off(document, 'keydown', _keyDownHandler)
+      off(document, mousewheelEventName, _mouseWheelHandler)
+      _keyDownHandler = null
+      _mouseWheelHandler = null
+    }
+
+    const handleImgLoad = () => {
+      loading.value = false
+    }
+
+    const handleImgError = (e) => {
+      loading.value = false
       e.target.alt = '加载失败'
-    },
-    handleMouseDown(e) {
-      if (this.loading || e.button !== 0) return
+    }
+
+    const handleMouseDown = (e) => {
+      if (loading.value || e.button !== 0) return
 
-      const { offsetX, offsetY } = this.transform
+      const { offsetX, offsetY } = toRef(data, 'transform')
       const startX = e.pageX
       const startY = e.pageY
-      this._dragHandler = rafThrottle((ev) => {
-        this.transform.offsetX = offsetX + ev.pageX - startX
-        this.transform.offsetY = offsetY + ev.pageY - startY
+      _dragHandler = rafThrottle((ev) => {
+        data.transform.offsetX = offsetX + ev.pageX - startX
+        data.transform.offsetY = offsetY + ev.pageY - startY
       })
-      on(document, 'mousemove', this._dragHandler)
+      on(document, 'mousemove', _dragHandler)
       on(document, 'mouseup', () => {
-        off(document, 'mousemove', this._dragHandler)
+        off(document, 'mousemove', _dragHandler)
       })
 
       e.preventDefault()
-    },
-    reset() {
-      this.transform = {
+    }
+    
+    const reset = () => {
+      data.transform = {
         scale: 1,
         deg: 0,
         offsetX: 0,
         offsetY: 0,
         enableTransition: false,
       }
-    },
-    toggleMode() {
-      if (this.loading) return
+    }
+
+    const toggleMode = ()=> {
+      if (loading.value) return
 
       const modeNames = Object.keys(Mode)
       const modeValues = Object.values(Mode)
-      const index = modeValues.indexOf(this.mode)
-      const nextIndex = (index + 1) % modeNames.length
-      this.mode = Mode[modeNames[nextIndex]]
+      const handleIndex = modeValues.indexOf(mode.value)
+      const nextIndex = (handleIndex + 1) % modeNames.length
+      mode.value = Mode[modeNames[nextIndex]]
       this.reset()
-    },
-    prev() {
-      if (this.isFirst && !this.infinite) return
-      const len = this.urlList.length
-      const index = (this.index - 1 + len) % len
-      this.$emit('update:index', index)
-    },
-    next() {
-      if (this.isLast && !this.infinite) return
-      const len = this.urlList.length
-      const index = (this.index + 1) % len
-      this.$emit('update:index', index)
-    },
-    handleActions(action, options = {}) {
-      if (this.loading) return
+    }
+
+    const prev = () => {
+      if (isFirst.value && !infinite.value) return
+      const len = urlList.length
+      const handleIndex = (index - 1 + len) % len
+      emit('update:index', handleIndex)
+    }
+
+
+    const next = () => {
+      if (isLast.value && !infinite.value) return
+      const len = urlList.length
+      const handleIndex = (index + 1) % len
+      emit('update:index', handleIndex)
+    }
+
+    const handleActions = (action, options = {}) => {
+      if (loading.value) return
       const { zoomRate, rotateDeg, enableTransition } = {
         zoomRate: 0.2,
         rotateDeg: 90,
         enableTransition: true,
         ...options,
       }
-      const { transform } = this
+      const { scale } = toRef(data, 'transform')
       switch (action) {
         case 'zoomOut':
-          if (transform.scale > 0.2) {
-            transform.scale = parseFloat(
-              (transform.scale - zoomRate).toFixed(3)
+          if (scale > 0.2) {
+            data.transform.scale = parseFloat(
+              (scale - zoomRate).toFixed(3)
             )
           }
           break
         case 'zoomIn':
-          transform.scale = parseFloat((transform.scale + zoomRate).toFixed(3))
+          data.transform.scale = parseFloat((scale + zoomRate).toFixed(3))
           break
         case 'clocelise':
-          transform.deg += rotateDeg
+           data.transform.deg += rotateDeg
           break
         case 'anticlocelise':
-          transform.deg -= rotateDeg
+          data.transform.deg -= rotateDeg
           break
       }
-      transform.enableTransition = enableTransition
-    },
-  },
-  mounted() {
-    this.deviceSupportInstall()
-  },
-}
+      data.transform.enableTransition = enableTransition
+    }
+
+
+    // watch
+    watch(()=>props.index,(val) => {
+      reset()
+      onSwitch(val)
+    })
+
+    watch(()=>props.currentImg,() => {
+      nextTick(() => {
+        const $img = imgRef.value.img[0]
+        if (!$img.complete) {
+          loading.value = true
+        }
+      })
+    })
+
+    return {
+      infinite,
+      mode,
+      loading,
+      imgRef,
+      ...toRefs(data),
+      zIndex,
+      isSingle,
+      isFirst,
+      isLast,
+      currentImg,
+      imgStyle,
+      toggleMode,
+      deviceSupportInstall,
+      deviceSupportUninstall,
+      handleImgLoad,
+      handleImgError,
+      handleMouseDown,
+      prev,
+      next,
+      handleActions,
+    }
+  }
+})
+
 </script>
 
 <style scoped>
diff --git a/src/markdown-it-vue-light.vue b/src/markdown-it-vue-light.vue
index a7d2c0e..2292e79 100644
--- a/src/markdown-it-vue-light.vue
+++ b/src/markdown-it-vue-light.vue
@@ -3,7 +3,6 @@
 </template>
 
 <script>
-
 import {defineComponent, ref, watch, toRefs, nextTick} from 'vue'
 import MarkdownIt from 'markdown-it'
 import MarkdownItEmoji from 'markdown-it-emoji'
diff --git a/src/markdown-it-vue.vue b/src/markdown-it-vue.vue
index 9d84b84..b945819 100644
--- a/src/markdown-it-vue.vue
+++ b/src/markdown-it-vue.vue
@@ -8,7 +8,7 @@
     <image-viewer
       v-if="showViewer"
       :url-list="urlList"
-      v-model:index="index"
+      v-model="index"
       :on-close="closeViewer"
     />
   </div>

From 9d056aa5644de826fda3322d2e93f01a73c74d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=93=E5=AE=89?= <yuanzhian@cai-inc.com>
Date: Wed, 23 Mar 2022 14:35:03 +0800
Subject: [PATCH 5/5] =?UTF-8?q?config=F0=9F=94=A7:=20=20Update=20package?=
 =?UTF-8?q?=20json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f3c33b0..2487f4e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "markdown-it-vue",
-  "version": "2.0.0",
+  "version": "1.1.7",
   "private": false,
   "description": "The vue3.0 lib for markdown-it",
   "author": {