Sfoglia il codice sorgente

修改已知问题

306132416@qq.com 4 anni fa
parent
commit
5291aeb8ab

+ 90 - 343
package-lock.json

@@ -1017,11 +1017,19 @@
       "version": "7.13.10",
       "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.13.10.tgz?cache=0&sync_timestamp=1615243551514&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.13.10.tgz",
       "integrity": "sha1-R9QqV7YJX0Ro2kQDiP262L6/DX0=",
-      "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
       }
     },
+    "@babel/runtime-corejs3": {
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.14.0.tgz",
+      "integrity": "sha512-0R0HTZWHLk6G8jIk0FtoX+AatCtKnswS98VhXwGImFc759PJRp4Tru0PQYZofyijTFUr+gT8Mu7sgXVJLQ0ceg==",
+      "requires": {
+        "core-js-pure": "^3.0.0",
+        "regenerator-runtime": "^0.13.4"
+      }
+    },
     "@babel/template": {
       "version": "7.12.13",
       "resolved": "https://registry.npm.taobao.org/@babel/template/download/@babel/template-7.12.13.tgz",
@@ -1111,11 +1119,6 @@
         "postcss": "^7.0.0"
       }
     },
-    "@juggle/resize-observer": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz",
-      "integrity": "sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw=="
-    },
     "@mrmlnc/readdir-enhanced": {
       "version": "2.2.1",
       "resolved": "https://registry.npm.taobao.org/@mrmlnc/readdir-enhanced/download/@mrmlnc/readdir-enhanced-2.2.1.tgz",
@@ -2393,14 +2396,6 @@
       "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
       "dev": true
     },
-    "async-validator": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
-      "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
-      "requires": {
-        "babel-runtime": "6.x"
-      }
-    },
     "asynckit": {
       "version": "0.4.0",
       "resolved": "https://registry.npm.taobao.org/asynckit/download/asynckit-0.4.0.tgz",
@@ -2518,27 +2513,6 @@
         "@babel/helper-define-polyfill-provider": "^0.1.5"
       }
     },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      },
-      "dependencies": {
-        "core-js": {
-          "version": "2.6.12",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
-          "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
-        },
-        "regenerator-runtime": {
-          "version": "0.11.1",
-          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-          "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
-        }
-      }
-    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/balanced-match/download/balanced-match-1.0.0.tgz",
@@ -3396,11 +3370,6 @@
         "q": "^1.1.2"
       }
     },
-    "codemirror": {
-      "version": "5.61.0",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.61.0.tgz",
-      "integrity": "sha512-D3wYH90tYY1BsKlUe0oNj2JAhQ9TepkD51auk3N7q+4uz7A/cgJ5JsWHreT0PqieW1QhOuqxQ2reCXV1YXzecg=="
-    },
     "collection-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npm.taobao.org/collection-visit/download/collection-visit-1.0.0.tgz",
@@ -3817,6 +3786,11 @@
         }
       }
     },
+    "core-js-pure": {
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.12.1.tgz",
+      "integrity": "sha512-1cch+qads4JnDSWsvc7d6nzlKAippwjUlf6vykkTLW53VSV+NkE6muGBToAjEA8pG90cSfcud3JgVmW2ds5TaQ=="
+    },
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npm.taobao.org/core-util-is/download/core-util-is-1.0.2.tgz",
@@ -4181,7 +4155,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
       "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-      "dev": true,
       "requires": {
         "is-arguments": "^1.0.4",
         "is-date-object": "^1.0.1",
@@ -4200,7 +4173,8 @@
     "deepmerge": {
       "version": "1.5.2",
       "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-1.5.2.tgz",
-      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ=="
+      "integrity": "sha512-95k0GDqvBjZavkuvzx/YqVLv/6YYa17fz6ILMSf7neqQITCPbnfEnQvEgMPNjH4kgobe7+WIL0yJEHku+H3qtQ==",
+      "dev": true
     },
     "default-gateway": {
       "version": "5.0.5",
@@ -4330,7 +4304,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npm.taobao.org/define-properties/download/define-properties-1.1.3.tgz",
       "integrity": "sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE=",
-      "dev": true,
       "requires": {
         "object-keys": "^1.0.12"
       }
@@ -4641,35 +4614,6 @@
       "integrity": "sha1-hU7qnbi8gQnECaSAe/2yAN11osc=",
       "dev": true
     },
-    "element-tiptap": {
-      "version": "1.26.2",
-      "resolved": "https://registry.npmjs.org/element-tiptap/-/element-tiptap-1.26.2.tgz",
-      "integrity": "sha512-O3dCdIwO++u0l0Q+LCVkp6etaFKtu2jpKl3ish8RMvc5eFkL9CLQqifZvb/ZtkDsHW1UQqxqRPaaZiU2hQHlYg==",
-      "requires": {
-        "@juggle/resize-observer": "^3.1.2",
-        "codemirror": "^5.54.0",
-        "core-js": "^3.4.3",
-        "prosemirror-utils": "^0.9.6",
-        "tiptap": "^1.26.6",
-        "tiptap-extensions": "^1.28.6",
-        "vue-awesome": "^4.0.2",
-        "vue-class-component": "^7.0.2",
-        "vue-property-decorator": "^8.3.0"
-      }
-    },
-    "element-ui": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.1.tgz",
-      "integrity": "sha512-TqlScAKGH97XndSScUDeEHIzL1x7yg7DvQdKPEOUdiDcyIz3y3FJJBlpHYaJT96FOn1xpIcUZb+I2FJeU9EcrQ==",
-      "requires": {
-        "async-validator": "~1.8.1",
-        "babel-helper-vue-jsx-merge-props": "^2.0.0",
-        "deepmerge": "^1.2.0",
-        "normalize-wheel": "^1.0.1",
-        "resize-observer-polyfill": "^1.5.0",
-        "throttle-debounce": "^1.0.1"
-      }
-    },
     "elliptic": {
       "version": "6.5.4",
       "resolved": "https://registry.npm.taobao.org/elliptic/download/elliptic-6.5.4.tgz?cache=0&sync_timestamp=1612290896983&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Felliptic%2Fdownload%2Felliptic-6.5.4.tgz",
@@ -5226,8 +5170,7 @@
     "extend": {
       "version": "3.0.2",
       "resolved": "https://registry.npm.taobao.org/extend/download/extend-3.0.2.tgz",
-      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo=",
-      "dev": true
+      "integrity": "sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo="
     },
     "extend-shallow": {
       "version": "3.0.2",
@@ -5338,6 +5281,11 @@
       "integrity": "sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU=",
       "dev": true
     },
+    "fast-diff": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
+      "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
+    },
     "fast-glob": {
       "version": "2.2.7",
       "resolved": "https://registry.npm.taobao.org/fast-glob/download/fast-glob-2.2.7.tgz?cache=0&sync_timestamp=1610876574130&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-glob%2Fdownload%2Ffast-glob-2.2.7.tgz",
@@ -5387,14 +5335,6 @@
       "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
       "dev": true
     },
-    "fault": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz",
-      "integrity": "sha512-CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==",
-      "requires": {
-        "format": "^0.2.0"
-      }
-    },
     "faye-websocket": {
       "version": "0.11.3",
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
@@ -5593,11 +5533,6 @@
         "mime-types": "^2.1.12"
       }
     },
-    "format": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
-      "integrity": "sha1-1hcBB+nv3E7TDJ3DkBbflCtctYs="
-    },
     "forwarded": {
       "version": "0.1.2",
       "resolved": "https://registry.npm.taobao.org/forwarded/download/forwarded-0.1.2.tgz",
@@ -5929,7 +5864,8 @@
     "highlight.js": {
       "version": "10.7.1",
       "resolved": "https://registry.npm.taobao.org/highlight.js/download/highlight.js-10.7.1.tgz?cache=0&sync_timestamp=1616402616036&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fhighlight.js%2Fdownload%2Fhighlight.js-10.7.1.tgz",
-      "integrity": "sha1-qOxBUtsk6mMMkJJ9bK4qRfjsuVU="
+      "integrity": "sha1-qOxBUtsk6mMMkJJ9bK4qRfjsuVU=",
+      "dev": true
     },
     "hmac-drbg": {
       "version": "1.0.1",
@@ -6570,7 +6506,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.0.tgz",
       "integrity": "sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.0"
       }
@@ -6673,8 +6608,7 @@
     "is-date-object": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.4.tgz",
-      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==",
-      "dev": true
+      "integrity": "sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A=="
     },
     "is-descriptor": {
       "version": "0.1.6",
@@ -6815,7 +6749,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.3.tgz",
       "integrity": "sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "has-symbols": "^1.0.2"
@@ -7291,15 +7224,6 @@
       "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=",
       "dev": true
     },
-    "lowlight": {
-      "version": "1.20.0",
-      "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz",
-      "integrity": "sha512-8Ktj+prEb1RoCPkEOrPMYUN/nCggB7qAWe3a7OpMjWQkh3l2RD5wKRQ+o8Q8YuI9RG/xs95waaI/E6ym/7NsTw==",
-      "requires": {
-        "fault": "^1.0.0",
-        "highlight.js": "~10.7.0"
-      }
-    },
     "lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npm.taobao.org/lru-cache/download/lru-cache-5.1.1.tgz?cache=0&sync_timestamp=1594427573763&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Flru-cache%2Fdownload%2Flru-cache-5.1.1.tgz",
@@ -7821,11 +7745,6 @@
       "integrity": "sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==",
       "dev": true
     },
-    "normalize-wheel": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
-      "integrity": "sha1-rsiGr/2wRQcNhWRH32Ls+GFG7EU="
-    },
     "npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npm.taobao.org/npm-run-path/download/npm-run-path-2.0.2.tgz?cache=0&sync_timestamp=1577052941951&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnpm-run-path%2Fdownload%2Fnpm-run-path-2.0.2.tgz",
@@ -7859,8 +7778,7 @@
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npm.taobao.org/object-assign/download/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
       "version": "0.1.0",
@@ -7908,7 +7826,6 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
       "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -7917,8 +7834,7 @@
     "object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npm.taobao.org/object-keys/download/object-keys-1.1.1.tgz",
