215d3ed42d
Merge remote-tracking branch 'origin/deploy/dev' into feat/evaluation
...
# Conflicts:
# .vite-hooks/pre-commit
# api/controllers/console/__init__.py
# api/core/agent/base_agent_runner.py
# api/core/app/app_config/easy_ui_based_app/model_config/converter.py
# api/core/app/apps/agent_chat/app_runner.py
# api/core/entities/provider_configuration.py
# api/core/helper/moderation.py
# api/core/model_manager.py
# api/core/rag/embedding/cached_embedding.py
# api/core/rag/retrieval/dataset_retrieval.py
# api/core/rag/splitter/fixed_text_splitter.py
# api/core/workflow/nodes/datasource/datasource_node.py
# api/core/workflow/nodes/knowledge_index/knowledge_index_node.py
# api/models/human_input.py
# api/providers/trace/trace-tencent/src/dify_trace_tencent/span_builder.py
# api/services/workflow_service.py
# api/tasks/trigger_processing_tasks.py
# api/tests/integration_tests/core/workflow/nodes/datasource/test_datasource_node_integration.py
# api/tests/integration_tests/workflow/nodes/test_http.py
# api/tests/integration_tests/workflow/nodes/test_parameter_extractor.py
# api/tests/unit_tests/controllers/service_api/app/test_conversation.py
# api/tests/unit_tests/core/prompt/test_agent_history_prompt_transform.py
# api/tests/unit_tests/core/variables/test_segment.py
# api/tests/unit_tests/core/workflow/graph_engine/test_mock_factory.py
# api/tests/unit_tests/core/workflow/nodes/answer/test_answer.py
# api/tests/unit_tests/core/workflow/nodes/datasource/test_datasource_node.py
# api/tests/unit_tests/core/workflow/nodes/http_request/test_http_request_node.py
# api/tests/unit_tests/core/workflow/nodes/human_input/test_email_delivery_config.py
# api/tests/unit_tests/services/workflow/test_workflow_human_input_delivery.py
# web/app/(commonLayout)/layout.tsx
# web/app/components/app/configuration/dataset-config/params-config/weighted-score.tsx
# web/app/components/app/configuration/debug/debug-with-multiple-model/debug-item.tsx
# web/app/components/app/workflow-log/__tests__/list.spec.tsx
# web/app/components/apps/__tests__/list.spec.tsx
# web/app/components/apps/list.tsx
# web/app/components/base/chat/chat-with-history/header/operation.tsx
# web/app/components/base/chat/chat-with-history/sidebar/operation.tsx
# web/app/components/header/account-setting/data-source-page-new/operator.tsx
# web/app/components/header/account-setting/members-page/operation/index.tsx
# web/app/components/plugins/marketplace/sort-dropdown/__tests__/index.spec.tsx
# web/app/components/plugins/marketplace/sort-dropdown/index.tsx
# web/app/components/plugins/plugin-page/plugin-tasks/index.tsx
# web/app/components/workflow/header/__tests__/test-run-menu.spec.tsx
# web/app/components/workflow/header/test-run-menu.tsx
# web/app/components/workflow/nodes/_base/components/next-step/operator.tsx
# web/app/components/workflow/nodes/_base/components/panel-operator/index.tsx
# web/app/components/workflow/nodes/assigner/components/__tests__/operation-selector.spec.tsx
# web/app/components/workflow/nodes/assigner/components/operation-selector.tsx
# web/app/components/workflow/operator/__tests__/more-actions.spec.tsx
# web/app/components/workflow/operator/zoom-in-out.tsx
# web/app/components/workflow/panel/version-history-panel/context-menu/menu-item.tsx
# web/app/components/workflow/selection-contextmenu.tsx
# web/eslint-suppressions.json
Co-authored-by: FFXN <[email protected]
2026-04-20 07:03:29 +00:00
Joel
3bb3670cb5
merge
2026-04-20 13:41:51 +08:00
Joel
103ba6ae3b
mrege
2026-04-20 10:39:37 +08:00
0c8acd402a
chore(web): drop delay={0} from tooltip triggers and retype DocName ( #35382 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-18 11:21:07 +00:00
f980d5d3be
feat: copy nodes cross apps ( #33273 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
2026-04-17 10:02:26 +00:00
JzoNg
cdd57c4b7d
fix merge error
2026-04-17 17:34:15 +08:00
yyh and GitHub
96122692cb
fix(web): keep workflow panel operator anchor mounted during menu close animation ( #35363 )
2026-04-17 09:10:10 +00:00
dfcc0f8863
refactor(dify-ui): finish primitive migration from web/base/ui to @langgenius/dify-ui ( #35349 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-17 08:46:11 +00:00
+21
0e320290e1
feat: evaluation ( #35353 )
...
Signed-off-by: dependabot[bot] <[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
2026-04-17 16:37:21 +08:00
fa74a4ed67
Merge deploy/dev into feat/evaluation - resolve merge conflicts
...
Agent-Logs-Url: https://github.com/langgenius/dify/sessions/489dd945-dfff-462a-9c76-d29fdaa55de2
Co-authored-by: FFXN <[email protected]
2026-04-17 08:29:13 +00:00
JzoNg
3ea4742b29
Merge branch 'main' into jzh
2026-04-17 16:26:19 +08:00
+4
eaddd4a132
fix(web): stabilize workflow node panel operator dropdown trigger ( #35352 )
...
Signed-off-by: dependabot[bot] <[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
2026-04-17 07:27:22 +00:00
JzoNg
364c0eb6e2
Merge branch 'main' into jzh
2026-04-17 14:57:13 +08:00
JzoNg
322b3ff641
fix(web): fix merge error
2026-04-17 14:49:08 +08:00
JzoNg
38736c154b
Merge branch 'main' into jzh
2026-04-17 14:05:23 +08:00
+4
b6c7581a31
refactor(web): replace portal component with DropdownMenu in various components ( #35319 )
...
Signed-off-by: dependabot[bot] <[email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected] [email protected]
2026-04-17 05:53:51 +00:00
6ca066983d
chore: auto fix for tailwind rules ( #35332 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 17:11:06 +00:00
Stephen Zhou and GitHub
4289cb2634
chore: workspace level typecheck ( #35329 )
2026-04-16 14:42:04 +00:00
c966e281d4
refactor(web): align UI component APIs with shadcn v4 best practices ( #35328 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-16 13:30:12 +00:00
Stephen Zhou and GitHub
abb84f1c38
chore: enable noUncheckedIndexedAccess ( #35178 )
2026-04-16 13:01:35 +00:00
yyh and GitHub
e507675860
fix(web): add destructive hover background to menu item components ( #35322 )
2026-04-16 12:26:06 +00:00
CodingOnStar
14e1fe46a5
Merge branch 'feat/dropdown-migaration' into deploy/dev
2026-04-16 16:58:08 +08:00
Joel
6978767f56
feat: workflow support get params from url and add set url config modal
2026-04-16 16:56:06 +08:00
CodingOnStar
79d87e6000
refactor(web): replace Dropdown component with DropdownMenu in various components
...
- Updated DebugItem, MobileOperationDropdown, and Operation components to utilize DropdownMenu for improved dropdown functionality.
- Removed deprecated Dropdown component references and adjusted related tests accordingly.
- Enhanced user interactions and accessibility across dropdown menus.
2026-04-16 16:40:26 +08:00
CodingOnStar
a13996dba1
refactor(web): replace PortalToFollowElem with DropdownMenu in various components
...
- Updated PublishWithMultipleModel, AppSidebarDropdown, DatasetSidebarDropdown, and others to use DropdownMenu for dropdown functionality.
- Adjusted related tests to reflect the new DropdownMenu structure.
- Enhanced the user interface by improving dropdown interactions and accessibility.
2026-04-16 15:30:27 +08:00
非法操作 and GitHub
0fea760143
fix: http node key value type dropdown ( #35304 )
2026-04-16 06:06:57 +00:00
c661d5c43a
refactor(web): migrate base/popoversto ui/dropdown-menu and ui/select ( #35278 )
...
Co-authored-by: CodingOnStar <[email protected] [email protected]
2026-04-16 05:13:17 +00:00
JzoNg
7aa700bf2b
fix(web): fix merge
2026-04-16 12:06:53 +08:00
JzoNg
0d47750b15
Merge branch 'main' into jzh
2026-04-16 11:48:48 +08:00
53a22aa41b
feat: collaboration ( #30781 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
Co-authored-by: yyh <[email protected] [email protected]
2026-04-16 02:21:04 +00:00
538093855b
refactor(web): align Switch API with Base UI naming convention ( #35269 )
...
Co-authored-by: copilot-swe-agent[bot] <[email protected]
2026-04-15 15:47:59 +00:00
af7d5e60b4
feat(ui): scaffold @langgenius/dify-ui and migrate design tokens ( #35256 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-15 13:11:20 +00:00
JzoNg
7f5bbe0ee3
fix(web): button import
2026-04-15 15:23:50 +08:00
JzoNg
e6e063138e
Merge branch 'main' into jzh
2026-04-15 10:20:27 +08:00
2c58b424a1
refactor(web): migrate confirm dialogs to base/ui/alert-dialog ( #35127 )
...
Co-authored-by: CodingOnStar <[email protected] [email protected]
2026-04-14 14:46:26 +00:00
yyh and GitHub
ebf741114d
refactor(web): replace Button destructive boolean with tone semantic axis ( #35176 )
2026-04-14 14:16:39 +00:00
e1bbe57f9c
refactor(web): re-design button api ( #35166 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
2026-04-14 13:22:23 +00:00
Joel and GitHub
d4783e8c14
chore: url in tool description support clicking jump directly ( #35163 )
2026-04-14 09:55:55 +00:00
Joel and GitHub
d7ad2baf79
chore: clarify tracing error copy to direct users to the Tracing tab ( #35153 )
2026-04-14 08:15:07 +00:00
JzoNg
605af8d60e
Merge branch 'main' into jzh
2026-04-14 14:05:44 +08:00
yyh and GitHub
79c1473378
refactor(web): align tooltip content class props ( #35135 )
2026-04-14 04:21:55 +00:00
c0e998ef6e
chore: update deps ( #35066 )
...
Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: yyh <[email protected]
2026-04-14 02:19:29 +00:00
JzoNg
8747e3a2d3
Merge branch 'main' into jzh
2026-04-14 10:14:13 +08:00
Joel and GitHub
28fce0a890
fix: click empty http node value may cause blur ( #35051 )
2026-04-13 14:48:18 +00:00
JzoNg
f93b287949
feat(web): billing for evaluation & snippets
2026-04-12 11:09:15 +08:00
JzoNg
e4c056a57a
Merge branch 'main' into jzh
2026-04-12 10:16:13 +08:00
1703df5c00
test: add unit tests for workflow components including tools and inspect vars ( #34843 )
...
Co-authored-by: CodingOnStar <[email protected]
2026-04-10 13:11:36 +00:00
wangxiaolei and GitHub
04f5fe5e38
fix: fix outputs share same name var ( #34604 )
2026-04-10 11:30:21 +00:00
非法操作 and GitHub
1b7d0bd4e6
chore: should hide change action when node is undeletable ( #34592 )
2026-04-10 11:29:29 +00:00
XHamzaX and GitHub
6612ba69b1
fix(workflow): correct maximized editor panel layout in execution logs ( #34909 )
2026-04-10 10:59:09 +00:00
