1944 Commits

Author	SHA1	Message	Date
Joel	c93c264c5a	feat: format to tracing	2024-12-24 16:08:48 +08:00
AkaraChen	77017522b8	chore: init tool select component	2024-12-24 16:01:14 +08:00
AkaraChen	aa309964e5	chore: init tool select component	2024-12-24 15:55:45 +08:00
zxhlyh	754baf8d02	refact workflow run	2024-12-24 15:38:54 +08:00
zxhlyh	b98dd22491	refact workflow run	2024-12-24 15:31:46 +08:00
AkaraChen	7c460eb6e7	chore: add warning ui for agentic stragey	2024-12-24 14:20:15 +08:00
JzoNg	e2e2090e0c	support model params change	2024-12-24 14:15:18 +08:00
JzoNg	c8fc1deca6	support & operator of model-selector scope	2024-12-24 12:18:03 +08:00
Yi	6dd14ca2be	chore: add agent strategy option apart from bundle	2024-12-24 12:05:35 +08:00
zxhlyh	ec6f4ee9df	Merge branch 'main' into feat/plugins	2024-12-24 11:35:47 +08:00
JzoNg	9d117fa2f9	param rules panel	2024-12-24 11:00:31 +08:00
Joel	e8319f01e0	fix: crash	2024-12-24 10:33:56 +08:00
zxhlyh	2bf33c4dd2	Fix/workflow retry log (#12013)	2024-12-23 17:18:09 +08:00
zxhlyh	ef95b1268e	Fix/workflow retry (#11999)	2024-12-23 15:55:50 +08:00
Joel	c3f3b79b79	merge main	2024-12-23 15:33:08 +08:00
Shun Miyazawa	4e3d732934	feat: Warning on invite modal when mail setup is incomplete (#11809)	2024-12-23 15:27:49 +08:00
yagiyuki	4584eb3058	Add custom to file types (#11966) ... Co-authored-by: yagiyuki <yagiyuki>	2024-12-23 13:53:46 +08:00
Yi Xiao	74b1b60125	Feat: account page dark mode (#11977)	2024-12-23 11:17:49 +08:00
liuhaoran	6b49889041	fix: messagefeedbackapi support content (#11716) ... Signed-off-by: weiyang <24080293@smb956101.com> Co-authored-by: weiyang <24080293@smb956101.com>	2024-12-22 10:45:55 +08:00
左凌	7a00798027	Update input-var-list.tsx (#9987)	2024-12-21 11:54:12 +08:00
zhu-an	6ded06c6d9	fix: dataset search-input compostion can't work in chrome (#11907) ... Co-authored-by: zhaoqingyu.1075 <zhaoqingyu.1075@bytedance.com>	2024-12-21 11:26:17 +08:00
JzoNg	327eac09e7	fix: scope value	2024-12-20 16:37:30 +08:00
JzoNg	cf75e2f053	model selector support scope	2024-12-20 16:36:22 +08:00
zxhlyh	ef7e47d162	fix: rerank switch (#11897)	2024-12-20 16:12:34 +08:00
zxhlyh	0c0120ef27	Feat/workflow retry (#11885)	2024-12-20 15:44:37 +08:00
-LAN-	dacd457478	feat: add workflow parallel depth limit configuration (#11460) ... Signed-off-by: -LAN- <laipz8200@outlook.com> Co-authored-by: zxhlyh <jasonapring2015@outlook.com>	2024-12-20 14:52:20 +08:00
Novice	f6247fe67c	Feat: Add partial success status to the app log (#11869) ... Co-authored-by: Novice Lee <novicelee@NoviPro.local>	2024-12-20 14:13:44 +08:00
JzoNg	12c47d80af	support llm tool_parameters	2024-12-20 12:46:07 +08:00
JzoNg	5c6916354e	app selector support scope	2024-12-20 11:59:18 +08:00
JzoNg	6d2b2d7810	fix number of tool actions	2024-12-20 11:27:52 +08:00
JzoNg	1fa5b1755f	dark mode for model provider	2024-12-20 10:44:39 +08:00
twwu	5dad4793e6	fix: Fix context selector usage in plugin page components	2024-12-20 09:56:06 +08:00
crazywoola	de3911e930	Fix/10584 wrong message when no custom tool available in custom tool list (#11851)	2024-12-19 21:19:08 +08:00
Shun Miyazawa	f7415e1ca4	feat: Disable the "Forgot your password?" button when the mail server setup is incomplete (#11653)	2024-12-18 15:20:41 +08:00
Benjamin	558ab25f51	fix: imperfect service-api introduction text (#11782)	2024-12-18 13:43:34 +08:00
barabicu	1325246da8	fix: Prevent redirection to /overview when accessing /workflow. (#11733)	2024-12-18 08:37:22 +08:00
Hiroshi Fujita	dfa9a91906	(doc) fix: update cURL examples to include Authorization header (#11750)	2024-12-17 17:44:40 +08:00
Charlie.Wei	5e2926a207	Fix explore app icon (#11742) ... Co-authored-by: luowei <glpat-EjySCyNjWiLqAED-YmwM> Co-authored-by: crazywoola <427733928@qq.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>	2024-12-17 17:42:44 +08:00
NFish	a399502ecd	Dark Mode: Workflow darkmode style (#11695)	2024-12-17 12:20:49 +08:00
crazywoola	7f095bdc42	fix: image icon can not display (#11701)	2024-12-16 19:15:23 +08:00
zxhlyh	04054954c5	Merge branch 'main' into feat/plugins	2024-12-16 17:55:52 +08:00
zxhlyh	672843dcab	feat: marketplace list more link	2024-12-16 17:39:07 +08:00
JzoNg	4f8cdabef0	dark mode of model provider	2024-12-16 16:29:45 +08:00
zxhlyh	9f602f73eb	fix: workflow continue on error edge color (#11689)	2024-12-16 15:39:53 +08:00
Joel	41de7e76ec	fix: iteration output array type causes always outputting string array (#11686)	2024-12-16 15:06:03 +08:00
zxhlyh	e792e91777	fix: model page	2024-12-16 14:56:55 +08:00
Joel	607a22ad12	fix: tool constant params change cause page crashed (#11682)	2024-12-16 14:33:00 +08:00
JzoNg	d5cb9f0193	add help doc link of endpoint	2024-12-16 14:20:22 +08:00
JzoNg	171cc88a0d	merge main	2024-12-16 11:09:13 +08:00
Junyan Qin	8ecb9aaa91	fix: remove unnecessary curly braces in wf api doc (#11658)	2024-12-15 17:12:26 +08:00
NFish	a725b8bb6e	Feat: new entry point for app creation (#10847)	2024-12-13 17:29:09 +08:00
Kevin9703	bdfdccd511	fix: app log filter value error (#11624)	2024-12-13 16:40:34 +08:00
JzoNg	463f5a34c6	dark mode for plugins	2024-12-13 14:06:07 +08:00
JzoNg	5c98f1a5aa	dark mode for tools	2024-12-13 13:10:29 +08:00
zxhlyh	3d803c2e80	Fix/pdf preview in build (#11621)	2024-12-13 11:01:53 +08:00
zxhlyh	a0e999e438	feat: plugin add agent-strategy type	2024-12-12 17:29:25 +08:00
JzoNg	e0cc990fa5	fix: tool parameter form change	2024-12-12 15:12:41 +08:00
yihong	36cb25b341	fix: support mdx files close #11557 (#11565) ... Signed-off-by: yihong0618 <zouzou0208@gmail.com>	2024-12-12 13:37:56 +08:00
KVOJJJin	f96fdc2970	Feat: dark mode for logs and annotations (#11575)	2024-12-12 10:09:48 +08:00
zxhlyh	6f4cbe0bde	fix: workflow continue on error doc link (#11554)	2024-12-11 18:03:41 +08:00
zxhlyh	bec5451f12	feat: workflow continue on error (#11474)	2024-12-11 14:21:38 +08:00
zxhlyh	5b3112a137	fix: model page empty	2024-12-11 14:10:28 +08:00
zxhlyh	35fb9099e3	fix: model page	2024-12-10 15:51:55 +08:00
zxhlyh	c51c032334	fix: dsl check	2024-12-10 14:11:34 +08:00
zxhlyh	5825c101c9	fix: marketplace exclude	2024-12-10 13:37:02 +08:00
Charlie.Wei	bdd5869244	Msg file preview (#11466) ... Co-authored-by: crazywoola <427733928@qq.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>	2024-12-10 10:53:37 +08:00
Hash Brown	2866383228	fix: cannot close notification manually (#11490)	2024-12-09 17:55:06 +08:00
suzuki.sh	c3c6a48059	Fix the token count at the iteration node (#11235) ... Co-authored-by: -LAN- <laipz8200@outlook.com>	2024-12-09 15:02:04 +08:00
kurokobo	230fa3286b	feat: add 'Open in Explore' link for each apps on studio (#11402)	2024-12-09 12:04:03 +08:00
Yi Xiao	32f8a98cf8	feat: ifelse condition variable editable after selection (#11431)	2024-12-09 11:06:47 +08:00
Charlie.Wei	6c60ecb237	Refactor: Remove redundant style and simplify Mermaid component (#11472)	2024-12-09 09:47:58 +08:00
VoidIsVoid	a594e256ae	remove mermail render cache (#11470) ... Co-authored-by: Gimling <huangjl@ruyi.ai>	2024-12-09 09:33:18 +08:00
Hash Brown	266d32bd77	fix: cannot upload animated webp image as app icon (#11453)	2024-12-08 08:37:21 +08:00
Hash Brown	cc8feaa483	style: EmojiPicker component top padding (#11452)	2024-12-07 22:26:28 +08:00
KVOJJJin	1490a19fa1	Fix: compatible with outputs data structure (#11432)	2024-12-06 17:35:35 +08:00
StyleZhang	69daf4a027	merge main	2024-12-06 16:56:42 +08:00
JzoNg	3bc9ddb006	fix mutation of model credentials update	2024-12-06 16:05:06 +08:00
JzoNg	ea2862e435	fix style of boolean form of model parameters	2024-12-06 16:05:06 +08:00
StyleZhang	ca3d96e5f4	fix: tool list	2024-12-06 15:42:02 +08:00
Charlie.Wei	7c979e6490	Update mermaid (#11356) ... Co-authored-by: luowei <glpat-EjySCyNjWiLqAED-YmwM> Co-authored-by: crazywoola <427733928@qq.com> Co-authored-by: crazywoola <100913391+crazywoola@users.noreply.github.com>	2024-12-05 20:43:42 +08:00
eux	bb62391a4c	fix: broken link to knowledge base guide (#11387)	2024-12-05 17:47:11 +08:00
KVOJJJin	0b25c0b677	Fix: support file download in workflow result (#11338)	2024-12-05 16:58:39 +08:00
Yi	d6dea67947	apply the skeleton component to the Plugin loading card	2024-12-05 15:27:47 +08:00
Yi	b8f9747849	Merge branch "main" into feat/plugins	2024-12-05 15:08:09 +08:00
StyleZhang	0e70e72594	fix: marketplace list	2024-12-05 14:54:20 +08:00
Yi	0e419a7a16	feat: move linear gradient bg to common config	2024-12-05 14:44:45 +08:00
Yi Xiao	20c4633d2a	fix: empty object (conversation variable) editable (#11352)	2024-12-05 13:59:59 +08:00
Yi Xiao	6180762160	fix: bg typo in variable aggregator node (#11376)	2024-12-05 11:46:12 +08:00
Joel	284bb7ac71	fix: ref attribute in markdown causes page crash (#11369) ... Co-authored-by: crazywoola <427733928@qq.com>	2024-12-05 10:15:21 +08:00
twwu	0ac5e53c2e	fix: refactor GitHub releases fetching to improve error handling and format response	2024-12-04 18:08:25 +08:00
Joel	44b0039e8b	fix: install plugin type show error	2024-12-04 18:06:00 +08:00
AkaraChen	5e2cb0e3a8	feat: add base skeleton component (#11339)	2024-12-04 17:34:55 +08:00
twwu	becdca24df	fix: enhance GitHub releases fetching with optional authentication	2024-12-04 16:49:49 +08:00
Hash Brown	16a65cb367	fix: cannot send message when debug with multiple model with conversa… (#11333)	2024-12-04 16:17:11 +08:00
Yi Xiao	f933af9f57	fix: check valid for number variable (#11334)	2024-12-04 15:46:54 +08:00
zxhlyh	98a1b01b0c	fix: file download in chat (#11322)	2024-12-04 11:10:56 +08:00
Joel	f634a4488f	merge main	2024-12-04 11:06:00 +08:00
Joel	e240424be5	fix: number variable can not input constant type value in tool config form (#11320)	2024-12-04 10:46:03 +08:00
DDDDD12138	1cb5a12abb	fix: resolve scrolling issue in workflow-log table (#11302)	2024-12-03 21:29:42 +08:00
KVOJJJin	ff2a4a6fcd	Fix: model params in logs (#11298)	2024-12-03 21:17:55 +08:00
Yi	fc2656b4b7	fix: workspace selector UI	2024-12-03 18:34:18 +08:00
StyleZhang	d6a4cbc6cc	fix: marketplace list	2024-12-03 18:03:39 +08:00
Yi	1e2ee61f6a	feat: add version check before Plugin install from GitHub	2024-12-03 15:47:45 +08:00
StyleZhang	ab9a177c90	fix: marketplace list	2024-12-03 14:34:44 +08:00
Yi Xiao	e135ffc2c1	Feat: upgrade variable assigner (#11285) ... Signed-off-by: -LAN- <laipz8200@outlook.com> Co-authored-by: -LAN- <laipz8200@outlook.com>	2024-12-03 13:56:40 +08:00
kurokobo	a86f1eca79	docs: add api docs for /v1/info (#11269)	2024-12-03 09:14:13 +08:00
Hiroshi Fujita	1d8385f7ac	Sync INDEXING_MAX_SEGMENTATION_TOKENS_LENGTH between API and Web (#11230)	2024-12-02 15:29:25 +08:00
Hiroshi Fujita	9bc5bc2548	feat: Increase the number of Opening Questions in the Conversation Opener (#11233)	2024-12-01 09:38:45 +08:00
非法操作	3bc4dc58d7	fix: search model not work as expected (#11225)	2024-11-30 17:31:15 +08:00
fengjiajie	9dd4bf5574	fix: Correct inputs field type in API documentation (#11198)	2024-11-30 11:13:32 +08:00
-LAN-	0554898b5d	fix(file_factory): Remove transfer_method validation (#11207) ... Signed-off-by: -LAN- <laipz8200@outlook.com>	2024-11-29 17:26:31 +08:00
Joel	b78ab0bd69	fix: other install error	2024-11-29 15:18:07 +08:00
Joel	84cad5969e	fix: not handleinstall error	2024-11-29 15:09:23 +08:00
Joel	35ef874867	fix: detect is same packege use uniqid	2024-11-29 10:56:58 +08:00
非法操作	d3af0e9090	fix: handleLoadFileFromLink's transfer method incorrect (#11197)	2024-11-29 09:37:50 +08:00
非法操作	e576d32fb6	chore: improve conversation list and rename docs (#11187)	2024-11-29 09:22:08 +08:00
Joel	47579c86e6	fix: from marketplace install and update bundle	2024-11-28 18:47:06 +08:00
Joel	32619bd05e	fix: install bunlde support update	2024-11-28 18:26:18 +08:00
JzoNg	6a500edf4d	fix: loading of credential form	2024-11-28 17:48:28 +08:00
JzoNg	3bcd470ec6	fix: authorization in debugging plugin	2024-11-28 17:27:21 +08:00
JzoNg	73825c59e4	fix: crash of tool authorization in agent	2024-11-28 17:27:21 +08:00
JzoNg	5f76975e12	fix: icon of tool provider in agent	2024-11-28 17:27:21 +08:00
JzoNg	3ddb3d2bff	fix: deleted tools in agent	2024-11-28 17:27:21 +08:00
JzoNg	a70eda6c45	add loading for auth modal	2024-11-28 17:27:21 +08:00
Joel	51f0f21a47	chore: not load updateInfo can not install	2024-11-28 14:30:31 +08:00
Joel	073e847524	fix: installed	2024-11-28 14:13:43 +08:00
Joel	3e601c4ef5	feat: local support upgrade	2024-11-28 14:09:05 +08:00
Joel	fba468e8ad	fix: handle install the same version	2024-11-28 13:50:04 +08:00
KVOJJJin	18d3ffc194	Feat: new pagination (#11170)	2024-11-28 12:26:02 +08:00
Joel	f40b212b04	feat: support update if installed from marketplace	2024-11-28 12:00:12 +08:00
StyleZhang	37eee7be24	fix: model provider page marketplace	2024-11-28 11:26:45 +08:00
NFish	0a30a5b077	Feat: remove github star and community links if it is enterprise version (#11180)	2024-11-28 11:02:25 +08:00
Joel	99942b26e6	chore: support install hide button	2024-11-28 10:40:33 +08:00
StyleZhang	d4cda69b0e	feat: marketplace add exclude	2024-11-27 16:14:15 +08:00
StyleZhang	e145dba487	fix: dsl check	2024-11-27 14:30:47 +08:00
Novice	baef18cedd	fix: Incorrect iteration log display in workflow with multiple parallel mode iteartaion nodes (#11158) ... Co-authored-by: Novice Lee <novicelee@NovicedeMacBook-Pro.local>	2024-11-27 13:42:28 +08:00
Joel	e908ecab8f	fix: add ui	2024-11-27 10:50:39 +08:00
Joel	79db920fa7	fix: enable after disabled memory not pass user query (#11136)	2024-11-26 17:55:11 +08:00
NFish	b3d65cc7df	Feat: Divider component now supports gradient background (#11130)	2024-11-26 17:44:56 +08:00
Joel	b8af4aead1	fix: update version show problem	2024-11-26 14:38:43 +08:00
Joel	d40f0e645c	fix: install marketplace bundle title	2024-11-26 14:11:21 +08:00
Joel	4b77ced4ad	fix: not show from market bundle package icon	2024-11-26 14:07:45 +08:00
StyleZhang	f47b32b26d	fix: dsl	2024-11-26 11:10:53 +08:00
StyleZhang	102a42d24c	Merge branch 'main' into feat/plugins	2024-11-26 11:08:30 +08:00
StyleZhang	2041650cca	merge main	2024-11-26 10:29:58 +08:00
StyleZhang	a0873a956f	merge main	2024-11-26 10:27:48 +08:00
非法操作	f1366e8e19	fix #11091 raise redirect issue (#11092)	2024-11-26 10:25:42 +08:00
非法操作	60c1549771	fix: import Explore Apps raise error (#11091)	2024-11-26 09:32:08 +08:00
Joel	df049564e8	feat: support install bundle from marketplace	2024-11-25 18:01:30 +08:00
Joel	b93be49530	chore: support update show version	2024-11-25 18:01:29 +08:00
StyleZhang	57756b18e4	fix: plugin task	2024-11-25 17:54:28 +08:00
StyleZhang	8ad9ab40df	fix: plugin task	2024-11-25 17:32:57 +08:00
Joel	eb542067af	feat: add cookie management (#11061)	2024-11-25 16:31:49 +08:00
KVOJJJin	8028e75fbb	Improvement: update api doc of workflow (#11054)	2024-11-25 12:48:36 +08:00
-LAN-	3eb51d85da	fix(workflow_entry): Support receive File and FileList in single step run. (#10947) ... Signed-off-by: -LAN- <laipz8200@outlook.com> Co-authored-by: JzoNg <jzongcode@gmail.com>	2024-11-25 12:46:50 +08:00
StyleZhang	4f54ac6ed6	fix: marketplace collection condition	2024-11-25 12:03:49 +08:00
Joel	2dd4c34423	fix: llm node do not pass sys.query in chatflow app init (#11053)	2024-11-25 12:01:57 +08:00
非法操作	08ac36812b	feat: support LLM process document file (#10966) ... Co-authored-by: -LAN- <laipz8200@outlook.com>	2024-11-22 19:32:44 +08:00
crazywoola	3750200c5e	feat: add a meta(mac) ctrl(windows) key (#10978)	2024-11-22 16:30:34 +08:00
-LAN-	c5f7d650b5	feat: Allow using file variables directly in the LLM node and support more file types. (#10679) ... Co-authored-by: Joel <iamjoel007@gmail.com>	2024-11-22 16:30:22 +08:00
NFish	8a83edc1b5	Feat: update icon and Divider components (#10975)	2024-11-22 15:44:42 +08:00
StyleZhang	3263a6a5f5	fix: marketplace plugin tags i18n	2024-11-22 15:26:25 +08:00
-LAN-	5172f0bf39	feat: Check and compare the DSL version before import an app (#10969) ... Co-authored-by: Yi <yxiaoisme@gmail.com>	2024-11-22 15:05:04 +08:00
JzoNg	506e5e0bc8	fix: plugin type	2024-11-22 14:53:20 +08:00
JzoNg	c768f8fdd1	fix: path of tool provider	2024-11-22 11:41:36 +08:00
twwu	d45ce48932	fix: update theme imports in globals.css	2024-11-22 11:02:45 +08:00
Wu Tianwei	3579bbd1c4	refactor: Split linear-gradient and color (#10961)	2024-11-22 10:55:42 +08:00
Joel	3e3ae989f0	chore: in tool file and files all support file and files	2024-11-22 10:54:22 +08:00
Joel	786f2d9bf6	chore: fix categoriesMap[category] undefined	2024-11-22 10:39:22 +08:00
twwu	85377d13fc	Merge branch 'feat/plugins' of https://github.com/langgenius/dify into feat/plugins	2024-11-22 10:22:39 +08:00
twwu	51e04b45ec	fix: update error icon z-index and upgrade react-query dependencies	2024-11-22 10:22:33 +08:00
JzoNg	bd6c2e519c	fix: corner mark	2024-11-22 09:09:35 +08:00
非法操作	8b16f07eb0	feat: add cURL import for http request node (#8656)	2024-11-21 22:25:18 +08:00
marvin-season	fefda40acf	fix: fix bugs of frontend-workflow panel operator (#10945) ... Co-authored-by: marvin <sea-son@foxmail.com>	2024-11-21 19:07:02 +08:00
Joel	3f0b35d72e	feat: install bundle from marketplace code	2024-11-21 18:22:11 +08:00
JzoNg	78c867b9a3	use plugin detail for builtin tool	2024-11-21 18:11:36 +08:00
JzoNg	f213c8f393	fix: version switch	2024-11-21 18:11:36 +08:00
Joel	1b3f4f1f2a	feat: support icon size	2024-11-21 18:00:13 +08:00
Joel	c59c696df2	chore: add version type in marketplace return	2024-11-21 17:43:41 +08:00
Joel	8993a91f12	fix: upgrade sussces auto hide	2024-11-21 17:38:23 +08:00
JzoNg	02c5989612	recover api tool create card	2024-11-21 17:29:28 +08:00
JzoNg	ac42ba880a	fix: install handle of list refresh	2024-11-21 17:11:22 +08:00
JzoNg	56f573ecfb	fix: update plugin handle	2024-11-21 15:35:39 +08:00
Joel	2560d3edae	fix: bundle install title	2024-11-21 15:22:19 +08:00
Joel	351615fb98	fix: not the first time upload bundle error	2024-11-21 15:14:21 +08:00
Joel	11ed86f2a8	feat: download package	2024-11-21 14:25:58 +08:00
JzoNg	b01c18ae7f	fix: version badge	2024-11-21 14:16:02 +08:00
Hash Brown	ea0ebc020c	fix: chat history might be empty in log detail view (#10905)	2024-11-21 14:12:01 +08:00
Kota-Yamaguchi	f358db9f02	feat : Add Japanese translations for API documentation: chat, advanced-chat, completion, and workflow (#10927)	2024-11-21 14:02:46 +08:00
StyleZhang	84a3fe85c8	fix: marketplace card link	2024-11-21 13:50:26 +08:00
JzoNg	3efc6c5050	fix: github link	2024-11-21 13:42:06 +08:00
JzoNg	42a0534299	fix: locale of model provider	2024-11-21 13:18:33 +08:00
JzoNg	eec193488d	fix: detail link of plugin	2024-11-21 13:09:10 +08:00
JzoNg	021bc57cd4	empty of tool list	2024-11-21 12:43:18 +08:00
StyleZhang	022eda9e8b	fix: tool providers	2024-11-21 12:03:53 +08:00
Joel	2067092f52	feat: detail link in tools	2024-11-21 11:33:21 +08:00
Joel	000db07d29	feat: in tool install plugin	2024-11-21 11:16:05 +08:00
Joel	98ae34acd5	chore: support tags filter	2024-11-21 10:51:36 +08:00
StyleZhang	698e94856e	fix: plugin task zindex	2024-11-21 08:42:36 +08:00
Joel	99ffe43e91	merge main	2024-11-20 18:24:03 +08:00