asd123a20 2 anos atrás
pai
commit
37cbb5ba0c

Diferenças do arquivo suprimidas por serem muito extensas
+ 10 - 825
admin-content/package-lock.json


+ 0 - 1
admin-content/package.json

@@ -8,7 +8,6 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@wangeditor/editor": "^5.1.14",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.6",
     "sass": "^1.48.0",

+ 3 - 3
admin-content/src/store/index.js

@@ -23,9 +23,9 @@ const state = () => ({
 });
 
 const actions = {
-  async search ({ commit }, { search }) {
-    const res = await $axios.get(api.search, { search });
-    commit('contentsQuery', { ...res, total: res.data.length });
+  async search ({ commit }, { search, paging }) {
+    const res = await $axios.get(api.search, { search, skip: paging.page, limit: paging.size });
+    commit('contentsQuery', res);
     return res;
   },
   async sourceQuery ({ commit }) {

+ 2 - 4
admin-content/src/views/home.vue

@@ -194,7 +194,6 @@ export default {
     },
     // 作者选择建议
     handleAuthorSelect(e) {
-      console.log(e);
       this.handleAuthor = true;
     },
     // 添加
@@ -221,12 +220,11 @@ export default {
     },
     // 查询
     async filterQuery ({ filter = {}, paging = { page: 0, size: 10 } } = {}) {
-      console.log(filter);
+      this.page = paging.page;
       if (filter.search) {
-        await this.search({ ...filter });
+        await this.search({ ...filter, paging });
         return;
       }
-      this.page = paging.page;
       if (this.types !== null) filter.bind = this.types;
       await this.contentsQuery({ filter, paging });
     },

+ 1 - 1
admin-frame/.env

@@ -5,7 +5,7 @@ VUE_APP_TABS_CARD=border-card
 # 设置头部使用高的还是矮的 (max, min )
 VUE_APP_HEADER=min
 # 首页标题
-VUE_APP_HOME_TITLE=社会科学联合会信息管理系统
+VUE_APP_HOME_TITLE=社会科学联合会信息管理系统
 # 首页描述
 VUE_APP_HOME_DESCRIDE=基于内容管理、系统管理、等功能的优秀网站管理系统。
 # 窗口使用弹出还是抽屉 (dialog And drawer)

+ 117 - 117
admin-frame/package-lock.json

@@ -8,7 +8,7 @@
       "name": "admin-frame",
       "version": "0.1.0",
       "dependencies": {
-        "@wangeditor/editor": "^5.1.14",
+        "@wangeditor/editor": "^5.1.23",
         "axios": "^0.24.0",
         "core-js": "^3.6.5",
         "element-ui": "^2.15.6",
@@ -2068,13 +2068,13 @@
       }
     },
     "node_modules/@uppy/core": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.3.tgz",
-      "integrity": "sha512-oTFYZT02dIoUGm8Ar6+Tg/xbL8MliwiPQdiuoCimPBmY19ZhuJm/K4wEYZ6nOFeYsgBWYi1yWfsmdx8LvFVx4g==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz",
+      "integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==",
       "dependencies": {
         "@transloadit/prettier-bytes": "0.0.7",
         "@uppy/store-default": "^2.1.1",
-        "@uppy/utils": "^4.1.2",
+        "@uppy/utils": "^4.1.3",
         "lodash.throttle": "^4.1.1",
         "mime-match": "^1.0.2",
         "namespace-emitter": "^2.0.1",
@@ -2088,9 +2088,9 @@
       "integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ=="
     },
     "node_modules/@uppy/utils": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.2.tgz",
-      "integrity": "sha512-rl9aKRE4o2mRKVAhYHHf8uV7BoUOQkvDH6yOaJ4tuHJ6HgPkvxVxqUY8L+yKV1hx4mw6OF9hLIzpW/+TLSfyfQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz",
+      "integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==",
       "dependencies": {
         "lodash.throttle": "^4.1.1"
       }
@@ -2626,9 +2626,9 @@
       "dev": true
     },
     "node_modules/@wangeditor/basic-modules": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.3.tgz",
-      "integrity": "sha512-TGJix4UelO46yAgwI946ctx4lSIJbYBwNvjSJ9Tf8mKr0WMCeLVBV+MV85rXPsfcmWtR4wBNwSg648Z+RbqRUg==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
+      "integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==",
       "dependencies": {
         "is-url": "^1.2.4"
       },
@@ -2642,9 +2642,9 @@
       }
     },
     "node_modules/@wangeditor/code-highlight": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.2.tgz",
