chore: upgrade dependencies. (halo-dev/console#284)

* chore: upgrade dependencies. * chore: upgrade dependencies.
2021-01-24 12:55:24 +08:00 · 2021-01-24 12:55:24 +08:00 · de929aa990
parent 84145d26db
commit de929aa990
7 changed files with 94 additions and 128 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -2462,6 +2462,18 @@
            "supports-color": "^7.0.0"
          }
        },
+        "loader-utils": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
+          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^2.1.2"
+          }
+        },
        "locate-path": {
          "version": "5.0.0",
          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
@ -2591,6 +2603,31 @@
            "webpack-sources": "^1.4.3"
          }
        },
+        "vue-loader-v16": {
+          "version": "npm:vue-loader@16.1.2",
+          "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
+          "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "^4.1.0",
+            "hash-sum": "^2.0.0",
+            "loader-utils": "^2.0.0"
+          },
+          "dependencies": {
+            "chalk": {
+              "version": "4.1.0",
+              "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+              "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+              "dev": true,
+              "optional": true,
+              "requires": {
+                "ansi-styles": "^4.1.0",
+                "supports-color": "^7.1.0"
+              }
+            }
+          }
+        },
        "wrap-ansi": {
          "version": "6.2.0",
          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
@ -6054,9 +6091,9 @@
      }
    },
    "dayjs": {
-      "version": "1.8.36",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz",
-      "integrity": "sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="
+      "version": "1.10.4",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.10.4.tgz",
+      "integrity": "sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw=="
    },
    "de-indent": {
      "version": "1.0.2",
@ -7803,9 +7840,9 @@
      "dev": true
    },
    "filepond": {
-      "version": "4.20.1",
-      "resolved": "https://registry.npmjs.org/filepond/-/filepond-4.20.1.tgz",
-      "integrity": "sha512-qYwE/xSODJuAJH0E2BHeD8f3X66nxZ/aUQSaGhUTVXuAWe0wvIjxaRcMZUIsZm2f7truScxAe16l5ITzxi5TFw=="
+      "version": "4.25.1",
+      "resolved": "https://registry.npmjs.org/filepond/-/filepond-4.25.1.tgz",
+      "integrity": "sha512-8UPPTzfpHZRUtJl3dEcGMLYOygg8taJZpYTv1WaEkvzeI+X0JX9+agMJ+5Lu1EKtdt9dGq/9Gud+EnNRBaGl1A=="
    },
    "filepond-plugin-image-preview": {
      "version": "4.6.4",
@ -11297,9 +11334,9 @@
      }
    },
    "marked": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz",
-      "integrity": "sha512-mJzT8D2yPxoPh7h0UXkB+dBj4FykPJ2OIfxAWeIHrvoHDkFxukV/29QxoFQoPM6RLEwhIFdJpmKBlqVM3s2ZIw=="
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-1.2.7.tgz",
+      "integrity": "sha512-No11hFYcXr/zkBvL6qFmAp1z6BKY3zqLMHny/JN/ey+al7qwCM2+CMBL9BOgqMxZU36fz4cCWfn2poWIf7QRXA=="
    },
    "md5.js": {
      "version": "1.3.5",
@ -14596,9 +14633,9 @@
      }
    },
    "sortablejs": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npm.taobao.org/sortablejs/download/sortablejs-1.12.0.tgz?cache=0&sync_timestamp=1601884638047&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsortablejs%2Fdownload%2Fsortablejs-1.12.0.tgz",
-      "integrity": "sha1-7m1+zjWYwq8P6xVZ2YWV5eo3y9Y="
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.10.2.tgz",
+      "integrity": "sha512-YkPGufevysvfwn5rfdlGyrGjt7/CRHwvRPogD/lC+TnvcN29jDpCifKP+rBqf+LRldfXSTh+0CGLcSg0VIxq3A=="
    },
    "source-list-map": {
      "version": "2.0.1",
@ -15424,9 +15461,9 @@
      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
    },
    "tiny-pinyin": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/tiny-pinyin/-/tiny-pinyin-1.3.0.tgz",
-      "integrity": "sha512-YHsqn1zksQ4CKVvArN7MIUtGx0eV/yl15vzdiwNFwAnOQQwL1+pNSLW4ISVWUN+PrzcnX4ojLgS4kgVCmue7Pw=="
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/tiny-pinyin/-/tiny-pinyin-1.3.2.tgz",
+      "integrity": "sha512-uHNGu4evFt/8eNLldazeAM1M8JrMc1jshhJJfVRARTN3yT8HEEibofeQ7QETWQ5ISBjd6fKtTVBCC/+mGS6FpA=="
    },
    "tinycolor2": {
      "version": "1.4.2",
@ -16149,79 +16186,6 @@
        }
      }
    },