-      "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4=",
-      "dev": true
+      "integrity": "sha1-HEfyct8nfzsdrwYWd9nILiMixg4="
     },
     "object-visit": {
       "version": "1.0.1",
@@ -8075,11 +7991,6 @@
         }
       }
     },
-    "orderedmap": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-1.1.1.tgz",
-      "integrity": "sha512-3Ux8um0zXbVacKUkcytc0u3HgC0b0bBLT+I60r2J/En72cI0nZffqrA7Xtf2Hqs27j1g82llR5Mhbd0Z1XW4AQ=="
-    },
     "original": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
@@ -8172,6 +8083,11 @@
         "no-case": "^2.2.0"
       }
     },
+    "parchment": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
+      "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
+    },
     "parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/parent-module/download/parent-module-1.0.1.tgz",
@@ -9041,134 +8957,6 @@
       "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
       "dev": true
     },
-    "prosemirror-collab": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/prosemirror-collab/-/prosemirror-collab-1.2.2.tgz",
-      "integrity": "sha512-tBnHKMLgy5Qmx9MYVcLfs3pAyjtcqYYDd9kp3y+LSiQzkhMQDfZSV3NXWe4Gsly32adSef173BvObwfoSQL5MA==",
-      "requires": {
-        "prosemirror-state": "^1.0.0"
-      }
-    },
-    "prosemirror-commands": {
-      "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.1.7.tgz",
-      "integrity": "sha512-tuQr8q5euDjE+WAHWmu1JMLYWsPfUDH80QLLpnQrPYOPysO26FZyyHwEvA0+hUzvF8fOt1oMj0+/YM9UsPkZiA==",
-      "requires": {
-        "prosemirror-model": "^1.0.0",
-        "prosemirror-state": "^1.0.0",
-        "prosemirror-transform": "^1.0.0"
-      }
-    },
-    "prosemirror-dropcursor": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.4.tgz",
-      "integrity": "sha512-eVmpMG5+fmvANT3xDzRirmG240rB/piI31ExIfW0Mkvo5/cYC/lm1fFMAOzjO22uc5OQXiodRqOnyE05+g3UqA==",
-      "requires": {
-        "prosemirror-state": "^1.0.0",
-        "prosemirror-transform": "^1.1.0",
-        "prosemirror-view": "^1.1.0"
-      }
-    },
-    "prosemirror-gapcursor": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz",
-      "integrity": "sha512-SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w==",
-      "requires": {
-        "prosemirror-keymap": "^1.0.0",
-        "prosemirror-model": "^1.0.0",
-        "prosemirror-state": "^1.0.0",
-        "prosemirror-view": "^1.0.0"
-      }
-    },
-    "prosemirror-history": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.1.3.tgz",
-      "integrity": "sha512-zGDotijea+vnfnyyUGyiy1wfOQhf0B/b6zYcCouBV8yo6JmrE9X23M5q7Nf/nATywEZbgRLG70R4DmfSTC+gfg==",
-      "requires": {
-        "prosemirror-state": "^1.2.2",
-        "prosemirror-transform": "^1.0.0",
-        "rope-sequence": "^1.3.0"
-      }
-    },
-    "prosemirror-inputrules": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz",
-      "integrity": "sha512-ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw==",
-      "requires": {
-        "prosemirror-state": "^1.0.0",
-        "prosemirror-transform": "^1.0.0"
-      }
-    },
-    "prosemirror-keymap": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz",
-      "integrity": "sha512-Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg==",
-      "requires": {
-        "prosemirror-state": "^1.0.0",
-        "w3c-keyname": "^2.2.0"
-      }
-    },
-    "prosemirror-model": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.14.1.tgz",
-      "integrity": "sha512-vZcbI+24VloFefKZkDnMaEpipL/vSKKPdFiik4KOnTzq3e6AO7+CAOixZ2G/SsfRaYC965XvnOIEbhIQdgki7w==",
-      "requires": {
-        "orderedmap": "^1.1.0"
-      }
-    },
-    "prosemirror-schema-list": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz",
-      "integrity": "sha512-pNTuZflacFOBlxrTcWSdWhjoB8BaucwfJVp/gJNxztOwaN3wQiC65axclXyplf6TKgXD/EkWfS/QAov3/Znadw==",
-      "requires": {
-        "prosemirror-model": "^1.0.0",
-        "prosemirror-transform": "^1.0.0"
-      }
-    },
-    "prosemirror-state": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.3.4.tgz",
-      "integrity": "sha512-Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA==",
-      "requires": {
-        "prosemirror-model": "^1.0.0",
-        "prosemirror-transform": "^1.0.0"
-      }
-    },
-    "prosemirror-tables": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz",
-      "integrity": "sha512-LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA==",
-      "requires": {
-        "prosemirror-keymap": "^1.1.2",
-        "prosemirror-model": "^1.8.1",
-        "prosemirror-state": "^1.3.1",
-        "prosemirror-transform": "^1.2.1",
-        "prosemirror-view": "^1.13.3"
-      }
-    },
-    "prosemirror-transform": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.3.2.tgz",
-      "integrity": "sha512-/G6d/u9Mf6Bv3H1XR8VxhpjmUO75LYmnvj+s3ZfZpakU1hnQbsvCEybml1B3f2IWUAAQRFkbO1PnsbFhLZsYsw==",
-      "requires": {
-        "prosemirror-model": "^1.0.0"
-      }
-    },
-    "prosemirror-utils": {
-      "version": "0.9.6",
-      "resolved": "https://registry.npmjs.org/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz",
-      "integrity": "sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA=="
-    },
-    "prosemirror-view": {
-      "version": "1.18.4",
-      "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.18.4.tgz",
-      "integrity": "sha512-6oi62XRK5WxhMX1Amjk5uMsWILUEcFbFF75i09BzpAdI+5glhs7heCaRvKOj4v3YRJ7LJVkOXS9xvjetlE3+pA==",
-      "requires": {
-        "prosemirror-model": "^1.1.0",
-        "prosemirror-state": "^1.0.0",
-        "prosemirror-transform": "^1.1.0"
-      }
-    },
     "proxy-addr": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