-      "integrity": "sha512-SCtOcUxjKqIso/LSxGSOaYr3G6MC2En0gNTyHIMCG928T0fo0ufaqp/vIXKQzVL2Y+X/CSAOB2EbrFlgGvr0AQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz",
+      "integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==",
       "dependencies": {
         "prismjs": "^1.23.0"
       },
@@ -2656,9 +2656,9 @@
       }
     },
     "node_modules/@wangeditor/core": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.11.tgz",
-      "integrity": "sha512-BwHVRJzESnkjKikTc2U2zsbd06l1pSo7qKy5+SpZLudYWrFxmd85VN+5GxM57FodogkNw/k04DFHcFSUfXcaKA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz",
+      "integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==",
       "dependencies": {
         "@types/event-emitter": "^0.3.3",
         "event-emitter": "^0.3.5",
@@ -2685,19 +2685,19 @@
       }
     },
     "node_modules/@wangeditor/editor": {
-      "version": "5.1.14",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.14.tgz",
-      "integrity": "sha512-erILPAkpKldyGi4cEwrOW65v12GhZy2qj2A8kPlypU46lE72Y3XowZxWogN1TI/mqMDR84AHr0QWOvygOV1xwQ==",
+      "version": "5.1.23",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
+      "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
       "dependencies": {
         "@uppy/core": "^2.1.1",
         "@uppy/xhr-upload": "^2.0.3",
-        "@wangeditor/basic-modules": "^1.1.3",
-        "@wangeditor/code-highlight": "^1.0.2",
-        "@wangeditor/core": "^1.1.11",
-        "@wangeditor/list-module": "^1.0.2",
-        "@wangeditor/table-module": "^1.1.1",
-        "@wangeditor/upload-image-module": "^1.0.1",
-        "@wangeditor/video-module": "^1.1.1",
+        "@wangeditor/basic-modules": "^1.1.7",
+        "@wangeditor/code-highlight": "^1.0.3",
+        "@wangeditor/core": "^1.1.19",
+        "@wangeditor/list-module": "^1.0.5",
+        "@wangeditor/table-module": "^1.1.4",
+        "@wangeditor/upload-image-module": "^1.0.2",
+        "@wangeditor/video-module": "^1.1.4",
         "dom7": "^3.0.0",
         "is-hotkey": "^0.2.0",
         "lodash.camelcase": "^4.3.0",
@@ -2713,9 +2713,9 @@
       }
     },
     "node_modules/@wangeditor/list-module": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz",
-      "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz",
+      "integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==",
       "peerDependencies": {
         "@wangeditor/core": "1.x",
         "dom7": "^3.0.0",
@@ -2724,9 +2724,9 @@
       }
     },
     "node_modules/@wangeditor/table-module": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz",
-      "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz",
+      "integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==",
       "peerDependencies": {
         "@wangeditor/core": "1.x",
         "dom7": "^3.0.0",
@@ -2738,9 +2738,9 @@
       }
     },
     "node_modules/@wangeditor/upload-image-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz",
-      "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz",
+      "integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==",
       "peerDependencies": {
         "@uppy/core": "^2.0.3",
         "@uppy/xhr-upload": "^2.0.3",
@@ -2753,9 +2753,9 @@
       }
     },
     "node_modules/@wangeditor/video-module": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz",
-      "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz",
+      "integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==",
       "peerDependencies": {
         "@uppy/core": "^2.1.4",
         "@uppy/xhr-upload": "^2.0.7",
@@ -4711,9 +4711,9 @@
       "dev": true
     },
     "node_modules/compute-scroll-into-view": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
-      "integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg=="
+      "version": "1.0.20",
+      "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
+      "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
@@ -7174,11 +7174,11 @@
       }
     },
     "node_modules/ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmmirror.com/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
       "dependencies": {
-        "type": "^2.5.0"
+        "type": "^2.7.2"
       }
     },
     "node_modules/ext/node_modules/type": {
@@ -8488,9 +8488,9 @@
       }
     },
     "node_modules/immer": {
-      "version": "9.0.15",
-      "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.15.tgz",
-      "integrity": "sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ=="
+      "version": "9.0.19",
+      "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.19.tgz",
+      "integrity": "sha512-eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ=="
     },
     "node_modules/immutable": {
       "version": "4.0.0",
@@ -11767,9 +11767,9 @@
       }
     },
     "node_modules/preact": {
-      "version": "10.10.6",
-      "resolved": "https://registry.npmmirror.com/preact/-/preact-10.10.6.tgz",
-      "integrity": "sha512-w0mCL5vICUAZrh1DuHEdOWBjxdO62lvcO++jbzr8UhhYcTbFkpegLH9XX+7MadjTl/y0feoqwQ/zAnzkc/EGog=="
+      "version": "10.13.1",
+      "resolved": "https://registry.npmmirror.com/preact/-/preact-10.13.1.tgz",
+      "integrity": "sha512-KyoXVDU5OqTpG9LXlB3+y639JAGzl8JSBXLn1J9HTSB3gbKcuInga7bZnXLlxmK94ntTs1EFeZp0lrja2AuBYQ=="
     },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
@@ -11813,9 +11813,9 @@
       }
     },
     "node_modules/prismjs": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.28.0.tgz",
-      "integrity": "sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw==",
+      "version": "1.29.0",
+      "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz",
+      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==",
       "engines": {
         "node": ">=6"
       }
@@ -12672,11 +12672,11 @@
       }
     },
     "node_modules/scroll-into-view-if-needed": {
-      "version": "2.2.29",
-      "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz",
-      "integrity": "sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==",
+      "version": "2.2.31",
+      "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
+      "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
       "dependencies": {
-        "compute-scroll-into-view": "^1.0.17"
+        "compute-scroll-into-view": "^1.0.20"
       }
     },
     "node_modules/select-hose": {
@@ -17505,13 +17505,13 @@
       }
     },
     "@uppy/core": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.3.tgz",
-      "integrity": "sha512-oTFYZT02dIoUGm8Ar6+Tg/xbL8MliwiPQdiuoCimPBmY19ZhuJm/K4wEYZ6nOFeYsgBWYi1yWfsmdx8LvFVx4g==",
+      "version": "2.3.4",
+      "resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz",
+      "integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==",
       "requires": {
         "@transloadit/prettier-bytes": "0.0.7",
         "@uppy/store-default": "^2.1.1",
-        "@uppy/utils": "^4.1.2",
+        "@uppy/utils": "^4.1.3",
         "lodash.throttle": "^4.1.1",
         "mime-match": "^1.0.2",
         "namespace-emitter": "^2.0.1",
@@ -17525,9 +17525,9 @@
       "integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ=="
     },
     "@uppy/utils": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.2.tgz",
-      "integrity": "sha512-rl9aKRE4o2mRKVAhYHHf8uV7BoUOQkvDH6yOaJ4tuHJ6HgPkvxVxqUY8L+yKV1hx4mw6OF9hLIzpW/+TLSfyfQ==",
+      "version": "4.1.3",
+      "resolved": "https://registry.npmmirror.com/@uppy/utils/-/utils-4.1.3.tgz",
+      "integrity": "sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==",
       "requires": {
         "lodash.throttle": "^4.1.1"
       }
@@ -17940,25 +17940,25 @@
       "dev": true
     },
     "@wangeditor/basic-modules": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.3.tgz",
-      "integrity": "sha512-TGJix4UelO46yAgwI946ctx4lSIJbYBwNvjSJ9Tf8mKr0WMCeLVBV+MV85rXPsfcmWtR4wBNwSg648Z+RbqRUg==",
+      "version": "1.1.7",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
+      "integrity": "sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==",
       "requires": {
         "is-url": "^1.2.4"
       }
     },
     "@wangeditor/code-highlight": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.2.tgz",
-      "integrity": "sha512-SCtOcUxjKqIso/LSxGSOaYr3G6MC2En0gNTyHIMCG928T0fo0ufaqp/vIXKQzVL2Y+X/CSAOB2EbrFlgGvr0AQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz",
+      "integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==",
       "requires": {
         "prismjs": "^1.23.0"
       }
     },
     "@wangeditor/core": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.11.tgz",