-    "vue-loader-v16": {
-      "version": "npm:vue-loader@16.1.2",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-16.1.2.tgz",
-      "integrity": "sha512-8QTxh+Fd+HB6fiL52iEVLKqE9N1JSlMXLR92Ijm6g8PZrwIxckgpqjPDWRP5TWxdiPaHR+alUWsnu1ShQOwt+Q==",
-      "dev": true,
-      "requires": {
-        "chalk": "^4.1.0",
-        "hash-sum": "^2.0.0",
-        "loader-utils": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-styles": {
-          "version": "4.3.0",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-          "dev": true,
-          "requires": {
-            "color-convert": "^2.0.1"
-          }
-        },
-        "chalk": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
-          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^4.1.0",
-            "supports-color": "^7.1.0"
-          }
-        },
-        "color-convert": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-          "dev": true,
-          "requires": {
-            "color-name": "~1.1.4"
-          }
-        },
-        "color-name": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-          "dev": true
-        },
-        "has-flag": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-          "dev": true
-        },
-        "loader-utils": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz",
-          "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^2.1.2"
-          }
-        },
-        "supports-color": {
-          "version": "7.2.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-          "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^4.0.0"
-          }
-        }
-      }
-    },
    "vue-ls": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/vue-ls/-/vue-ls-3.2.1.tgz",
@ -16233,9 +16197,9 @@
      "integrity": "sha512-uKNKpFOVeWNqS2mrBZqnpLyXJo5Q+vnkex6JvpENvhXHFNBW/SJTP8vJywLuVT3DpxwXcF9N0dyIiZ4/NpTexQ=="
    },
    "vue-router": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.3.tgz",
-      "integrity": "sha512-BADg1mjGWX18Dpmy6bOGzGNnk7B/ZA0RxuA6qedY/YJwirMfKXIDzcccmHbQI0A6k5PzMdMloc0ElHfyOoX35A=="
+      "version": "3.4.9",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.9.tgz",
+      "integrity": "sha512-CGAKWN44RqXW06oC+u4mPgHLQQi2t6vLD/JbGRDAXm0YpMv0bgpKuU5bBd7AvMgfTz9kXVRIWKHqRwGEb8xFkA=="
    },
    "vue-style-loader": {
      "version": "4.1.2",
@ -16333,11 +16297,11 @@
      "dev": true
    },
    "vuedraggable": {
-      "version": "2.24.2",
-      "resolved": "https://registry.npm.taobao.org/vuedraggable/download/vuedraggable-2.24.2.tgz",
-      "integrity": "sha1-zZj67JmQUjhGnptNI1+6Wln7faI=",
+      "version": "2.24.3",
+      "resolved": "https://registry.npmjs.org/vuedraggable/-/vuedraggable-2.24.3.tgz",
+      "integrity": "sha512-6/HDXi92GzB+Hcs9fC6PAAozK1RLt1ewPTLjK0anTYguXLAeySDmcnqE8IC0xa7shvSzRjQXq3/+dsZ7ETGF3g==",
      "requires": {
-        "sortablejs": "^1.10.1"
+        "sortablejs": "1.10.2"
      }
    },
    "vuejs-logger": {
@ -16357,9 +16321,9 @@
      }
    },
    "vuex": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz",