@@ -9300,6 +9088,41 @@
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
+    "quill": {
+      "version": "1.3.7",
+      "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
+      "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
+      "requires": {
+        "clone": "^2.1.1",
+        "deep-equal": "^1.0.1",
+        "eventemitter3": "^2.0.3",
+        "extend": "^3.0.2",
+        "parchment": "^1.1.4",
+        "quill-delta": "^3.6.2"
+      },
+      "dependencies": {
+        "clone": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+          "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+        },
+        "eventemitter3": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
+          "integrity": "sha1-teEHm1n7XhuidxwKmTvgYKWMmbo="
+        }
+      }
+    },
+    "quill-delta": {
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/quill-delta/-/quill-delta-3.6.3.tgz",
+      "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==",
+      "requires": {
+        "deep-equal": "^1.0.1",
+        "extend": "^3.0.2",
+        "fast-diff": "1.1.2"
+      }
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npm.taobao.org/randombytes/download/randombytes-2.1.0.tgz",
@@ -9392,8 +9215,7 @@
     "regenerator-runtime": {
       "version": "0.13.7",
       "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.7.tgz",
-      "integrity": "sha1-ysLazIoepnX+qrrriugziYrkb1U=",
-      "dev": true
+      "integrity": "sha1-ysLazIoepnX+qrrriugziYrkb1U="
     },
     "regenerator-transform": {
       "version": "0.14.5",
@@ -9418,7 +9240,6 @@
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz",
       "integrity": "sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==",
-      "dev": true,
       "requires": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.3"
@@ -9575,11 +9396,6 @@
       "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
       "dev": true
     },
-    "resize-observer-polyfill": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
-    },
     "resolve": {
       "version": "1.20.0",
       "resolved": "https://registry.npm.taobao.org/resolve/download/resolve-1.20.0.tgz?cache=0&sync_timestamp=1613055280179&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fresolve%2Fdownload%2Fresolve-1.20.0.tgz",
@@ -9664,11 +9480,6 @@
         "inherits": "^2.0.1"
       }
     },
-    "rope-sequence": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.2.tgz",
-      "integrity": "sha512-ku6MFrwEVSVmXLvy3dYph3LAMNS0890K7fabn+0YIRQ2T96T9F4gkFf0vf0WW0JUraNWwGRtInEpH7yO4tbQZg=="
-    },
     "run-async": {
       "version": "2.4.1",
       "resolved": "https://registry.npm.taobao.org/run-async/download/run-async-2.4.1.tgz",
@@ -10785,11 +10596,6 @@
         "neo-async": "^2.6.0"
       }
     },
-    "throttle-debounce": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
-      "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
-    },
     "through": {
       "version": "2.3.8",
       "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz",
@@ -10827,65 +10633,6 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
-    "tiptap": {
-      "version": "1.32.2",
-      "resolved": "https://registry.npmjs.org/tiptap/-/tiptap-1.32.2.tgz",
-      "integrity": "sha512-5IwVj8nGo8y5V3jbdtoEd7xNUsi8Q0N6WV2Nfs70olqz3fldXkiImBrDhZJ4Anx8vhyP6PIBttrg0prFVmwIvw==",
-      "requires": {
-        "prosemirror-commands": "^1.1.4",
-        "prosemirror-dropcursor": "^1.3.2",
-        "prosemirror-gapcursor": "^1.1.5",
-        "prosemirror-inputrules": "^1.1.3",
-        "prosemirror-keymap": "^1.1.4",
-        "prosemirror-model": "^1.13.1",
-        "prosemirror-state": "^1.3.3",
-        "prosemirror-view": "^1.16.5",
-        "tiptap-commands": "^1.17.1",
-        "tiptap-utils": "^1.13.1"
-      }
-    },
-    "tiptap-commands": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/tiptap-commands/-/tiptap-commands-1.17.1.tgz",
-      "integrity": "sha512-CyGvMD/c6fNer5LThWGtrVMXHAqHn93ivGQpqJ58x3HNZFuoIiF9QTWXAiWbY/4QrG0ANYHKCSe9n5afickTqw==",
-      "requires": {
-        "prosemirror-commands": "^1.1.4",
-        "prosemirror-inputrules": "^1.1.2",
-        "prosemirror-model": "^1.13.1",
-        "prosemirror-schema-list": "^1.1.4",
-        "prosemirror-state": "^1.3.3",
-        "prosemirror-tables": "^1.1.1",
-        "tiptap-utils": "^1.13.1"
-      }
-    },
-    "tiptap-extensions": {
-      "version": "1.35.2",
-      "resolved": "https://registry.npmjs.org/tiptap-extensions/-/tiptap-extensions-1.35.2.tgz",
-      "integrity": "sha512-TIMbHVJe0/3aVeTeCmqGbatDkfxduPYFOffNCmuKR+h6oQNzTu6rLVhRzoNqktfxIoi/b44SiDPorTjSN72dCw==",
-      "requires": {
-        "lowlight": "^1.17.0",
-        "prosemirror-collab": "^1.2.2",
-        "prosemirror-history": "^1.1.3",
-        "prosemirror-model": "^1.13.1",
-        "prosemirror-state": "^1.3.3",
-        "prosemirror-tables": "^1.1.1",
-        "prosemirror-transform": "^1.2.8",
-        "prosemirror-view": "^1.16.5",
-        "tiptap": "^1.32.2",
-        "tiptap-commands": "^1.17.1",
-        "tiptap-utils": "^1.13.1"
-      }
-    },
-    "tiptap-utils": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/tiptap-utils/-/tiptap-utils-1.13.1.tgz",
-      "integrity": "sha512-RoCvMfkdu7fp9u7nsRr1OgsYU8RFjoHKHEKpx075rJ9X0t+j5Vxah9n6QzTTr4yjvcavq22WO2flFacm36zYtA==",
-      "requires": {
-        "prosemirror-model": "^1.13.1",
-        "prosemirror-state": "^1.3.3",
-        "prosemirror-tables": "^1.1.1"
-      }
-    },
     "tmp": {
       "version": "0.0.33",
       "resolved": "https://registry.npm.taobao.org/tmp/download/tmp-0.0.33.tgz",
@@ -11380,19 +11127,6 @@
       "resolved": "https://registry.npm.taobao.org/vue/download/vue-2.6.12.tgz?cache=0&sync_timestamp=1614614488830&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue%2Fdownload%2Fvue-2.6.12.tgz",
       "integrity": "sha1-9evU+mvShpQD4pqJau1JBEVskSM="
     },
-    "vue-awesome": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/vue-awesome/-/vue-awesome-4.1.0.tgz",
-      "integrity": "sha512-4n+hg8KIMrwjXV6sRHcRZd18Somih5j4Yk2ZOv95pnvDpzbBkIYW4ktfivhqgNt50m0zDjmeEWiy1iVLtcccfw==",
-      "requires": {
-        "core-js": "^3.4.4"
-      }
-    },
-    "vue-class-component": {
-      "version": "7.2.6",
-      "resolved": "https://registry.npmjs.org/vue-class-component/-/vue-class-component-7.2.6.tgz",
-      "integrity": "sha512-+eaQXVrAm/LldalI272PpDe3+i4mPis0ORiMYxF6Ae4hyuCh15W8Idet7wPUEs4N4YptgFHGys4UrgNQOMyO6w=="
-    },
     "vue-eslint-parser": {
       "version": "7.6.0",
       "resolved": "https://registry.npm.taobao.org/vue-eslint-parser/download/vue-eslint-parser-7.6.0.tgz",
@@ -11446,12 +11180,13 @@
         }
       }
     },
-    "vue-property-decorator": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/vue-property-decorator/-/vue-property-decorator-8.5.1.tgz",
-      "integrity": "sha512-O6OUN2OMsYTGPvgFtXeBU3jPnX5ffQ9V4I1WfxFQ6dqz6cOUbR3Usou7kgFpfiXDvV7dJQSFcJ5yUPgOtPPm1Q==",
+    "vue-quill-editor": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/vue-quill-editor/-/vue-quill-editor-3.0.6.tgz",
+      "integrity": "sha512-g20oSZNWg8Hbu41Kinjd55e235qVWPLfg4NvsLW6d+DhgBTFbEuMpcWlUdrD6qT3+Noim6DRu18VLM9lVShXOQ==",
       "requires": {
-        "vue-class-component": "^7.1.0"
+        "object-assign": "^4.1.1",
+        "quill": "^1.3.4"
       }
     },
     "vue-router": {
@@ -11498,10 +11233,22 @@
       "resolved": "https://registry.npmjs.org/vuejs-datepicker/-/vuejs-datepicker-1.6.2.tgz",
       "integrity": "sha512-PkC4vxzFBo7i6FSCUAJfnaWOx6VkKbOqxijSGHHlWxh8FIUKEZVtFychkonVWtK3iwWfhmYtqHcwsmgxefLpLQ=="
     },
