浏览代码

Merge remote-tracking branch 'origin/master'

yumeng 5 年之前
父节点
当前提交
83000eb8ff
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. 2 0
      package.json
  2. 2 0
      src/views/system/modules/QuartzJobModal.vue

+ 2 - 0
package.json

@@ -28,6 +28,7 @@
     "lodash.pick": "^4.4.0",
     "lodash.pick": "^4.4.0",
     "md5": "^2.2.1",
     "md5": "^2.2.1",
     "nprogress": "^0.2.0",
     "nprogress": "^0.2.0",
+    "promise.prototype.finally": "^3.1.0",
     "tinymce": "^5.0.2",
     "tinymce": "^5.0.2",
     "viser-vue": "^2.4.4",
     "viser-vue": "^2.4.4",
     "vue": "^2.6.10",
     "vue": "^2.6.10",
@@ -35,6 +36,7 @@
     "vue-class-component": "^6.0.0",
     "vue-class-component": "^6.0.0",
     "vue-cropper": "^0.4.8",
     "vue-cropper": "^0.4.8",
     "vue-i18n": "^8.7.0",
     "vue-i18n": "^8.7.0",
+    "vue-layer": "^1.0.2",
     "vue-loader": "^15.7.0",
     "vue-loader": "^15.7.0",
     "vue-ls": "^3.2.0",
     "vue-ls": "^3.2.0",
     "vue-oss-uploader": "^0.1.10",
     "vue-oss-uploader": "^0.1.10",

+ 2 - 0
src/views/system/modules/QuartzJobModal.vue

@@ -64,6 +64,8 @@
   import {httpAction} from '@/api/manage'
   import {httpAction} from '@/api/manage'
   import pick from 'lodash.pick'
   import pick from 'lodash.pick'
   import moment from "moment"
   import moment from "moment"
+  import promiseFinally from 'promise.prototype.finally';
+  promiseFinally.shim();
 
 
   export default {
   export default {
     name: "QuartzJobModal",
     name: "QuartzJobModal",