-      "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.6.0.tgz",
+      "integrity": "sha512-W74OO2vCJPs9/YjNjW8lLbj+jzT24waTo2KShI8jLvJW8OaIkgb3wuAMA7D+ZiUxDOx3ubwSZTaJBip9G8a3aQ=="
    },
    "w3c-hr-time": {
      "version": "1.0.2",
--- a/package.json
+++ b/package.json
@ -22,15 +22,15 @@
  "dependencies": {
    "ant-design-vue": "^1.7.2",
    "axios": "^0.21.1",
-    "dayjs": "^1.8.36",
+    "dayjs": "^1.10.4",
    "enquire.js": "^2.1.6",
-    "filepond": "^4.20.1",
+    "filepond": "^4.25.1",
    "filepond-plugin-image-preview": "^4.6.4",
    "flv.js": "^1.5.0",
    "halo-editor": "^2.8.2",
-    "marked": "^1.1.1",
+    "marked": "^1.2.7",
    "nprogress": "^0.2.0",
-    "tiny-pinyin": "^1.3.0",
+    "tiny-pinyin": "^1.3.2",
    "verte": "^0.0.12",
    "vue": "^2.6.12",
    "vue-clipboard2": "^0.3.1",
@ -40,10 +40,10 @@
    "vue-dplayer": "0.0.10",
    "vue-filepond": "^6.0.3",
    "vue-ls": "^3.2.1",
-    "vue-router": "^3.4.3",
-    "vuedraggable": "^2.24.2",
+    "vue-router": "^3.4.9",
+    "vuedraggable": "^2.24.3",
    "vuejs-logger": "^1.5.4",
-    "vuex": "^3.5.1"
+    "vuex": "^3.6.0"
  },
  "devDependencies": {
    "@babel/polyfill": "^7.11.5",
--- a/src/views/interface/MenuList.vue
+++ b/src/views/interface/MenuList.vue
@ -274,9 +274,6 @@ export default {
  created() {
    this.handleListTeams()
  },
-  mounted() {
-    window.addEventListener('scroll', this.scrollHandle, true)
-  },
  methods: {
    ...mapActions(['refreshOptionsCache']),
    handleListTeams(autoSelectTeam = false) {
@ -415,14 +412,7 @@ export default {
      } else {
        this.refreshOptionsCache()
      }
-    },
-
-    scrollHandle: function(e) {
-      if (this.$refs.mheader.$el !== undefined) {
-        this.headerIsFixed = this.$refs.mheader.$el.getBoundingClientRect().top < 0
-        this.$set(this.headStyle, 'width', this.$refs.mheader.$el.offsetWidth + 'px')
-      }
-    },
+    }
  },
 }
 </script>
--- a/src/views/interface/components/MenuInternalLinkSelector.vue
+++ b/src/views/interface/components/MenuInternalLinkSelector.vue
@ -271,18 +271,19 @@ export default {
    },
    otherInternalLinks() {
      const options = this.options
+      const pathSuffix = this.options.path_suffix ? this.options.path_suffix : ''
      return [
        {
          name: '分类目录',
-          url: `${options.blog_url}/${options.categories_prefix}${options.path_suffix}`,
+          url: `${options.blog_url}/${options.categories_prefix}${pathSuffix}`,
        },
        {
          name: '标签',
-          url: `${options.blog_url}/${options.tags_prefix}${options.path_suffix}`,
+          url: `${options.blog_url}/${options.tags_prefix}${pathSuffix}`,
        },
        {
          name: '文章归档',
-          url: `${options.blog_url}/${options.archives_prefix}${options.path_suffix}`,
+          url: `${options.blog_url}/${options.archives_prefix}${pathSuffix}`,
        },
        {
          name: 'RSS',
--- a/src/views/interface/components/MenuTreeNode.vue
+++ b/src/views/interface/components/MenuTreeNode.vue
@ -41,12 +41,6 @@
                {{ item.formVisible?'（正在编辑）':'' }}
              </span>
            </a-list-item-meta>
-            <template slot="actions">
-              <a
-                href="javascript:void(0);"
-                @click="handleDelete(item.id)"
-              >删除</a>
-            </template>
            <template slot="actions">
              <a
                href="javascript:void(0);"
@ -55,6 +49,12 @@
                编辑
              </a>
            </template>
+            <template slot="actions">
+              <a
+                href="javascript:void(0);"
+                @click="handleDelete(item.id)"
+              >删除</a>
+            </template>
            <template
              slot="actions"
              v-if="excludedTeams && excludedTeams.length>0"
@ -146,11 +146,9 @@ export default {
  computed: {
    dragOptions() {
      return {
-        animation: 100,
+        animation: 200,
        group: 'description',
-        disabled: false,
        ghostClass: 'ghost',
-        forceFallback: true,
        emptyInsertThreshold: 20,
      }
    },
--- a/src/views/post/components/PostSettingDrawer.vue
+++ b/src/views/post/components/PostSettingDrawer.vue
@ -273,6 +273,11 @@
        </div>
        <a-divider class="divider-transparent" />
      </div>
+      <div class="bottom-control">
+        <a-space>
+          <a-button type="primary" @click="advancedVisible = false">返回</a-button>
+        </a-space>
+      </div>
    </a-drawer>

    <div class="bottom-control">
--- a/src/views/sheet/components/SheetSettingDrawer.vue
+++ b/src/views/sheet/components/SheetSettingDrawer.vue
@ -189,6 +189,14 @@
        </div>
        <a-divider class="divider-transparent" />
      </div>
+      <div class="bottom-control">
+        <a-space>
+          <a-button
+            type="primary"
+            @click="advancedVisible = false"
+          >返回</a-button>
+        </a-space>
+      </div>
    </a-drawer>

    <div class="bottom-control">