-      "integrity": "sha512-BwHVRJzESnkjKikTc2U2zsbd06l1pSo7qKy5+SpZLudYWrFxmd85VN+5GxM57FodogkNw/k04DFHcFSUfXcaKA==",
+      "version": "1.1.19",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/core/-/core-1.1.19.tgz",
+      "integrity": "sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==",
       "requires": {
         "@types/event-emitter": "^0.3.3",
         "event-emitter": "^0.3.5",
@@ -17969,19 +17969,19 @@
       }
     },
     "@wangeditor/editor": {
-      "version": "5.1.14",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.14.tgz",
-      "integrity": "sha512-erILPAkpKldyGi4cEwrOW65v12GhZy2qj2A8kPlypU46lE72Y3XowZxWogN1TI/mqMDR84AHr0QWOvygOV1xwQ==",
+      "version": "5.1.23",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/editor/-/editor-5.1.23.tgz",
+      "integrity": "sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==",
       "requires": {
         "@uppy/core": "^2.1.1",
         "@uppy/xhr-upload": "^2.0.3",
-        "@wangeditor/basic-modules": "^1.1.3",
-        "@wangeditor/code-highlight": "^1.0.2",
-        "@wangeditor/core": "^1.1.11",
-        "@wangeditor/list-module": "^1.0.2",
-        "@wangeditor/table-module": "^1.1.1",
-        "@wangeditor/upload-image-module": "^1.0.1",
-        "@wangeditor/video-module": "^1.1.1",
+        "@wangeditor/basic-modules": "^1.1.7",
+        "@wangeditor/code-highlight": "^1.0.3",
+        "@wangeditor/core": "^1.1.19",
+        "@wangeditor/list-module": "^1.0.5",
+        "@wangeditor/table-module": "^1.1.4",
+        "@wangeditor/upload-image-module": "^1.0.2",
+        "@wangeditor/video-module": "^1.1.4",
         "dom7": "^3.0.0",
         "is-hotkey": "^0.2.0",
         "lodash.camelcase": "^4.3.0",
@@ -17997,27 +17997,27 @@
       }
     },
     "@wangeditor/list-module": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.2.tgz",
-      "integrity": "sha512-VfENZEFvsLTiLxN/cj8cibFGy9NVV+/cfATTiLiH9ef+8lgKv8apttXYVlqIAfnlJLLuCk0cIm8c/zH+hbtrZg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz",
+      "integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==",
       "requires": {}
     },
     "@wangeditor/table-module": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.1.tgz",
-      "integrity": "sha512-VPjEWQtncS2DsXYXiHUxPSxn2Xhc8GdhG3la7N5YhvxQde1+4N0SZLXeWsYvbGzOq4um5XToq5pktLLbE8G+EA==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz",
+      "integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==",
       "requires": {}
     },
     "@wangeditor/upload-image-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.1.tgz",
-      "integrity": "sha512-vgUV4ENttTITblqtVuzleIq732OmzmzzgrIvX6b3GRGPSw5u8glJ/87tOEhvHjHECc4oFo18B7xzJ1GpBj79/w==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz",
+      "integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==",
       "requires": {}
     },
     "@wangeditor/video-module": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.1.tgz",
-      "integrity": "sha512-6gzpS5cnJihW2T0HFjqmbv6v8ouyaeMUjdM2X8BPohwD74p1ov00dCmRt5QekNTyYSmRHK0ASkUMOvRGqaDxMg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz",
+      "integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==",
       "requires": {}
     },
     "@webassemblyjs/ast": {
@@ -19703,9 +19703,9 @@
       }
     },
     "compute-scroll-into-view": {
-      "version": "1.0.17",
-      "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.17.tgz",
-      "integrity": "sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg=="
+      "version": "1.0.20",
+      "resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
+      "integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
     },
     "concat-map": {
       "version": "0.0.1",
@@ -21742,11 +21742,11 @@
       }
     },
     "ext": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmmirror.com/ext/-/ext-1.6.0.tgz",
