Commit Graph

913 Commits

Author SHA1 Message Date
rd
6de2dc946a Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 17:59:24 +08:00
rd
cb1350242c style: 平台加圆角 2025-08-15 17:59:13 +08:00
rd
25d051ee0d Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 17:55:55 +08:00
rd
438e8eac80 perf: 上传时间字段修改 2025-08-15 17:55:44 +08:00
rd
b0b9399685 Merge remote-tracking branch 'origin/main' into feature/v1.3_主agent_rxd
# Conflicts:
#	src/styles/lib/reset.scss
#	src/views/creative-generation-workshop/explore/detail/index.vue
#	src/views/creative-generation-workshop/explore/detail/style.scss
#	src/views/creative-generation-workshop/explore/list/index.vue
#	src/views/creative-generation-workshop/manuscript-writer/detail/index.vue
#	src/views/creative-generation-workshop/manuscript/detail/index.vue
2025-08-15 17:43:43 +08:00
rd
a0ece21fa1 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 17:38:20 +08:00
rd
96e181a4ca perf: 去掉上传文件超时限制 2025-08-15 17:38:12 +08:00
rd
0e6de2ab46 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 17:33:38 +08:00
rd
642f98807c perf: 样式调整 2025-08-15 17:33:29 +08:00
rd
0e8579f257 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 17:23:53 +08:00
rd
ffcc982898 style: 文字换航处理 2025-08-15 17:23:44 +08:00
rd
e5c823145d perf: 样式调整 2025-08-15 17:15:36 +08:00
rd
d89791135f Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 16:31:20 +08:00
rd
b655600d53 style: 样式调整 2025-08-15 16:31:09 +08:00
rd
c916de8e67 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 16:26:52 +08:00
rd
2546b0a5cc style: 样式调整 2025-08-15 16:26:43 +08:00
rd
bd87e753f7 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 16:23:28 +08:00
rd
f27764e915 perf: 走查调整 2025-08-15 16:22:59 +08:00
rd
997c765eaa perf: ui走查问题修改 2025-08-15 15:36:03 +08:00
rd
ca53964cfb feat: 框架样式调整 2025-08-15 14:32:40 +08:00
rd
d80bfca793 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-15 10:39:22 +08:00
rd
d4617f6db1 perf: 切换卡片时重置ai-check 2025-08-15 10:39:14 +08:00
rd
1b0554a3cf Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test
# Conflicts:
#	src/views/property-marketing/media-account/account-manage/components/add-account-modal/index.vue
2025-08-15 10:32:57 +08:00
rd
af174dbbed perf: ui走查问题调整 2025-08-15 10:32:00 +08:00
lq
9571c2bf7b Merge branch 'test_多平台' into test
* test_多平台:
  添加视频号的数据采集
2025-08-15 10:12:56 +08:00
lq
f998513f19 添加视频号的数据采集 2025-08-15 09:34:02 +08:00
rd
ec6bdd36b4 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-14 18:12:46 +08:00
rd
0b8dd4b86a perf: 批量上传视频列表新增id 2025-08-14 18:12:27 +08:00
rd
ff8380ed46 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-14 18:06:01 +08:00
rd
0619b83edc perf: 走查优化 2025-08-14 18:05:46 +08:00
rd
e173b11750 perf: ui走查问题调整 2025-08-14 17:42:05 +08:00
rd
2a102f9f32 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-14 16:27:49 +08:00
rd
97f02b1785 perf: 走查问题调整 2025-08-14 16:26:43 +08:00
rd
e6f834e0d3 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test
# Conflicts:
#	pnpm-lock.yaml
#	src/components/text-over-tips/index.vue
#	src/layouts/Basic.vue
#	src/main.ts
#	src/router/constants.ts
#	src/router/typeings.d.ts
#	src/utils/tools.ts
#	vite.config.ts
2025-08-14 15:27:10 +08:00
rd
2d55501b23 feat: 批量上传文件, 2025-08-14 15:24:18 +08:00
rd
f11548e9c1 Merge remote-tracking branch 'origin/main' into feature/v1.3_主agent_rxd
# Conflicts:
#	pnpm-lock.yaml
#	vite.config.ts
2025-08-14 15:08:52 +08:00
rd
9dea979afc Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd
# Conflicts:
#	pnpm-lock.yaml
#	src/components/_base/navbar/index.vue
#	src/components/text-over-tips/index.vue
#	src/layouts/Basic.vue
#	src/layouts/Page.vue
#	src/main.ts
#	src/router/constants.ts
#	src/router/index.ts
#	src/router/typeings.d.ts
#	src/utils/tools.ts
2025-08-14 15:06:46 +08:00
rd
9b9f66b5af perf: 拷贝一份新的路由配置、注释产品路由校验 2025-08-14 14:46:51 +08:00
c8899f620b Merge pull request 'feature/linzhijun_扣子智能体_0710' (#24) from feature/linzhijun_扣子智能体_0710 into main
Reviewed-on: ai-team/lingji-work-fe#24
2025-08-14 03:39:22 +00:00
rd
9348c4369f Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-14 09:50:09 +08:00
rd
c3c0d2e40c perf: 视频展示比例调整 2025-08-14 09:49:55 +08:00
rd
8bd273c249 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 18:03:35 +08:00
rd
f64b460e59 perf: 清空后重置状态 2025-08-13 18:03:26 +08:00
rd
8b08594d0c Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 17:56:03 +08:00
rd
7f6999b5de feat: 视频上传处理 2025-08-13 17:55:39 +08:00
rd
fcd3fae569 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 17:43:07 +08:00
rd
028162e899 perf: 走查调整 2025-08-13 17:42:51 +08:00
rd
0bf7f48c18 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 17:21:53 +08:00
rd
5bc15d7e05 style: 文本换行兼容 2025-08-13 17:21:38 +08:00
rd
b18591e446 Merge remote-tracking branch 'origin/main' into feature/v1.3_营销资产中台 2025-08-13 16:49:10 +08:00