-    "w3c-keyname": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.4.tgz",
-      "integrity": "sha512-tOhfEwEzFLJzf6d1ZPkYfGj+FWhIpBux9ppoP3rlclw3Z0BZv3N7b7030Z1kYth+6rDuAsXUFr+d0VE6Ed1ikw=="
+    "wangeditor": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/wangeditor/-/wangeditor-4.7.1.tgz",
+      "integrity": "sha512-Q10pJ21Fa3v51D7icMM3t9jIZw34+TVVhM/VmbYd6NAy9Zt8uW3f6OxlEFXtrVXhYi/9d8p5YBczFdQw6W7T+w==",
+      "requires": {
+        "@babel/runtime": "^7.11.2",
+        "@babel/runtime-corejs3": "^7.11.2",
+        "tslib": "^2.1.0"
+      },
+      "dependencies": {
+        "tslib": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.2.0.tgz",
+          "integrity": "sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w=="
+        }
+      }
     },
     "watchpack": {
       "version": "1.7.5",

+ 3 - 3
package.json

@@ -12,12 +12,12 @@
     "axios": "^0.21.1",
     "babel-helper-vue-jsx-merge-props": "^2.0.3",
     "core-js": "^3.6.5",
-    "element-tiptap": "^1.26.2",
-    "element-ui": "^2.15.1",
     "qs": "^6.10.1",
     "vue": "^2.6.11",
+    "vue-quill-editor": "^3.0.6",
     "vue-router": "^3.2.0",
-    "vuejs-datepicker": "^1.6.2"
+    "vuejs-datepicker": "^1.6.2",
+    "wangeditor": "^4.7.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "~4.5.0",

+ 5 - 5
src/App.vue

@@ -135,7 +135,7 @@ export default {
     localTest(){
       // 本地调试打开
       this.loadingFlag = false;
-      this.isManufacturer = "distributor"; //  distributor
+      this.isManufacturer = "manufacturer"; //  distributor
       if (this.isManufacturer === "manufacturer") {
         if (this.$route.path === "/loading")
           this.$router.replace({ path: "/uploadInfor" });
@@ -159,9 +159,9 @@ export default {
     this.localTest();// 本地调试打开
   }, */
   created() {
-     this.loadingFlag = true;
-     this.getData(); // 线上打开
-     //this.localTest();// 本地调试打开
+     // this.loadingFlag = true;
+     // this.getData(); // 线上打开
+     this.localTest();// 本地调试打开
   },
 };
 </script>
@@ -179,7 +179,7 @@ button {
   height: 30px;
   width: 58px;
   color: #fff;
-  font-weight: 400px;
+  font-weight: 400;
   font-family: Arial;
   margin-left: 18px;
   font-size: 14px;

+ 85 - 84
src/components/TipModal.vue

@@ -1,84 +1,85 @@
-<template>
-  <div class="tip_modal" v-if="tipFlag" @mousewheel="mousewheel">
-    <div class="modal_content">
-      <div class="img"><img src="../img/crossMark.png" @click="closeModal"/></div>
-      <p>{{ tipText }}</p>
-      <div class="button">
-        <div class="current_button" @click="closeModal">确定</div>
-        <div class="current_button" @click="closeModal" v-if="btnFlag">取消</div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  props: {
-    tipFlag: {
-      type: Boolean,
-      default: false,
-    },
-    tipText: {
-      type: String,
-      default: "删除成功!!!",
-    },
-    btnFlag: {
-      type: Boolean,
-      default: false
-    }
-  },
-  methods: {
-    mousewheel: function (e) {
-      e.preventDefault();
-    },
-    closeModal: function() {
-        this.$emit('close_tip_modal');
-    }
-  },
-};
-</script>
-
-<style scoped lang="less">
-.tip_modal {
-  position: fixed;
-  left: 0;
-  top: 0;
-  height: 100vh;
-  width: 100vw;
-  background-color: rgba(127, 127, 127, 0.7);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  .modal_content {
-    width: 400px;
-    height: 200px;
-    background-color: #fff;
-    transform: translateY(-150px);
-    .img {
-      background-color: #0056a0;
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-      height: 40px;
-      padding-right: 15px;
-      img {
-        width: 30px;
-        height: 30px;
-        &:hover {
-          cursor: pointer;
-        }
-      }
-    }
-    p {
-      font-size: 16px;
-      margin-left: 50px;
-      margin-top: 30px;
-    }
-    .button {
-      margin-top: 50px;
-      display: flex;
-      justify-content: center;
-    }
-  }
-}
-</style>
+<template>
+  <div class="tip_modal" v-if="tipFlag" @mousewheel="mousewheel">
+    <div class="modal_content">
+      <div class="img"><img src="../img/crossMark.png" @click="closeModal"/></div>
+      <p>{{ tipText }}</p>
+      <div class="button">
+        <div class="current_button" @click="closeModal">确定</div>
+        <div class="current_button" @click="closeModal" v-if="btnFlag">取消</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    tipFlag: {
+      type: Boolean,
+      default: false,
+    },
+    tipText: {
+      type: String,
+      default: "删除成功!!!",
+    },
+    btnFlag: {
+      type: Boolean,
+      default: false
+    }
+  },
+  methods: {
+    mousewheel: function (e) {
+      e.preventDefault();
+    },
+    closeModal: function() {
+        this.$emit('close_tip_modal');
+    }
+  },
+};
+</script>
+
+<style scoped lang="less">
+.tip_modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  height: 100vh;
+  width: 100vw;
+  background-color: rgba(127, 127, 127, 0.7);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 99999;
+  .modal_content {
+    width: 400px;
+    height: 200px;
+    background-color: #fff;
+    transform: translateY(-150px);
+    .img {
+      background-color: #0056a0;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      height: 40px;
+      padding-right: 15px;
+      img {
+        width: 30px;
+        height: 30px;
+        &:hover {
+          cursor: pointer;
+        }
+      }
+    }
+    p {
+      font-size: 16px;
+      margin-left: 50px;
+      margin-top: 30px;
+    }
+    .button {
+      margin-top: 50px;
+      display: flex;
+      justify-content: center;
+    }
+  }
+}
+</style>

+ 86 - 0
src/components/wangEditor.vue

@@ -0,0 +1,86 @@
+<template>
+    <div>
+        <div ref="editor"></div>
+    </div>
+</template>
+
+<script>
+    import E from 'wangeditor';
+    import { php_url } from "../config/env";
+    let editor;
+    export default {
+        name: 'editor',
+        data() {
+            return {
+                unifiedUrl: "/lexus_php/api/"
+            };
+        },
+        props: ['content'],
+        watch:{
+            'content':function (n) {
+                editor.txt.html(n);
+            }
+        },
+        mounted() {
+            editor = new E(this.$refs.editor);
+            editor.config.menus = [
+                'bold', // 粗体
+                'fontSize', // 字号
+                'fontName', // 字体
+                'italic', // 斜体
+                'underline', // 下划线
+                'strikeThrough', // 删除线
+                'foreColor', // 文字颜色
+                'link', // 插入链接
+                'list', // 列表
+                'justify', // 对齐方式
+                'quote', // 引用
+                'image', // 插入图片
+                'location', // 位置
+            ];
+            editor.config.onchange = html => {
+                this.$emit('input', html);
+            };
+            editor.config.uploadImgServer = php_url + this.unifiedUrl + 'upload.php';
+            editor.config.uploadImgMaxSize = 10 * 1024 * 1024; // 将图片大小限制为 10M
+            editor.config.uploadFileName = 'file'; //后端接受上传文件的参数名
+            editor.config.uploadImgMaxLength = 1; // 限制一次最多上传 1 张图片
+            editor.config.showLinkImg = false; //隐藏网络图片上传
+            editor.config.uploadImgHooks = {
+                fail: (xhr, editor, result) => {
+                    // 插入图片失败回调
+                    console.log(result);
+                },
+                success: (xhr, editor, result) => {
+                    // 图片上传成功回调
+                    console.log(result);
+                },
+                timeout: (xhr, editor) => {
+                    // 网络超时的回调
+                    console.log(xhr, editor);
+                    console.log('网络超时');
+                },
+                error: (xhr, editor) => {
+                    // 图片上传错误的回调
+                    console.log(xhr, editor);
+                    console.log('上传错误');
+                },
+                //回显
+                customInsert: (insertImg, result) => {
+                    let url = php_url + result.full_url
+                    insertImg(url);
+                },
+            };
+            editor.create();
+        },
+    };
+</script>
+
+<style scoped>
+    /*.w-e-tooltip {*/
+        /*background: #fff!important;*/
+    /*}*/
+     /*a {*/
+        /*color: cornflowerblue!important;*/
+    /*}*/
+</style>

+ 0 - 15
src/main.js

@@ -2,21 +2,6 @@ import Vue from 'vue'
 import App from './App.vue'
 import router from './router'
 import axiosApi from './request/api'
-
-
-import ElementUI from 'element-ui';
-import { ElementTiptapPlugin } from 'element-tiptap';
-// import ElementUI's styles
-import 'element-ui/lib/theme-chalk/index.css';
-// import this package's styles
-import 'element-tiptap/lib/index.css';
-
-// use ElementUI's plugin
-Vue.use(ElementUI);
-// use this package's plugin
-Vue.use(ElementTiptapPlugin, { lang:'zh' });
-// Now you register `'el-tiptap'` component globally.
-
 Vue.config.productionTip = false
 Vue.prototype.$http = axiosApi
 new Vue({

+ 1 - 1
src/views/notification/changShang.vue

@@ -21,7 +21,7 @@
               <tr
                 v-for="(obj, index) in tableData"
                 :key="index"
-                :class="{ table_gray: !discolor && index % 2 === 0 }"
+                :class="{ table_gray: !discolor && index % 2 === 1 }"
               >
                 <td class="titleStyle" @click="goDetailPage(obj)">{{ obj.title || "-" }}</td>
                 <td>重要通知</td>

+ 7 - 100
src/views/notification/editPage/editPage.vue

@@ -35,14 +35,7 @@
       <div class="Line Line4">
         <span>信息配置:</span>
         <div class="fuWenBen">
-          <el-tiptap
-            v-model="contentParam.content"
-            :extensions="extensions"
-            :charCounterCount="false"
-            placeholder="请编辑文本内容 ..."
-          >
-            <!--charCounterCount 是否显示字数统计 -->
-          </el-tiptap>
+          <editor-bar v-model="contentParam.content" :content="this.contentParam.content"></editor-bar>
         </div>
         <div style="clear: both; display: block"></div>
       </div>
@@ -75,109 +68,24 @@
 </template>
 
 <script>
-import {
-  // necessary extensions
-  Doc,
-  Paragraph,
-  Text,
-  Heading,
-  History,
-  Code,
-  CodeBlock,
-  Blockquote,
-  BulletList,
-  OrderedList,
-  ListItem,
-  TodoList,
-  TodoItem,
-  //Iframe,
-  Table,
-  TableHeader,
-  TableRow,
-  TableCell,
-  TextAlign,
-  LineHeight,
-  Indent,
-  HorizontalRule,
-  HardBreak,
-  TrailingNode,
-  TextColor,
-  TextHighlight,
-  FormatClear,
-  FontType,
-  FontSize,
-  // Preview,
-  //Print,
-  // SelectAll,
-  Bold,
-  //Underline,
-  Italic,
-  Strike,
-  Link,
-  Image,
-  Fullscreen,
-  // CodeView,
-} from "element-tiptap";
 import TipModal from "../../../components/TipModal";
 import Loading from "../../data/components/UploadLoading";
-import helpButton from "../custom_extensions/helpButton/index";
-import CodeView from "../custom_extensions/CodeView/index";
+import EditorBar from '../../../components/wangEditor'
+// import helpButton from "../custom_extensions/helpButton/index";
 import { php_url } from "../../../config/env";
 import axiosPhp from "axios";
 export default {
-  components: { TipModal, Loading },
+  components: { TipModal, Loading ,EditorBar},
+  name: 'tinymce',
   data() {
     return {
       tipFlag: false,
+      isClear: false,
       tipText: "",
       noticeTitle: "",
       InfoType: "",
       title: this.$route.query.title,
-      areaList: ["全区", "北区", "南区", "东区"], // 按区域添加
-      extensions: [
-        // new Preview(),
-        // new Print(),
-        // new SelectAll(),
-        new Bold({ bubble: false }), // render command-button in bubble menu.
-        new Italic(),
-        new Strike(),
-        new Link(),
-        new Image(),
-        new Fullscreen(),
-        new CodeView(), //源码
-        new Doc(),
-        new Text(),
-        new Paragraph(),
-        new Doc(),
-        new Text(),
-        new Paragraph(),
-        new Heading({ level: 5 }),
-        new Code(),
-        new Blockquote(),
-        new BulletList(),
-        new OrderedList(),
-        new ListItem(),
-        new CodeBlock(),
-        new TodoList(),
-        new TodoItem(),
-        new Table(),
-        new TableHeader(),
-        new TableRow(),
-        new TableCell(),
-        new TextAlign(),
-        new LineHeight(),
-        new Indent(),
-        new HorizontalRule(),
-        new HardBreak(),
-        new TrailingNode(),
-        new TextColor(),
-        new TextHighlight(),
-        new FormatClear(),
-        new FontType(),
-        new FontSize(),
-        new History(),
-        new helpButton({ bubble: false }),
-      ],
+      areaList: ["全区", "北区", "南区", "东区", "华东", "西南"],
       content: "",
       unifiedUrl: "/lexus_php/api/",
       fileDes: [], // 上传的文件名,
@@ -357,7 +265,6 @@ export default {
     },
   },
   mounted() {
-    console.log(this.contentParam,'child')
     this.getDataList();
     this.contentParam = this.$route.query;
     this.noticeId = this.contentParam.id;

+ 23 - 11
src/views/notification/jingXiaoshang.vue

@@ -21,12 +21,14 @@
           @click="toDetail(obj.id)"
         >
           <div class="lineItem1">
-            <span class="dotStyle"></span>
-            <div ><span>·</span>[重要通知]</div>
+            <div class="notice-style-box">
+              <div class="dotted-style"></div>
+              [ 重要通知 ]
+            </div>
           </div>
-          <div>{{ obj.title || "-" }}</div>
+          <div class="lineItem1">{{ obj.title || "-" }}</div>
           <!--<div v-html="obj.content"></div>-->
-          <div>{{ (obj.update_time || obj.addtime || '').slice(0, -8) }}</div>
+          <div class="lineItem1">{{ (obj.update_time || obj.addtime || '').slice(0, -8) }}</div>
         </div>
       </div>
     </div>
@@ -104,7 +106,19 @@ export default {
   display: flex;
   justify-content: center;
   align-items: center;
+  margin-right: 10px;
 }
+ .notice-style-box {
+   display: flex;
+   align-items: center;
+  }
+  .dotted-style {
+    width: 5px;
+    height: 5px;
+    background: #000;
+    border-radius: 50%;
+    margin-right: 5px;
+  }
 .noticeContent {
   position: relative;
   top: 30px;
@@ -113,14 +127,12 @@ export default {
 .itemBox {
   display: flex;
   cursor: pointer;
+  width: 100%;
+  height: 30px;
 }
-.itemBox div {
-  margin: 8px 6px 4px 4px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding-bottom: 3px;
-}
+ .itemBox:first-child {
+   margin-top: 15px;
+ }
 .topTab {
   height: 30px;
   background-color: rgba(102, 102, 102, 1);