-      "integrity": "sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
+      "integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
       "requires": {
-        "type": "^2.5.0"
+        "type": "^2.7.2"
       },
       "dependencies": {
         "type": {
@@ -22837,9 +22837,9 @@
       "dev": true
     },
     "immer": {
-      "version": "9.0.15",
-      "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.15.tgz",
-      "integrity": "sha512-2eB/sswms9AEUSkOm4SbV5Y7Vmt/bKRwByd52jfLkW4OLYeaTP3EEiJ9agqU0O/tq6Dk62Zfj+TJSqfm1rLVGQ=="
+      "version": "9.0.19",
+      "resolved": "https://registry.npmmirror.com/immer/-/immer-9.0.19.tgz",
+      "integrity": "sha512-eY+Y0qcsB4TZKwgQzLaE/lqYMlKhv5J9dyd2RhhtGhNo2njPXDqU9XPfcNfa3MIDsdtZt5KlkIsirlo4dHsWdQ=="
     },
     "immutable": {
       "version": "4.0.0",
@@ -25584,9 +25584,9 @@
       "dev": true
     },
     "preact": {
-      "version": "10.10.6",
-      "resolved": "https://registry.npmmirror.com/preact/-/preact-10.10.6.tgz",
-      "integrity": "sha512-w0mCL5vICUAZrh1DuHEdOWBjxdO62lvcO++jbzr8UhhYcTbFkpegLH9XX+7MadjTl/y0feoqwQ/zAnzkc/EGog=="
+      "version": "10.13.1",
+      "resolved": "https://registry.npmmirror.com/preact/-/preact-10.13.1.tgz",
+      "integrity": "sha512-KyoXVDU5OqTpG9LXlB3+y639JAGzl8JSBXLn1J9HTSB3gbKcuInga7bZnXLlxmK94ntTs1EFeZp0lrja2AuBYQ=="
     },
     "prelude-ls": {
       "version": "1.1.2",
@@ -25618,9 +25618,9 @@
       }
     },
     "prismjs": {
-      "version": "1.28.0",
-      "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.28.0.tgz",
-      "integrity": "sha512-8aaXdYvl1F7iC7Xm1spqSaY/OJBpYW3v+KJ+F17iYxvdc8sfjW194COK5wVhMZX45tGteiBQgdvD/nhxcRwylw=="
+      "version": "1.29.0",
+      "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz",
+      "integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="
     },
     "process": {
       "version": "0.11.10",
@@ -26329,11 +26329,11 @@
       }
     },
     "scroll-into-view-if-needed": {
-      "version": "2.2.29",
-      "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.29.tgz",
-      "integrity": "sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==",
+      "version": "2.2.31",
+      "resolved": "https://registry.npmmirror.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
+      "integrity": "sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==",
       "requires": {
-        "compute-scroll-into-view": "^1.0.17"
+        "compute-scroll-into-view": "^1.0.20"
       }
     },
     "select-hose": {

+ 1 - 1
admin-frame/package.json

@@ -8,7 +8,7 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@wangeditor/editor": "^5.1.14",
+    "@wangeditor/editor": "^5.1.23",
     "axios": "^0.24.0",
     "core-js": "^3.6.5",
     "element-ui": "^2.15.6",

+ 1 - 1
admin-frame/public/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>吉林省社会科学联合会-后台管理系统</title>
+    <title>吉林省社会科学联合会-后台管理系统</title>
   </head>
   <body>
     <noscript>

+ 4 - 7
admin-frame/src/components/editoritem2.vue

@@ -51,12 +51,9 @@ export default {
               const nodeList = [];
               text.split(/\n/).map(line => {
                 line = line.replace(/\r/, '');
-                line = line.replace(/(\s{2})/, (all, $1) => {
-                  if ($1.charAt(0) == '\n' || $1.charAt(0) == '\r' || $1.charAt(0) == '\x20') return all;
-                  return all.replace($1, Array($1.length).fill('').join(''));
-                });
-                // nodeList.push({ type: 'paragraph', children: [{ text: line }] });
-                nodeList.push({ type: 'paragraph', indent: '2em', children: [{ text: line }] });
+                line = line.replace(/\n/, '');
+                line = line.replace(/ {2}/gm, '\u3000');
+                nodeList.push({ type: 'paragraph', children: [{ text: line }] });
               }).join('\n');
               SlateTransforms.insertNodes(editor, nodeList);
               event.preventDefault();
@@ -92,7 +89,7 @@ export default {
       //   index: 0,
       //   keys: ['menu1']
       // };
-      editor.setHtml((this.value));
+      editor.setHtml(this.value);
     }
   },
   beforeDestroy() {

+ 2 - 2
admin-frame/vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
     port: 3000,
     proxy: {
       '/api/': {
-        target: 'http://skl.cc-lotus.info'
-        // target: 'http://127.0.0.1:18090'
+        // target: 'http://skl.cc-lotus.info'
+        target: 'http://127.0.0.1:18090'
       },
       '/upload/': {
         // target: 'http://127.0.0.1:9002'