Commit 13f37328 by wuqian

Merge branch 'dev' of http://47.99.244.21:9999/chehuidong/saas-manage into wq

parents bd852efe e60990ba
......@@ -1500,7 +1500,7 @@
},
"@transloadit/prettier-bytes": {
"version": "0.0.7",
"resolved": "https://registry.npmjs.org/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
"resolved": "https://registry.npmmirror.com/@transloadit/prettier-bytes/-/prettier-bytes-0.0.7.tgz",
"integrity": "sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA=="
},
"@trysound/sax": {
......@@ -1745,7 +1745,7 @@
},
"@uppy/companion-client": {
"version": "2.2.2",
"resolved": "https://registry.npmjs.org/@uppy/companion-client/-/companion-client-2.2.2.tgz",
"resolved": "https://registry.npmmirror.com/@uppy/companion-client/-/companion-client-2.2.2.tgz",
"integrity": "sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==",
"requires": {
"@uppy/utils": "^4.1.2",
......@@ -1754,7 +1754,7 @@
},
"@uppy/core": {
"version": "2.3.4",
"resolved": "https://registry.npmjs.org/@uppy/core/-/core-2.3.4.tgz",
"resolved": "https://registry.npmmirror.com/@uppy/core/-/core-2.3.4.tgz",
"integrity": "sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==",
"requires": {
"@transloadit/prettier-bytes": "0.0.7",
......@@ -1769,12 +1769,12 @@
},
"@uppy/store-default": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/@uppy/store-default/-/store-default-2.1.1.tgz",
"resolved": "https://registry.npmmirror.com/@uppy/store-default/-/store-default-2.1.1.tgz",
"integrity": "sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ=="
},
"@uppy/utils": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/@uppy/utils/-/utils-4.1.3.tgz",
"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"
......@@ -1782,7 +1782,7 @@
},
"@uppy/xhr-upload": {
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz",
"resolved": "https://registry.npmmirror.com/@uppy/xhr-upload/-/xhr-upload-2.1.3.tgz",
"integrity": "sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==",
"requires": {
"@uppy/companion-client": "^2.2.2",
......@@ -2396,7 +2396,7 @@
},
"@wangeditor/basic-modules": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/@wangeditor/basic-modules/-/basic-modules-1.1.7.tgz",
"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"
......@@ -2404,7 +2404,7 @@
},
"@wangeditor/code-highlight": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz",
"resolved": "https://registry.npmmirror.com/@wangeditor/code-highlight/-/code-highlight-1.0.3.tgz",
"integrity": "sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==",
"requires": {
"prismjs": "^1.23.0"
......@@ -2412,7 +2412,7 @@
},
"@wangeditor/core": {
"version": "1.1.19",
"resolved": "https://registry.npmjs.org/@wangeditor/core/-/core-1.1.19.tgz",
"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",
......@@ -2425,7 +2425,7 @@
},
"@wangeditor/editor": {
"version": "5.1.23",
"resolved": "https://registry.npmjs.org/@wangeditor/editor/-/editor-5.1.23.tgz",
"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",
......@@ -2453,27 +2453,27 @@
},
"@wangeditor/editor-for-vue": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@wangeditor/editor-for-vue/-/editor-for-vue-1.0.2.tgz",
"resolved": "https://registry.npmmirror.com/@wangeditor/editor-for-vue/-/editor-for-vue-1.0.2.tgz",
"integrity": "sha512-BOENvAXJVtVXlE2X50AAvjV82YlCUeu5cbeR0cvEQHQjYtiVnJtq7HSoj85r2kTgGouI5OrpJG9BBEjSjUSPyA=="
},
"@wangeditor/list-module": {
"version": "1.0.5",
"resolved": "https://registry.npmjs.org/@wangeditor/list-module/-/list-module-1.0.5.tgz",
"resolved": "https://registry.npmmirror.com/@wangeditor/list-module/-/list-module-1.0.5.tgz",
"integrity": "sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ=="
},
"@wangeditor/table-module": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/@wangeditor/table-module/-/table-module-1.1.4.tgz",
"resolved": "https://registry.npmmirror.com/@wangeditor/table-module/-/table-module-1.1.4.tgz",
"integrity": "sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w=="
},
"@wangeditor/upload-image-module": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz",
"resolved": "https://registry.npmmirror.com/@wangeditor/upload-image-module/-/upload-image-module-1.0.2.tgz",
"integrity": "sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA=="
},
"@wangeditor/video-module": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/@wangeditor/video-module/-/video-module-1.1.4.tgz",
"resolved": "https://registry.npmmirror.com/@wangeditor/video-module/-/video-module-1.1.4.tgz",
"integrity": "sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg=="
},
"@webassemblyjs/ast": {
......@@ -2907,7 +2907,7 @@
},
"async-validator": {
"version": "1.8.5",
"resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
"resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
"integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
"requires": {
"babel-runtime": "6.x"
......@@ -2915,7 +2915,7 @@
},
"asynckit": {
"version": "0.4.0",
"resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
"resolved": "https://registry.npmmirror.com/asynckit/-/asynckit-0.4.0.tgz",
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"at-least-node": {
......@@ -2959,7 +2959,7 @@
},
"babel-helper-vue-jsx-merge-props": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"resolved": "https://registry.npmmirror.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
"integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
},
"babel-loader": {
......@@ -3052,7 +3052,7 @@
},
"babel-runtime": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"resolved": "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
"requires": {
"core-js": "^2.4.0",
......@@ -3061,12 +3061,12 @@
"dependencies": {
"core-js": {
"version": "2.6.12",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
"resolved": "https://registry.npmmirror.com/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",
"resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
"integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
}
}
......@@ -3503,7 +3503,7 @@
},
"combined-stream": {
"version": "1.0.8",
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
"resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
"integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
"requires": {
"delayed-stream": "~1.0.0"
......@@ -3570,7 +3570,7 @@
},
"compute-scroll-into-view": {
"version": "1.0.20",
"resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
"resolved": "https://registry.npmmirror.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.20.tgz",
"integrity": "sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg=="
},
"concat-map": {
......@@ -4116,7 +4116,7 @@
},
"delayed-stream": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
"resolved": "https://registry.npmmirror.com/delayed-stream/-/delayed-stream-1.0.0.tgz",
"integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="
},
"delegate": {
......@@ -4204,7 +4204,7 @@
},
"dom7": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/dom7/-/dom7-3.0.0.tgz",
"resolved": "https://registry.npmmirror.com/dom7/-/dom7-3.0.0.tgz",
"integrity": "sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==",
"requires": {
"ssr-window": "^3.0.0-alpha.1"
......@@ -4504,7 +4504,7 @@
},
"es6-iterator": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
"resolved": "https://registry.npmmirror.com/es6-iterator/-/es6-iterator-2.0.3.tgz",
"integrity": "sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==",
"requires": {
"d": "1",
......@@ -5152,7 +5152,7 @@
},
"event-emitter": {
"version": "0.3.5",
"resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
"resolved": "https://registry.npmmirror.com/event-emitter/-/event-emitter-0.3.5.tgz",
"integrity": "sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==",
"requires": {
"d": "1",
......@@ -5250,7 +5250,7 @@
},
"ext": {
"version": "1.7.0",
"resolved": "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz",
"resolved": "https://registry.npmmirror.com/ext/-/ext-1.7.0.tgz",
"integrity": "sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==",
"requires": {
"type": "^2.7.2"
......@@ -5430,7 +5430,7 @@
},
"form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
"resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"requires": {
"asynckit": "^0.4.0",
......@@ -5819,7 +5819,7 @@
},
"html-void-elements": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-2.0.1.tgz",
"resolved": "https://registry.npmmirror.com/html-void-elements/-/html-void-elements-2.0.1.tgz",
"integrity": "sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A=="
},
"html-webpack-plugin": {
......@@ -5912,7 +5912,7 @@
},
"i18next": {
"version": "20.6.1",
"resolved": "https://registry.npmjs.org/i18next/-/i18next-20.6.1.tgz",
"resolved": "https://registry.npmmirror.com/i18next/-/i18next-20.6.1.tgz",
"integrity": "sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==",
"requires": {
"@babel/runtime": "^7.12.0"
......@@ -6142,7 +6142,7 @@
},
"is-hotkey": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/is-hotkey/-/is-hotkey-0.2.0.tgz",
"resolved": "https://registry.npmmirror.com/is-hotkey/-/is-hotkey-0.2.0.tgz",
"integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw=="
},
"is-interactive": {
......@@ -6243,7 +6243,7 @@
},
"is-url": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz",
"resolved": "https://registry.npmmirror.com/is-url/-/is-url-1.2.4.tgz",
"integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww=="
},
"is-weakref": {
......@@ -6337,7 +6337,7 @@
},
"js-md5": {
"version": "0.7.3",
"resolved": "https://registry.npmjs.org/js-md5/-/js-md5-0.7.3.tgz",
"resolved": "https://registry.npmmirror.com/js-md5/-/js-md5-0.7.3.tgz",
"integrity": "sha512-ZC41vPSTLKGwIRjqDh8DfXoCrdQIyBgspJVPXHBGu4nZlAEvG3nf+jO9avM9RmLiGakg7vz974ms99nEV0tmTQ=="
},
"js-message": {
......@@ -6554,12 +6554,12 @@
},
"lodash.camelcase": {
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
"resolved": "https://registry.npmmirror.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz",
"integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA=="
},
"lodash.clonedeep": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
"resolved": "https://registry.npmmirror.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
"integrity": "sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ=="
},
"lodash.debounce": {
......@@ -6575,12 +6575,12 @@
},
"lodash.foreach": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
"resolved": "https://registry.npmmirror.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz",
"integrity": "sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ=="
},
"lodash.isequal": {
"version": "4.5.0",
"resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
"resolved": "https://registry.npmmirror.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
"integrity": "sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ=="
},
"lodash.kebabcase": {
......@@ -6609,12 +6609,12 @@
},
"lodash.throttle": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
"resolved": "https://registry.npmmirror.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
"integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
},
"lodash.toarray": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
"resolved": "https://registry.npmmirror.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
"integrity": "sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw=="
},
"lodash.truncate": {
......@@ -6897,7 +6897,7 @@
},
"mime-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/mime-match/-/mime-match-1.0.2.tgz",
"resolved": "https://registry.npmmirror.com/mime-match/-/mime-match-1.0.2.tgz",
"integrity": "sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==",
"requires": {
"wildcard": "^1.1.0"
......@@ -7055,7 +7055,7 @@
},
"namespace-emitter": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/namespace-emitter/-/namespace-emitter-2.0.1.tgz",
"resolved": "https://registry.npmmirror.com/namespace-emitter/-/namespace-emitter-2.0.1.tgz",
"integrity": "sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g=="
},
"nanoid": {
......@@ -7106,7 +7106,7 @@
},
"next-tick": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz",
"resolved": "https://registry.npmmirror.com/next-tick/-/next-tick-1.1.0.tgz",
"integrity": "sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="
},
"nice-try": {
......@@ -7186,7 +7186,7 @@
},
"normalize-wheel": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
"resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
"integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
},
"npm-run-path": {
......@@ -7971,7 +7971,7 @@
},
"prismjs": {
"version": "1.29.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.29.0.tgz",
"resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.29.0.tgz",
"integrity": "sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q=="
},
"process-nextick-args": {
......@@ -8017,7 +8017,7 @@
},
"proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
},
"prr": {
......@@ -8267,7 +8267,7 @@
},
"resize-observer-polyfill": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
"resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
"integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
},
"resolve": {
......@@ -8410,7 +8410,7 @@
},
"scroll-into-view-if-needed": {
"version": "2.2.31",
"resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz",
"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.20"
......@@ -8677,7 +8677,7 @@
},
"slate": {
"version": "0.72.8",
"resolved": "https://registry.npmjs.org/slate/-/slate-0.72.8.tgz",
"resolved": "https://registry.npmmirror.com/slate/-/slate-0.72.8.tgz",
"integrity": "sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==",
"requires": {
"immer": "^9.0.6",
......@@ -8687,7 +8687,7 @@
},
"slate-history": {
"version": "0.66.0",
"resolved": "https://registry.npmjs.org/slate-history/-/slate-history-0.66.0.tgz",
"resolved": "https://registry.npmmirror.com/slate-history/-/slate-history-0.66.0.tgz",
"integrity": "sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==",
"requires": {
"is-plain-object": "^5.0.0"
......@@ -8838,7 +8838,7 @@
},
"ssr-window": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/ssr-window/-/ssr-window-3.0.0.tgz",
"resolved": "https://registry.npmmirror.com/ssr-window/-/ssr-window-3.0.0.tgz",
"integrity": "sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA=="
},
"ssri": {
......@@ -9143,7 +9143,7 @@
},
"throttle-debounce": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
"resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
"integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
},
"thunky": {
......@@ -9159,7 +9159,7 @@
},
"tiny-warning": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",
"resolved": "https://registry.npmmirror.com/tiny-warning/-/tiny-warning-1.0.3.tgz",
"integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA=="
},
"to-fast-properties": {
......
import axios from '../axios'
export function erpProductionAssistantManage(data) {
return axios.post('/erpAppManage/uploadToLocal', data, {
headers: {
'Content-Type': 'multipart/form-data'
}
})
}
export function erpProductionAssistantManageListPage(data) {
return axios.post('/erpAppManage/list_page', data)
}
export function deleteErpProductionAssistantManage(data) {
return axios.get('/erpAppManage/delete?ids=' + data)
}
......@@ -38,6 +38,7 @@ import {
CheckboxGroup,
Divider,
Popover,
Upload
} from 'element-ui'
const components = [
......@@ -75,6 +76,7 @@ const components = [
ColorPicker,
CheckboxGroup,
Popover,
Upload
]
export default {
......
......@@ -4,7 +4,6 @@ import router from './router'
import store from './store'
import './plugins/myui'
import element from '@/common/components/element-ui.js'
// import vxeTable from '@/common/components/vxeTable.js'
import vxeTable from 'vxe-table'
import 'xe-utils'
import 'vxe-table/lib/index.css'
......
......@@ -133,12 +133,19 @@ const routes = [
meta: { title: '丢单管理' }
},
{
path: '/operation/exceptionMessage',
component: () => import('@/views/operation/exceptionMessage.vue'),
name: 'exceptionMessage',
meta: { title: '异常消息' }
},
{
path: '/saas/production/assistant/manage',
component: () => import('@/views/production/AssistantManage.vue'),
name: 'production_assistant_manage',
meta: { title: '应用版本管理' }
},
{
path: '/dynamicForm',
component: () => import('@/components/dynamicForms/index.vue'),
name: 'system_management',
......@@ -147,7 +154,6 @@ const routes = [
]
}
]
const router = new VueRouter({
mode: 'history',
base: process.env.BASE_URL,
......
......@@ -122,6 +122,7 @@ import { mapGetters, mapState } from 'vuex'
import { logout, resetPassword } from '@/common/api/login'
import { setToken, setUser } from '@/utils/auth'
import { post } from '@/common/api/axios'
export default {
name: 'navMenu',
data() {
......@@ -262,7 +263,7 @@ export default {
icon: 'el-icon-box',
index: '/saas/sku-manage',
children: []
},
}
// {
// id: 11,
// path: '',
......@@ -303,17 +304,25 @@ export default {
icon: 'el-icon-bank-card',
index: '',
children: []
},
}
]
},
// {
// id: 7,
// path: '',
// label: '应用中心',
// icon: 'el-icon-menu',
// index: '/saas/app',
// children: []
// },
{
id: 7,
id: 8,
path: '',
label: '应用中心',
icon: 'el-icon-menu',
index: '/saas/app',
label: '应用版本管理',
icon: 'el-icon-suitcase-1',
index: '/saas/production/assistant/manage',
children: []
},
}
],
dialogVisible: false,
oldPwd: '',
......@@ -426,10 +435,12 @@ export default {
.el-menu {
border-bottom: none;
}
.el-submenu__title i {
color: #fff;
}
}
i {
color: #fff;
}
......@@ -446,6 +457,7 @@ export default {
.label {
font-size: 16px;
}
.user-area {
float: right;
display: flex;
......@@ -453,6 +465,7 @@ export default {
flex-shrink: 0;
padding-right: 16px;
color: #fff;
.user-name {
margin-right: 10px;
}
......
<template>
<div class='system-menu card'>
<div class='header'>
<el-form
size='mini'
:inline='true'
label-width='80px'
>
<el-form-item label>
<el-button
type='primary'
@click='showDialog({ id: 0 }, 2)'
>
新增
</el-button>
</el-form-item>
</el-form>
</div>
<div class='table-wrap' v-loading='loading'>
<table-view
:tableColumns='tableColumns'
rowKey='id'
:serialNumber='true'
:treeConfig="{
children: 'children',
reserve: true,
}"
:sourceData='sourceData'
></table-view>
</div>
<div class="pagination">
<el-pagination
layout="sizes, total, prev, pager, next, jumper"
background
:total="total"
:page-size="pageSize"
:current-page="currentPage"
@size-change="sizeChange"
@current-change="onCurrentChange"
>
</el-pagination>
</div>
<el-dialog
:title="editForm.id?'编辑':'新增'"
:visible.sync='dialogVisible'
:close-on-click-modal='false'
:before-close='beforeClose'
width='1000px'
>
<div v-loading="saveLoading">
<el-form
size='mini'
:inline='true'
label-width='120px'
:rules='rules'
ref='editForm'
:model='editForm'
>
<el-form-item class="title_width" prop="title" label="更新标题">
<el-input type="textarea" v-model="editForm.title" placeholder="请输入更新标题"></el-input>
</el-form-item>
<el-form-item class="title_width" prop="content" label="更新内容">
<el-input type="textarea" rows="10" v-model="editForm.content" placeholder="请输入更新内容"></el-input>
</el-form-item>
<el-form-item prop="version" label="版本号">
<el-input class="item_width" v-model="editForm.version" placeholder="请输入版本号"></el-input>
</el-form-item>
<div class="el-row" style="width: 100%;">
<el-form-item class="el-col-11" prop="forcedUpdate" label="是否强制更新">
<el-radio-group class="item_width" v-model="editForm.forcedUpdate">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item class="el-col-11" prop="fullUpdate" label="是否全量更新">
<el-radio-group class="item_width" v-model="editForm.fullUpdate">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
</el-radio-group>
</el-form-item>
</div>
<!-- 上传多个app文件 -->
<el-form-item required label="上传文件">
<!-- accept=".apk,.ipa" -->
<el-upload
action
:http-request="handleCustom"
:multiple="false"
:on-change="handleChange"
:on-remove="handleRemove"
:file-list="fileList"
list-type="text"
>
<el-button type="primary">
上传文件
</el-button>
</el-upload>
</el-form-item>
</el-form>
</div>
<div slot='footer'>
<el-button :disabled="saveLoading" size='small' @click='clone'
>取 消
</el-button
>
<el-button
size='small'
type='primary'
:disabled="saveLoading"
@click='submit'
>保 存
</el-button
>
</div>
</el-dialog>
</div>
</template>
<script>
import tableView from '@/common/components/base/tableView.vue'
import {
erpProductionAssistantManage,
erpProductionAssistantManageListPage,
deleteErpProductionAssistantManage
} from '../../common/api/production/assistantManage'
export default {
name: 'saasMenu',
components: {
tableView
},
data() {
return {
loading: false,
saveLoading: false,
sourceData: [],
dialogVisible: false,
editForm: {
version: '',
title: '',
content: '',
forcedUpdate: 0,
fullUpdate: 1
// businessType: 'production_assistant'
},
fileList: [],
rules: {
// 自定义版本号的校验规则
version: [
{
required: true,
message: '请输入版本号',
trigger: 'blur'
},
{
validator: (rule, value, callback) => {
if (!/^\d+\.\d+\.\d+$/.test(value)) {
callback(new Error('版本号格式不正确'))
} else {
callback()
}
},
trigger: 'blur'
}
],
title: [
{
required: true,
message: '请输入更新标题',
trigger: 'blur'
}
],
thirdWarehouseType: [
{
required: true,
message: '请选择更新类型',
trigger: 'change'
}
],
content: [
{
required: true,
message: '请输入更新内容',
trigger: 'blur'
}
]
},
total: 1,
currentPage: 1,
pageSize: 10
}
},
computed: {
tableColumns() {
return [
{
label: '版本号',
key: 'version',
width: '100'
},
{
label: '更新标题',
key: 'title',
width: ''
},
{
label: '更新内容',
key: 'content',
width: ''
},
{
label: '是否强制更新',
key: 'forcedUpdate',
width: '140',
render: item => {
return item.forcedUpdate === 1 ? '是' : '否'
}
},
{
label: '是否全量更新',
key: 'forcedUpdate',
width: '140',
render: item => {
return item.fullUpdate === 1 ? '是' : '否'
}
},
{
label: '应用软件名称',
key: 'businessType',
width: '100',
render: item => {
return item ? '生产助手' : ''
}
},
{
label: '操作',
key: '',
width: '120',
// align: 'left',
render: item => (
<div>
<span title="删除" class="icon-view ">
<i
style="color:#F56C6C"
class="el-icon-delete"
onClick={() => this.remove(item)}
></i>
</span>
</div>
)
}
]
}
},
created() {
this.getProductionAssistantList()
},
methods: {
async getProductionAssistantList() {
this.loading = true
try {
const {
data: erpProductionAssistantManageRes,
code
} = await erpProductionAssistantManageListPage({
currentPage: this.currentPage,
businessType: 'production_assistant',
pageSize: this.pageSize
})
if (code === 200) {
console.log('erpProductionAssistantManageRes:>>', erpProductionAssistantManageRes)
this.sourceData = erpProductionAssistantManageRes.records
this.total = erpProductionAssistantManageRes.total
}
} catch (error) {
console.log('error:>>', error)
} finally {
this.loading = false
}
},
async deleteProductionAssistant(ids) {
const deleteProductionRes = await deleteErpProductionAssistantManage(ids)
if (deleteProductionRes.code === 200) {
this.$message({
type: 'success',
message: '删除成功!'
})
setTimeout(() => {
this.getProductionAssistantList()
}, 1000)
}
},
formFile(fileList, reset) {
const formData = new FormData()
fileList.forEach(file => {
formData.append('fileList', file.raw)
})
for (const key in reset) {
formData.append(key, reset[key])
}
return formData
},
showDialog() {
this.dialogVisible = true
},
resetForm() {
for (const key in this.editForm) {
if (key === 'forcedUpdate') {
this.editForm[key] = 0
continue
}
if (key === 'businessType') {
this.editForm[key] = 'production_assistant'
continue
}
this.editForm[key] = ''
}
this.fileList = []
},
clone() {
this.resetForm()
this.dialogVisible = false
},
submit() {
// 验证表单
this.$refs.editForm.validate(async valid => {
if (valid) {
// 提交表单
if (this.fileList?.length === 0) {
return this.$message({
type: 'warning',
message: '请上传文件!'
})
}
this.saveLoading = true
const productionAssistantParams = this.formFile(this.fileList, {
...this.editForm,
businessType: 'production_assistant'
})
try {
const res = await erpProductionAssistantManage(productionAssistantParams)
console.log('提交表单:>>> ', res, '\nproductionAssistantParams:>>', productionAssistantParams)
if (res.code === 200) {
this.$message({
type: 'success',
message: '保存成功!'
})
this.saveLoading = false
this.resetForm()
await this.getProductionAssistantList()
this.dialogVisible = false
} else {
this.saveLoading = false
}
} catch (error) {
this.saveLoading = false
console.log('error:>>', error)
}
}
})
},
beforeClose(done) {
this.resetForm()
done()
},
remove({ id }) {
this.$confirm('是否删除该数据', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.deleteProductionAssistant(id)
})
},
handleCustom(file) {
// this.$message({
// type: 'success',
// message: '上传成功!'
// })
},
handleChange(file, fileList) {
this.fileList = fileList
},
beforeUpload(file) {
const isLt2M = file.size / 1024 / 1024 < 50
if (!isLt2M) {
this.$message.error('上传文件大小不能超过 50MB!')
return false
}
return isLt2M
},
update(row) {
this.editForm = row
this.dialogVisible = true
console.log(row)
},
handleRemove(file, fileList) {
this.fileList = fileList
},
sizeChange(pageSize) {
this.pageSize = pageSize
this.getProductionAssistantList()
},
onCurrentChange(currentPage) {
this.currentPage = currentPage
this.getProductionAssistantList()
}
}
}
</script>
<style lang='scss' scoped>
.system-menu {
height: 100%;
display: flex;
flex-direction: column;
padding: 10px 20px 0;
overflow: hidden;
.item_width {
width: 220px;
}
.title_width {
display: flex;
}
}
.table-wrap {
background: #fff;
flex: 1;
overflow: hidden;
}
.system-menu:deep() .el-form-item__content {
flex: 1;
}
.radioGroup {
.el-radio {
margin-right: 15px !important;
}
}
.edit {
color: #fff; /* 字体颜色 */
background-color: #409EFF; /* 背景颜色 */
border-radius: 4px; /* 圆角 */
cursor: pointer; /* 鼠标悬停时显示手型 */
transition: background-color 0.3s; /* 背景颜色过渡效果 */
}
.edit:hover {
background-color: #66b1ff; /* 鼠标悬停时的背景颜色 */
}
.upload-file {
.el-upload {
padding: 70px;
border-radius: 6px;
background-color: #fff;
border: 1px dashed #d9d9d9;
}
.el-button {
font-size: 28px;
color: #8c939d;
text-align: center;
}
}
</style>
......@@ -6,10 +6,12 @@ module.exports = defineConfig({
host: '',
proxy: {
'/api': {
target: 'http://10.168.31.142:8070',
changeOrigin: true
// 路径重写规则,这里将 /api 开头的请求路径替换为空字符串,即去掉 /api 前缀
}
}
}
target: 'http://10.168.31.188:8096',
changeOrigin: true,
// pathRewrite: {
// '^/api': '',
// },
},
},
},
})
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment