Merge pull request #1245 from crawlab-team/develop

Develop
This commit is contained in:
Marvin Zhang
2022-12-26 14:09:49 +08:00
committed by GitHub
4 changed files with 13 additions and 20 deletions

View File

@@ -2,4 +2,4 @@ module crawlab
go 1.16
require github.com/crawlab-team/crawlab-core v0.6.1-0.20221221050531-dd102678c9cc
require github.com/crawlab-team/crawlab-core v0.6.1-0.20221225051941-5b0a1701c3db

View File

@@ -131,6 +131,8 @@ github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfc
github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/crawlab-team/crawlab-core v0.6.1-0.20221221050531-dd102678c9cc h1:XY8nLBx7JE9be4uUXNOL/j8ncaTgA7pBTcUm28v+698=
github.com/crawlab-team/crawlab-core v0.6.1-0.20221221050531-dd102678c9cc/go.mod h1:CEOIiXjkkIrgZI+81ztWQvzP3NrxHqzAuxtvS5YmZt0=
github.com/crawlab-team/crawlab-core v0.6.1-0.20221225051941-5b0a1701c3db h1:t3JUhJzwZOJMPegaMPugm30I7EP6XSkWlhM+k445xG0=
github.com/crawlab-team/crawlab-core v0.6.1-0.20221225051941-5b0a1701c3db/go.mod h1:5XmCf6j55cuIUPHVHGWShY50A6OwZxOoD3fTlybozPA=
github.com/crawlab-team/crawlab-db v0.6.0-1/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU=
github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300.0.20221020034454-40c7a5c6cbe2 h1:dmC9D/BSHv6yh8khtQ7cDYFh8Yzr8NmhbAMBS36h9dA=
github.com/crawlab-team/crawlab-db v0.6.0-beta.20220417.1300.0.20221020034454-40c7a5c6cbe2/go.mod h1:gfeF0nAnFuup6iYvgHkY0in/HpO/+JktXqVNMdhoxhU=
@@ -484,6 +486,7 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc=
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nleeper/goment v1.4.4/go.mod h1:zDl5bAyDhqxwQKAvkSXMRLOdCowrdZz53ofRJc4VhTo=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/olekukonko/tablewriter v0.0.1 h1:b3iUnf1v+ppJiOfNX4yxxqfWKMQPZR5yoh8urCTFX88=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
@@ -616,6 +619,7 @@ github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev
github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
github.com/tkuchiki/go-timezone v0.2.0/go.mod h1:b1Ean9v2UXtxSq4TZF0i/TU9NuoWa9hOzOKoGCV2zqY=
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=

View File

@@ -22,7 +22,7 @@
"@vitejs/plugin-vue": "^3.2.0",
"atom-material-icons": "^3.0.0",
"codemirror": "^5.59.1",
"crawlab-ui": "0.6.0-37",
"crawlab-ui": "0.6.0-39",
"echarts": "^5.1.2",
"element-plus": "^1.3.0-beta.10",
"vue": "^3.2",

View File

@@ -12,7 +12,7 @@ specifiers:
'@vue/compiler-sfc': ^3.2.45
atom-material-icons: ^3.0.0
codemirror: ^5.59.1
crawlab-ui: 0.6.0-37
crawlab-ui: 0.6.0-39
echarts: ^5.1.2
element-plus: ^1.3.0-beta.10
typescript: ^4.6.4
@@ -33,7 +33,7 @@ dependencies:
'@vitejs/plugin-vue': registry.npmmirror.com/@vitejs/plugin-vue/3.2.0_vite@3.2.4+vue@3.2.45
atom-material-icons: registry.npmmirror.com/atom-material-icons/3.0.0
codemirror: registry.npmmirror.com/codemirror/5.65.10
crawlab-ui: 0.6.0-37
crawlab-ui: 0.6.0-39
echarts: registry.npmmirror.com/echarts/5.4.0
element-plus: registry.npmmirror.com/element-plus/1.3.0-beta.10_vue@3.2.45
vue: registry.npmmirror.com/vue/3.2.45
@@ -723,8 +723,8 @@ packages:
requiresBuild: true
dev: false
/crawlab-ui/0.6.0-37:
resolution: {integrity: sha512-YCqBpuvsja4YchXmxDk7TlqNClQXFarrn+pEPF9Uo1zeTNoCfTacxGzCwwMjnzlEuLnwvdE7fwW+pEs8irYkHA==}
/crawlab-ui/0.6.0-39:
resolution: {integrity: sha512-GyDVGjf1FeNLMsh0GtX2Zsf59va1poLnBstUj+rtqGd8KvxbZepkEDuDZrzqsw5zt0p3IIIrdS51AWNRYfGrHg==}
dependencies:
'@element-plus/icons': 0.0.11
'@fortawesome/fontawesome-common-types': 6.2.1
@@ -749,7 +749,7 @@ packages:
axios: 0.21.4
codemirror: 5.65.10
core-js: 3.26.1
crawlab-vue3-dropzone: 3.0.2_vue@3.2.45
crawlab-vue3-dropzone: 3.0.3_vue@3.2.45
cron-parser: 3.5.0
cronstrue: 1.125.0
dayjs: 1.11.6
@@ -772,7 +772,6 @@ packages:
vue-debounce: 4.0.0_vue@3.2.45
vue-i18n: 9.1.9_vue@3.2.45
vue-router: 4.0.11_vue@3.2.45
vue3-dropzone: 0.0.7_vue@3.2.45
vuex: 4.1.0_vue@3.2.45
transitivePeerDependencies:
- '@vue/composition-api'
@@ -781,8 +780,8 @@ packages:
- supports-color
dev: false
/crawlab-vue3-dropzone/3.0.2_vue@3.2.45:
resolution: {integrity: sha512-11kwSm62Kq6UwVVwW1e43h0sPbemt8jKi/mq5ZSAIJosF9wx2AZWvPM5tTWE0HEd0Ms4zfPh5auaYfwM5sSpxw==}
/crawlab-vue3-dropzone/3.0.3_vue@3.2.45:
resolution: {integrity: sha512-s/GHSTteFqJcMk14Xkp1imwEyrOCa+uwwH1eCsTAxVzaYocpiDpbDjQ3u3vrMyws9InsqqgtmAJhy2vGHEsk/Q==}
peerDependencies:
vue: '>=3.2.45'
dependencies:
@@ -2129,16 +2128,6 @@ packages:
'@vue/shared': 3.2.45
dev: false
/vue3-dropzone/0.0.7_vue@3.2.45:
resolution: {integrity: sha512-aNUCEWcq/umC1rPLkpXBMcA8OIn17OKRKZxqIhVSBBhqt0F6ObAacKMC8noOTfHutVWzXhQU1qk8ynqCRfsEWA==}
peerDependencies:
vue: '>=3'
dependencies:
attr-accept: 2.2.2
file-selector: 0.2.4
vue: 3.2.45
dev: false
/vuex/4.1.0_vue@3.2.45:
resolution: {integrity: sha512-hmV6UerDrPcgbSy9ORAtNXDr9M4wlNP4pEFKye4ujJF8oqgFFuxDCdOLS3eNoRTtq5O3hoBDh9Doj1bQMYHRbQ==}
peerDependencies: