From 8d32d54fe81a3e549a0d4f749e416f7c6fed2bc8 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 6 Jun 2025 14:59:59 +0800 Subject: [PATCH] feat: add development and index generation run configurations; update SVG files and improve icon styles --- core/task/scheduler/service.go | 6 +- frontend/crawlab-ui/.run/dev.run.xml | 12 + frontend/crawlab-ui/.run/gen_index.run.xml | 12 + frontend/crawlab-ui/package.json | 3 +- frontend/crawlab-ui/scripts/gen-svg.js | 44 -- frontend/crawlab-ui/src/assets/js/svg/163.js | 1 - .../crawlab-ui/src/assets/js/svg/anthropic.js | 1 - frontend/crawlab-ui/src/assets/js/svg/aol.js | 1 - .../src/assets/js/svg/arrow-clockwise.js | 1 - .../assets/js/svg/arrow-counterclockwise.js | 1 - .../crawlab-ui/src/assets/js/svg/azure.js | 1 - .../crawlab-ui/src/assets/js/svg/cassandra.js | 1 - .../src/assets/js/svg/chat-square-quote.js | 1 - .../crawlab-ui/src/assets/js/svg/cheerio.js | 1 - .../src/assets/js/svg/chevron-down.js | 1 - .../crawlab-ui/src/assets/js/svg/chromium.js | 1 - .../src/assets/js/svg/clickhouse.js | 1 - frontend/crawlab-ui/src/assets/js/svg/code.js | 1 - .../crawlab-ui/src/assets/js/svg/colly.js | 1 - .../crawlab-ui/src/assets/js/svg/crawlee.js | 1 - frontend/crawlab-ui/src/assets/js/svg/db2.js | 1 - .../crawlab-ui/src/assets/js/svg/deepseek.js | 1 - .../crawlab-ui/src/assets/js/svg/devops.js | 1 - .../crawlab-ui/src/assets/js/svg/dingtalk.js | 1 - .../src/assets/js/svg/drission-page.js | 1 - .../src/assets/js/svg/elasticsearch.js | 1 - .../crawlab-ui/src/assets/js/svg/gemini.js | 1 - .../crawlab-ui/src/assets/js/svg/gmail.js | 1 - frontend/crawlab-ui/src/assets/js/svg/go.js | 1 - frontend/crawlab-ui/src/assets/js/svg/grok.js | 1 - frontend/crawlab-ui/src/assets/js/svg/hive.js | 1 - .../src/assets/js/svg/image-broken.js | 1 - .../crawlab-ui/src/assets/js/svg/image.js | 1 - .../src/assets/js/svg/journal-code.js | 1 - .../src/assets/js/svg/journal-text.js | 1 - .../crawlab-ui/src/assets/js/svg/justify.js | 1 - .../crawlab-ui/src/assets/js/svg/kafka.js | 1 - frontend/crawlab-ui/src/assets/js/svg/lark.js | 1 - frontend/crawlab-ui/src/assets/js/svg/link.js | 1 - .../crawlab-ui/src/assets/js/svg/list-ol.js | 1 - .../crawlab-ui/src/assets/js/svg/list-ul.js | 1 - .../src/assets/js/svg/logo-icon-white.js | 1 - .../crawlab-ui/src/assets/js/svg/logo-icon.js | 1 - .../crawlab-ui/src/assets/js/svg/logo-main.js | 1 - .../src/assets/js/svg/logo-white.js | 1 - frontend/crawlab-ui/src/assets/js/svg/logo.js | 1 - .../crawlab-ui/src/assets/js/svg/maven.js | 1 - .../crawlab-ui/src/assets/js/svg/mistral.js | 1 - .../crawlab-ui/src/assets/js/svg/mongodb.js | 1 - .../crawlab-ui/src/assets/js/svg/ms_teams.js | 1 - .../crawlab-ui/src/assets/js/svg/mssql.js | 1 - .../crawlab-ui/src/assets/js/svg/mysql.js | 1 - .../crawlab-ui/src/assets/js/svg/netease.js | 1 - .../crawlab-ui/src/assets/js/svg/openai.js | 1 - .../crawlab-ui/src/assets/js/svg/oracle.js | 1 - .../crawlab-ui/src/assets/js/svg/outlook.js | 1 - .../src/assets/js/svg/pencil-fill.js | 1 - .../src/assets/js/svg/playwright.js | 1 - frontend/crawlab-ui/src/assets/js/svg/plus.js | 1 - .../crawlab-ui/src/assets/js/svg/postgres.js | 1 - .../crawlab-ui/src/assets/js/svg/proton.js | 1 - .../crawlab-ui/src/assets/js/svg/puppeteer.js | 1 - frontend/crawlab-ui/src/assets/js/svg/qwen.js | 1 - .../crawlab-ui/src/assets/js/svg/redis.js | 1 - .../crawlab-ui/src/assets/js/svg/scrapy.js | 1 - .../crawlab-ui/src/assets/js/svg/selenium.js | 1 - .../crawlab-ui/src/assets/js/svg/snowflake.js | 1 - .../crawlab-ui/src/assets/js/svg/table.js | 1 - .../src/assets/js/svg/text-center.js | 1 - .../crawlab-ui/src/assets/js/svg/text-left.js | 1 - .../src/assets/js/svg/text-paragraph.js | 1 - .../src/assets/js/svg/text-right.js | 1 - .../crawlab-ui/src/assets/js/svg/type-bold.js | 1 - .../crawlab-ui/src/assets/js/svg/type-h1.js | 1 - .../crawlab-ui/src/assets/js/svg/type-h2.js | 1 - .../crawlab-ui/src/assets/js/svg/type-h3.js | 1 - .../src/assets/js/svg/type-italic.js | 1 - .../src/assets/js/svg/type-strikethrough.js | 1 - .../src/assets/js/svg/type-underline.js | 1 - .../crawlab-ui/src/assets/js/svg/webmagic.js | 1 - .../src/assets/js/svg/wechat_work.js | 1 - frontend/crawlab-ui/src/assets/js/svg/xxl.js | 1 - frontend/crawlab-ui/src/assets/js/svg/zoho.js | 1 - .../crawlab-ui/src/assets/svg/icons/colly.svg | 46 +- .../src/assets/svg/icons/crawlee.svg | 2 +- .../src/assets/svg/icons/drission-page.svg | 110 +++-- .../src/assets/svg/icons/puppeteer.svg | 52 ++- .../crawlab-ui/src/assets/svg/icons/redis.svg | 6 +- .../src/assets/svg/icons/scrapy.svg | 52 ++- .../src/assets/svg/icons/selenium.svg | 16 +- .../src/assets/svg/icons/webmagic.svg | 136 ++++-- .../crawlab-ui/src/assets/svg/icons/xxl.svg | 415 +++++++++++++----- .../src/components/ui/icon/Icon.vue | 5 +- .../src/layouts/components/Header.vue | 1 + .../task/detail/tabs/TaskDetailTabLogs.vue | 57 +-- 95 files changed, 672 insertions(+), 381 deletions(-) create mode 100644 frontend/crawlab-ui/.run/dev.run.xml create mode 100644 frontend/crawlab-ui/.run/gen_index.run.xml delete mode 100644 frontend/crawlab-ui/scripts/gen-svg.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/163.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/anthropic.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/aol.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/arrow-clockwise.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/arrow-counterclockwise.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/azure.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/cassandra.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/chat-square-quote.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/cheerio.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/chevron-down.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/chromium.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/clickhouse.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/code.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/colly.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/crawlee.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/db2.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/deepseek.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/devops.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/dingtalk.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/drission-page.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/elasticsearch.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/gemini.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/gmail.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/go.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/grok.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/hive.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/image-broken.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/image.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/journal-code.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/journal-text.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/justify.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/kafka.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/lark.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/link.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/list-ol.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/list-ul.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/logo-icon-white.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/logo-icon.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/logo-main.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/logo-white.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/logo.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/maven.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/mistral.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/mongodb.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/ms_teams.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/mssql.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/mysql.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/netease.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/openai.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/oracle.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/outlook.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/pencil-fill.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/playwright.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/plus.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/postgres.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/proton.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/puppeteer.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/qwen.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/redis.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/scrapy.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/selenium.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/snowflake.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/table.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/text-center.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/text-left.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/text-paragraph.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/text-right.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/type-bold.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/type-h1.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/type-h2.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/type-h3.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/type-italic.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/type-strikethrough.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/type-underline.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/webmagic.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/wechat_work.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/xxl.js delete mode 100644 frontend/crawlab-ui/src/assets/js/svg/zoho.js diff --git a/core/task/scheduler/service.go b/core/task/scheduler/service.go index 05e880e2..c8e46522 100644 --- a/core/task/scheduler/service.go +++ b/core/task/scheduler/service.go @@ -103,7 +103,7 @@ func (svc *Service) Cancel(id, by primitive.ObjectID, force bool) (err error) { func (svc *Service) cancelOnMaster(t *models.Task, by primitive.ObjectID, force bool) (err error) { if err := svc.handlerSvc.Cancel(t.Id, force); err != nil { - svc.Errorf("failed to cancel task on master: %s", t.Id.Hex()) + svc.Errorf("failed to cancel task (%s) on master: %v", t.Id.Hex(), err) return err } @@ -116,7 +116,7 @@ func (svc *Service) cancelOnWorker(t *models.Task, by primitive.ObjectID, force // get subscribe stream stream, ok := svc.svr.TaskSvr.GetSubscribeStream(t.Id) if !ok { - err := fmt.Errorf("stream not found for task: %s", t.Id.Hex()) + err := fmt.Errorf("stream not found for task (%s)", t.Id.Hex()) svc.Errorf(err.Error()) t.Status = constants.TaskStatusAbnormal t.Error = err.Error() @@ -130,7 +130,7 @@ func (svc *Service) cancelOnWorker(t *models.Task, by primitive.ObjectID, force Force: force, }) if err != nil { - svc.Errorf("failed to send cancel request to worker: %s", t.Id.Hex()) + svc.Errorf("failed to send cancel task (%s) request to worker: %v", t.Id.Hex(), err) return err } diff --git a/frontend/crawlab-ui/.run/dev.run.xml b/frontend/crawlab-ui/.run/dev.run.xml new file mode 100644 index 00000000..46d8ec8b --- /dev/null +++ b/frontend/crawlab-ui/.run/dev.run.xml @@ -0,0 +1,12 @@ + + + + + +