Commit Graph

891 Commits

Author SHA1 Message Date
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
rd
238c01513a Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 16:33:10 +08:00
rd
930051a39c feat: textarea高亮词语组件调整 2025-08-13 16:33:01 +08:00
rd
d4d9d8f82c style: 修改背景色 2025-08-13 15:57:27 +08:00
rd
7d7f0c2dc5 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 15:44:55 +08:00
rd
166804da7c perf: 添加z-index 2025-08-13 15:44:38 +08:00
rd
0f742d9dc6 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 15:40:01 +08:00
rd
be1cdf70b6 fix: 测试环境打包后多处一个zindex问题处理 2025-08-13 15:39:52 +08:00
rd
8e1326b5f0 perf: 删除ref 2025-08-13 15:18:45 +08:00
rd
e35498a527 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 15:02:03 +08:00
rd
0037b7c877 perf: 聚焦样式调整 2025-08-13 15:01:54 +08:00
rd
5799a18036 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test
# Conflicts:
#	src/views/creative-generation-workshop/manuscript/check/components/content-card/highlight-textarea.vue
2025-08-13 14:47:54 +08:00
rd
7b95fe6017 perf: 输入框样式调整 2025-08-13 14:47:10 +08:00
rd
4646efc20a Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 14:12:56 +08:00
rd
47450e401b perf: 增加换行符 2025-08-13 14:12:34 +08:00
rd
7c86856b43 perf: 增加tooltip 2025-08-13 14:00:07 +08:00
rd
0b0dac5cf1 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 11:08:00 +08:00
rd
e9085c19c2 perf: hover显示大图 2025-08-13 11:07:48 +08:00
rd
6bab0c1092 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test
# Conflicts:
#	src/components/_base/navbar/index.vue
2025-08-13 10:48:35 +08:00
rd
a0a96f512a perf: 登录才展示RightSide 2025-08-13 10:46:10 +08:00
rd
4b7d0c0f8e Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 10:43:13 +08:00
rd
92f17c70d3 perf: 文本检测交互修改 2025-08-13 10:43:02 +08:00
rd
e08ed73528 Merge remote-tracking branch 'origin/feature/v1.2灵机空间-内容上传审核_rxd' into test 2025-08-13 09:55:37 +08:00