698 Commits
Author SHA1 Message Date
YunaiV 1b036e84d1 V2.2.0 版本发布 2024-08-02 22:55:21 +08:00
YunaiV 900d275055 【代码优化】AI:music 的路径修改 2024-08-02 21:17:35 +08:00
YunaiV 2ff21aa65e 【代码优化】AI:image 作品中心的代码 2024-08-02 21:17:35 +08:00
YunaiV 108dcccafe 【代码评审】AI:code review 思维导图的逻辑 2024-08-02 21:17:35 +08:00
YunaiV a805ceb534 【代码优化】AI:markdown 组件,增加相关的注释 2024-08-02 21:17:35 +08:00
cherishsince cb02377706 【删除】marked 2024-08-02 21:17:34 +08:00
cherishsince bead947284 【优化】marked 替换成 markdown-it 2024-08-02 21:17:06 +08:00
hhhero fa59b3c16a [新增]AI: 思维导图 2024-08-02 21:17:06 +08:00
芋道源码 fde37b0410 !488 axios请求拦截错误处理中Promise.reject(error)未返回
Merge pull request !488 from perterHUAN/fix
2024-07-29 14:12:47 +00:00
芋道源码 e6f2a62c15 !487 【功能优化】修复商城装修页面拖动组件时会异常选择所有文字的问题
Merge pull request !487 from zhaoyu/master
2024-07-29 11:47:03 +00:00
YunaiV df8b1fbc0d 【功能优化】MALL:商品新增时,增加 keepalive 缓存 2024-07-28 19:29:14 +08:00
YunaiV 36b5db16dd 【功能优化】MALL:商品分类界面,增加【查看商品】按钮 2024-07-28 14:54:52 +08:00
YunaiV 8bbe9ad424 【功能优化】PAY:回调内容过长,折行展示 2024-07-28 14:39:36 +08:00
YunaiV 3fec45b5b4 【功能优化】INFRA:测试文件上传时,使用 confirm 替代 message 作为提示,避免文件地址过长的问题 2024-07-28 12:11:27 +08:00
YunaiV 8caf19a193 【功能优化】全局:接入 V2 版本操作日志 2024-07-28 11:30:40 +08:00
桓宪柱 05a6c4f288 axios请求拦截错误处理中Promise.reject(error)未返回 2024-07-28 11:08:13 +08:00
YunaiV d88707b306 【功能优化】全局:接入 V2 版本操作日志 2024-07-27 18:48:50 +08:00
tb 8f31bd73cd 【功能优化】修复商城装修页面拖动组件时会异常选择所有文字的问题 2024-07-27 17:20:30 +08:00
YunaiV 9e44a6cf0f 【功能修复】全局:锁定后,返回登录界面后,无法登录成功(回报 stack 溢出) 2024-07-26 22:58:39 +08:00
YunaiV 188b4033ba 【功能优化】PAY:微信支付使用 certSerialNo 替代 privateCertContent 2024-07-25 23:46:07 +08:00
YunaiV 145226deed 【功能优化】全局:message 提示最多 5 个,https://t.zsxq.com/CIVnc 2024-07-23 23:35:11 +08:00
YunaiV f5d445be1d 【代码评审】UploadFile 增加修改建议 2024-07-23 21:14:48 +08:00
YunaiV e21114c0b5 【代码优化】websocket 连接示例,增加 autoReconnect = true 重连 2024-07-22 23:10:54 +08:00
YunaiV cfb3e4a5ff 【代码修复】修复短信的 status 筛选宽度样式不对的问题 2024-07-22 22:50:25 +08:00
YunaiV 162b93bc1d 【代码优化】全局:允许 .local 提交到 git 上 2024-07-22 22:11:07 +08:00
YunaiV 0763f33351 【代码代码】PAY:移除对 member 的依赖 2024-07-21 11:13:16 +08:00
YunaiV 0704672ad3 【功能优化】全局:DictTag 的 default 情况下,使用 info 替代,避免浏览器 warning 警告 2024-07-21 10:59:50 +08:00
YunaiV 8ed2afb712 【功能新增】全局:富文本编辑器,支持视频文件的上传 2024-07-21 10:44:15 +08:00
YunaiV 5d91131eb7 【缺陷修复】BPM:流程重新发起时,禁用业务表单的情况,避免报错 2024-07-20 20:05:42 +08:00
YunaiV 46da7e2876 【缺陷修复】BPM:流程设计器中,选择表达式时,不生效的情况 2024-07-20 19:35:23 +08:00
芋道源码 4a829c7525 !486 AI 大模型的草稿提交(code review 代码)
Merge pull request !486 from 芋道源码/dev
2024-07-20 11:13:35 +00:00
YunaiV 4d3c5b7eff 【代码评审】AI:绘图、音乐相关的代码 2024-07-20 19:12:35 +08:00
cherishsince fcf948e781 【增加】画廊增加 search 2024-07-19 15:45:18 +08:00
xiaohong bd643f9376 feat: 音乐卡片新增播放和暂停按钮 2024-07-19 13:57:32 +08:00
xiaohong b7f06ec698 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-07-19 13:23:34 +08:00
xiaohong 7f7c508bb2 feat: 完善AI音频播放 2024-07-19 13:23:21 +08:00
YunaiV 638035249e 【代码评审】MALL:客服聊天 2024-07-19 13:13:19 +08:00
xiaohong bfddd674c1 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-07-19 10:14:58 +08:00
YunaiV e8a0eb08d6 【代码优化】MALL:客服聊天 2024-07-17 20:15:41 +08:00
芋道源码 4abd246d96 !483 完善 mall 客服
Merge pull request !483 from puhui999/dev-crm
2024-07-17 12:08:28 +00:00
puhui999 d072098038 【优化】修复客服消息列表加载 bug 2024-07-17 18:40:01 +08:00
puhui999 1ad5de57f9 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-07-17 18:04:01 +08:00
puhui999 eeb76bb4c2 【新增】客服会话所属会员足迹展示组件 2024-07-17 18:03:34 +08:00
puhui999 fe48f87f37 【重构】客服抽离封装消息组件,移除冗余封装 2024-07-17 17:22:19 +08:00
puhui999 f0ba8ff0af 【新增】客服会话所属会员足迹展示组件 2024-07-17 16:43:20 +08:00
puhui999 14cb120519 【优化】客服订单卡片样式优化 2024-07-17 16:41:41 +08:00
puhui999 34542cae4b 【优化】客服订单卡片样式优化 2024-07-17 15:17:58 +08:00
cherishsince ccf21dd4d4 【优化】优化画廊样式 2024-07-17 13:49:06 +08:00
puhui999 416df14b8c 【优化】客服重构消息列表加载逻辑 2024-07-17 11:25:26 +08:00
芋道源码 21c7c17e8f !479 AI 大模型的草稿提交(code review 代码)
Merge pull request !479 from 芋道源码/dev
2024-07-17 00:52:23 +00:00
YunaiV a854e96343 【代码优化】AI:绘图画廊 2024-07-17 08:50:06 +08:00
YunaiV b1752f39b6 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-07-17 08:48:28 +08:00
cherishsince 9b647cc19e Merge remote-tracking branch 'origin/dev' into dev 2024-07-16 18:02:58 +08:00
cherishsince 922b0c4e63 【增加】画廊页面,临时提交 2024-07-16 18:02:48 +08:00
xiaohong 10f6a2b158 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-07-16 17:36:53 +08:00
xiaohong 806888cce8 feat: 新增音频播放器 2024-07-16 17:36:46 +08:00
YunaiV 4d44440070 【代码评审】AI:写作优化 2024-07-16 13:56:56 +08:00
芋道源码 35b2708ca6 !482 [代码优化]AI: 写作页面样式调整,目录更名writer => write,写作管理更改
Merge pull request !482 from hhhero/dev
2024-07-16 04:55:39 +00:00
hhhero c4ee9581d0 [代码优化]AI: 目录更名writer => write,写作管理调整 2024-07-14 23:55:12 +08:00
hhhero 0a48b523b9 Merge remote-tracking branch 'yudao-ui-admin-vue3/dev' into dev
# Conflicts:
#	src/api/ai/writer/index.ts
2024-07-14 23:25:55 +08:00
hhhero 1f22e0b88d [新增]AI: 写作管理 2024-07-14 23:22:10 +08:00
hhhero d266b99e9e [代码优化]AI: 回显写作类型切换之前的数据 2024-07-13 08:51:25 +08:00
YunaiV 69940e2780 【代码评审】AI:绘图 other 优化 2024-07-13 00:06:27 +08:00
芋道源码 369860a055 !481 【修复】恢复 websocket path
Merge pull request !481 from puhui999/dev-crm
2024-07-12 11:56:41 +00:00
puhui999 ae0bca1774 【修复】恢复 websocket path 2024-07-12 18:06:22 +08:00
cherishsince d14ba2ed9e 【增加】ChatGlm 对接 Image 2024-07-12 16:30:33 +08:00
hhhero bb17651915 [代码优化]AI: 写作更改样式 2024-07-12 01:39:53 +08:00
cherishsince dd76cc581c 【增加】ai image 增加千帆模型 2024-07-11 16:54:06 +08:00
芋道源码 b9178c88aa !469 AI 大模型的草稿提交(code review 代码)
Merge pull request !469 from 芋道源码/dev
2024-07-11 01:38:07 +00:00
YunaiV 933628050b 【功能优化】全局:优化 Markdown 组件的代码 2024-07-11 09:36:56 +08:00
YunaiV 925d356e41 【功能注释】AI:临时注释 AI 音乐的菜单,开发中... 2024-07-11 09:29:15 +08:00
YunaiV 12c0f36bb8 【功能修复】全局:AppView min-h 导致有小方块问题,换回 h 2024-07-11 08:51:58 +08:00
YunaiV b98f1220ac 【代码新增】AI:写作管理节点 2024-07-11 08:48:08 +08:00
芋道源码 392603c811 !478 完善 mall 客服
Merge pull request !478 from puhui999/dev-crm
2024-07-11 00:41:35 +00:00
YunaiV e655b4d6ef 【代码新增】AI:写作管理节点 2024-07-10 23:01:13 +08:00
cherishsince c76b622722 【增加】ai image 对接通义参数 2024-07-10 21:35:45 +08:00
cherishsince 51c6bfe42c 【解决todo】合并 scss 2024-07-10 21:03:02 +08:00
puhui999 60d4175396 【修复】mall 客服会话消息少时触顶不加载bug 2024-07-10 21:02:10 +08:00
cherishsince 20054b28c3 【增加】ai 作图 other模块,临时提交 2024-07-10 18:50:34 +08:00
puhui999 79b6b87721 【修复】mall 客服会话消息页面高度不一致导致的滚动功能精度失效 2024-07-10 18:09:04 +08:00
puhui999 b6cd12a300 【优化】mall 客服会话置顶排序,右键菜单适配折叠菜单产生的位置偏移 2024-07-10 17:05:46 +08:00
puhui999 993d070560 【优化】mall 客服触顶自动加载下一页数据 2024-07-10 15:53:48 +08:00
puhui999 fa0892980d 【优化】mall 客服加载历史消息时页面保持在当前正在查看的消息位置 2024-07-10 15:40:37 +08:00
puhui999 32d6ac0183 【优化】根据代码评审优化 mall 客服 2024-07-10 14:34:12 +08:00
YunaiV ece1533436 【代码评审】写作:生成部分 2024-07-10 12:49:54 +08:00
芋道源码 e53786e8bd !477 [代码优化]AI: 写作添加注释,增加可读性,调整代码,方便后续调整,添加预览header,调整生成内容区域布局,将右边铺满
Merge pull request !477 from hhhero/dev
2024-07-10 01:34:43 +00:00
YunaiV 908b3c212c Merge remote-tracking branch 'origin/dev' into dev 2024-07-10 09:30:12 +08:00
YunaiV ec61670b75 【代码评审】Mall:客服的会话列表 2024-07-10 09:30:03 +08:00
cherishsince 21ade9b9ac 【解决todo】role 角色表单,规则改为 formRules 2024-07-10 09:12:11 +08:00
hhhero a68ae29f3a Merge remote-tracking branch 'yudao-ui-admin-vue3/dev' into dev
# Conflicts:
#	src/views/ai/utils/constants.ts
2024-07-10 00:15:07 +08:00
hhhero 9e628ba59d [代码优化]AI: 写作添加预览header,调整生成内容区域布局,将右边铺满 2024-07-10 00:11:00 +08:00
hhhero 5730707be9 [代码优化]AI: 写作添加注释,增加可读性,调整代码,方便后续调整 2024-07-10 00:09:39 +08:00
YunaiV 6550983413 【代码评审】Mall:客服的会话列表 2024-07-10 00:02:39 +08:00
芋道源码 0051264142 !476 完善 mall 客服,新增商品、订单消息
Merge pull request !476 from puhui999/dev-crm
2024-07-09 14:17:21 +00:00
YunaiV ba8681e3c7 【代码优化】AI:绘图 index.vue 代码梳理 80%(Dall3.vue) 2024-07-09 21:37:46 +08:00
YunaiV e881b9cefd 【代码优化】AI:绘图 index.vue 代码梳理 70%(Dall3.vue) 2024-07-09 21:06:57 +08:00
YunaiV 7706e46bfa 【代码优化】AI:绘图 index.vue 代码梳理 65%(Dall3.vue) 2024-07-09 20:41:22 +08:00
cherishsince 75af4f07c0 【解决todo】isUser 修改为 computed 2024-07-09 20:14:15 +08:00
cherishsince 9e3f228a61 【todo备注】@芋艿,这个地方 unocss 那个地方有使用,可以先参考一下 2024-07-09 19:55:03 +08:00
cherishsince d6c016e3ea 【解决todo】角色仓库,覆盖 element ui css 2024-07-09 17:54:45 +08:00
cherishsince dbacc0c371 【解决todo】添加角色 icon 修改为为 Icon 组件 2024-07-09 17:52:43 +08:00
cherishsince 4cfc785667 【解决todo】角色列表 icon 修改为为 Icon 组件 2024-07-09 17:51:08 +08:00
cherishsince 5734faa5fc 【todo】keydown.shift.enter 修改为@芋艿 2024-07-09 17:42:30 +08:00
cherishsince 326fc3d03f 【解决todo】el-button icon 改为 Icon 使用 iconfy 资源 2024-07-09 17:41:58 +08:00
puhui999 93006504ce 【新增】mall 客服订单消息 2024-07-09 17:24:33 +08:00
cherishsince cb68ef5fa7 【解决todo】ai-layout 100%高宽问题,只能通过 position: absolute 来特殊处理 2024-07-09 17:17:45 +08:00
cherishsince b4b9015869 【解决todo】对话中不能清楚 chat 消息 2024-07-09 17:14:38 +08:00
cherishsince 2204876076 【解决todo】对话中不允许切换(自动stop stream 删除) 2024-07-09 17:05:07 +08:00
puhui999 ebc995ac4c 【优化】mall 客服商品消息 2024-07-09 17:00:58 +08:00
puhui999 9dfb869a4b 【新增】mall 客服商品消息 2024-07-09 16:14:51 +08:00
YunaiV 61bf6fb85b 【代码优化】AI:绘图 index.vue 代码梳理 60%(StableDiffusion.vue) 2024-07-09 13:55:07 +08:00
YunaiV ac46a37638 【代码优化】AI:绘图 index.vue 代码梳理 50%(ImageDetail.vue) 2024-07-09 09:13:10 +08:00
YunaiV 749e44081e 【代码优化】AI:绘图 index.vue 代码梳理 40%(ImageCard) 2024-07-09 08:39:37 +08:00
芋道源码 5162191340 !474 【优化】spu:新增商品属性属性值为空校验。【新增】mall 客服消息下拉加载,有新消息提醒
Merge pull request !474 from puhui999/dev-crm
2024-07-08 16:08:33 +00:00
YunaiV 82b53b9b03 【代码优化】AI:绘图 index.vue 代码梳理 30%(ImageList) 2024-07-09 00:00:53 +08:00
YunaiV 80d87b8e99 【代码优化】AI:绘图 index.vue 代码梳理 20% 2024-07-08 23:29:27 +08:00
YunaiV 6224602152 【代码优化】AI:聊天对话 index.vue 代码梳理 80%(message 部分) 2024-07-08 21:12:49 +08:00
puhui999 848bc60612 【新增】mall 客服消息下拉加载,有新消息提醒 2024-07-08 17:53:56 +08:00
YunaiV 1a6afa3263 【代码优化】AI:聊天对话 index.vue 代码梳理 40%(message 部分) 2024-07-08 13:00:24 +08:00
YunaiV 2b0789112f 【代码评审】AI:写作相关的建议 2024-07-08 12:39:49 +08:00
puhui999 e9bb9403b4 【优化】spu:新增商品属性属性值为空校验 2024-07-08 12:00:34 +08:00
芋道源码 96a499a815 !473 [新增]AI写作
Merge pull request !473 from hhhero/dev
2024-07-08 00:51:30 +00:00
hhhero f72e4f47f4 [新增]完善AI写作 2024-07-08 00:41:20 +08:00
YunaiV 44f322bb35 【代码优化】AI:聊天对话 index.vue 代码梳理 30% 2024-07-07 22:11:40 +08:00
YunaiV 1064bbe570 【代码优化】AI:聊天对话 index.vue 代码梳理 20% 2024-07-07 20:30:44 +08:00
hhhero 1afdbe651e Merge remote-tracking branch 'yudao/dev' into dev 2024-07-07 18:15:00 +08:00
hhhero 18e87cf967 [新增]ai写作页面完成 2024-07-07 18:14:03 +08:00
YunaiV f3777f6334 【代码优化】AI:将对话、聊天挪到 index 目录下,更模块化 2024-07-07 17:22:16 +08:00
YunaiV 4acd379d50 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-07-07 17:10:18 +08:00
芋道源码 8a73fbe775 !465 fix: update axios interceptors response
Merge pull request !465 from AhJindeg/hotfix/response
2024-07-07 03:35:31 +00:00
芋道源码 38fe69fbd4 !464 fix: add result field to JobLogDetail el-descriptions-item
Merge pull request !464 from AhJindeg/hotfix/JobLogDetail
2024-07-07 03:34:23 +00:00
芋道源码 f341ba4d3c !463 update src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue.
Merge pull request !463 from 最后的梦想/N/A
2024-07-07 03:33:07 +00:00
芋道源码 21c9cba67b !466 fix: 修复会员和售后退款中订和单明细查询传递参数错误
Merge pull request !466 from OnPeaceOfMind/dev
2024-07-07 03:31:33 +00:00
芋道源码 3938a78db2 !472 fix: 修复CRM合同详情中团队成员未展示权限编辑的问题
Merge pull request !472 from downeyin/downey
2024-07-07 03:30:19 +00:00
YunaiV 2871961582 docs: update README 2024-07-07 11:23:27 +08:00
YunaiV a9ca98036c Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 2024-07-07 11:22:26 +08:00
YunaiV 6f86ea96da 【代码优化】AI:接入更多 AI 大模型 2024-07-07 11:22:02 +08:00
芋道源码 922b9edfcb Merge pull request #60 from selicens/develop-readme
docs: update README
2024-07-07 11:21:33 +08:00
芋道源码 c825216063 Merge pull request #63 from geekymv/fix-leave-status
修改OA请假示例审批结果字段
2024-07-07 11:19:19 +08:00
downeyin f70c8dcee2 fix: 修复CRM合同详情中团队成员未展示权限编辑的问题 2024-07-06 23:31:59 +08:00
芋道源码 8d73d741d4 !471 mall 客服会话相关
Merge pull request !471 from puhui999/dev-crm
2024-07-06 01:05:00 +00:00
puhui999 d3c596dcaf Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-07-05 18:01:40 +08:00
puhui999 334c0241a9 【新增】:mall 客服会话右键菜单实现会话相关操作 2024-07-05 18:00:59 +08:00
geekymv db3b8285d1 修改OA请假审批结果字段 2024-07-05 17:54:05 +08:00
puhui999 9ab367e4f4 【新增】:mall 客服会话未读消息展示和消息已读处理 2024-07-05 16:36:52 +08:00
cherishsince 5fd8177791 【修改todo】Loading组件 改为 @芋艿 2024-07-05 09:39:14 +08:00
cherishsince fda50ff291 【解决todo】drawIn 没用啦 2024-07-05 09:36:34 +08:00
cherishsince f147f05aeb 【解决todo】增加重新生成按钮 2024-07-05 09:35:33 +08:00
cherishsince 53de30c698 【优化】ImageVO 增加 finishTime 2024-07-05 09:16:38 +08:00
cherishsince afcb7e76b7 【解决todo】图片下载抽离到 download 2024-07-05 09:16:13 +08:00
cherishsince 557dc7d5d9 【修改todo】图片生产逻辑 @芋艿 2024-07-05 09:14:56 +08:00
cherishsince 8cc40626d6 【解决todo】sd 调整 sampler类型 2024-07-05 09:10:22 +08:00
cherishsince ca64760dd0 Merge remote-tracking branch 'origin/dev' into dev 2024-07-05 09:09:49 +08:00
cherishsince cd2f049619 【解决todo】使用 finishTime 2024-07-05 09:09:38 +08:00
YunaiV c09af1cbe1 【代码优化】AI:对话 deleteChatConversationMyByUnpinned 接口 2024-07-04 23:40:03 +08:00
芋道源码 cabfc5ccc0 !470 【新增】:mall 客服选择并发送图片信息
Merge pull request !470 from puhui999/dev-crm
2024-07-04 13:55:32 +00:00
puhui999 2b329d33e4 【新增】:mall 客服接入 websocket 实现消息实时拉取 2024-07-04 17:00:50 +08:00
puhui999 893cd5d8f5 【优化】:mall 客服优化消息样式,增加消息时间段显示 2024-07-04 16:23:11 +08:00
cherishsince edaf30a32b 【解决todo】资源图片修改为自己的 2024-07-04 16:17:00 +08:00
cherishsince b6ff9ede11 【解决todo】handle命名 2024-07-04 16:01:08 +08:00
puhui999 e89b274e3f 【优化】:mall 客服消息组件抽离 2024-07-04 15:41:15 +08:00
puhui999 e45cade877 【新增】:mall 客服选择并发送图片信息 2024-07-04 15:28:34 +08:00
cherishsince bb34c2b75c 【增加】openai 重新生成 2024-07-04 15:01:19 +08:00
cherishsince 39facc2f49 【增加】midjourney 重新生成 2024-07-04 11:52:04 +08:00
cherishsince 807e9272a5 【增加】stable-diffusion 增加重新生成 2024-07-04 11:18:36 +08:00
cherishsince d974124918 【优化】中文判断 2024-07-04 11:10:59 +08:00
cherishsince 8f6e6fdb54 【优化】hasChinese 抽离 utils 2024-07-04 09:51:39 +08:00
cherishsince ed786b2db6 【增加】image 增加重新生成操作(值已经完成切换,还不能完全填充值) 2024-07-03 22:04:59 +08:00
cherishsince 5c560e2fbe 【增加】mj 增加参考图 2024-07-03 20:21:08 +08:00
cherishsince 0e755acf52 【sd】增加中文判断 2024-07-03 20:17:33 +08:00
cherishsince 16d53bbf4b Revert "【sd】增加中文判断"
This reverts commit 47636a8a87a3f4b4d4e1bd36ca05eb65b9a66167.
2024-07-03 20:17:33 +08:00
cherishsince 9c43594010 【sd】增加中文判断 2024-07-03 20:17:33 +08:00
puhui999 b0b62eb250 【优化】:mall 客服表情包存放到本地使用 2024-07-03 17:51:58 +08:00
YunaiV 33cf98e306 【代码优化】AI:增加枚举类 2024-07-03 13:52:00 +08:00
YunaiV 8da1c04b55 【代码评审】MALL:review 客服逻辑 2024-07-02 20:49:40 +08:00
芋道源码 8d759b2a0b !468 【新增】:mall 客服
Merge pull request !468 from puhui999/dev-crm
2024-07-02 12:40:46 +00:00
puhui999 00619ca6db 【新增】:mall 客服图片消息显示 2024-07-02 17:31:26 +08:00
puhui999 91c262fb24 【新增】:mall 客服使用轮训模拟 websocket 2024-07-02 17:10:53 +08:00
puhui999 9c05ff35db 【新增】:mall 客服实现 emoji 表情选择和消息发送 2024-07-02 16:45:32 +08:00
puhui999 1abfec766e Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-07-01 17:17:47 +08:00
puhui999 3d5cb15eae 【新增】:mall 客服消息样式设计 2024-07-01 17:16:48 +08:00
puhui999 7a6f5c2db8 【新增】:mall 客服消息样式设计 2024-07-01 17:11:47 +08:00
puhui999 d3b4063b94 【新增】:mall 客服消息样式设计 2024-07-01 16:15:27 +08:00
puhui999 d3614cbbac 【新增】:mall 客服初始化 2024-07-01 11:36:07 +08:00
cherishsince f19e8c4d0a 【修改todo】增加 sd 各种参数 2024-06-30 16:10:45 +08:00
YunaiV f98f794f77 【代码优化】AI:音乐、图片的更新状态的接口调整 2024-06-29 09:47:11 +08:00
YunaiV 68c573d902 【代码评审】AI:图片 SD 的接入 2024-06-28 23:03:55 +08:00
YunaiV d800143a88 【代码优化】AI:图片轮询实现 2024-06-28 21:18:21 +08:00
cherishsince 9983dc5bb9 【解决todo】如果有生成中的图片,轮询改成 get 接口去轮询,不基于 page 轮询 2024-06-28 17:15:00 +08:00
cherishsince 906169f9be Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/ai/image/ImageTask.vue
2024-06-28 16:45:21 +08:00
cherishsince 6f9cb4f8f2 【解决todo】如果有生成中的图片,轮询改成 get 接口去轮询,不基于 page 轮询 2024-06-28 16:41:12 +08:00
YunaiV c0e51bd7aa 【功能新增】AI:音乐管理 100% 2024-06-28 09:49:17 +08:00
xiaohong e3c46cab53 feat: 调整ai music 页面文件结构 2024-06-28 09:26:58 +08:00
YunaiV 440ad58a77 Merge remote-tracking branch 'origin/dev' into dev 2024-06-27 23:08:55 +08:00
YunaiV 8d33476472 【功能新增】AI:音乐管理 50% 2024-06-27 23:08:50 +08:00
xiaohong 75d0be9742 feat: 将视频列表改成单排 2024-06-27 22:31:49 +08:00
cherishsince 8daf9bb347 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/ai/image/ImageTask.vue
2024-06-27 18:12:21 +08:00
cherishsince 14c9e33b60 【解决todo】get 轮训,临时提交 2024-06-27 18:11:22 +08:00
罗婷(luot1) 2da5cc34a8 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-06-27 17:50:54 +08:00
罗婷(luot1) 9516e7184f feat: 新增AI music相关页面以及组件,调整了APPview页面min-height为height,注释了登录时dict接口获取,在contentWrap组件新增了bodystyle属性 2024-06-27 17:50:48 +08:00
YunaiV 39d3995ea0 【功能新增】AI:图片管理 2024-06-26 23:18:39 +08:00
OnPeaceOfMind 6e7812a11b fix: 🐞 修复会员和售后退款中订和单明细查询传递参数错误
Signed-off-by: OnPeaceOfMind <onpeaceofmind@qq.com>
2024-06-26 11:44:07 +00:00
YunaiV 36dc3c0b5c 【代码调整】AI:MJ 二次 Action 的接口修改 2024-06-26 12:38:21 +08:00
AhJindeg ef9ed50533 fix: 🐞 update axios interceptors response 2024-06-25 11:30:24 +08:00
AhJindeg bd4f2b8b7c fix: 🐞 add result field to JobLogDetail el-descriptions-item 2024-06-25 11:21:16 +08:00
最后的梦想 d66664b3d4 update src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue.
修复:流程设计器bpmn流转条件-流转类型选择默认流转路径,未正确显示/

Signed-off-by: 最后的梦想 <1971063665@qq.com>
2024-06-24 01:53:12 +00:00
芋道源码 7fe8b8b7a9 !456 fix: #I9TIYS
Merge pull request !456 from ms_think/dev
2024-06-22 06:56:02 +00:00
芋道源码 a0ecfed693 !461 【轻量级 PR】 /mp/open/ -> /admin-api/mp/open/
Merge pull request !461 from 21克的爱情/master
2024-06-22 06:54:13 +00:00
芋道源码 ca7077caf6 !459 fix: 流程详情的表单不显示数据问题
Merge pull request !459 from OlyLis/master
2024-06-22 06:52:26 +00:00
芋道源码 1bbed80e2e !457 修复:解决操作日志无法搜索操作人的问题
Merge pull request !457 from 杨宇庆/N/A
2024-06-22 06:50:06 +00:00
芋道源码 0895f9ffcb !455 fix: fix calculation method of isLocal
Merge pull request !455 from AhJindeg/hotfix/icon
2024-06-22 06:49:33 +00:00
芋道源码 210c4d4024 !453 fix: Add StringDictDataType type by imitating getIntDictOptions
Merge pull request !453 from AhJindeg/hotfix/dict
2024-06-22 06:47:26 +00:00
芋道源码 2cd98a438f !462 update src/api/mall/promotion/seckill/seckillConfig.ts.
Merge pull request !462 from 21克的爱情/N/A
2024-06-22 06:46:12 +00:00
cherishsince 33366efe11 【增加】StableDiffusion 2024-06-21 15:26:08 +08:00
21克的爱情 1a04b7b9e7 update src/api/mall/promotion/seckill/seckillConfig.ts.
Signed-off-by: 21克的爱情 <raohong07@163.com>
2024-06-20 14:58:32 +00:00
21克的爱情 8eee46d85c /mp/open/ -> /admin-api/mp/open/
Signed-off-by: 21克的爱情 <raohong07@163.com>
2024-06-20 07:13:35 +00:00
cherishsince 918f35f824 【优化】element 转换 LoadingOptionsResolved 2024-06-19 10:44:48 +08:00
cherishsince bd80a6f34f 【增加】image task 增加分页 2024-06-19 10:41:33 +08:00
cherishsince 63f0a2058d 【优化】删除 image task 分页,改为 top 前多少数据 2024-06-18 17:18:55 +08:00
cherishsince dc31aeb24e 【优化】处理 image card 抽屉不显示问题 2024-06-18 16:58:23 +08:00
cherishsince 19c752e81d 【优化】调整内边距,让imag card 滚动底部有一些距离 2024-06-18 14:53:51 +08:00
cherishsince 05ba908a7f 【增加】增加 loading 2024-06-18 14:35:42 +08:00
cherishsince 8db7c7d92b 【增加】image task 增加滚动分页 2024-06-18 14:31:14 +08:00
cherishsince 990093c0cb 【优化】生成内容按钮增加 二次确认 2024-06-18 11:28:01 +08:00
cherishsince 27d7fe48c6 【增加】NIJI 增加版本控制 2024-06-18 11:02:41 +08:00
cherishsince 79819aed19 【增加】midjourney button 操作二次确认 2024-06-18 10:06:14 +08:00
芋道源码 3f3faaca9b Merge pull request #56 from DevDengChao/feat/extract-default-login-info
提取默认登录使用的租户与账号密码, 规避潜在的账户泄露问题
2024-06-15 18:18:37 +08:00
duxz 490c4bde02 fix: 修复表单数据没有显示的问题 2024-06-13 10:04:38 +08:00
杨宇庆 7f034724a9 修复:解决操作日志无法搜索操作人的问题
Signed-off-by: 杨宇庆 <hiyyq@qq.com>
2024-06-07 11:05:42 +00:00
YunaiV efcf64ed7d 【代码评审】AI:绘制功能的测试和 review 2024-06-06 20:17:40 +08:00
cherishsince 4adc5677a0 【增加】增加 action 操作 2024-06-05 16:41:21 +08:00
cherishsince 1b070e720d 【优化】canvas 下载图片 2024-06-05 13:57:02 +08:00
cherishsince 520244eea9 【增加】Image 列表组件取消挂在 销毁定时刷 2024-06-05 13:54:36 +08:00
ZhouWei e83df37616 docs: update README 2024-06-05 12:44:50 +08:00
cherishsince c96f3cea61 【优化】增加 image mj 按钮回调 2024-06-05 09:51:33 +08:00
cherishsince 29e1426a79 【增加】Image midjourney 增加 click 事件 2024-06-04 17:38:07 +08:00
cherishsince 1be7713f56 【增加】Image midjourney 增加操作按钮 2024-06-04 17:37:52 +08:00
cherishsince 5876fdca10 【解决todo】 方法注释命名 2024-06-03 10:18:03 +08:00
cherishsince 8e821445c2 【优化】调整 ai Image 方法注释 2024-06-03 10:16:56 +08:00
cherishsince 9bd8d8e9cb 【增加】midjourney 增加版本号设置 2024-06-03 09:41:56 +08:00
YunaiV 3c4327e4dd 【代码评审】AI:绘制功能的测试和 review 2024-06-01 16:49:42 +08:00
YunaiV 1eacbe62d6 Merge remote-tracking branch 'origin/dev' into dev 2024-06-01 15:55:25 +08:00
YunaiV a2474c9c43 【修复】AI:对话管理不展示的问题 2024-06-01 15:55:19 +08:00
cherishsince cc9e11859d 【增加】midjourney 增加 width 和 height 2024-05-31 14:02:35 +08:00
ms_think f60b308dec 修改 点击 开启/关闭 按钮, 弹窗点击取消,列表页状态已更改 2024-05-30 09:01:22 +00:00
cherishsince 616fe2c3c1 【优化】midjourney 模型默认选中一个模型 2024-05-30 16:30:39 +08:00
cherishsince d1be8991b3 【增加】midjourney 提交任务回调 onDrawStart 、onDrawComplete 2024-05-30 16:26:12 +08:00
cherishsince 82fbb5e024 【优化】midjourney 提交,支持 nijj 切换 2024-05-30 16:25:31 +08:00
cherishsince 15a3e80d62 【midjourney】删除热词 2024-05-30 16:22:35 +08:00
cherishsince 6726a7c562 【优化】处理 size 改为 width 和 height 2024-05-30 16:16:56 +08:00
cherishsince 8a8cb159a4 【增加】Image card 组件增加异常展示 2024-05-30 16:14:50 +08:00
cherishsince 87ffd38dcd 【优化】调整 image 列表刷新时间 2024-05-30 16:12:42 +08:00
cherishsince 8f2c6ab0db 【增加】增加 midjourney 请求 2024-05-30 16:12:24 +08:00
AhJindeg cc39be8207 fix: 🐞 fix calculation method of isLocal 2024-05-30 14:48:12 +08:00
cherishsince b82391da0a 【解决todo】调整接口命名、和接口返回值 2024-05-29 18:07:54 +08:00
AhJindeg a9082d8b6f fix: 🐞 Add StringDictDataType type by imitating getIntDictOptions 2024-05-29 15:18:58 +08:00
cherishsince ecc924301d 【增加】AI Image 热词设置提示词 2024-05-28 15:13:32 +08:00
cherishsince 11ec263a64 【优化】处理抽屉中 绘画中的图片不能展示加载状态 2024-05-28 15:03:12 +08:00
cherishsince bbf7956f6d 【增加】Image 抽屉增加图片尺寸展示 2024-05-28 14:49:15 +08:00
cherishsince b0f26f64f7 【优化】调整 AI Image 抽屉展示卡片内容,和样式 2024-05-28 14:40:43 +08:00
cherishsince bd09ecf688 【调整】Image card 组件内容溢出问题 2024-05-28 14:30:03 +08:00
cherishsince a6ec43fd46 【增加】Image task 增加抽屉详细信息切换 2024-05-28 14:29:46 +08:00
cherishsince 0a9882e909 【增加】Ai Image 抽屉显示详细信息 2024-05-28 14:29:18 +08:00
cherishsince c8d26db4b4 【修改】AI Image 列表自动刷新改为5秒 2024-05-28 11:37:15 +08:00
cherishsince fdeedcfe7b 【增加】Image card 增加图片下载 2024-05-28 11:35:02 +08:00
cherishsince 2211618ada 【增加】AI Image 列表增加删除 2024-05-28 10:37:44 +08:00
cherishsince c87713f040 【增加】Dall 生成中 按钮控制 2024-05-28 10:27:57 +08:00
cherishsince 91fc46691e 【优化】优化 Image Card 加载中 2024-05-28 10:27:33 +08:00
cherishsince ad10328b73 【增加】AI Image 列表增加状态切换 2024-05-28 10:04:44 +08:00
cherishsince 0b8301cc1c 【增加】Ai Image 列表增加自动刷新 2024-05-28 09:51:58 +08:00
cherishsince f74e8e6689 【增加】AI Image 增加生成中 ref 2024-05-27 18:17:37 +08:00
cherishsince 805745f384 【增加】Image 列表增加滚动。 2024-05-27 17:43:03 +08:00
cherishsince 824fb4d5ec 【增加】Image AI 监听 dall 生成完成,刷新图片列表 2024-05-27 17:35:50 +08:00
cherishsince d74677abd0 【增加】Image Task 公开刷新列表方法 2024-05-27 17:35:18 +08:00
cherishsince df5c3be7fa 【增加】dall 增加 onDrawComplete 回调 2024-05-27 17:34:59 +08:00
cherishsince cc60edf8d3 【调整】AI Image 任务列表,调整 card 间距 2024-05-27 17:20:03 +08:00
cherishsince d1e0270bee 【增加】增加 picUrl 2024-05-27 17:14:23 +08:00
cherishsince 5353531e8b 【增加】Image task 增加关联接口调用 2024-05-27 17:14:03 +08:00
cherishsince 9cad4d6054 【增加】AI Image 增加获取 image list 接口 2024-05-27 17:01:04 +08:00
cherishsince d9ebb61dc1 【增加】AI Image 增加 dall 绘画 2024-05-27 15:28:53 +08:00
cherishsince 2ae7838aeb 【增加】Dall 增加 style 选择 2024-05-27 14:40:10 +08:00
cherishsince fd4ef4b172 【优化】调整 image card 尺寸 2024-05-27 10:47:43 +08:00
cherishsince 959ee90810 【优化】修改 Image Task Card 按键类型 2024-05-26 21:56:10 +08:00
cherishsince cb7c5b7458 【优化】Image 抽屉,使用 Card 组件 2024-05-26 21:53:26 +08:00
cherishsince c06dd8e273 【优化】Image Task 使用 card 组件 2024-05-26 21:51:42 +08:00
cherishsince 4542337f4f 【增加】增加 Image Task Card 组件 2024-05-26 21:50:59 +08:00
cherishsince 376ec1a61c 【增加】image list 接口 mock 2024-05-26 21:50:46 +08:00
cherishsince 51e28065ee 【增加】ImageDetail mock 2024-05-26 21:18:23 +08:00
cherishsince 3d5879ecb8 【增加】AI Image 增加 detail vo 定义 2024-05-26 21:05:53 +08:00
cherishsince 61418a1a1b 【增加】AI image 增加 Image Task 2024-05-26 21:00:00 +08:00
cherishsince 9c8d10b70c 【增加】AI image 增加图片详情,抽屉 2024-05-26 20:59:42 +08:00
cherishsince 131e071b2d 【增加】Ai Image task 任务列表 2024-05-26 20:47:29 +08:00
cherishsince bfa396b127 【优化】替换 midjourney 模型图片 2024-05-26 20:22:36 +08:00
cherishsince ffa691c4ee 【优化】修改模型名称 2024-05-26 20:08:43 +08:00
cherishsince 86f3ae2301 【优化】AI image dall3 调整模型显示的名字 2024-05-25 21:20:43 +08:00
cherishsince 12e87cc0f2 【增加】Ai Image midjourney 增加,提示词、模型、尺寸 2024-05-25 21:18:43 +08:00
cherishsince f156ba1877 【增加】AI Image 增加model 配置切换 2024-05-25 21:12:36 +08:00
cherishsince 60de1b9737 【增加】Dall3 增加图片生成 (function 待实现) 2024-05-25 21:06:58 +08:00
cherishsince 5232a2bf3f 【增加】Dall3 增加图片尺寸选择 2024-05-25 21:01:34 +08:00
cherishsince 9460c264eb 【增加】DALL3 增加提示词、随机热词、模型选择 ui 2024-05-25 16:21:23 +08:00
cherishsince df6cca0731 【优化】调整 Ai Image 配置区域样式 2024-05-25 16:21:00 +08:00
cherishsince e801ea949b 【创建】dall3 和 midjourney 页面 2024-05-25 15:36:41 +08:00
cherishsince 3d5bef78b3 【增加】AI Image 框架 2024-05-25 15:36:21 +08:00
cherishsince a46185e4dd 【升级】升级 element-plus 2.6.1 -> 2.7.0(需要 segmented 组件) 2024-05-25 15:35:56 +08:00
YunaiV cdf0a1137d 【优化】AI:对话的 user、role 头像从前端获取 2024-05-25 11:49:23 +08:00
YunaiV 46eb89695d 【代码评审】AI:review 聊天对话的实现 2024-05-25 10:54:04 +08:00
YunaiV 4c259cd60f 【新增】AI:对话管理 100% 2024-05-25 08:59:56 +08:00
YunaiV d172d3db73 【新增】AI:对话管理 50% 2024-05-25 00:08:40 +08:00
YunaiV ca40047f0b 【新增】AI:新建对话时,不使用默认角色 2024-05-24 20:58:31 +08:00
YunaiV ac18d871ca Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/ai/chat/index.vue
2024-05-24 20:54:10 +08:00
cherishsince 24c459557d 【解决todo】 清空输入框 2024-05-24 16:50:55 +08:00
cherishsince 63693f7a83 【解决todo】chat 默认选中对话 2024-05-24 16:42:27 +08:00
cherishsince 09c03abf51 【优化】AI 对话增加回答中,不能删除 2024-05-24 16:11:16 +08:00
YunaiV 8764c6c471 【新增】AI:新建对话时,不使用默认角色 2024-05-24 15:39:05 +08:00
cherishsince 8fb54dbb7c 【解决todo】Chat 对话默认选中第一个 2024-05-24 10:39:12 +08:00
cherishsince bebf1e7ae3 【解决todo】Chat 聊天,新建对话清空输入框 2024-05-24 10:35:11 +08:00
cherishsince 03c6a6ce59 【解决todo】Chat message 增加刷新和编辑 2024-05-24 10:32:08 +08:00
cherishsince f1beb488ce 【解决todo】AI chat 标题后显示对话数量 2024-05-22 17:17:43 +08:00
cherishsince 89deddb9e0 【解决todo】AI 删除对话,不默认选中 2024-05-22 17:08:13 +08:00
cherishsince e7403ba2a4 【增加】AI chat 增加 new chat 2024-05-22 17:07:54 +08:00
cherishsince aa93172c1d 【解决todo】AI Chat 增加 useContext 控制 2024-05-22 15:14:17 +08:00
cherishsince 689d92dc66 【解决todo】AI 对话修改,避免切换对话 2024-05-22 11:23:06 +08:00
cherishsince fa4081d669 【优化】AI stream 优化,添加的临时role 头像对不上问题 2024-05-22 11:08:22 +08:00
cherishsince 4466c5b4ec 【解决todo】AI Chat stream 增加默认头像 2024-05-22 10:58:54 +08:00
cherishsince 431ae7b01b 【解决todo】AI Chat 转换用户头像、role头像 2024-05-22 10:30:00 +08:00
cherishsince 561d60bccd 【解决todo】AI Chat 增加清理 message 2024-05-22 09:57:46 +08:00
cherishsince d603f1edd0 【优化】AI 对话中,不允许切换对话 2024-05-21 22:44:37 +08:00
cherishsince 8f2b81bb79 【优化】AI 切换对话,先回调成功再切换 2024-05-21 22:44:15 +08:00
cherishsince 63638ce4a1 【优化】try mkardown 组件异常,因为 stream 模型可能返回的信息不全 2024-05-21 22:43:50 +08:00
cherishsince a96a2ec9ec 【优化】AI chat 默认选中对话,刷新增加加载中显示 2024-05-21 22:21:45 +08:00
cherishsince a431867f41 【优化】AI chat 发送按钮独立方法 2024-05-21 22:18:03 +08:00
cherishsince 32c6818ee8 【解决todo】AI 角色仓库,使用角色不创建对话问题 2024-05-21 22:07:56 +08:00
cherishsince f6698c0286 【解决todo】AI chat 输入框增加 shift + 回车 换行 2024-05-21 22:05:56 +08:00
cherishsince 2d7bf84593 【解决todo】AI 对话显示隐藏效果 2024-05-21 21:50:28 +08:00
cherishsince a8cf6b6f29 【解决todo】AI 角色仓库,公开仓库不显示 创建角色按钮 2024-05-21 21:19:49 +08:00
cherishsince 15b8ea5a0d 【优化】AI 角色仓库,分类间距 2024-05-21 18:21:29 +08:00
cherishsince c06de8095e 【解决todo】AI 角色仓库,增加全部分类筛选 2024-05-21 18:20:45 +08:00
cherishsince 0803e33d1d 【解决todo】AI Chat 头部模型按钮,如果模型名字过长,会把其他按钮挤出屏幕 2024-05-21 17:52:21 +08:00
DevDengChao d883b860ac refactor: 提取默认登录使用的租户与账号密码, 规避潜在的账户泄露问题 2024-05-21 17:44:37 +08:00
cherishsince 88c7dc52be 【优化】AI chat 对话宽 margin 调整,让回到底部按钮有更多空间 2024-05-21 17:30:48 +08:00
cherishsince 5aa8261b7b 【优化】AI 对话,如果删除的是选中的对话,需要重新选中 2024-05-21 17:28:02 +08:00
cherishsince da75b1758f 【解决todo】AI 对话过多,会超出窗口问题 2024-05-21 17:07:37 +08:00
cherishsince 7237da9764 【bug】解决 AI chat stream 返回 content === '' 会结束对话问题 2024-05-21 16:40:38 +08:00
cherishsince 3634fca835 【解决todo】AI 更新对话标题,chat 窗口也更新 title 2024-05-21 16:38:09 +08:00
cherishsince 24ead9f09b 【优化】AI 对话,处理id 为空,对话不存在情况 2024-05-21 16:21:14 +08:00
cherishsince 15e7a260bf 【解决todo】Ai Chat 增加回到顶部 2024-05-21 16:09:33 +08:00
cherishsince e3bc50e4fc 【解决todo】AI chat 增加回到底部 2024-05-21 16:05:44 +08:00
cherishsince 6a03b7637e 【解决todo】AI 对话增加加载中。 2024-05-21 14:24:21 +08:00
cherishsince 8b0d598d8a 【解决todo】AI 对话前后,增加加载中页面 2024-05-21 13:56:11 +08:00
cherishsince 8ca3d26cbb 【优化】AI Chat 复制按钮和删除按钮间距 2024-05-21 12:07:53 +08:00
cherishsince e896e5bb27 【解决todo】AI chat 头部修改模型,不更新问题 2024-05-21 11:46:30 +08:00
cherishsince 939e3790ee 【解决todo】角色仓库,公共仓库不显示更多操作 2024-05-21 11:40:15 +08:00
cherishsince 8c81a9fc19 【已解决todo】AI 对话 删除、编辑 不切换对话 2024-05-21 11:37:44 +08:00
cherishsince 5c15b7f503 【解决todo】处理 AI 对话排序 2024-05-21 11:33:28 +08:00
cherishsince f164225bbe 【解决todo】 ai 对话列表间距 2024-05-21 10:33:21 +08:00
cherishsince 61fa0f65ab 【优化】优化 AI 角色仓库 Card 底部预留空间 2024-05-21 10:15:46 +08:00
cherishsince ac436ae186 【解决todo】AI 角色仓库,搜索改为右侧所搜 2024-05-21 10:13:30 +08:00
cherishsince 5871464681 【todo】AI Chat 已删除 Message 组件中的复制、删除文字 2024-05-21 10:10:14 +08:00
cherishsince 138cf760b2 【todo】AI 角色仓库,调整 card 大小 2024-05-21 09:52:02 +08:00
cherishsince cb64b940a5 【todo】解决 AI 对话 置顶、编辑 按钮,hover效果 2024-05-21 09:45:39 +08:00
cherishsince 264cad5301 Merge remote-tracking branch 'origin/dev' into dev 2024-05-18 22:03:00 +08:00
cherishsince 7de0b075cb 【优化】处理btn全局样式问题 2024-05-18 22:02:52 +08:00
芋道源码 e04a8eeea9 !449 fix:恢复 form-create [select、radio、checkbox] 组件
Merge pull request !449 from puhui999/dev-crm
2024-05-18 13:28:04 +00:00
YunaiV c2b439c463 【新增】AI:聊天角色的温度、token 数的 input-number 组件 2024-05-18 19:50:40 +08:00
cherishsince de754a6a6e Merge remote-tracking branch 'origin/dev' into dev 2024-05-18 00:02:23 +08:00
cherishsince 8bea8ce623 【优化】AI 切换按钮,并排按钮 2024-05-18 00:02:15 +08:00
cherishsince a33c0887b0 【优化】AI 聊天处理双滚动条问题 2024-05-17 23:57:59 +08:00
cherishsince 559cd48c4f 【优化】Ai 对话 Message 非 user 类型显示到左边 2024-05-17 23:48:18 +08:00
cherishsince 07241b5efb 【处理】全局滚动条问题 2024-05-17 23:47:53 +08:00
cherishsince 2be1411179 【优化】解决全局有滚动条问题 2024-05-17 23:45:50 +08:00
cherishsince b9460d2028 【优化】解决全局有滚动条问题 2024-05-17 23:44:11 +08:00
cherishsince 959731609f 【优化】AI 聊天卡顿问题 2024-05-17 23:27:13 +08:00
cherishsince d8dcc911b5 【增加】AI 对话增加置顶,和取消置顶 2024-05-17 22:58:44 +08:00
cherishsince 1c8bdc7e7e 【优化】AI 对话,编辑、删除 改为 button icon 2024-05-17 22:53:07 +08:00
cherishsince 7acc2fcb1b 【增加】AI 对话增加搜索 2024-05-17 22:44:04 +08:00
cherishsince 2b38e62c85 【优化】临时提交 2024-05-17 18:25:34 +08:00
cherishsince 0569dd1a26 【优化】AI 发送消息的input,不能滚动 2024-05-17 18:12:01 +08:00
cherishsince 43a41290a0 【优化】Chat 字体滚动,如果stream结束,开始加速 2024-05-17 18:08:57 +08:00
cherishsince a3c5d253b3 【优化】Chat 字体滚动,如果stream结束,开始加速 2024-05-17 18:07:54 +08:00
cherishsince 055abf62cd 【增加】AI Chat 增加回答字体滚动效果 2024-05-17 18:01:06 +08:00
cherishsince ca2b7202e6 【调整】AI 对话调整,提示词发送 2024-05-17 17:21:30 +08:00
cherishsince b6c654f039 【优化】调整markdown 样式 2024-05-17 17:14:28 +08:00
cherishsince 60fdbfb838 【优化】修改 Chat 提示词 2024-05-17 17:12:07 +08:00
cherishsince f6f786f1b6 【增加】AI 聊天发送,判断是否存在对话 2024-05-17 17:11:23 +08:00
cherishsince 1a1e53ae70 【增加】默认选中一个对话 2024-05-17 17:08:09 +08:00
cherishsince fc31528367 【增加】AI Chat 应道页面 2024-05-17 17:07:57 +08:00
cherishsince 48b3b08f0a 【优化】删除没用的 console 2024-05-17 16:13:42 +08:00
cherishsince cfdceca9f3 【优化】AI 抽离代码后,代码复制失效问题 2024-05-17 16:12:32 +08:00
cherishsince 0fef28e4a5 【优化】角色仓库底部留空 2024-05-17 16:05:21 +08:00
cherishsince efaf9ea96c 【优化】AI 对话角色抽屉,弹出比例 2024-05-17 16:03:13 +08:00
cherishsince 68762e73a2 【优化】处理 AI 角色搜索换行问题 2024-05-17 16:00:00 +08:00
cherishsince d5ffc80ea5 【增加】Ai 角色搜索,重置分页,不然会搜索不到 2024-05-17 15:35:13 +08:00
cherishsince 0d44b6cb37 【增加滚动分页】 2024-05-17 15:30:50 +08:00
cherishsince da65de038e 【优化】调整角色分页大小 2024-05-17 10:30:05 +08:00
cherishsince 80746d20fd 【增加】对话增加排序 2024-05-16 23:49:03 +08:00
cherishsince c3884c5dfd 【增加】AI Chat 抽离 Message 2024-05-16 23:39:31 +08:00
cherishsince 222a841226 【增加】AI 对话删除,重置 Chat 聊天 2024-05-16 23:21:31 +08:00
cherishsince 934d5e7ca8 【优化】修改对话Id类型 2024-05-16 23:21:02 +08:00
cherishsince dbca077f31 【优化】修改对话Id类型 2024-05-16 23:20:58 +08:00
cherishsince 7ab9aa77b8 【增加】Chat 对话增加更新选中 2024-05-16 23:20:44 +08:00
cherishsince 6fc5f8c685 【优化】AI 对话创建对话切换对话问题 2024-05-16 22:46:49 +08:00
cherishsince 1a681c2063 【优化】AI 对话,切换的id问题 2024-05-16 20:34:19 +08:00
cherishsince 58d3d1ed9a 【优化】删除没有的import 2024-05-16 20:08:32 +08:00
cherishsince 22081cbd48 【优化】AI 切换对话,动态切换 chat 标题 2024-05-16 19:43:51 +08:00
cherishsince b7d5ce4bc5 【优化】AI Chat 预设角色调整 2024-05-16 19:43:18 +08:00
cherishsince e0b38f5804 【优化】AI Chat 对话自动滚动 2024-05-16 18:34:19 +08:00
cherishsince 482ce62370 【优化】Ai 对话解耦 2024-05-16 18:29:42 +08:00
puhui999 bc8948eecf Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-16 17:05:54 +08:00
puhui999 a9994970fc fix:恢复 form-create [select、radio、checkbox] 组件 2024-05-16 17:05:00 +08:00
cherishsince 91593d5d40 【优化】AI Chat 抽离 Markdown 渲染 2024-05-16 16:04:21 +08:00
cherishsince ac9e5846c4 【增加】AI Chat 增加代码高亮(highlight)、实时渲染组件 2024-05-16 16:03:34 +08:00
cherishsince 9c370f729a 【优化】增加对话,切换message 2024-05-16 15:09:20 +08:00
cherishsince 36beffe140 【增加】清空 Chat 对话 2024-05-16 12:09:39 +08:00
cherishsince f21991f4fc 【增加】AI 对话增加 GROUP 分组 2024-05-16 11:28:31 +08:00
cherishsince ad02983098 【增加】AI ts 增加更新时间 2024-05-16 11:28:04 +08:00
cherishsince 25d346c201 【增加】AI Chat 角色仓库调用 2024-05-16 09:34:53 +08:00
cherishsince 1a56021e75 【优化】兼容 AI chat 调用 2024-05-16 09:34:30 +08:00
cherishsince da66aead54 【增加】增加对话切换 2024-05-16 00:28:24 +08:00
cherishsince f14032d69d 【增加】AI 配置 Chat角色 2024-05-16 00:18:29 +08:00
cherishsince 9658af7c04 【增加】AI 角色调整 2024-05-15 23:57:58 +08:00
cherishsince 490b11aa3a 【增加】AI 角色使用 2024-05-15 23:57:41 +08:00
cherishsince e7643c0343 【优化】调整事件触发范围 2024-05-15 23:12:53 +08:00
cherishsince 5c02e79105 Merge remote-tracking branch 'origin/dev' into dev 2024-05-15 23:11:49 +08:00
cherishsince b2c15ab2cb 【增加】AI 角色定制 2024-05-15 23:11:40 +08:00
YunaiV 4d3c5ef7c1 【新增】AI:流式发送消息的微调,统一成单接口 2024-05-15 23:06:27 +08:00
YunaiV 83b9332125 【新增】AI:聊天对话的删除功能 2024-05-15 20:32:58 +08:00
YunaiV 3d83f4928a 【新增】AI:聊天对话的更新模型 2024-05-15 19:45:19 +08:00
cherishsince c06bc71020 【增加】增加仓库搜索 2024-05-15 18:31:07 +08:00
cherishsince 3e0da37e16 【增加】增加仓库分类 2024-05-15 18:16:00 +08:00
cherishsince 986f50c6da 【增加】角色仓库 和 公开角色仓库 2024-05-15 16:55:37 +08:00
cherishsince 76903f6868 【增加】Header 组件 2024-05-15 16:31:14 +08:00
YunaiV bd5262e21d 【新增】AI:聊天更新的窗口 2024-05-15 13:00:31 +08:00
YunaiV ebd593bf92 【新增】AI:聊天对话的更新标题 2024-05-15 08:59:30 +08:00
YunaiV 67ece2ac5c 【新增】AI:对话接入聊天会话列表 2024-05-15 00:00:03 +08:00
YunaiV 051a610e56 【新增】AI:格式化 chat 对话的代码 2024-05-14 23:55:23 +08:00
cherishsince 3d15eadb5d 【优化】聊天 markdown 段落调整 2024-05-14 18:02:07 +08:00
cherishsince 175f9d58ad 【增加】拉去对话信息,选中切换的模型 2024-05-14 17:58:06 +08:00
cherishsince 8d907a76bf 【增加】增加输入法输入、普通输入监听 避免回车误触发送 2024-05-14 17:17:26 +08:00
cherishsince cea5b8b138 【增加】chat 增加 modal 切换 2024-05-14 15:32:30 +08:00
cherishsince 27569a746e 【增加】对话 modal 拉取 2024-05-14 13:43:56 +08:00
cherishsince 20b7403a6a Merge remote-tracking branch 'origin/dev' into dev 2024-05-13 23:22:50 +08:00
cherishsince 6c1298f7ef 【优化】采用 marked 重写 md 渲染,增加 code 复制功能 2024-05-13 23:22:42 +08:00
YunaiV df60cb617f Merge remote-tracking branch 'origin/dev' into dev 2024-05-13 21:46:39 +08:00
YunaiV c16bcef5a6 【新增】AI:聊天角色管理(80%) 2024-05-13 21:46:32 +08:00
cherishsince ffc134d26c Merge remote-tracking branch 'origin/dev' into dev 2024-05-13 21:39:53 +08:00
cherishsince 5ec08e9758 【增加】markdown-it 渲染、增加 highlight 高亮 2024-05-13 21:38:18 +08:00
YunaiV 9e99807bd0 【新增】AI:聊天角色管理(50%) 2024-05-13 20:46:45 +08:00
cherishsince 10beee84fb 【增加】消息增加 marked 渲染 markdown 2024-05-13 18:26:28 +08:00
cherishsince 7f25419caf 【优化】处理空的对话,消息靠左问题 2024-05-13 17:52:39 +08:00
cherishsince b0de27a721 【增加】增加发送 stream 中可以进行取消 2024-05-13 17:49:18 +08:00
cherishsince c1b9baf8b6 【增加】stream 聊天进行中删除,调用 stream 控制器中断 2024-05-12 22:22:34 +08:00
cherishsince 151076a79e 【增加】增加 chat stream 功能(删除、复制、滚动删除、发送消息自动到最下面) 2024-05-12 19:02:45 +08:00
cherishsince b116d82376 【增加】增加 chat 聊天列表、删除、复制到粘贴板 2024-05-12 14:28:27 +08:00
芋道源码 be978f2e9f Merge pull request #53 from DevDengChao/fix/wx-pay-channels
fix: 修复无法配置微信原生支付与网站支付的问题
2024-05-11 23:26:30 +08:00
芋道源码 663c8b3824 Merge pull request #42 from JJBoy1995/fix-bug
【修复】商城管理首页统计数据显示问题
2024-05-11 23:25:05 +08:00
芋道源码 05e6c2c2df Merge pull request #50 from DevDengChao/fix/demo-order-return-url
fix: 修复实例订单完成支付后跳转到 404 页面的问题
2024-05-11 23:23:45 +08:00
芋道源码 057a980982 Merge pull request #45 from DevDengChao/fix/submit-product-property-by-enter
fix: 修复填写商品属性后按回车键导致页面刷新的问题
2024-05-11 22:34:23 +08:00
YunaiV 73e8516024 【代码评审】CRM:优化员工业绩统计的实现 2024-05-11 22:30:44 +08:00
YunaiV 8ba6095b1b Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
2024-05-11 22:22:27 +08:00
YunaiV 43dcefdcf0 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-11 22:20:19 +08:00
芋道源码 93bee8c82c !445 解决部门管理页面中,重置按钮失效问题
Merge pull request !445 from 刘岩Tony/N/A
2024-05-11 13:59:08 +00:00
芋道源码 0385d4dbb3 !442 update src/views/Login/SocialLogin.vue.
Merge pull request !442 from 天痕/N/A
2024-05-11 13:58:56 +00:00
芋道源码 aefee5211a !443 update src/views/Login/SocialLogin.vue.
Merge pull request !443 from 天痕/N/A
2024-05-11 13:57:12 +00:00
YunaiV dd2c4b6b3c 【新增】AI:API 模型管理(完善) 2024-05-11 19:46:33 +08:00
scholar f01dc0a539 优化代码实现。 2024-05-11 11:26:47 +08:00
DevDengChao 7883e3161d fix: 修复微信原生支付与网站支付无法配置的问题 2024-05-11 11:00:00 +08:00
DevDengChao 0275cb6dd7 fix: 修复 el-upload 组件提示 http-request 属性报错的问题 2024-05-11 10:59:59 +08:00
DevDengChao e1d2305ddd fix: 补充缺失的微信 Native 支付与 WAP 支付枚举 2024-05-11 10:59:59 +08:00
cherishsince b19d56ad02 【优化】调整 right 对话 头像距离问题 2024-05-10 23:38:44 +08:00
cherishsince 0887c46f14 Merge remote-tracking branch 'origin/dev' into dev 2024-05-10 23:36:05 +08:00
cherishsince 9d322c3a94 【添加】调整ui 增加 chat对话和发送 2024-05-10 23:35:47 +08:00
YunaiV 1776217f1c 【新增】AI:API 模型管理 2024-05-10 22:48:33 +08:00
DevDengChao 79f011fe17 fix: 修复实例订单完成支付后跳转到 404 页面的问题 2024-05-10 10:24:57 +08:00
芋道源码 f5474840b3 !444 oa请假,修复列表展示的状态字段取值错误
Merge pull request !444 from syubun/master
2024-05-10 00:40:49 +00:00
芋道源码 be13eb1d0d !446 form-create: 优化 select options 解析,增加 el 表达式解析、自定义函数解析
Merge pull request !446 from puhui999/dev-crm
2024-05-10 00:31:00 +00:00
YunaiV 02fe7e31d0 【新增】AI:API 密钥管理 2024-05-09 23:02:57 +08:00
cherishsince 5525bc2257 【优化】优化 ai chat 主框架布局 2024-05-09 22:13:23 +08:00
puhui999 cb82578b27 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm
# Conflicts:
#	src/components/FormCreate/src/components/useApiSelect.tsx
2024-05-09 18:04:17 +08:00
puhui999 24f2c49e0b form-create: 完善 select 远程搜索 2024-05-09 18:02:57 +08:00
puhui999 9cde488577 form-create: 完善 select 远程搜索 2024-05-09 17:30:49 +08:00
DevDengChao 1ce3343578 fix: 修复填写商品属性后按回车键导致页面刷新的问题 2024-05-09 15:02:45 +08:00
puhui999 40fe87920b form-create: 优化 select option 选项解析,增加 el 表达式解析、自定义函数解析 (data: any)=>{ label: string; value: any } 2024-05-09 14:35:57 +08:00
JJBoy 1cf286b057 【修复】商城管理首页统计数据显示问题
(cherry picked from commit 78dd2fa38a2d040c1c97d70cababc4f9265ac705)
2024-05-08 21:16:09 +08:00
syubun e8f1b411ba 修改流程流转类型判断错误的问题 2024-05-08 15:13:51 +08:00
刘岩Tony 742456dd87 解决部门管理页面中,重置按钮失效问题
部门名称中的prop属性值写错了,会导致重置按钮不生效,已做相应更改

Signed-off-by: 刘岩Tony <345006662@qq.com>
2024-05-08 06:14:01 +00:00
syubun 657ad506a4 oa请假,修复列表展示的状态字段取值错误 2024-05-08 09:44:47 +08:00
YunaiV 6c1798097c Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-05-07 22:20:42 +08:00
YunaiV 8454d1d3e5 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-05-07 22:20:32 +08:00
芋道源码 9e25686c7c Merge pull request #39 from DevDengChao/fix/local-dev
fix: 修复由于 .env.local-dev 重命名导致的构建指令异常
2024-05-07 22:19:50 +08:00
YunaiV 760bab7d29 【修复】全局:id=0导致sqlserver的insert失败 2024-05-07 22:18:43 +08:00
YunaiV 3976e49e35 【新增】AI:新增 chat 对话界面(草稿状态) 2024-05-07 21:59:47 +08:00
天痕 7092e24098 update src/views/Login/SocialLogin.vue.
这里应该取反

Signed-off-by: 天痕 <614891294@qq.com>
2024-05-07 09:10:43 +00:00
天痕 eeae01e661 update src/views/Login/SocialLogin.vue.
这里已经是布尔值了,不用在判断为布尔值

Signed-off-by: 天痕 <614891294@qq.com>
2024-05-07 09:08:28 +00:00
DevDengChao ccd56f2dda fix: 修复由于 .env.local-dev 重命名导致的构建指令异常 2024-05-07 15:31:01 +08:00
YunaiV 9402b29684 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-07 09:13:25 +08:00
芋道源码 e8e1467f27 !441 fix: id=0导致sqlserver的insert失败
Merge pull request !441 from dhb52/dev
2024-05-07 01:10:01 +00:00
dhb52 0fb70607d9 fix: id=0导致sqlserver的insert失败 2024-05-06 23:28:33 +08:00
芋道源码 a60826529b !440 fix: id=0导致sqlserver新增菜单失败
Merge pull request !440 from dhb52/N/A
2024-05-06 14:53:17 +00:00
芋道源码 99f8fa8253 !439 商品统计计数显示成价格了 update src/views/mall/statistics/product/components/ProductSummary.vue.
Merge pull request !439 from 山野羡民/N/A
2024-05-06 14:52:40 +00:00
YunaiV 0222eef6b5 【优化】全局:动态表单的注释、error log 打印 2024-05-06 22:51:26 +08:00
dhb52 c350fc466e fix: id=0导致sqlserver新增菜单失败
Signed-off-by: dhb52 <dhb52@126.com>
2024-05-06 14:43:52 +00:00
芋道源码 41cbabcf88 !435 form-create:字典选择器分离,重新封装 api 选择器。扩展字体图标。
Merge pull request !435 from puhui999/dev-crm
2024-05-06 14:41:02 +00:00
山野羡民 2101731f0b update src/views/mall/statistics/product/components/ProductSummary.vue.
商品统计计数显示有问题,数量显示成价格了

Signed-off-by: 山野羡民 <liyujiang_tk@yeah.net>
2024-05-06 01:55:15 +00:00
puhui999 bcf2f7a5dc Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-06 02:12:39 +08:00
puhui999 9f704fb8ff form-create: 字体图标扩展 2024-05-06 02:12:09 +08:00
puhui999 7c158af3cc form-create: 字典选择器分离,重新封装 api 选择器 2024-05-06 01:24:25 +08:00
YunaiV 66c6463f44 【修复】商城:seckill 导致打包失败的问题 2024-05-05 11:20:08 +08:00
scholar 449d1191ff fix同比环比数据计算的bug。 2024-05-04 22:28:37 +08:00
YunaiV f4705ad4e1 【发版】全局:2.1.0 发版 2024-05-04 21:51:06 +08:00
YunaiV 143eb655b1 【发版】全局:2.1.0 发版 2024-05-04 11:14:41 +08:00
YunaiV bbf009e15d 【优化】首页增加“项目说明” 2024-05-04 11:14:11 +08:00
YunaiV ecf9052452 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-02 15:14:23 +08:00
芋道源码 869cae0675 !437 update src/views/infra/webSocket/index.vue. #434
Merge pull request !437 from AhJindeg/N/A
2024-05-02 07:14:15 +00:00
YunaiV dd36bbce42 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-02 15:04:52 +08:00
芋道源码 939ceb32ce !436 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题
Merge pull request !436 from Khalid/master
2024-05-02 07:04:38 +00:00
YunaiV e2fe04749b 【修复】商城系统:管理后台的商城订单统计数据有问题 2024-05-02 09:24:45 +08:00
YunaiV 20a9780654 【修复】商城:秒杀时段点击编辑报错 2024-05-01 20:53:01 +08:00
puhui999 c77526e8c5 form-create: 封装通用选择器 hook 2024-05-01 20:42:53 +08:00
puhui999 1434d7ddad Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-01 20:30:57 +08:00
puhui999 b4d85b782e form-create: 封装通用选择器 hook 2024-05-01 19:53:35 +08:00
YunaiV f75e8d1fd4 【新增】在菜单管理中,可通过“路由地址”添加 ? 拼接参数 2024-05-01 18:47:51 +08:00
puhui999 c1c21d826d form-create: 封装通用选择器 hook 2024-05-01 17:29:13 +08:00
puhui999 51e6887bde Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-05-01 14:52:16 +08:00
YunaiV bde5597467 【优化】结合 vite 机制,将 .env.local-dev 修改成 .env.local 2024-04-30 21:33:35 +08:00
AhJindeg de967a0160 update src/views/infra/webSocket/index.vue. #434
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2024-04-30 08:50:55 +00:00
YunaiV 9527b41b62 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-30 15:04:41 +08:00
puhui999 1f1ac1f246 使用 tsx 封装 form-create 通用选择组件 2024-04-30 14:15:44 +08:00
khalidlife ff14cf90f0 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 2024-04-30 09:30:43 +08:00
puhui999 21483448b9 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-30 00:07:37 +08:00
puhui999 769b63d9ca form-create:移除自带的下拉选择器组件,使用 currencySelectRule 替代 2024-04-30 00:07:25 +08:00
YunaiV dcf66749af 【移除】stylelint.vscode-stylelint 插件的推荐,避免 vscode 样式红色波浪线 2024-04-29 22:01:59 +08:00
YunaiV 500b8632df 【优化】增加 pnpm-lock 保证大家更好的打包 2024-04-29 21:47:49 +08:00
YunaiV 730da857e1 【恢复】npm run dev 使用 local-dev 配置文件 2024-04-28 12:58:35 +08:00
芋道源码 c96902d622 !433 CRM: 修复客户导入、销售漏斗。上传组件的文件列表给拓展一个下载 。
Merge pull request !433 from puhui999/dev-crm
2024-04-28 04:52:53 +00:00
puhui999 0076236280 Merge remote-tracking branch 'refs/remotes/yudao/dev' into dev-crm 2024-04-25 22:34:14 +08:00
puhui999 ae53ca6f4f feat:文件上传组件的文件列表拓展一个下载 2024-04-25 22:33:36 +08:00
puhui999 9a36d9d663 fix: import FunnelChart from echarts 2024-04-24 23:28:09 +08:00
YunaiV f55c9b7273 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-24 23:01:05 +08:00
puhui999 6ff31b90c7 CRM: 修复客户导入 2024-04-24 22:55:14 +08:00
YunaiV a0996bd0cf 【优化】移除 env 多余的 VITE_API_BASEPATH 配置项 2024-04-24 21:50:21 +08:00
YunaiV f405ac3293 【优化】新增 sslEnable 字段,支持 outlook 邮箱 2024-04-24 09:14:43 +08:00
YunaiV 2d999138ba 依赖升级:element-plus、axios 等依赖 2024-04-24 00:32:10 +08:00
YunaiV 1d533e49e4 crm:bugfix FunnelBusiness.vue 导致打包失败的问题 2024-04-24 00:31:44 +08:00
YunaiV dee479ce3c Merge remote-tracking branch 'origin/dev' into dev 2024-04-23 23:31:58 +08:00
YunaiV 715f37eb0b crm:code review 员工业绩统计 2024-04-23 23:31:52 +08:00
YunaiV 56543b8db4 Merge branch 'dev' of https://gitee.com/scholarli/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/crm/statistics/performance/components/ContractCountPerformance.vue
#	src/views/crm/statistics/performance/components/ContractPricePerformance.vue
#	src/views/crm/statistics/performance/components/ReceivablePricePerformance.vue
#	src/views/crm/statistics/performance/index.vue
2024-04-23 23:17:15 +08:00
YunaiV 7f3950018e Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
# Conflicts:
#	src/api/infra/codegen/index.ts
#	src/views/system/sensitiveWord/index.vue
2024-04-23 00:28:26 +08:00
芋道源码 d26e0976db !430 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题
Merge pull request !430 from limz/bugfix-pull
2024-04-22 16:27:11 +00:00
芋道源码 95a51ce4f3 !432 fix:修复 issues 提到的一些问题
Merge pull request !432 from puhui999/dev-crm
2024-04-22 16:25:14 +00:00
YunaiV 0925253a9d 【移除】敏感词的管理,简化项目的复杂度 2024-04-22 19:52:05 +08:00
YunaiV 98bf5a102e 【移除】错误码的管理,简化项目的复杂度 2024-04-22 19:42:56 +08:00
YunaiV ff0c12c551 【移除】数据库文档,简化项目的复杂度 2024-04-22 19:13:57 +08:00
puhui999 243da124a8 fix: 调整价格弹窗不出来问题 2024-04-22 11:35:28 +08:00
puhui999 deb4585d4b fix: 适配 echarts map 的地名 2024-04-22 11:04:53 +08:00
puhui999 afdee2cd48 fix: 移除 form-crate 自带的富文本组件规则,使用 editorRule 替代 2024-04-22 10:56:16 +08:00
scholar f4dd1bed63 1, 修改数据列表无法刷新的问题;
2, 修改时间选择,后端按照年实现的,前端同样按照年份选择实现;
3,修改环比同比计算;
4,回款金额统计bug修复。
2024-04-19 17:46:09 +08:00
limingz d96f951113 bugfix:修复角色管理页面-角色类型字段没有被字典翻译问题 2024-04-18 14:45:43 +08:00
YunaiV f5d013187b crm:code review 销售漏斗 2024-04-18 09:28:07 +08:00
芋道源码 50ab864698 !428 CRM: 新增商机赢单转化率分析
Merge pull request !428 from puhui999/dev-crm
2024-04-18 01:10:12 +00:00
芋道源码 b1c832d27f !429 fix: Permissions filled in incorrectly
Merge pull request !429 from AhJindeg/hotfix/hasPermi
2024-04-18 01:08:58 +00:00
芋道源码 5ba6c5ee00 !427 修复第四个导航模式无法点开菜单的问题
Merge pull request !427 from moon69/N/A
2024-04-18 01:04:58 +00:00
AhJindeg ac6618a943 fix: 🐞 fix sensitiveWord hasPermi value 2024-04-16 18:24:56 +08:00
AhJindeg decdd1b25d fix: 🐞 fix post hasPermi value 2024-04-16 18:24:36 +08:00
AhJindeg 97c8cefb7d fix: 🐞 fix operatelog hasPermi value 2024-04-16 18:24:16 +08:00
AhJindeg bfb69ccccd fix: 🐞 fix template hasPermi value 2024-04-16 18:23:57 +08:00
AhJindeg 958ec41f4e fix: 🐞 fix loginlog hasPermi value 2024-04-16 18:23:39 +08:00
AhJindeg dc5bede084 fix: 🐞 fix fileConfig hasPermi value 2024-04-16 18:23:24 +08:00
AhJindeg 755526834e fix: 🐞 fix file hasPermi value 2024-04-16 18:23:08 +08:00
AhJindeg 221f78aa9a fix: 🐞 fix apiAccessLog hasPermi value 2024-04-16 18:22:46 +08:00
puhui999 4e640bae88 CRM: 新增商机赢单转化率分析 2024-04-15 16:38:24 +08:00
puhui999 014d1f8cd2 CRM: 新增商机赢单转化率分析 2024-04-15 16:32:48 +08:00
puhui999 6acfc77d08 CRM: 完善销售漏斗 2024-04-15 15:37:37 +08:00
moon69 033462d25f 修复第四个导航模式无法点开菜单的问题
Signed-off-by: moon69 <1016830869@qq.com>
2024-04-15 06:24:32 +00:00
YunaiV 2512253020 crm:code review 销售漏斗 2024-04-14 21:22:55 +08:00
YunaiV c331a83b74 crm:code review 销售漏斗 2024-04-14 21:21:52 +08:00
芋道源码 56829ff921 !426 CRM: 完善销售漏斗分析
Merge pull request !426 from puhui999/dev-crm
2024-04-14 12:19:51 +00:00
芋道源码 6037ac4052 !419 feat: 客户成交周期分析(按区域、按产品)
Merge pull request !419 from dhb52/dev
2024-04-14 10:23:40 +00:00
YunaiV 1f0ef78219 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-14 18:23:04 +08:00
芋道源码 1c469300f5 !422 Infra模块>代码生成器>适配达梦数据库
Merge pull request !422 from 再见七月/infraBug-by-dm
2024-04-14 10:21:53 +00:00
YunaiV 7ba611bdb7 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-04-14 18:18:53 +08:00
芋道源码 aba61120e4 !421 fix(UserImportForm): fix a bunch of bugs
Merge pull request !421 from AhJindeg/hotfix-UserImportForm
2024-04-14 10:18:31 +00:00
YunaiV e885bf2f2a Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-04-14 18:17:53 +08:00
芋道源码 ddfa0a5a0f !424 fix:部署报错移除多余的代码
Merge pull request !424 from 李占宏/dev
2024-04-14 10:17:42 +00:00
芋道源码 855987d5fa !425 fix:部署报错移除多余的代码
Merge pull request !425 from 李占宏/dev
2024-04-14 10:14:42 +00:00
puhui999 bc95dc2959 CRM: 完善新增商机分析 2024-04-14 16:31:43 +08:00
puhui999 3c49ed570a CRM: 完善销售漏斗分析 2024-04-14 00:34:33 +08:00
zhanhong 2f0fdd1d36 fix:移除多余的代码 2024-04-13 12:39:41 +08:00
puhui999 2d7bab8adb CRM: 完善用户画像数据统计 2024-04-13 11:04:56 +08:00
YunaiV ab1c506226 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-04-12 20:37:50 +08:00
YunaiV 99addf2cfa README:移除 resilience4j 组件,增加分布式锁 2024-04-11 23:51:51 +08:00
puhui999 64af029c86 CRM: 完善用户画像数据统计 2024-04-11 15:25:48 +08:00
AhJindeg 4793897511 fix(UserImportForm): 🐞 add update formLoading and dialogVisible to submitFormSuccess 2024-04-11 11:03:06 +08:00
AhJindeg 786468f437 fix(UserImportForm): 🐞 add init updateSupport to open 2024-04-11 11:00:24 +08:00
byeJuly 1f517c3faf 修复 Infra 模块:
修复项目迁移达梦8数据库后,代码生成器导入功能报错的原因:
调整策略:删除-> autoIncrement <-字段
2024-04-10 19:33:01 +08:00
AhJindeg 4c15e6675a fix(UserImportForm): 🐞 add nextTick to resetForm 2024-04-10 18:09:43 +08:00
dhb52 5358863fc6 refactor: 统一处理null数据为'未知' 2024-04-09 18:47:31 +08:00
dhb52 0e15d6c9d2 feat: 客户成交周期分析(按区域、按产品) 2024-04-09 00:21:10 +08:00
芋道源码 f6e4753b34 !414 fix(role): add nextTick for open
Merge pull request !414 from AhJindeg/hotfix-role
2024-04-07 13:28:38 +00:00
YunaiV e8a3745b5e crm:code review 公海客户分析 2024-04-07 21:27:29 +08:00
芋道源码 091ce90359 !417 feat: 增加[客户公海分析]tab
Merge pull request !417 from dhb52/dev
2024-04-07 13:17:35 +00:00
AhJindeg b5fa188805 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into hotfix-role
Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2024-04-06 14:37:34 +00:00
YunaiV 8f8edc9565 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-04-06 19:39:14 +08:00
dhb52 3c54f5f565 feat: 增加[客户公海分析]tab 2024-04-06 15:38:50 +08:00
dhb52 13cf1feefb refactor: 使用try finally停止loading 2024-04-06 15:38:04 +08:00
YunaiV 6772568a58 crm:code review 客户画像 2024-04-05 14:43:55 +08:00
芋道源码 8926dd1173 !415 CRM: 完善用户画像数据统计
Merge pull request !415 from puhui999/dev-crm
2024-04-05 05:54:06 +00:00
YunaiV dcfad7a427 crm:code review 员工业绩的前端 2024-04-05 13:53:14 +08:00
AhJindeg db4795744e style: 🌈 add more readable for open 2024-04-05 13:51:27 +08:00
芋道源码 f17dfb9a31 !416 CRM员工业绩统计分析v2.0
Merge pull request !416 from scholarli/dev
2024-04-05 05:45:09 +00:00
AhJindeg 7b84ddd358 perf: 🎈 add await for nextTick() 2024-04-04 18:54:51 +08:00
YunaiV 283a9d0507 【新增】system user 和 role 接入新操作日志 2024-04-04 09:57:25 +08:00
YunaiV c01571d11d 【重构】V2 操作日志转正,基于注解的可使用变量、可以自定义函数的通用操作日志组件 2024-04-04 01:21:27 +08:00
YunaiV 757281ce34 【优化】增强访问日志,支持是否记录、脱敏、操作信息等功能 2024-04-03 19:55:54 +08:00
scholar b57a2c50a9 CRM员工业绩统计分析v2.0 2024-04-03 18:43:34 +08:00
puhui999 36385a74ba CRM: 完善用户画像数据统计 2024-04-03 12:19:09 +08:00
AhJindeg c048dcf02a fix(role): 🐞 add nextTick for open
- 增加 nextTick(),修复在权限范围为指定机构并且已选择数据时,编辑打开提示 setChecked undefined 问题
2024-04-01 16:14:30 +08:00
芋道源码 9ede8ffe4d !413 form-create-designer: 表单组件新增字典选择器和用户选择器
Merge pull request !413 from puhui999/dev-crm
2024-03-31 14:15:52 +00:00
puhui999 d16bed4ad7 form-create-designer: 表单组件新增用户选择器 2024-03-31 17:58:44 +08:00
puhui999 68dae2d1fe form-create-designer: 表单组件新增字典选择器 2024-03-30 23:18:23 +08:00
YunaiV d05c67ffaa infra:code review 表单增强 2024-03-30 21:15:01 +08:00
芋道源码 5ca3358237 !412 使用项目组件对 form-create-designer 进行增强
Merge pull request !412 from puhui999/dev-crm
2024-03-30 13:03:29 +00:00
YunaiV ffc81621d7 REPORT:【移除】Ureport 的实现,因为和 Spring Boot 兼容性较差 2024-03-30 20:41:32 +08:00
puhui999 a489d21add Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-30 18:53:30 +08:00
puhui999 bc004b3b27 使用项目组件对 form-create-designer 进行增强 2024-03-30 18:53:05 +08:00
芋道源码 52889e3504 !411 SYSTEM:修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误
Merge pull request !411 from aqiangaqiang/master
2024-03-30 07:56:52 +00:00
芋道源码 6764f86980 !409 fix(crontab): add inputChange for crontab
Merge pull request !409 from AhJindeg/hotfix-crontab
2024-03-30 07:55:47 +00:00
芋道源码 02af138069 !402 修复数据权限无法回显的问题
Merge pull request !402 from moon69/master
2024-03-30 07:50:38 +00:00
YunaiV 427c2d5d2a MALL:修复营销的商品范围枚举不正确的问题 2024-03-30 15:42:28 +08:00
YunaiV 87d1047fa9 CRM:code review【客户画像】的实现 2024-03-30 14:17:14 +08:00
YunaiV 34b788cb88 Merge branch 'dev-crm' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/bpm/definition/index.vue
#	src/views/bpm/model/index.vue
#	src/views/bpm/processInstance/create/index.vue
#	src/views/crm/statistics/customer/index.vue
2024-03-30 12:54:51 +08:00
YunaiV 291dc51849 CRM:完善【排行版】功能 2024-03-30 11:48:41 +08:00
YunaiV 1b7d604858 CRM:code review【客户统计】的代码实现 2024-03-30 11:02:29 +08:00
YunaiV b51397fe19 CRM:优化【客户统计】的代码实现 2024-03-30 09:23:02 +08:00
sunva 68e1556378 SYSTEM:修复【系统管理/岗位管理/新增按钮与导出按钮】权限hasPermi错误 2024-03-29 17:06:56 +08:00
YunaiV 23150fcfc3 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	package.json
2024-03-28 19:30:02 +08:00
芋道源码 1f14bf4bda !404 feat: [CRM-客户分析]增加[时间间隔]选项
Merge pull request !404 from dhb52/dev
2024-03-28 11:18:52 +00:00
YunaiV b4677c4546 README:增加功能图,方便理解 2024-03-27 21:23:21 +08:00
YunaiV 9f3bc1ead8 BPM:修复 bpmnxml 为空时,展示的 key 被覆盖的问题 2024-03-27 18:51:06 +08:00
YunaiV 607c2b6c4a BPM:完善文档说明 2024-03-27 09:41:00 +08:00
puhui999 3820710c56 二次封装 form-create 组件,使用项目重新封装的文件上传组件实现文件上载 2024-03-26 10:59:03 +08:00
puhui999 cce1fadc33 CRM: 新增客户行业、来源、级别统计、区域数据统计 2024-03-24 22:22:09 +08:00
YunaiV 77971f9c96 Merge branch 'feature/bpm' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2024-03-24 10:47:04 +08:00
YunaiV 624594bb5c BPM:处理打开 bpmn 设计器时,key 和 name 覆盖更新 2024-03-24 10:46:37 +08:00
YunaiV eed7bb2e1a BPM:流程模型的 icon 维护 2024-03-24 10:08:59 +08:00
YunaiV cc14963bc8 BPM:增加流程表达式的管理 2024-03-23 21:12:09 +08:00
YunaiV 7218e71884 BPM:增加任务监听器、执行监听器的管理 2024-03-23 19:23:19 +08:00
YunaiV faf4557783 BPM:增加任务监听器、执行监听器的管理 2024-03-23 15:58:38 +08:00
YunaiV 728cf15c45 BPM:增加「发起人自选」的任务审批人的分配策略 2024-03-23 00:54:33 +08:00
YunaiV 48f6624737 BPM:新增【流程任务】菜单,用于全部流程任务的查询 2024-03-22 09:07:04 +08:00
YunaiV 5286ad1cd6 BPM:新增【流程实例】菜单,用于全部流程实例的查询 2024-03-22 08:26:26 +08:00
jason ee12e691be 暂时去掉原有设计器的审批人设置, 避免缺少资源报错。后续需要改造 2024-03-21 21:14:16 +08:00
AhJindeg c2f98043df fix: 🐞 add inputChange for crontab 2024-03-21 17:20:01 +08:00
YunaiV 05b408d107 BPM:新增流程的重新发起 2024-03-21 00:34:10 +08:00
jason 0d4b6f6344 流程模型中增加仿钉钉设计器入口 2024-03-20 22:26:35 +08:00
jason 07dc725857 整合仿钉钉流程设计器 https://github.com/StavinLi/Workflow-Vue3 2024-03-20 22:26:35 +08:00
YunaiV d16194b794 BPM:优化 task 审批详情界面,增加开始时间、结束时间的展示 2024-03-20 21:33:48 +08:00
YunaiV d0f73344bf BPM:增强 model 流程模型部署时,各种参数校验 2024-03-20 18:51:49 +08:00
YunaiV 08dd4ed072 BPM:支持多表单,每个流程任务都可以绑定流程表单 2024-03-20 12:50:59 +08:00
YunaiV 501a1c2f4d BPM:新增流程分类表,替代现有的 bpm_category 数据字典 2024-03-19 19:49:52 +08:00
YunaiV a0f157c8b6 BPM:简化 userGroup 的实现 2024-03-19 12:13:54 +08:00
YunaiV 2d424fc9a6 BPM:优化 task 加减签的实现 2024-03-19 01:31:51 +08:00
YunaiV a40866e27f BPM:完善 task 转派的实现 2024-03-18 20:45:39 +08:00
YunaiV 60ddc45b9b BPM:增加 task 的审批建议 2024-03-18 18:41:11 +08:00
YunaiV 03b8bd5e22 BPM:调整抄送逻辑的实现,改成审批通过、不通过时,可选择抄送 2024-03-17 22:14:28 +08:00
YunaiV de29528165 BPM:简化 task 接口的 VO,做一些合并。虽然字段上有冗余,但是读代码难度降低 2024-03-17 17:25:40 +08:00
芋道源码 6b45ed7e78 !406 适配顶部导航
Merge pull request !406 from 疯狂的世界/dev
2024-03-17 01:25:50 +00:00
YunaiV 59c7c49efa BPM:流程实例的 status 状态实现,使用 Flowable 的 variables 存储,移除 bpm_process_instance_ext 表 2024-03-16 16:43:47 +08:00
YunaiV 33d59c8b7d BPM:新增顺序会签、或签的能力 2024-03-16 00:05:58 +08:00
YunaiV 5f7ccd4e7c BPM:重构流程分配人的实现,通过 BpmTaskCandidateStrategy 策略模式 2024-03-15 00:19:23 +08:00
YunaiV 960f27f6ef BPM:新增 flowable expression 表达式,替代现有 BpmTaskAssignScript,更加灵活 2024-03-14 12:54:28 +08:00
owen aa57d89bea Merge remote-tracking branch 'origin/dev' into dev 2024-03-14 00:13:58 +08:00
owen c5b1ad480f 适配顶部导航 2024-03-14 00:13:40 +08:00
YunaiV feadd022e7 BPM:重构审批人的分配规则实现,移除 bpm_task_assign_rule 表,存储在 bpmn 的 userTask 中 2024-03-13 21:18:26 +08:00
moon69 4c0a5e8c30 修复数据权限无法回显的问题 2024-03-10 11:59:49 +08:00
dhb52 b0d4c87d8e feat: [CRM-客户分析]增加[时间间隔]选项 2024-03-10 10:30:32 +08:00
芋道源码 1a0f0a11b1 !403 CRM:完善转移
Merge pull request !403 from puhui999/dev-crm
2024-03-09 10:35:39 +00:00
puhui999 d21c060903 CRM:完善转移 2024-03-09 17:57:24 +08:00
moon69 0230a4af01 修复数据权限无法回显的问题 2024-03-09 17:38:56 +08:00
芋道源码 2ed41ab164 !401 build(package): add prettier-eslint@16.3.0 #392
Merge pull request !401 from AhJindeg/N/A
2024-03-09 09:00:46 +00:00
YunaiV c89941d435 CRM:code review 客户总量统计 2024-03-09 16:51:42 +08:00
芋道源码 55856be1de !394 feat: CRM/数据统计/员工客户分析 初稿
Merge pull request !394 from dhb52/dev
2024-03-09 08:37:59 +00:00
芋道源码 a6e29c5615 !400 fix(LoginForm): update doSocialLogin
Merge pull request !400 from AhJindeg/dev
2024-03-09 07:35:04 +00:00
芋道源码 ecf9f26547 !398 删除重复的 pagination 事件
Merge pull request !398 from moon69/master
2024-03-09 07:34:06 +00:00
芋道源码 4dabfcba23 !399 CRM:完善数据权限,实现数据权限同时添加、同时转移
Merge pull request !399 from puhui999/dev-crm
2024-03-09 07:21:16 +00:00
AhJindeg 53c63ba68f build(package): 🔧 add prettier-eslint@16.3.0 #392
修复 settings.json 文件中设置格式化插件 rvest.vs-code-prettier-eslint 未生效问题。

Signed-off-by: AhJindeg <ahjindeg@gmail.com>
2024-03-07 07:42:59 +00:00
AhJindeg 2d4ed85e94 fix(LoginForm): 🐞 update doSocialLogin
- 修复手动填写租户名称时,点击取消按钮,登录按钮 loading 状态未取消,并且会继续执行 LoginApi.socialAuthRedirect 方法
2024-03-07 14:38:31 +08:00
dhb52 470c5076a3 fix: 合同摘要信息(客户转化率页面) api 地址错误 2024-03-05 23:16:57 +08:00
dhb52 762b51a5b4 fix: [CRM-客户统计]根据Code-Review 修改 2024-03-04 23:51:42 +08:00
puhui999 13e925e29f CRM:完善数据权限,实现数据权限同时添加、同时转移 2024-03-03 20:11:52 +08:00
moon69 e4e37d0cb4 删除重复的 pagination 事件 2024-03-03 16:18:53 +08:00
puhui999 3660cd26ae CRM: 完善回款合同回款计划编辑合同回显 2024-03-02 23:38:13 +08:00
puhui999 a31c995508 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-02 23:26:26 +08:00
dhb52 d0501ee0a6 feat: CRM/数据统计/员工客户分析 初稿 2024-03-01 00:10:38 +08:00
dhb52 3ddba81e24 Merge remote-tracking branch 'yudao/dev' into dev 2024-02-29 21:03:19 +08:00
puhui999 c9d5ec26a2 fix: 主子表 demo03 List props 2024-02-28 09:35:12 +08:00
dhb52 441b91381f feat: CRM/数据统计/客户总量分析 2024-02-27 23:45:13 +08:00
dhb52 0db264dcac Merge remote-tracking branch 'yudao/dev' into dev 2024-02-27 21:42:40 +08:00
dhb52 783f6283ca Merge remote-tracking branch 'yudao/dev' into dev 2024-02-25 21:07:23 +08:00
424 changed files with 34721 additions and 3825 deletions

No files matched your search

+5
View File
@@ -18,3 +18,8 @@ VITE_APP_DOCALERT_ENABLE=true
# 百度统计
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
# 默认账户密码
VITE_APP_DEFAULT_LOGIN_TENANT = 芋道源码
VITE_APP_DEFAULT_LOGIN_USERNAME = admin
VITE_APP_DEFAULT_LOGIN_PASSWORD = admin123
+2 -6
View File
@@ -1,20 +1,16 @@
# 开发环境:本地只启动前端项目,依赖开发环境(后端、APP)
NODE_ENV=development
NODE_ENV=production
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# VITE_BASE_URL='http://dofast.demo.huizhizao.vip:20001'
# 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
# 接口地址
VITE_API_URL=/admin-api
@@ -37,4 +33,4 @@ VITE_OUT_DIR=dist
VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn'
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false
VITE_APP_CAPTCHA_ENABLE=true
-3
View File
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
# 接口地址
VITE_API_URL=/admin-api
-3
View File
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
-3
View File
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
-3
View File
@@ -11,9 +11,6 @@ VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
-2
View File
@@ -2,9 +2,7 @@ node_modules
.DS_Store
dist
dist-ssr
*.local
/dist*
*-lock.*
pnpm-debug
auto-*.d.ts
.idea
Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 348 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

-1
View File
@@ -3,7 +3,6 @@
"christian-kohler.path-intellisense",
"vscode-icons-team.vscode-icons",
"davidanson.vscode-markdownlint",
"stylelint.vscode-stylelint",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"mrmlnc.vscode-less",
+41 -40
View File
@@ -54,17 +54,16 @@
推荐 VS Code 开发,配合插件如下:
| 插件名 | 功能 |
|-------------------------------|--------------------------|
| TypeScript Vue Plugin (Volar) | 用于 TypeScript 的 Vue 插件 |
| Vue Language Features (Volar) | Vue3.0 语法支持 |
| unocss | unocss for vscode |
| Iconify IntelliSense | Iconify 预览和搜索 |
| i18n Ally | 国际化智能提示 |
| Stylelint | Css 格式化 |
| Prettier | 代码格式化 |
| ESLint | 脚本代码检查 |
| DotENV | env 文件高亮 |
| 插件名 | 功能 |
|-------------------------------|---------------------|
| Vue - Official | Vue 与 TypeScript 支持 |
| unocss | unocss for vscode |
| Iconify IntelliSense | Iconify 预览和搜索 |
| i18n Ally | 国际化智能提示 |
| Stylelint | Css 格式化 |
| Prettier | 代码格式化 |
| ESLint | 脚本代码检查 |
| DotENV | env 文件高亮 |
## 🔥 后端架构
@@ -117,6 +116,8 @@
| 🚀 | 应用管理 | 管理 SSO 单点登录的应用,支持多种 OAuth2 授权方式 |
| 🚀 | 地区管理 | 展示省份、城市、区镇等城市信息,支持 IP 对应城市 |
![功能图](/.image/common/system-feature.png)
### 工作流程
| | 功能 | 描述 |
@@ -129,6 +130,8 @@
| 🚀 | 已办任务 | 查看自己【已】审批的工作任务,未来会支持回退操作 |
| 🚀 | OA 请假 | 作为业务自定义接入工作流的使用示例,只需创建请求对应的工作流程,即可进行审批 |
![功能图](/.image/common/bpm-feature.png)
### 支付系统
| | 功能 | 描述 |
@@ -142,27 +145,27 @@ ps:核心功能已经实现,正在对接微信小程序中...
### 基础设施
| | 功能 | 描述 |
|-----|----------|----------------------------------------------|
| 🚀 | 代码生成 | 前后端代码的生成(Java、Vue、SQL、单元测试),支持 CRUD 下载 |
| 🚀 | 系统接口 | 基于 Swagger 自动生成相关的 RESTful API 接口文档 |
| 🚀 | 数据库文档 | 基于 Screw 自动生成数据库文档,支持导出 Word、HTML、MD 格式 |
| | 表单构建 | 拖动表单元素生成相应的 HTML 代码,支持导出 JSON、Vue 文件 |
| 🚀 | 配置管理 | 对系统动态配置常用参数,支持 SpringBoot 加载 |
| ⭐️ | 定时任务 | 在线(添加、修改、删除)任务调度包含执行结果日志 |
| 🚀 | 文件服务 | 支持将文件存储到 S3(MinIO、阿里云、腾讯云、七牛云)、本地、FTP、数据库等 |
| 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 |
| | MySQL 监控 | 监视当前系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈 |
| | Redis 监控 | 监控 Redis 数据库的使用情况,使用的 Redis Key 管理 |
| 🚀 | 消息队列 | 基于 Redis 实现消息队列,Stream 提供集群消费,Pub/Sub 提供广播消费 |
| 🚀 | Java 监控 | 基于 Spring Boot Admin 实现 Java 应用的监控 |
| 🚀 | 链路追踪 | 接入 SkyWalking 组件,实现链路追踪 |
| 🚀 | 日志中心 | 接入 SkyWalking 组件,实现日志中心 |
| 🚀 | 分布式锁 | 基于 Redis 实现分布式锁,满足并发场景 |
| 🚀 | 幂等组件 | 基于 Redis 实现幂等组件,解决重复请求问题 |
| 🚀 | 服务保障 | 基于 Resilience4j 实现服务的稳定性,包括限流、熔断等功能 |
| 🚀 | 日志服务 | 轻量级日志中心,查看远程服务器的日志 |
| 🚀 | 单元测试 | 基于 JUnit + Mockito 实现单元测试,保证功能的正确性、代码的质量等 |
| | 功能 | 描述 |
|----|----------|----------------------------------------------|
| 🚀 | 代码生成 | 前后端代码的生成(Java、Vue、SQL、单元测试),支持 CRUD 下载 |
| 🚀 | 系统接口 | 基于 Swagger 自动生成相关的 RESTful API 接口文档 |
| 🚀 | 数据库文档 | 基于 Screw 自动生成数据库文档,支持导出 Word、HTML、MD 格式 |
| | 表单构建 | 拖动表单元素生成相应的 HTML 代码,支持导出 JSON、Vue 文件 |
| 🚀 | 配置管理 | 对系统动态配置常用参数,支持 SpringBoot 加载 |
| ⭐️ | 定时任务 | 在线(添加、修改、删除)任务调度包含执行结果日志 |
| 🚀 | 文件服务 | 支持将文件存储到 S3(MinIO、阿里云、腾讯云、七牛云)、本地、FTP、数据库等 |
| 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 |
| | MySQL 监控 | 监视当前系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈 |
| | Redis 监控 | 监控 Redis 数据库的使用情况,使用的 Redis Key 管理 |
| 🚀 | 消息队列 | 基于 Redis 实现消息队列,Stream 提供集群消费,Pub/Sub 提供广播消费 |
| 🚀 | Java 监控 | 基于 Spring Boot Admin 实现 Java 应用的监控 |
| 🚀 | 链路追踪 | 接入 SkyWalking 组件,实现链路追踪 |
| 🚀 | 日志中心 | 接入 SkyWalking 组件,实现日志中心 |
| 🚀 | 服务保障 | 基于 Redis 实现分布式锁、幂等、限流功能,满足高并发场景 |
| 🚀 | 日志服务 | 轻量级日志中心,查看远程服务器的日志 |
| 🚀 | 单元测试 | 基于 JUnit + Mockito 实现单元测试,保证功能的正确性、代码的质量等 |
![功能图](/.image/common/infra-feature.png)
### 数据报表
@@ -188,26 +191,24 @@ ps:核心功能已经实现,正在对接微信小程序中...
### 商城系统
演示地址:<https://doc.iocoder.cn/mall-preview/>
![功能图](/.image/common/mall-feature.png)
![功能图](/.image/common/mall-preview.png)
_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入芋道快速开发平台_
演示地址:<https://doc.iocoder.cn/mall-preview/>
### ERP 系统
![功能图](/.image/common/erp-feature.png)
演示地址:<https://doc.iocoder.cn/erp-preview/>
![功能图](/.image/common/erp-feature.png)
### CRM 系统
![功能图](/.image/common/crm-feature.png)
演示地址:<https://doc.iocoder.cn/crm-preview/>
![功能图](/.image/common/crm-feature.png)
## 🐷 演示图
### 系统功能
+11 -1
View File
@@ -27,6 +27,12 @@ const include = [
'echarts-wordcloud',
'@wangeditor/editor',
'@wangeditor/editor-for-vue',
'@microsoft/fetch-event-source',
'markdown-it',
'markmap-view',
'markmap-lib',
'markmap-toolbar',
'highlight.js',
'element-plus',
'element-plus/es',
'element-plus/es/locale/lang/zh-cn',
@@ -104,7 +110,11 @@ const include = [
'element-plus/es/components/collapse/style/css',
'element-plus/es/components/collapse-item/style/css',
'element-plus/es/components/button-group/style/css',
'element-plus/es/components/text/style/css'
'element-plus/es/components/text/style/css',
'element-plus/es/components/segmented/style/css',
'@element-plus/icons-vue',
'element-plus/es/components/footer/style/css',
'element-plus/es/components/empty/style/css'
]
const exclude = ['@iconify/json']
+19 -13
View File
@@ -1,22 +1,22 @@
{
"name": "yudao-ui-admin-vue3",
"version": "2.0.1-snapshot",
"version": "2.2.0-snapshot",
"description": "基于vue3、vite4、element-plus、typesScript",
"author": "xingyu",
"private": false,
"scripts": {
"i": "pnpm install",
"dev": "vite --mode local-dev",
"dev": "vite --mode env.local",
"dev-server": "vite --mode dev",
"ts:check": "vue-tsc --noEmit",
"build:local-dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode local-dev",
"build:local": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build",
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
"build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test",
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",
"build:prod": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode prod",
"serve:dev": "vite preview --mode dev",
"serve:prod": "vite preview --mode prod",
"preview": "pnpm build:local-dev && vite preview",
"preview": "pnpm build:local && vite preview",
"clean": "npx rimraf node_modules",
"clean:cache": "npx rimraf node_modules/.cache",
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
@@ -29,13 +29,14 @@
"@form-create/designer": "^3.1.3",
"@form-create/element-ui": "^3.1.24",
"@iconify/iconify": "^3.1.1",
"@microsoft/fetch-event-source": "^2.0.1",
"@videojs-player/vue": "^1.0.0",
"@vueuse/core": "^10.9.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.10",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.6.7",
"axios": "^1.6.8",
"benz-amr-recorder": "^1.1.5",
"bpmn-js-token-simulation": "^0.10.0",
"camunda-bpmn-moddle": "^7.0.1",
@@ -46,24 +47,29 @@
"driver.js": "^1.3.1",
"echarts": "^5.5.0",
"echarts-wordcloud": "^2.1.0",
"element-plus": "2.5.3",
"element-plus": "2.7.0",
"fast-xml-parser": "^4.3.2",
"highlight.js": "^11.9.0",
"jsencrypt": "^3.3.2",
"lodash-es": "^4.17.21",
"markdown-it": "^14.1.0",
"markmap-common": "^0.16.0",
"markmap-lib": "^0.16.1",
"markmap-toolbar": "^0.17.0",
"markmap-view": "^0.16.0",
"min-dash": "^4.1.1",
"mitt": "^3.0.1",
"nprogress": "^0.2.0",
"pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.0",
"pinia-plugin-persistedstate": "^3.2.1",
"qrcode": "^1.5.3",
"qs": "^6.11.2",
"qs": "^6.12.0",
"steady-xml": "^0.1.0",
"url": "^0.11.3",
"video.js": "^7.21.5",
"vue": "3.4.20",
"vue": "3.4.21",
"vue-dompurify-html": "^4.1.4",
"vue-i18n": "9.9.1",
"vue-i18n": "9.10.2",
"vue-router": "^4.3.0",
"vue-types": "^5.1.1",
"vuedraggable": "^4.1.0",
@@ -83,8 +89,8 @@
"@types/qs": "^6.9.12",
"@typescript-eslint/eslint-plugin": "^7.1.0",
"@typescript-eslint/parser": "^7.1.0",
"@unocss/transformer-variant-group": "^0.58.5",
"@unocss/eslint-config": "^0.57.4",
"@unocss/transformer-variant-group": "^0.58.5",
"@vitejs/plugin-legacy": "^5.3.1",
"@vitejs/plugin-vue": "^5.0.4",
"@vitejs/plugin-vue-jsx": "^3.1.0",
@@ -102,6 +108,7 @@
"postcss-html": "^1.6.0",
"postcss-scss": "^4.0.9",
"prettier": "^3.2.5",
"prettier-eslint": "^16.3.0",
"rimraf": "^5.0.5",
"rollup": "^4.12.0",
"sass": "^1.69.5",
@@ -136,7 +143,6 @@
"url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues"
},
"homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3",
"packageManager": "pnpm@8.6.0",
"engines": {
"node": ">= 16.0.0",
"pnpm": ">=8.6.0"
+11620
View File
File diff suppressed because it is too large. Load diff
+4
View File
@@ -54,4 +54,8 @@ body {
.#{$prefix-cls}-grey-mode {
filter: grayscale(100%);
}
.scrollbar__view {
height: 99%!important;
}
</style>
+65
View File
@@ -0,0 +1,65 @@
import request from '@/config/axios'
// AI 聊天对话 VO
export interface ChatConversationVO {
id: number // ID 编号
userId: number // 用户编号
title: string // 对话标题
pinned: boolean // 是否置顶
roleId: number // 角色编号
modelId: number // 模型编号
model: string // 模型标志
temperature: number // 温度参数
maxTokens: number // 单条回复的最大 Token 数量
maxContexts: number // 上下文的最大 Message 数量
createTime?: Date // 创建时间
// 额外字段
systemMessage?: string // 角色设定
modelName?: string // 模型名字
roleAvatar?: string // 角色头像
modelMaxTokens?: string // 模型的单条回复的最大 Token 数量
modelMaxContexts?: string // 模型的上下文的最大 Message 数量
}
// AI 聊天对话 API
export const ChatConversationApi = {
// 获得【我的】聊天对话
getChatConversationMy: async (id: number) => {
return await request.get({ url: `/ai/chat/conversation/get-my?id=${id}` })
},
// 新增【我的】聊天对话
createChatConversationMy: async (data?: ChatConversationVO) => {
return await request.post({ url: `/ai/chat/conversation/create-my`, data })
},
// 更新【我的】聊天对话
updateChatConversationMy: async (data: ChatConversationVO) => {
return await request.put({ url: `/ai/chat/conversation/update-my`, data })
},
// 删除【我的】聊天对话
deleteChatConversationMy: async (id: string) => {
return await request.delete({ url: `/ai/chat/conversation/delete-my?id=${id}` })
},
// 删除【我的】所有对话,置顶除外
deleteChatConversationMyByUnpinned: async () => {
return await request.delete({ url: `/ai/chat/conversation/delete-by-unpinned` })
},
// 获得【我的】聊天对话列表
getChatConversationMyList: async () => {
return await request.get({ url: `/ai/chat/conversation/my-list` })
},
// 获得对话分页
getChatConversationPage: async (params: any) => {
return await request.get({ url: `/ai/chat/conversation/page`, params })
},
// 管理员删除消息
deleteChatConversationByAdmin: async (id: number) => {
return await request.delete({ url: `/ai/chat/conversation/delete-by-admin?id=${id}` })
}
}
+83
View File
@@ -0,0 +1,83 @@
import request from '@/config/axios'
import { fetchEventSource } from '@microsoft/fetch-event-source'
import { getAccessToken } from '@/utils/auth'
import { config } from '@/config/axios/config'
// 聊天VO
export interface ChatMessageVO {
id: number // 编号
conversationId: number // 对话编号
type: string // 消息类型
userId: string // 用户编号
roleId: string // 角色编号
model: number // 模型标志
modelId: number // 模型编号
content: string // 聊天内容
tokens: number // 消耗 Token 数量
createTime: Date // 创建时间
roleAvatar: string // 角色头像
userAvatar: string // 创建时间
}
// AI chat 聊天
export const ChatMessageApi = {
// 消息列表
getChatMessageListByConversationId: async (conversationId: number | null) => {
return await request.get({
url: `/ai/chat/message/list-by-conversation-id?conversationId=${conversationId}`
})
},
// 发送 Stream 消息
// 为什么不用 axios 呢?因为它不支持 SSE 调用
sendChatMessageStream: async (
conversationId: number,
content: string,
ctrl,
enableContext: boolean,
onMessage,
onError,
onClose
) => {
const token = getAccessToken()
return fetchEventSource(`${config.base_url}/ai/chat/message/send-stream`, {
method: 'post',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${token}`
},
openWhenHidden: true,
body: JSON.stringify({
conversationId,
content,
useContext: enableContext
}),
onmessage: onMessage,
onerror: onError,
onclose: onClose,
signal: ctrl.signal
})
},
// 删除消息
deleteChatMessage: async (id: string) => {
return await request.delete({ url: `/ai/chat/message/delete?id=${id}` })
},
// 删除指定对话的消息
deleteByConversationId: async (conversationId: number) => {
return await request.delete({
url: `/ai/chat/message/delete-by-conversation-id?conversationId=${conversationId}`
})
},
// 获得消息分页
getChatMessagePage: async (params: any) => {
return await request.get({ url: '/ai/chat/message/page', params })
},
// 管理员删除消息
deleteChatMessageByAdmin: async (id: number) => {
return await request.delete({ url: `/ai/chat/message/delete-by-admin?id=${id}` })
}
}
+103
View File
@@ -0,0 +1,103 @@
import request from '@/config/axios'
// AI 绘图 VO
export interface ImageVO {
id: number // 编号
platform: string // 平台
model: string // 模型
prompt: string // 提示词
width: number // 图片宽度
height: number // 图片高度
status: number // 状态
publicStatus: boolean // 公开状态
picUrl: string // 任务地址
errorMessage: string // 错误信息
options: any // 配置 Map<string, string>
taskId: number // 任务编号
buttons: ImageMidjourneyButtonsVO[] // mj 操作按钮
createTime: Date // 创建时间
finishTime: Date // 完成时间
}
export interface ImageDrawReqVO {
platform: string // 平台
prompt: string // 提示词
model: string // 模型
style: string // 图像生成的风格
width: string // 图片宽度
height: string // 图片高度
options: object // 绘制参数,Map<String, String>
}
export interface ImageMidjourneyImagineReqVO {
prompt: string // 提示词
model: string // 模型 mj nijj
base64Array: string[] // size不能为空
width: string // 图片宽度
height: string // 图片高度
version: string // 版本
}
export interface ImageMidjourneyActionVO {
id: number // 图片编号
customId: string // MJ::JOB::upsample::1::85a4b4c1-8835-46c5-a15c-aea34fad1862 动作标识
}
export interface ImageMidjourneyButtonsVO {
customId: string // MJ::JOB::upsample::1::85a4b4c1-8835-46c5-a15c-aea34fad1862 动作标识
emoji: string // 图标 emoji
label: string // Make Variations 文本
style: number // 样式: 2(Primary)、3(Green)
}
// AI 图片 API
export const ImageApi = {
// 获取【我的】绘图分页
getImagePageMy: async (params: any) => {
return await request.get({ url: `/ai/image/my-page`, params })
},
// 获取【我的】绘图记录
getImageMy: async (id: number) => {
return await request.get({ url: `/ai/image/get-my?id=${id}` })
},
// 获取【我的】绘图记录列表
getImageListMyByIds: async (ids: number[]) => {
return await request.get({ url: `/ai/image/my-list-by-ids`, params: { ids: ids.join(',') } })
},
// 生成图片
drawImage: async (data: ImageDrawReqVO) => {
return await request.post({ url: `/ai/image/draw`, data })
},
// 删除【我的】绘画记录
deleteImageMy: async (id: number) => {
return await request.delete({ url: `/ai/image/delete-my?id=${id}` })
},
// ================ midjourney 专属 ================
// 【Midjourney】生成图片
midjourneyImagine: async (data: ImageMidjourneyImagineReqVO) => {
return await request.post({ url: `/ai/image/midjourney/imagine`, data })
},
// 【Midjourney】Action 操作(二次生成图片)
midjourneyAction: async (data: ImageMidjourneyActionVO) => {
return await request.post({ url: `/ai/image/midjourney/action`, data })
},
// ================ 绘图管理 ================
// 查询绘画分页
getImagePage: async (params: any) => {
return await request.get({ url: `/ai/image/page`, params })
},
// 更新绘画发布状态
updateImage: async (data: any) => {
return await request.put({ url: '/ai/image/update', data })
},
// 删除绘画
deleteImage: async (id: number) => {
return await request.delete({ url: `/ai/image/delete?id=` + id })
}
}
+38
View File
@@ -0,0 +1,38 @@
import { getAccessToken } from '@/utils/auth'
import { fetchEventSource } from '@microsoft/fetch-event-source'
import { config } from '@/config/axios/config'
export interface AiMindMapGenerateReqVO {
prompt: string
}
export const AiMindMapApi = {
generateMindMap: ({
data,
onClose,
onMessage,
onError,
ctrl
}: {
data: AiMindMapGenerateReqVO
onMessage?: (res: any) => void
onError?: (...args: any[]) => void
onClose?: (...args: any[]) => void
ctrl: AbortController
}) => {
const token = getAccessToken()
return fetchEventSource(`${config.base_url}/ai/mind-map/generate-stream`, {
method: 'post',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${token}`
},
openWhenHidden: true,
body: JSON.stringify(data),
onmessage: onMessage,
onerror: onError,
onclose: onClose,
signal: ctrl.signal
})
}
}
+44
View File
@@ -0,0 +1,44 @@
import request from '@/config/axios'
// AI API 密钥 VO
export interface ApiKeyVO {
id: number // 编号
name: string // 名称
apiKey: string // 密钥
platform: string // 平台
url: string // 自定义 API 地址
status: number // 状态
}
// AI API 密钥 API
export const ApiKeyApi = {
// 查询 API 密钥分页
getApiKeyPage: async (params: any) => {
return await request.get({ url: `/ai/api-key/page`, params })
},
// 获得 API 密钥列表
getApiKeySimpleList: async () => {
return await request.get({ url: `/ai/api-key/simple-list` })
},
// 查询 API 密钥详情
getApiKey: async (id: number) => {
return await request.get({ url: `/ai/api-key/get?id=` + id })
},
// 新增 API 密钥
createApiKey: async (data: ApiKeyVO) => {
return await request.post({ url: `/ai/api-key/create`, data })
},
// 修改 API 密钥
updateApiKey: async (data: ApiKeyVO) => {
return await request.put({ url: `/ai/api-key/update`, data })
},
// 删除 API 密钥
deleteApiKey: async (id: number) => {
return await request.delete({ url: `/ai/api-key/delete?id=` + id })
}
}
+53
View File
@@ -0,0 +1,53 @@
import request from '@/config/axios'
// AI 聊天模型 VO
export interface ChatModelVO {
id: number // 编号
keyId: number // API 秘钥编号
name: string // 模型名字
model: string // 模型标识
platform: string // 模型平台
sort: number // 排序
status: number // 状态
temperature: number // 温度参数
maxTokens: number // 单条回复的最大 Token 数量
maxContexts: number // 上下文的最大 Message 数量
}
// AI 聊天模型 API
export const ChatModelApi = {
// 查询聊天模型分页
getChatModelPage: async (params: any) => {
return await request.get({ url: `/ai/chat-model/page`, params })
},
// 获得聊天模型列表
getChatModelSimpleList: async (status?: number) => {
return await request.get({
url: `/ai/chat-model/simple-list`,
params: {
status
}
})
},
// 查询聊天模型详情
getChatModel: async (id: number) => {
return await request.get({ url: `/ai/chat-model/get?id=` + id })
},
// 新增聊天模型
createChatModel: async (data: ChatModelVO) => {
return await request.post({ url: `/ai/chat-model/create`, data })
},
// 修改聊天模型
updateChatModel: async (data: ChatModelVO) => {
return await request.put({ url: `/ai/chat-model/update`, data })
},
// 删除聊天模型
deleteChatModel: async (id: number) => {
return await request.delete({ url: `/ai/chat-model/delete?id=` + id })
}
}
+80
View File
@@ -0,0 +1,80 @@
import request from '@/config/axios'
// AI 聊天角色 VO
export interface ChatRoleVO {
id: number // 角色编号
modelId: number // 模型编号
name: string // 角色名称
avatar: string // 角色头像
category: string // 角色类别
sort: number // 角色排序
description: string // 角色描述
systemMessage: string // 角色设定
welcomeMessage: string // 角色设定
publicStatus: boolean // 是否公开
status: number // 状态
}
// AI 聊天角色 分页请求 vo
export interface ChatRolePageReqVO {
name?: string // 角色名称
category?: string // 角色类别
publicStatus: boolean // 是否公开
pageNo: number // 是否公开
pageSize: number // 是否公开
}
// AI 聊天角色 API
export const ChatRoleApi = {
// 查询聊天角色分页
getChatRolePage: async (params: any) => {
return await request.get({ url: `/ai/chat-role/page`, params })
},
// 查询聊天角色详情
getChatRole: async (id: number) => {
return await request.get({ url: `/ai/chat-role/get?id=` + id })
},
// 新增聊天角色
createChatRole: async (data: ChatRoleVO) => {
return await request.post({ url: `/ai/chat-role/create`, data })
},
// 修改聊天角色
updateChatRole: async (data: ChatRoleVO) => {
return await request.put({ url: `/ai/chat-role/update`, data })
},
// 删除聊天角色
deleteChatRole: async (id: number) => {
return await request.delete({ url: `/ai/chat-role/delete?id=` + id })
},
// ======= chat 聊天
// 获取 my role
getMyPage: async (params: ChatRolePageReqVO) => {
return await request.get({ url: `/ai/chat-role/my-page`, params})
},
// 获取角色分类
getCategoryList: async () => {
return await request.get({ url: `/ai/chat-role/category-list`})
},
// 创建角色
createMy: async (data: ChatRoleVO) => {
return await request.post({ url: `/ai/chat-role/create-my`, data})
},
// 更新角色
updateMy: async (data: ChatRoleVO) => {
return await request.put({ url: `/ai/chat-role/update-my`, data})
},
// 删除角色 my
deleteMy: async (id: number) => {
return await request.delete({ url: `/ai/chat-role/delete-my?id=` + id })
},
}
+41
View File
@@ -0,0 +1,41 @@
import request from '@/config/axios'
// AI 音乐 VO
export interface MusicVO {
id: number // 编号
userId: number // 用户编号
title: string // 音乐名称
lyric: string // 歌词
imageUrl: string // 图片地址
audioUrl: string // 音频地址
videoUrl: string // 视频地址
status: number // 音乐状态
gptDescriptionPrompt: string // 描述词
prompt: string // 提示词
platform: string // 模型平台
model: string // 模型
generateMode: number // 生成模式
tags: string // 音乐风格标签
duration: number // 音乐时长
publicStatus: boolean // 是否发布
taskId: string // 任务id
errorMessage: string // 错误信息
}
// AI 音乐 API
export const MusicApi = {
// 查询音乐分页
getMusicPage: async (params: any) => {
return await request.get({ url: `/ai/music/page`, params })
},
// 更新音乐
updateMusic: async (data: any) => {
return await request.put({ url: '/ai/music/update', data })
},
// 删除音乐
deleteMusic: async (id: number) => {
return await request.delete({ url: `/ai/music/delete?id=` + id })
}
}
+85
View File
@@ -0,0 +1,85 @@
import { fetchEventSource } from '@microsoft/fetch-event-source'
import { getAccessToken } from '@/utils/auth'
import { config } from '@/config/axios/config'
import { AiWriteTypeEnum } from '@/views/ai/utils/constants'
import request from '@/config/axios'
export interface WriteVO {
type: AiWriteTypeEnum.WRITING | AiWriteTypeEnum.REPLY // 1:撰写 2:回复
prompt: string // 写作内容提示 1。撰写 2回复
originalContent: string // 原文
length: number // 长度
format: number // 格式
tone: number // 语气
language: number // 语言
userId?: number // 用户编号
platform?: string // 平台
model?: string // 模型
generatedContent?: string // 生成的内容
errorMessage?: string // 错误信息
createTime?: Date // 创建时间
}
export interface AiWritePageReqVO extends PageParam {
userId?: number // 用户编号
type?: AiWriteTypeEnum // 写作类型
platform?: string // 平台
createTime?: [string, string] // 创建时间
}
export interface AiWriteRespVo {
id: number
userId: number
type: number
platform: string
model: string
prompt: string
generatedContent: string
originalContent: string
length: number
format: number
tone: number
language: number
errorMessage: string
createTime: string
}
export const WriteApi = {
writeStream: ({
data,
onClose,
onMessage,
onError,
ctrl
}: {
data: WriteVO
onMessage?: (res: any) => void
onError?: (...args: any[]) => void
onClose?: (...args: any[]) => void
ctrl: AbortController
}) => {
const token = getAccessToken()
return fetchEventSource(`${config.base_url}/ai/write/generate-stream`, {
method: 'post',
headers: {
'Content-Type': 'application/json',
Authorization: `Bearer ${token}`
},
openWhenHidden: true,
body: JSON.stringify(data),
onmessage: onMessage,
onerror: onError,
onclose: onClose,
signal: ctrl.signal
})
},
// 获取写作列表
getWritePage: (params: AiWritePageReqVO) => {
return request.get<PageResult<AiWriteRespVo[]>>({ url: `/ai/write/page`, params })
},
// 删除写作
deleteWrite(id: number) {
return request.delete({ url: `/ai/write/delete`, params: { id } })
}
}
+43
View File
@@ -0,0 +1,43 @@
import request from '@/config/axios'
// BPM 流程分类 VO
export interface CategoryVO {
id: number // 分类编号
name: string // 分类名
code: string // 分类标志
status: number // 分类状态
sort: number // 分类排序
}
// BPM 流程分类 API
export const CategoryApi = {
// 查询流程分类分页
getCategoryPage: async (params: any) => {
return await request.get({ url: `/bpm/category/page`, params })
},
// 查询流程分类列表
getCategorySimpleList: async () => {
return await request.get({ url: `/bpm/category/simple-list` })
},
// 查询流程分类详情
getCategory: async (id: number) => {
return await request.get({ url: `/bpm/category/get?id=` + id })
},
// 新增流程分类
createCategory: async (data: CategoryVO) => {
return await request.post({ url: `/bpm/category/create`, data })
},
// 修改流程分类
updateCategory: async (data: CategoryVO) => {
return await request.put({ url: `/bpm/category/update`, data })
},
// 删除流程分类
deleteCategory: async (id: number) => {
return await request.delete({ url: `/bpm/category/delete?id=` + id })
}
}
+3 -2
View File
@@ -1,8 +1,9 @@
import request from '@/config/axios'
export const getProcessDefinitionBpmnXML = async (id: number) => {
export const getProcessDefinition = async (id?: string, key?: string) => {
return await request.get({
url: '/bpm/process-definition/get-bpmn-xml?id=' + id
url: '/bpm/process-definition/get',
params: { id, key }
})
}
+2 -2
View File
@@ -49,8 +49,8 @@ export const getFormPage = async (params) => {
}
// 获得动态表单的精简列表
export const getSimpleFormList = async () => {
export const getFormSimpleList = async () => {
return await request.get({
url: '/bpm/form/list-all-simple'
url: '/bpm/form/simple-list'
})
}
+1 -1
View File
@@ -2,7 +2,7 @@ import request from '@/config/axios'
export type LeaveVO = {
id: number
result: number
status: number
type: number
reason: string
processInstanceId: string
+1
View File
@@ -5,6 +5,7 @@ export type ProcessDefinitionVO = {
version: number
deploymentTIme: string
suspensionState: number
formType?: number
}
export type ModelVO = {
+42
View File
@@ -0,0 +1,42 @@
import request from '@/config/axios'
// BPM 流程表达式 VO
export interface ProcessExpressionVO {
id: number // 编号
name: string // 表达式名字
status: number // 表达式状态
expression: string // 表达式
}
// BPM 流程表达式 API
export const ProcessExpressionApi = {
// 查询BPM 流程表达式分页
getProcessExpressionPage: async (params: any) => {
return await request.get({ url: `/bpm/process-expression/page`, params })
},
// 查询BPM 流程表达式详情
getProcessExpression: async (id: number) => {
return await request.get({ url: `/bpm/process-expression/get?id=` + id })
},
// 新增BPM 流程表达式
createProcessExpression: async (data: ProcessExpressionVO) => {
return await request.post({ url: `/bpm/process-expression/create`, data })
},
// 修改BPM 流程表达式
updateProcessExpression: async (data: ProcessExpressionVO) => {
return await request.put({ url: `/bpm/process-expression/update`, data })
},
// 删除BPM 流程表达式
deleteProcessExpression: async (id: number) => {
return await request.delete({ url: `/bpm/process-expression/delete?id=` + id })
},
// 导出BPM 流程表达式 Excel
exportProcessExpression: async (params) => {
return await request.download({ url: `/bpm/process-expression/export-excel`, params })
}
}
+20 -31
View File
@@ -1,4 +1,5 @@
import request from '@/config/axios'
import { ProcessDefinitionVO } from '@/api/bpm/model'
export type Task = {
id: string
@@ -18,53 +19,41 @@ export type ProcessInstanceVO = {
businessKey: string
createTime: string
endTime: string
processDefinition?: ProcessDefinitionVO
}
export type ProcessInstanceCCVO = {
type: number,
taskName: string,
taskKey: string,
processInstanceName: string,
processInstanceKey: string,
startUserId: string,
options:string [],
reason: string
}
export const getMyProcessInstancePage = async (params) => {
export const getProcessInstanceMyPage = async (params: any) => {
return await request.get({ url: '/bpm/process-instance/my-page', params })
}
export const getProcessInstanceManagerPage = async (params: any) => {
return await request.get({ url: '/bpm/process-instance/manager-page', params })
}
export const createProcessInstance = async (data) => {
return await request.post({ url: '/bpm/process-instance/create', data: data })
}
export const cancelProcessInstance = async (id: number, reason: string) => {
export const cancelProcessInstanceByStartUser = async (id: number, reason: string) => {
const data = {
id: id,
reason: reason
}
return await request.delete({ url: '/bpm/process-instance/cancel', data: data })
return await request.delete({ url: '/bpm/process-instance/cancel-by-start-user', data: data })
}
export const getProcessInstance = async (id: number) => {
export const cancelProcessInstanceByAdmin = async (id: number, reason: string) => {
const data = {
id: id,
reason: reason
}
return await request.delete({ url: '/bpm/process-instance/cancel-by-admin', data: data })
}
export const getProcessInstance = async (id: string) => {
return await request.get({ url: '/bpm/process-instance/get?id=' + id })
}
/**
* 抄送
* @param data 抄送数据
* @returns 是否抄送成功
*/
export const createProcessInstanceCC = async (data) => {
return await request.post({ url: '/bpm/process-instance/cc/create', data: data })
export const getProcessInstanceCopyPage = async (params: any) => {
return await request.get({ url: '/bpm/process-instance/copy/page', params })
}
/**
* 抄送列表
* @param params
* @returns
*/
export const getProcessInstanceCCPage = async (params) => {
return await request.get({ url: '/bpm/process-instance/cc/my-page', params })
}
+40
View File
@@ -0,0 +1,40 @@
import request from '@/config/axios'
// BPM 流程监听器 VO
export interface ProcessListenerVO {
id: number // 编号
name: string // 监听器名字
type: string // 监听器类型
status: number // 监听器状态
event: string // 监听事件
valueType: string // 监听器值类型
value: string // 监听器值
}
// BPM 流程监听器 API
export const ProcessListenerApi = {
// 查询流程监听器分页
getProcessListenerPage: async (params: any) => {
return await request.get({ url: `/bpm/process-listener/page`, params })
},
// 查询流程监听器详情
getProcessListener: async (id: number) => {
return await request.get({ url: `/bpm/process-listener/get?id=` + id })
},
// 新增流程监听器
createProcessListener: async (data: ProcessListenerVO) => {
return await request.post({ url: `/bpm/process-listener/create`, data })
},
// 修改流程监听器
updateProcessListener: async (data: ProcessListenerVO) => {
return await request.put({ url: `/bpm/process-listener/update`, data })
},
// 删除流程监听器
deleteProcessListener: async (id: number) => {
return await request.delete({ url: `/bpm/process-listener/delete?id=` + id })
}
}
+26 -41
View File
@@ -4,78 +4,63 @@ export type TaskVO = {
id: number
}
export const getTodoTaskPage = async (params) => {
export const getTaskTodoPage = async (params: any) => {
return await request.get({ url: '/bpm/task/todo-page', params })
}
export const getDoneTaskPage = async (params) => {
export const getTaskDonePage = async (params: any) => {
return await request.get({ url: '/bpm/task/done-page', params })
}
export const completeTask = async (data) => {
return await request.put({ url: '/bpm/task/complete', data })
export const getTaskManagerPage = async (params: any) => {
return await request.get({ url: '/bpm/task/manager-page', params })
}
export const approveTask = async (data) => {
export const approveTask = async (data: any) => {
return await request.put({ url: '/bpm/task/approve', data })
}
export const rejectTask = async (data) => {
export const rejectTask = async (data: any) => {
return await request.put({ url: '/bpm/task/reject', data })
}
export const backTask = async (data) => {
return await request.put({ url: '/bpm/task/back', data })
}
export const updateTaskAssignee = async (data) => {
return await request.put({ url: '/bpm/task/update-assignee', data })
}
export const getTaskListByProcessInstanceId = async (processInstanceId) => {
export const getTaskListByProcessInstanceId = async (processInstanceId: string) => {
return await request.get({
url: '/bpm/task/list-by-process-instance-id?processInstanceId=' + processInstanceId
})
}
// 导出任务
export const exportTask = async (params) => {
return await request.download({ url: '/bpm/task/export', params })
}
// 获取所有可回退的节点
export const getReturnList = async (params) => {
return await request.get({ url: '/bpm/task/return-list', params })
export const getTaskListByReturn = async (id: string) => {
return await request.get({ url: '/bpm/task/list-by-return', params: { id } })
}
// 回退
export const returnTask = async (data) => {
export const returnTask = async (data: any) => {
return await request.put({ url: '/bpm/task/return', data })
}
/**
* 委派
*/
export const delegateTask = async (data) => {
// 委派
export const delegateTask = async (data: any) => {
return await request.put({ url: '/bpm/task/delegate', data })
}
/**
* 加签
*/
export const taskAddSign = async (data) => {
// 转派
export const transferTask = async (data: any) => {
return await request.put({ url: '/bpm/task/transfer', data })
}
// 加签
export const signCreateTask = async (data: any) => {
return await request.put({ url: '/bpm/task/create-sign', data })
}
/**
* 获取减签任务列表
*/
export const getChildrenTaskList = async (id: string) => {
return await request.get({ url: '/bpm/task/children-list?taskId=' + id })
}
/**
* 减签
*/
export const taskSubSign = async (data) => {
// 减签
export const signDeleteTask = async (data: any) => {
return await request.delete({ url: '/bpm/task/delete-sign', data })
}
// 获取减签任务列表
export const getChildrenTaskList = async (id: string) => {
return await request.get({ url: '/bpm/task/list-by-parent-task-id?parentTaskId=' + id })
}
-29
View File
@@ -1,29 +0,0 @@
import request from '@/config/axios'
export type TaskAssignVO = {
id: number
modelId: string
processDefinitionId: string
taskDefinitionKey: string
taskDefinitionName: string
options: string[]
type: number
}
export const getTaskAssignRuleList = async (params) => {
return await request.get({ url: '/bpm/task-assign-rule/list', params })
}
export const createTaskAssignRule = async (data: TaskAssignVO) => {
return await request.post({
url: '/bpm/task-assign-rule/create',
data: data
})
}
export const updateTaskAssignRule = async (data: TaskAssignVO) => {
return await request.put({
url: '/bpm/task-assign-rule/update',
data: data
})
}
+3 -3
View File
@@ -4,7 +4,7 @@ export type UserGroupVO = {
id: number
name: string
description: string
memberUserIds: number[]
userIds: number[]
status: number
remark: string
createTime: string
@@ -42,6 +42,6 @@ export const getUserGroupPage = async (params) => {
}
// 获取用户组精简信息列表
export const getSimpleUserGroupList = async (): Promise<UserGroupVO[]> => {
return await request.get({ url: '/bpm/user-group/list-all-simple' })
export const getUserGroupSimpleList = async (): Promise<UserGroupVO[]> => {
return await request.get({ url: '/bpm/user-group/simple-list' })
}
+1 -1
View File
@@ -1,5 +1,5 @@
import request from '@/config/axios'
import { TransferReqVO } from '@/api/crm/customer'
import { TransferReqVO } from '@/api/crm/permission'
export interface BusinessVO {
id: number
+1 -1
View File
@@ -1,5 +1,5 @@
import request from '@/config/axios'
import { TransferReqVO } from '@/api/crm/customer'
import { TransferReqVO } from '@/api/crm/permission'
export interface ClueVO {
id: number // 编号
+1 -1
View File
@@ -1,5 +1,5 @@
import request from '@/config/axios'
import { TransferReqVO } from '@/api/crm/customer'
import { TransferReqVO } from '@/api/crm/permission'
export interface ContactVO {
id: number // 编号
+1 -1
View File
@@ -1,5 +1,5 @@
import request from '@/config/axios'
import { TransferReqVO } from '@/api/crm/customer'
import { TransferReqVO } from '@/api/crm/permission'
export interface ContractVO {
id: number
+1 -6
View File
@@ -1,4 +1,5 @@
import request from '@/config/axios'
import { TransferReqVO } from '@/api/crm/permission'
export interface CustomerVO {
id: number // 编号
@@ -102,12 +103,6 @@ export const getCustomerSimpleList = async () => {
// ======================= 业务操作 =======================
export interface TransferReqVO {
id: number | undefined // 客户编号
newOwnerUserId: number | undefined // 新负责人的用户编号
oldOwnerPermissionLevel: number | undefined // 老负责人加入团队后的权限级别
}
// 客户转移
export const transferCustomer = async (data: TransferReqVO) => {
return await request.put({ url: '/crm/customer/transfer', data })
+8
View File
@@ -6,6 +6,7 @@ export interface PermissionVO {
bizType: number // Crm 类型
bizId: number // Crm 类型数据编号
level: number // 权限级别
toBizTypes?: number[] // 同时添加至
deptName?: string // 部门名称
nickname?: string // 用户昵称
postNames?: string[] // 岗位名称数组
@@ -13,6 +14,13 @@ export interface PermissionVO {
ids?: number[]
}
export interface TransferReqVO {
id: number // 模块编号
newOwnerUserId: number // 新负责人的用户编号
oldOwnerPermissionLevel?: number // 老负责人加入团队后的权限级别
toBizTypes?: number[] // 转移客户时,需要额外有【联系人】【商机】【合同】的 checkbox 选择
}
/**
* CRM 业务类型枚举
*
+6 -4
View File
@@ -3,18 +3,20 @@ import request from '@/config/axios'
export interface ReceivableVO {
id: number
no: string
planId: number
customerId: number
planId?: number
customerId?: number
customerName?: string
contractId: number
contractId?: number
contract?: {
id?: number
name?: string
no: string
totalPrice: number
}
auditStatus: number
processInstanceId: number
returnTime: Date
returnType: string
returnType: number
price: number
ownerUserId: number
ownerUserName?: string
+1 -1
View File
@@ -11,7 +11,7 @@ export interface ReceivablePlanVO {
remindTime: Date
customerId: number
customerName?: string
contractId: number
contractId?: number
contractNo?: string
ownerUserId: number
ownerUserName?: string
+168
View File
@@ -0,0 +1,168 @@
import request from '@/config/axios'
export interface CrmStatisticsCustomerSummaryByDateRespVO {
time: string
customerCreateCount: number
customerDealCount: number
}
export interface CrmStatisticsCustomerSummaryByUserRespVO {
ownerUserName: string
customerCreateCount: number
customerDealCount: number
contractPrice: number
receivablePrice: number
}
export interface CrmStatisticsFollowUpSummaryByDateRespVO {
time: string
followUpRecordCount: number
followUpCustomerCount: number
}
export interface CrmStatisticsFollowUpSummaryByUserRespVO {
ownerUserName: string
followupRecordCount: number
followupCustomerCount: number
}
export interface CrmStatisticsFollowUpSummaryByTypeRespVO {
followUpType: string
followUpRecordCount: number
}
export interface CrmStatisticsCustomerContractSummaryRespVO {
customerName: string
contractName: string
totalPrice: number
receivablePrice: number
customerType: string
customerSource: string
ownerUserName: string
creatorUserName: string
createTime: Date
orderDate: Date
}
export interface CrmStatisticsPoolSummaryByDateRespVO {
time: string
customerPutCount: number
customerTakeCount: number
}
export interface CrmStatisticsPoolSummaryByUserRespVO {
ownerUserName: string
customerPutCount: number
customerTakeCount: number
}
export interface CrmStatisticsCustomerDealCycleByDateRespVO {
time: string
customerDealCycle: number
}
export interface CrmStatisticsCustomerDealCycleByUserRespVO {
ownerUserName: string
customerDealCycle: number
customerDealCount: number
}
export interface CrmStatisticsCustomerDealCycleByAreaRespVO {
areaName: string
customerDealCycle: number
customerDealCount: number
}
export interface CrmStatisticsCustomerDealCycleByProductRespVO {
productName: string
customerDealCycle: number
customerDealCount: number
}
// 客户分析 API
export const StatisticsCustomerApi = {
// 1.1 客户总量分析(按日期)
getCustomerSummaryByDate: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-customer-summary-by-date',
params
})
},
// 1.2 客户总量分析(按用户)
getCustomerSummaryByUser: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-customer-summary-by-user',
params
})
},
// 2.1 客户跟进次数分析(按日期)
getFollowUpSummaryByDate: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-follow-up-summary-by-date',
params
})
},
// 2.2 客户跟进次数分析(按用户)
getFollowUpSummaryByUser: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-follow-up-summary-by-user',
params
})
},
// 3.1 获取客户跟进方式统计数
getFollowUpSummaryByType: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-follow-up-summary-by-type',
params
})
},
// 4.1 合同摘要信息(客户转化率页面)
getContractSummary: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-contract-summary',
params
})
},
// 5.1 获取客户公海分析(按日期)
getPoolSummaryByDate: (param: any) => {
return request.get({
url: '/crm/statistics-customer/get-pool-summary-by-date',
params: param
})
},
// 5.2 获取客户公海分析(按用户)
getPoolSummaryByUser: (param: any) => {
return request.get({
url: '/crm/statistics-customer/get-pool-summary-by-user',
params: param
})
},
// 6.1 获取客户成交周期(按日期)
getCustomerDealCycleByDate: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-customer-deal-cycle-by-date',
params
})
},
// 6.2 获取客户成交周期(按用户)
getCustomerDealCycleByUser: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-customer-deal-cycle-by-user',
params
})
},
// 6.2 获取客户成交周期(按用户)
getCustomerDealCycleByArea: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-customer-deal-cycle-by-area',
params
})
},
// 6.2 获取客户成交周期(按用户)
getCustomerDealCycleByProduct: (params: any) => {
return request.get({
url: '/crm/statistics-customer/get-customer-deal-cycle-by-product',
params
})
}
}
+58
View File
@@ -0,0 +1,58 @@
import request from '@/config/axios'
export interface CrmStatisticFunnelRespVO {
customerCount: number // 客户数
businessCount: number // 商机数
businessWinCount: number // 赢单数
}
export interface CrmStatisticsBusinessSummaryByDateRespVO {
time: string // 时间
businessCreateCount: number // 商机数
totalPrice: number | string // 商机金额
}
export interface CrmStatisticsBusinessInversionRateSummaryByDateRespVO {
time: string // 时间
businessCount: number // 商机数量
businessWinCount: number // 赢单商机数
}
// 客户分析 API
export const StatisticFunnelApi = {
// 1. 获取销售漏斗统计数据
getFunnelSummary: (params: any) => {
return request.get({
url: '/crm/statistics-funnel/get-funnel-summary',
params
})
},
// 2. 获取商机结束状态统计
getBusinessSummaryByEndStatus: (params: any) => {
return request.get({
url: '/crm/statistics-funnel/get-business-summary-by-end-status',
params
})
},
// 3. 获取新增商机分析(按日期)
getBusinessSummaryByDate: (params: any) => {
return request.get({
url: '/crm/statistics-funnel/get-business-summary-by-date',
params
})
},
// 4. 获取商机转化率分析(按日期)
getBusinessInversionRateSummaryByDate: (params: any) => {
return request.get({
url: '/crm/statistics-funnel/get-business-inversion-rate-summary-by-date',
params
})
},
// 5. 获取商机列表(按日期)
getBusinessPageByDate: (params: any) => {
return request.get({
url: '/crm/statistics-funnel/get-business-page-by-date',
params
})
}
}
+33
View File
@@ -0,0 +1,33 @@
import request from '@/config/axios'
export interface StatisticsPerformanceRespVO {
time: string
currentMonthCount: number
lastMonthCount: number
lastYearCount: number
}
// 排行 API
export const StatisticsPerformanceApi = {
// 员工获得合同金额统计
getContractPricePerformance: (params: any) => {
return request.get({
url: '/crm/statistics-performance/get-contract-price-performance',
params
})
},
// 员工获得回款统计
getReceivablePricePerformance: (params: any) => {
return request.get({
url: '/crm/statistics-performance/get-receivable-price-performance',
params
})
},
//员工获得签约合同数量统计
getContractCountPerformance: (params: any) => {
return request.get({
url: '/crm/statistics-performance/get-contract-count-performance',
params
})
}
}
+60
View File
@@ -0,0 +1,60 @@
import request from '@/config/axios'
export interface CrmStatisticCustomerBaseRespVO {
customerCount: number
dealCount: number
dealPortion: string | number
}
export interface CrmStatisticCustomerIndustryRespVO extends CrmStatisticCustomerBaseRespVO {
industryId: number
industryPortion: string | number
}
export interface CrmStatisticCustomerSourceRespVO extends CrmStatisticCustomerBaseRespVO {
source: number
sourcePortion: string | number
}
export interface CrmStatisticCustomerLevelRespVO extends CrmStatisticCustomerBaseRespVO {
level: number
levelPortion: string | number
}
export interface CrmStatisticCustomerAreaRespVO extends CrmStatisticCustomerBaseRespVO {
areaId: number
areaName: string
areaPortion: string | number
}
// 客户分析 API
export const StatisticsPortraitApi = {
// 1. 获取客户行业统计数据
getCustomerIndustry: (params: any) => {
return request.get({
url: '/crm/statistics-portrait/get-customer-industry-summary',
params
})
},
// 2. 获取客户来源统计数据
getCustomerSource: (params: any) => {
return request.get({
url: '/crm/statistics-portrait/get-customer-source-summary',
params
})
},
// 3. 获取客户级别统计数据
getCustomerLevel: (params: any) => {
return request.get({
url: '/crm/statistics-portrait/get-customer-level-summary',
params
})
},
// 4. 获取客户地区统计数据
getCustomerArea: (params: any) => {
return request.get({
url: '/crm/statistics-portrait/get-customer-area-summary',
params
})
}
}
+2 -2
View File
@@ -13,8 +13,8 @@ export interface ProductCategoryVO {
// ERP 产品分类 API
export const ProductCategoryApi = {
// 查询产品分类列表
getProductCategoryList: async (params) => {
return await request.get({ url: `/erp/product-category/list`, params })
getProductCategoryList: async () => {
return await request.get({ url: `/erp/product-category/list` })
},
// 查询产品分类精简列表
+5 -1
View File
@@ -8,11 +8,15 @@ export interface ApiAccessLogVO {
applicationName: string
requestMethod: string
requestParams: string
responseBody: string
requestUrl: string
userIp: string
userAgent: string
operateModule: string
operateName: string
operateType: number
beginTime: Date
endTIme: Date
endTime: Date
duration: number
resultCode: number
resultMsg: string
-1
View File
@@ -28,7 +28,6 @@ export type CodegenColumnVO = {
columnComment: string
nullable: number
primaryKey: number
autoIncrement: boolean
ordinalPosition: number
javaType: string
javaField: string
-16
View File
@@ -1,16 +0,0 @@
import request from '@/config/axios'
// 导出Html
export const exportHtml = () => {
return request.download({ url: '/infra/db-doc/export-html' })
}
// 导出Word
export const exportWord = () => {
return request.download({ url: '/infra/db-doc/export-word' })
}
// 导出Markdown
export const exportMarkdown = () => {
return request.download({ url: '/infra/db-doc/export-markdown' })
}
+2 -2
View File
@@ -7,8 +7,8 @@ export interface Demo02CategoryVO {
}
// 查询示例分类列表
export const getDemo02CategoryList = async (params) => {
return await request.get({ url: `/infra/demo02-category/list`, params })
export const getDemo02CategoryList = async () => {
return await request.get({ url: `/infra/demo02-category/list` })
}
// 查询示例分类详情
+1
View File
@@ -12,6 +12,7 @@ export interface JobLogVO {
duration: string
status: number
createTime: string
result: string
}
// 任务日志列表
+10
View File
@@ -0,0 +1,10 @@
import request from '@/config/axios'
/**
* 获得商品浏览记录分页
*
* @param params 请求参数
*/
export const getBrowseHistoryPage = (params: any) => {
return request.get({ url: '/product/browse-history/page', params })
}
@@ -0,0 +1,35 @@
import request from '@/config/axios'
export interface KeFuConversationRespVO {
id: number // 编号
userId: number // 会话所属用户
userAvatar: string // 会话所属用户头像
userNickname: string // 会话所属用户昵称
lastMessageTime: Date // 最后聊天时间
lastMessageContent: string // 最后聊天内容
lastMessageContentType: number // 最后发送的消息类型
adminPinned: boolean // 管理端置顶
userDeleted: boolean // 用户是否可见
adminDeleted: boolean // 管理员是否可见
adminUnreadMessageCount: number // 管理员未读消息数
createTime?: string // 创建时间
}
// 客服会话 API
export const KeFuConversationApi = {
// 获得客服会话列表
getConversationList: async () => {
return await request.get({ url: '/promotion/kefu-conversation/list' })
},
// 客服会话置顶
updateConversationPinned: async (data: any) => {
return await request.put({
url: '/promotion/kefu-conversation/update-conversation-pinned',
data
})
},
// 删除客服会话
deleteConversation: async (id: number) => {
return await request.get({ url: '/promotion/kefu-conversation/delete?id' + id })
}
}
@@ -0,0 +1,36 @@
import request from '@/config/axios'
export interface KeFuMessageRespVO {
id: number // 编号
conversationId: number // 会话编号
senderId: number // 发送人编号
senderAvatar: string // 发送人头像
senderType: number // 发送人类型
receiverId: number // 接收人编号
receiverType: number // 接收人类型
contentType: number // 消息类型
content: string // 消息
readStatus: boolean // 是否已读
createTime: Date // 创建时间
}
// 客服会话 API
export const KeFuMessageApi = {
// 发送客服消息
sendKeFuMessage: async (data: any) => {
return await request.post({
url: '/promotion/kefu-message/send',
data
})
},
// 更新客服消息已读状态
updateKeFuMessageReadStatus: async (conversationId: number) => {
return await request.put({
url: '/promotion/kefu-message/update-read-status?conversationId=' + conversationId
})
},
// 获得消息分页数据
getKeFuMessagePage: async (params: any) => {
return await request.get({ url: '/promotion/kefu-message/page', params })
}
}
+41 -37
View File
@@ -1,49 +1,53 @@
import request from '@/config/axios'
// 秒杀时段 VO
export interface SeckillConfigVO {
id: number
name: string
startTime: string
endTime: string
sliderPicUrls: string[]
status: number
id: number // 编号
name: string // 秒杀时段名称
startTime: string // 开始时间点
endTime: string // 结束时间点
sliderPicUrls: string[] // 秒杀轮播图
status: number // 活动状态
}
// 查询秒杀时段配置列表
export const getSeckillConfigPage = async (params) => {
return await request.get({ url: '/promotion/seckill-config/page', params })
}
// 秒杀时段 API
export const SeckillConfigApi = {
// 查询秒杀时段分页
getSeckillConfigPage: async (params: any) => {
return await request.get({ url: `/promotion/seckill-config/page`, params })
},
// 查询秒杀时段配置详情
export const getSeckillConfig = async (id: number) => {
return await request.get({ url: '/promotion/seckill-config/get?id=' + id })
}
// 查询秒杀时段列表
getSimpleSeckillConfigList: async () => {
return await request.get({ url: `/promotion/seckill-config/list` })
},
// 获得所有开启状态的秒杀时段精简列表
export const getSimpleSeckillConfigList = async () => {
return await request.get({ url: '/promotion/seckill-config/list-all-simple' })
}
// 查询秒杀时段详情
getSeckillConfig: async (id: number) => {
return await request.get({ url: `/promotion/seckill-config/get?id=` + id })
},
// 新增秒杀时段配置
export const createSeckillConfig = async (data: SeckillConfigVO) => {
return await request.post({ url: '/promotion/seckill-config/create', data })
}
// 新增秒杀时段
createSeckillConfig: async (data: SeckillConfigVO) => {
return await request.post({ url: `/promotion/seckill-config/create`, data })
},
// 修改秒杀时段配置
export const updateSeckillConfig = async (data: SeckillConfigVO) => {
return await request.put({ url: '/promotion/seckill-config/update', data })
}
// 修改秒杀时段
updateSeckillConfig: async (data: SeckillConfigVO) => {
return await request.put({ url: `/promotion/seckill-config/update`, data })
},
// 修改时段配置状态
export const updateSeckillConfigStatus = (id: number, status: number) => {
const data = {
id,
status
// 删除秒杀时段
deleteSeckillConfig: async (id: number) => {
return await request.delete({ url: `/promotion/seckill-config/delete?id=` + id })
},
// 修改时段配置状态
updateSeckillConfigStatus: async (id: number, status: number) => {
const data = {
id,
status
}
return request.put({ url: '/promotion/seckill-config/update-status', data: data })
}
return request.put({ url: '/promotion/seckill-config/update-status', data: data })
}
// 删除秒杀时段配置
export const deleteSeckillConfig = async (id: number) => {
return await request.delete({ url: '/promotion/seckill-config/delete?id=' + id })
}
+1 -1
View File
@@ -5,7 +5,7 @@ import { formatDate } from '@/utils/formatTime'
/** 会员分析 Request VO */
export interface MemberAnalyseReqVO {
times: [dayjs.ConfigType, dayjs.ConfigType]
times: dayjs.ConfigType[]
}
/** 会员分析 Response VO */
+1 -1
View File
@@ -141,7 +141,7 @@ export const getExpressTrackList = async (id: number | null) => {
}
export interface DeliveryVO {
id: number // 订单编号
id?: number // 订单编号
logisticsId: number | null // 物流公司编号
logisticsNo: string // 物流编号
}
-39
View File
@@ -1,39 +0,0 @@
import request from '@/config/axios'
export interface UReportDataVO {
id: number
name: string
status: number
content: string
remark: string
}
// 查询Ureport2报表分页
export const getUReportDataPage = async (params) => {
return await request.get({ url: `/report/ureport-data/page`, params })
}
// 查询Ureport2报表详情
export const getUReportData = async (id: number) => {
return await request.get({ url: `/report/ureport-data/get?id=` + id })
}
// 新增Ureport2报表
export const createUReportData = async (data: UReportDataVO) => {
return await request.post({ url: `/report/ureport-data/create`, data })
}
// 修改Ureport2报表
export const updateUReportData = async (data: UReportDataVO) => {
return await request.put({ url: `/report/ureport-data/update`, data })
}
// 删除Ureport2报表
export const deleteUReportData = async (id: number) => {
return await request.delete({ url: `/report/ureport-data/delete?id=` + id })
}
// 导出Ureport2报表 Excel
export const exportUReportData = async (params) => {
return await request.download({ url: `/report/ureport-data/export-excel`, params })
}
-40
View File
@@ -1,40 +0,0 @@
import request from '@/config/axios'
export interface ErrorCodeVO {
id: number | undefined
type: number
applicationName: string
code: number | undefined
message: string
memo: string
createTime: Date
}
// 查询错误码列表
export const getErrorCodePage = (params: PageParam) => {
return request.get({ url: '/system/error-code/page', params })
}
// 查询错误码详情
export const getErrorCode = (id: number) => {
return request.get({ url: '/system/error-code/get?id=' + id })
}
// 新增错误码
export const createErrorCode = (data: ErrorCodeVO) => {
return request.post({ url: '/system/error-code/create', data })
}
// 修改错误码
export const updateErrorCode = (data: ErrorCodeVO) => {
return request.put({ url: '/system/error-code/update', data })
}
// 删除错误码
export const deleteErrorCode = (id: number) => {
return request.delete({ url: '/system/error-code/delete?id=' + id })
}
// 导出错误码
export const excelErrorCode = (params) => {
return request.download({ url: '/system/error-code/export-excel', params })
}
+1
View File
@@ -8,6 +8,7 @@ export interface MailAccountVO {
host: string
port: number
sslEnable: boolean
starttlsEnable: boolean
}
// 查询邮箱账号列表
+1 -30
View File
@@ -2,30 +2,6 @@ import request from '@/config/axios'
export type OperateLogVO = {
id: number
userNickname: string
traceId: string
userId: number
module: string
name: string
type: number
content: string
exts: Map<String, Object>
requestMethod: string
requestUrl: string
userIp: string
userAgent: string
javaMethod: string
javaMethodArgs: string
startTime: Date
duration: number
resultCode: number
resultMsg: string
resultData: string
}
export type OperateLogV2VO = {
id: number
userNickname: string
traceId: string
userType: number
userId: number
@@ -42,11 +18,6 @@ export type OperateLogV2VO = {
creator: string
creatorName: string
createTime: Date
// 数据扩展,渲染时使用
title: string // 操作标题(如果为空则取 name 值)
colSize: number // 变更记录行数
contentStrList: string[]
tagsContentList: string[]
}
// 查询操作日志列表
@@ -54,6 +25,6 @@ export const getOperateLogPage = (params: PageParam) => {
return request.get({ url: '/system/operate-log/page', params })
}
// 导出操作日志
export const exportOperateLog = (params) => {
export const exportOperateLog = (params: any) => {
return request.download({ url: '/system/operate-log/export', params })
}
-58
View File
@@ -1,58 +0,0 @@
import request from '@/config/axios'
import qs from 'qs'
export interface SensitiveWordVO {
id: number
name: string
status: number
description: string
tags: string[]
createTime: Date
}
export interface SensitiveWordTestReqVO {
text: string
tag: string[]
}
// 查询敏感词列表
export const getSensitiveWordPage = (params: PageParam) => {
return request.get({ url: '/system/sensitive-word/page', params })
}
// 查询敏感词详情
export const getSensitiveWord = (id: number) => {
return request.get({ url: '/system/sensitive-word/get?id=' + id })
}
// 新增敏感词
export const createSensitiveWord = (data: SensitiveWordVO) => {
return request.post({ url: '/system/sensitive-word/create', data })
}
// 修改敏感词
export const updateSensitiveWord = (data: SensitiveWordVO) => {
return request.put({ url: '/system/sensitive-word/update', data })
}
// 删除敏感词
export const deleteSensitiveWord = (id: number) => {
return request.delete({ url: '/system/sensitive-word/delete?id=' + id })
}
// 导出敏感词
export const exportSensitiveWord = (params) => {
return request.download({ url: '/system/sensitive-word/export-excel', params })
}
// 获取所有敏感词的标签数组
export const getSensitiveWordTagList = () => {
return request.get({ url: '/system/sensitive-word/get-tags' })
}
// 获得文本所包含的不合法的敏感词数组
export const validateText = (query: SensitiveWordTestReqVO) => {
return request.get({
url: '/system/sensitive-word/validate-text?' + qs.stringify(query, { arrayFormat: 'repeat' })
})
}
+1
View File
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715606039621" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4256" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M878.250667 981.333333H375.338667a104.661333 104.661333 0 0 1-104.661334-104.661333V375.338667a104.661333 104.661333 0 0 1 104.661334-104.661334h502.912a104.661333 104.661333 0 0 1 104.661333 104.661334v502.912C981.333333 934.485333 934.485333 981.333333 878.250667 981.333333zM375.338667 364.373333a10.666667 10.666667 0 0 0-10.922667 10.965334v502.912c0 6.229333 4.693333 10.922667 10.922667 10.922666h502.912a10.666667 10.666667 0 0 0 10.922666-10.922666V375.338667a10.666667 10.666667 0 0 0-10.922666-10.922667H375.338667z" fill="#ffffff" p-id="4257"></path><path d="M192.597333 753.322667H147.328A104.661333 104.661333 0 0 1 42.666667 648.661333V147.328A104.661333 104.661333 0 0 1 147.328 42.666667H650.24a104.661333 104.661333 0 0 1 104.618667 104.661333v49.962667c0 26.538667-20.309333 46.848-46.848 46.848a46.037333 46.037333 0 0 1-46.848-46.848V147.328a10.666667 10.666667 0 0 0-10.922667-10.965333H147.328a10.666667 10.666667 0 0 0-10.965333 10.965333V650.24c0 6.229333 4.693333 10.922667 10.965333 10.922667h45.269333c26.538667 0 46.848 20.309333 46.848 46.848 0 26.538667-21.845333 45.312-46.848 45.312z" fill="#ffffff" p-id="4258"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

+1
View File
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715352878351" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1499" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M624.5 786.3c92.9 0 168.2-75.3 168.2-168.2V309c0-92.4-75.3-168.2-168.2-168.2H303.6c-92.4 0-168.2 75.3-168.2 168.2v309.1c0 92.4 75.3 168.2 168.2 168.2h320.9zM178.2 618.1V309c0-69.4 56.1-125.5 125.5-125.5h320.9c69.4 0 125.5 56.1 125.5 125.5v309.1c0 69.4-56.1 125.5-125.5 125.5h-321c-69.4 0-125.4-56.1-125.4-125.5z" p-id="1500" fill="#8a8a8a"></path><path d="M849.8 295.1v361.5c0 102.7-83.6 186.3-186.3 186.3H279.1v42.7h384.4c126.3 0 229.1-102.8 229.1-229.1V295.1h-42.8zM307.9 361.8h312.3c11.8 0 21.4-9.6 21.4-21.4 0-11.8-9.6-21.4-21.4-21.4H307.9c-11.8 0-21.4 9.6-21.4 21.4 0 11.9 9.6 21.4 21.4 21.4zM307.9 484.6h312.3c11.8 0 21.4-9.6 21.4-21.4 0-11.8-9.6-21.4-21.4-21.4H307.9c-11.8 0-21.4 9.6-21.4 21.4 0 11.9 9.6 21.4 21.4 21.4z" p-id="1501" fill="#8a8a8a"></path><path d="M620.2 607.4c11.8 0 21.4-9.6 21.4-21.4 0-11.8-9.6-21.4-21.4-21.4H307.9c-11.8 0-21.4 9.6-21.4 21.4 0 11.8 9.6 21.4 21.4 21.4h312.3z" p-id="1502" fill="#8a8a8a"></path></svg>

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

+1
View File
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1715354120346" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3256" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M907.1 263.7H118.9c-9.1 0-16.4-7.3-16.4-16.4s7.3-16.4 16.4-16.4H907c9.1 0 16.4 7.3 16.4 16.4s-7.3 16.4-16.3 16.4z" fill="#8a8a8a" p-id="3257"></path><path d="M772.5 928.3H257.4c-27.7 0-50.2-22.5-50.2-50.2V247.2c0-9.1 7.3-16.4 16.4-16.4H801c12.1 0 21.9 9.8 21.9 21.9v625.2c0 27.8-22.6 50.4-50.4 50.4zM240 263.7v614.4c0 9.6 7.8 17.4 17.4 17.4h515.2c9.7 0 17.5-7.9 17.5-17.5V263.7H240zM657.4 131.1H368.6c-9.1 0-16.4-7.3-16.4-16.4s7.3-16.4 16.4-16.4h288.7c9.1 0 16.4 7.3 16.4 16.4s-7.3 16.4-16.3 16.4z" fill="#8a8a8a" p-id="3258"></path><path d="M416 754.5c-9.1 0-16.4-7.3-16.4-16.4V517.8c0-9.1 7.3-16.4 16.4-16.4s16.4 7.3 16.4 16.4V738c0.1 9.1-7.3 16.5-16.4 16.5z" fill="#8a8a8a" p-id="3259"></path><path d="M416 465.2c-9.1 0-16.4-7.3-16.4-16.4v-59.4c0-9.1 7.3-16.4 16.4-16.4s16.4 7.3 16.4 16.4v59.4c0.1 9.1-7.3 16.4-16.4 16.4zM604.9 754.5c-9.1 0-16.4-7.3-16.4-16.4v-67.2c0-9.1 7.3-16.4 16.4-16.4s16.4 7.3 16.4 16.4V738c0 9.1-7.3 16.5-16.4 16.5z" fill="#8a8a8a" opacity=".4" p-id="3260"></path><path d="M604.9 619.1c-9.1 0-16.4-7.3-16.4-16.4V389.4c0-9.1 7.3-16.4 16.4-16.4s16.4 7.3 16.4 16.4v213.3c0 9.1-7.3 16.4-16.4 16.4z" fill="#8a8a8a" p-id="3261"></path></svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

+1
View File
@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1716345268026" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5622" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M956.408445 419.226665a250.670939 250.670939 0 0 0-22.425219-209.609236A263.163526 263.163526 0 0 0 652.490412 85.715535 259.784384 259.784384 0 0 0 457.728923 0.008192a261.422756 261.422756 0 0 0-249.44216 178.582564 258.453206 258.453206 0 0 0-172.848261 123.901894c-57.03583 96.868753-44.031251 219.132275 32.153053 302.279661a250.670939 250.670939 0 0 0 22.32282 209.609237 263.163526 263.163526 0 0 0 281.595213 123.901893A259.067596 259.067596 0 0 0 566.271077 1023.990784a260.60357 260.60357 0 0 0 249.339762-178.889759 258.453206 258.453206 0 0 0 172.848261-123.901893c57.445423-96.868753 44.13365-218.82508-32.050655-302.074865zM566.578272 957.124721c-45.362429 0-89.496079-15.666934-124.516283-44.543243 1.638372-0.921584 4.198329-2.150363 6.143895-3.481541l206.537289-117.757998a32.35785 32.35785 0 0 0 16.895713-29.081105V474.82892l87.243317 49.97035c1.023983 0.307195 1.638372 1.228779 1.638372 2.252762v238.075953c0 105.8798-86.936122 191.689541-193.942303 191.996736zM148.588578 781.102113a189.846373 189.846373 0 0 1-23.346803-128.612213c1.535974 1.023983 4.09593 2.559956 6.143895 3.48154L337.922959 773.729439c10.444622 6.143896 23.346803 6.143896 34.098621 0l252.30931-143.664758v99.531108c0 1.023983-0.307195 1.945567-1.331177 2.559956l-208.892449 118.986778a196.297463 196.297463 0 0 1-265.518686-70.04041zM94.112704 335.97688c22.630015-39.013737 58.367008-68.81163 101.16948-84.171369V494.591784c0 11.7758 6.45109 22.93721 16.793315 28.978707l252.30931 143.767156L377.141493 716.796006a3.174346 3.174346 0 0 1-2.867152 0.307195l-208.892448-118.986777A190.870355 190.870355 0 0 1 94.215102 335.874482z m717.607001 164.861198L559.410394 357.070922 646.653711 307.20297a3.174346 3.174346 0 0 1 2.969549-0.307195l208.892449 118.986777a190.358364 190.358364 0 0 1 70.961994 262.139544 194.556693 194.556693 0 0 1-101.16948 84.171369V529.407192a31.538664 31.538664 0 0 0-16.588518-28.671513z m87.03852-129.329002c-1.74077-1.023983-4.300727-2.559956-6.246294-3.48154l-206.639687-117.757999a34.09862 34.09862 0 0 0-33.996222 0L399.566711 393.934295v-99.531108c0-1.023983 0.307195-1.945567 1.331178-2.559956l208.892449-119.089176a195.990268 195.990268 0 0 1 265.518686 70.450003c22.732414 38.706542 31.129071 84.171369 23.346803 128.305018zM352.258716 548.862861l-87.243317-49.560757a2.457558 2.457558 0 0 1-1.638372-2.252762V258.870991c0-105.8798 87.243317-191.996736 194.556692-191.689541a194.556693 194.556693 0 0 1 124.209089 44.543243c-1.638372 0.921584-4.198329 2.252762-6.143896 3.48154l-206.639687 117.757999a31.948257 31.948257 0 0 0-16.793315 29.081105l-0.307194 286.715126z m47.307995-100.759887L512 384.001664l112.535687 63.998912v127.997824l-112.228492 63.998912-112.535687-63.998912-0.307195-127.997824z" p-id="5623" fill="#707070"></path></svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 86 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

@@ -54,7 +54,7 @@ const currentLocale = computed(() => localeStore.currentLocale)
<ElConfigProvider
:namespace="variables.elNamespace"
:locale="currentLocale.elLocale"
:message="{ max: 1 }"
:message="{ max: 5 }"
:size="size"
>
<slot></slot>
@@ -10,12 +10,13 @@ const prefixCls = getPrefixCls('content-wrap')
defineProps({
title: propTypes.string.def(''),
message: propTypes.string.def('')
message: propTypes.string.def(''),
bodyStyle: propTypes.object.def({ padding: '20px' })
})
</script>
<template>
<ElCard :class="[prefixCls, 'mb-15px']" shadow="never">
<ElCard :body-style="bodyStyle" :class="[prefixCls, 'mb-15px']" shadow="never">
<template v-if="title" #header>
<div class="flex items-center">
<span class="text-16px font-700">{{ title }}</span>
@@ -30,8 +31,6 @@ defineProps({
</div>
</div>
</template>
<div>
<slot></slot>
</div>
<slot></slot>
</ElCard>
</template>
+5 -1
View File
@@ -503,9 +503,13 @@ const submit = () => {
emit('update:modelValue', defaultValue.value)
dialogVisible.value = false
}
const inputChange = () => {
emit('update:modelValue', defaultValue.value)
}
</script>
<template>
<el-input v-model="defaultValue" class="input-with-select" v-bind="$attrs">
<el-input v-model="defaultValue" class="input-with-select" v-bind="$attrs" @input="inputChange">
<template #append>
<el-select v-model="select" placeholder="生成器" style="width: 115px">
<el-option label="每分钟" value="0 * * * * ?" />
+2 -2
View File
@@ -22,8 +22,8 @@ export default defineComponent({
const dictOptions = getDictOptions(dictType)
dictOptions.forEach((dict: DictDataType) => {
if (dict.value === value) {
if (dict.colorType + '' === 'primary' || dict.colorType + '' === 'default') {
dict.colorType = ''
if (dict.colorType + '' === 'default') {
dict.colorType = 'info'
}
dictData.value = dict
}
@@ -95,6 +95,7 @@ const handleCloneComponent = (component: DiyComponent<any>) => {
.editor-left {
z-index: 1;
flex-shrink: 0;
user-select: none;
box-shadow: 8px 0 8px -8px rgb(0 0 0 / 12%);
:deep(.el-collapse) {
@@ -0,0 +1,90 @@
<template>
<div class="h-40px flex items-center justify-center">
<MagicCubeEditor
v-model="cellList"
class="m-b-16px"
:rows="1"
:cols="cellCount"
:cube-size="38"
@hot-area-selected="handleHotAreaSelected"
/>
<img src="@/assets/imgs/diy/app-nav-bar-mp.png" alt="" class="h-30px w-76px" v-if="isMp" />
</div>
<template v-for="(cell, cellIndex) in cellList" :key="cellIndex">
<template v-if="selectedHotAreaIndex === cellIndex">
<el-form-item label="类型" :prop="`cell[${cellIndex}].type`">
<el-radio-group v-model="cell.type">
<el-radio label="text">文字</el-radio>
<el-radio label="image">图片</el-radio>
<el-radio label="search">搜索框</el-radio>
</el-radio-group>
</el-form-item>
<!-- 1. 文字 -->
<template v-if="cell.type === 'text'">
<el-form-item label="内容" :prop="`cell[${cellIndex}].text`">
<el-input v-model="cell!.text" maxlength="10" show-word-limit />
</el-form-item>
<el-form-item label="颜色" :prop="`cell[${cellIndex}].text`">
<ColorInput v-model="cell!.textColor" />
</el-form-item>
</template>
<!-- 2. 图片 -->
<template v-else-if="cell.type === 'image'">
<el-form-item label="图片" :prop="`cell[${cellIndex}].imgUrl`">
<UploadImg v-model="cell.imgUrl" :limit="1" height="56px" width="56px">
<template #tip>建议尺寸 56*56</template>
</UploadImg>
</el-form-item>
<el-form-item label="链接" :prop="`cell[${cellIndex}].url`">
<AppLinkInput v-model="cell.url" />
</el-form-item>
</template>
<!-- 3. 搜索框 -->
<template v-else>
<el-form-item label="提示文字" :prop="`cell[${cellIndex}].placeholder`">
<el-input v-model="cell.placeholder" maxlength="10" show-word-limit />
</el-form-item>
<el-form-item label="圆角" :prop="`cell[${cellIndex}].borderRadius`">
<el-slider
v-model="cell.borderRadius"
:max="100"
:min="0"
show-input
input-size="small"
:show-input-controls="false"
/>
</el-form-item>
</template>
</template>
</template>
</template>
<script setup lang="ts">
import { NavigationBarCellProperty } from '../config'
import { usePropertyForm } from '@/components/DiyEditor/util'
// 导航栏属性面板
defineOptions({ name: 'NavigationBarCellProperty' })
const props = defineProps<{
modelValue: NavigationBarCellProperty[]
isMp: boolean
}>()
const emit = defineEmits(['update:modelValue'])
const { formData: cellList } = usePropertyForm(props.modelValue, emit)
if (!cellList.value) cellList.value = []
// 单元格数量:小程序6个(右侧胶囊按钮占了2个),其它平台8个
const cellCount = computed(() => (props.isMp ? 6 : 8))
// 选中的热区
const selectedHotAreaIndex = ref(0)
const handleHotAreaSelected = (cellValue: NavigationBarCellProperty, index: number) => {
selectedHotAreaIndex.value = index
if (!cellValue.type) {
cellValue.type = 'text'
cellValue.textColor = '#111111'
}
}
</script>
<style scoped lang="scss"></style>
@@ -2,22 +2,53 @@ import { DiyComponent } from '@/components/DiyEditor/util'
/** 顶部导航栏属性 */
export interface NavigationBarProperty {
// 页面标题
title: string
// 页面描述
description: string
// 顶部导航高度
navBarHeight: number
// 页面背景颜色
backgroundColor: string
// 页面背景图片
backgroundImage: string
// 背景类型
bgType: 'color' | 'img'
// 背景颜色
bgColor: string
// 图片链接
bgImg: string
// 样式类型:默认 | 沉浸式
styleType: 'default' | 'immersion'
styleType: 'normal' | 'inner'
// 常驻显示
alwaysShow: boolean
// 是否显示返回按钮
showGoBack: boolean
// 小程序单元格列表
mpCells: NavigationBarCellProperty[]
// 其它平台单元格列表
otherCells: NavigationBarCellProperty[]
// 本地变量
_local: {
// 预览顶部导航(小程序)
previewMp: boolean
// 预览顶部导航(非小程序)
previewOther: boolean
}
}
/** 顶部导航栏 - 单元格 属性 */
export interface NavigationBarCellProperty {
// 类型:文字 | 图片 | 搜索框
type: 'text' | 'image' | 'search'
// 宽度
width: number
// 高度
height: number
// 顶部位置
top: number
// 左侧位置
left: number
// 文字内容
text: string
// 文字颜色
textColor: string
// 图片地址
imgUrl: string
// 图片链接
url: string
// 搜索框:提示文字
placeholder: string
// 搜索框:边框圆角半径
borderRadius: number
}
// 定义组件
@@ -26,13 +57,26 @@ export const component = {
name: '顶部导航栏',
icon: 'tabler:layout-navbar',
property: {
title: '页面标题',
description: '',
navBarHeight: 35,
backgroundColor: '#fff',
backgroundImage: '',
styleType: 'default',
bgType: 'color',
bgColor: '#fff',
bgImg: '',
styleType: 'normal',
alwaysShow: true,
showGoBack: true
mpCells: [
{
type: 'text',
textColor: '#111111'
}
],
otherCells: [
{
type: 'text',
textColor: '#111111'
}
],
_local: {
previewMp: true,
previewOther: false
}
}
} as DiyComponent<NavigationBarProperty>
@@ -1,45 +1,73 @@
<template>
<div
class="navigation-bar"
:style="{
height: `${property.navBarHeight}px`,
backgroundColor: property.backgroundColor,
backgroundImage: `url(${property.backgroundImage})`
}"
>
<!-- 左侧 -->
<div class="left">
<Icon icon="ep:arrow-left" v-show="property.showGoBack" />
<div class="navigation-bar" :style="bgStyle">
<div class="h-full w-full flex items-center">
<div v-for="(cell, cellIndex) in cellList" :key="cellIndex" :style="getCellStyle(cell)">
<span v-if="cell.type === 'text'">{{ cell.text }}</span>
<img v-else-if="cell.type === 'image'" :src="cell.imgUrl" alt="" class="h-full w-full" />
<SearchBar v-else :property="getSearchProp" />
</div>
</div>
<!-- 中间 -->
<div
class="center"
:style="{
height: `${property.navBarHeight}px`,
lineHeight: `${property.navBarHeight}px`
}"
>
{{ property.title }}
</div>
<!-- 右侧 -->
<div class="right"></div>
<img
v-if="property._local?.previewMp"
src="@/assets/imgs/diy/app-nav-bar-mp.png"
alt=""
class="h-30px w-86px"
/>
</div>
</template>
<script setup lang="ts">
import { NavigationBarProperty } from './config'
import { NavigationBarCellProperty, NavigationBarProperty } from './config'
import SearchBar from '@/components/DiyEditor/components/mobile/SearchBar/index.vue'
import { StyleValue } from 'vue'
import { SearchProperty } from '@/components/DiyEditor/components/mobile/SearchBar/config'
/** 页面顶部导航栏 */
defineOptions({ name: 'NavigationBar' })
defineProps<{ property: NavigationBarProperty }>()
const props = defineProps<{ property: NavigationBarProperty }>()
// 背景
const bgStyle = computed(() => {
const background =
props.property.bgType === 'img' && props.property.bgImg
? `url(${props.property.bgImg}) no-repeat top center / 100% 100%`
: props.property.bgColor
return { background }
})
// 单元格列表
const cellList = computed(() =>
props.property._local?.previewMp ? props.property.mpCells : props.property.otherCells
)
// 单元格宽度
const cellWidth = computed(() => {
return props.property._local?.previewMp ? (375 - 80 - 86) / 6 : (375 - 90) / 8
})
// 获得单元格样式
const getCellStyle = (cell: NavigationBarCellProperty) => {
return {
width: cell.width * cellWidth.value + (cell.width - 1) * 10 + 'px',
left: cell.left * cellWidth.value + (cell.left + 1) * 10 + 'px',
position: 'absolute'
} as StyleValue
}
// 获得搜索框属性
const getSearchProp = (cell: NavigationBarCellProperty) => {
return {
height: 30,
showScan: false,
placeholder: cell.placeholder,
borderRadius: cell.borderRadius
} as SearchProperty
}
</script>
<style lang="scss" scoped>
.navigation-bar {
display: flex;
height: 35px;
height: 50px;
background: #fff;
justify-content: space-between;
align-items: center;
padding: 0 6px;
/* 左边 */
.left {
@@ -1,53 +1,73 @@
<template>
<el-form label-width="80px" :model="formData" :rules="rules">
<el-form-item label="页面标题" prop="title">
<el-input v-model="formData!.title" placeholder="页面标题" maxlength="25" show-word-limit />
</el-form-item>
<el-form-item label="页面描述" prop="description">
<el-input
type="textarea"
v-model="formData!.description"
placeholder="用户通过微信分享给朋友时,会自动显示页面描述"
/>
</el-form-item>
<el-form-item label="样式" prop="styleType">
<el-radio-group v-model="formData!.styleType">
<el-radio label="default">默认</el-radio>
<el-radio label="immersion">沉浸式</el-radio>
<el-radio label="normal">标准</el-radio>
<el-tooltip
content="沉侵式头部仅支持微信小程序、APP,建议页面第一个组件为图片展示类组件"
placement="top"
>
<el-radio label="inner">沉浸式</el-radio>
</el-tooltip>
</el-radio-group>
</el-form-item>
<el-form-item label="常驻显示" prop="alwaysShow" v-if="formData.styleType === 'immersion'">
<el-form-item label="常驻显示" prop="alwaysShow" v-if="formData.styleType === 'inner'">
<el-radio-group v-model="formData!.alwaysShow">
<el-radio :label="false">关闭</el-radio>
<el-radio :label="true">开启</el-radio>
<el-tooltip content="常驻显示关闭后,头部小组件将在页面滑动时淡入" placement="top">
<el-radio :label="true">开启</el-radio>
</el-tooltip>
</el-radio-group>
</el-form-item>
<el-form-item label="高度" prop="navBarHeight">
<el-slider
v-model="formData!.navBarHeight"
:max="100"
:min="35"
show-input
input-size="small"
/>
<el-form-item label="背景类型" prop="bgType">
<el-radio-group v-model="formData.bgType">
<el-radio label="color">纯色</el-radio>
<el-radio label="img">图片</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="返回按钮" prop="showGoBack">
<el-switch v-model="formData!.showGoBack" />
<el-form-item label="背景颜色" prop="bgColor" v-if="formData.bgType === 'color'">
<ColorInput v-model="formData.bgColor" />
</el-form-item>
<el-form-item label="背景颜色" prop="backgroundColor">
<ColorInput v-model="formData!.backgroundColor" />
</el-form-item>
<el-form-item label="背景图片" prop="backgroundImage">
<UploadImg v-model="formData!.backgroundImage" :limit="1">
<template #tip>建议宽度 750px</template>
</UploadImg>
<el-form-item label="背景图片" prop="bgImg" v-else>
<UploadImg v-model="formData.bgImg" :limit="1" width="56px" height="56px" />
</el-form-item>
<el-card class="property-group" shadow="never">
<template #header>
<div class="flex items-center justify-between">
<span>内容(小程序)</span>
<el-form-item prop="_local.previewMp" class="m-b-0!">
<el-checkbox
v-model="formData._local.previewMp"
@change="formData._local.previewOther = !formData._local.previewMp"
>预览</el-checkbox
>
</el-form-item>
</div>
</template>
<NavigationBarCellProperty v-model="formData.mpCells" is-mp />
</el-card>
<el-card class="property-group" shadow="never">
<template #header>
<div class="flex items-center justify-between">
<span>内容(非小程序)</span>
<el-form-item prop="_local.previewOther" class="m-b-0!">
<el-checkbox
v-model="formData._local.previewOther"
@change="formData._local.previewMp = !formData._local.previewOther"
>预览</el-checkbox
>
</el-form-item>
</div>
</template>
<NavigationBarCellProperty v-model="formData.otherCells" :is-mp="false" />
</el-card>
</el-form>
</template>
<script setup lang="ts">
import { NavigationBarProperty } from './config'
import { usePropertyForm } from '@/components/DiyEditor/util'
import NavigationBarCellProperty from '@/components/DiyEditor/components/mobile/NavigationBar/components/CellProperty.vue'
// 导航栏属性面板
defineOptions({ name: 'NavigationBarProperty' })
// 表单校验
@@ -58,6 +78,9 @@ const rules = {
const props = defineProps<{ modelValue: NavigationBarProperty }>()
const emit = defineEmits(['update:modelValue'])
const { formData } = usePropertyForm(props.modelValue, emit)
if (!formData.value._local) {
formData.value._local = { previewMp: true, previewOther: false }
}
</script>
<style scoped lang="scss"></style>
+49 -9
View File
@@ -96,11 +96,6 @@ const editorConfig = computed((): IEditorConfig => {
// 选择文件时的类型限制,默认为 ['image/*'] 。如不想限制,则设置为 []
allowedFileTypes: ['image/*'],
// 自定义上传参数,例如传递验证的 token 等。参数会被添加到 formData 中,一起上传到服务端。
meta: { updateSupport: 0 },
// 将 meta 拼接到 url 参数中,默认 false
metaWithUrl: true,
// 自定义增加 http header
headers: {
Accept: '*',
@@ -108,9 +103,6 @@ const editorConfig = computed((): IEditorConfig => {
'tenant-id': getTenantId()
},
// 跨域是否传递 cookie ,默认为 false
withCredentials: true,
// 超时时间,默认为 10 秒
timeout: 5 * 1000, // 5 秒
@@ -119,7 +111,7 @@ const editorConfig = computed((): IEditorConfig => {
// 上传之前触发
onBeforeUpload(file: File) {
console.log(file)
// console.log(file)
return file
},
// 上传进度的回调函数
@@ -142,6 +134,54 @@ const editorConfig = computed((): IEditorConfig => {
customInsert(res: any, insertFn: InsertFnType) {
insertFn(res.data, 'image', res.data)
}
},
['uploadVideo']: {
server: import.meta.env.VITE_UPLOAD_URL,
// 单个文件的最大体积限制,默认为 10M
maxFileSize: 10 * 1024 * 1024,
// 最多可上传几个文件,默认为 100
maxNumberOfFiles: 10,
// 选择文件时的类型限制,默认为 ['video/*'] 。如不想限制,则设置为 []
allowedFileTypes: ['video/*'],
// 自定义增加 http header
headers: {
Accept: '*',
Authorization: 'Bearer ' + getAccessToken(),
'tenant-id': getTenantId()
},
// 超时时间,默认为 30 秒
timeout: 15 * 1000, // 15 秒
// form-data fieldName,后端接口参数名称,默认值wangeditor-uploaded-image
fieldName: 'file',
// 上传之前触发
onBeforeUpload(file: File) {
// console.log(file)
return file
},
// 上传进度的回调函数
onProgress(progress: number) {
// progress 是 0-100 的数字
console.log('progress', progress)
},
onSuccess(file: File, res: any) {
console.log('onSuccess', file, res)
},
onFailed(file: File, res: any) {
alert(res.message)
console.log('onFailed', file, res)
},
onError(file: File, err: any, res: any) {
alert(err.message)
console.error('onError', file, err, res)
},
// 自定义插入图片
customInsert(res: any, insertFn: InsertFnType) {
insertFn(res.data, 'mp4', res.data)
}
}
},
uploadImgShowBase64: true
+4
View File
@@ -0,0 +1,4 @@
import { useFormCreateDesigner } from './src/useFormCreateDesigner'
import { useApiSelect } from './src/components/useApiSelect'
export { useFormCreateDesigner, useApiSelect }
@@ -0,0 +1,59 @@
<!-- 数据字典 Select 选择器 -->
<template>
<el-select v-if="selectType === 'select'" class="w-1/1" v-bind="attrs">
<el-option
v-for="(dict, index) in getDictOptions"
:key="index"
:label="dict.label"
:value="dict.value"
/>
</el-select>
<el-radio-group v-if="selectType === 'radio'" class="w-1/1" v-bind="attrs">
<el-radio v-for="(dict, index) in getDictOptions" :key="index" :value="dict.value">
{{ dict.label }}
</el-radio>
</el-radio-group>
<el-checkbox-group v-if="selectType === 'checkbox'" class="w-1/1" v-bind="attrs">
<el-checkbox
v-for="(dict, index) in getDictOptions"
:key="index"
:label="dict.label"
:value="dict.value"
/>
</el-checkbox-group>
</template>
<script lang="ts" setup>
import { getBoolDictOptions, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
defineOptions({ name: 'DictSelect' })
const attrs = useAttrs()
// 接受父组件参数
interface Props {
dictType: string // 字典类型
valueType?: 'str' | 'int' | 'bool' // 字典值类型
selectType?: 'select' | 'radio' | 'checkbox' // 选择器类型,下拉框 select、多选框 checkbox、单选框 radio
formCreateInject?: any
}
const props = withDefaults(defineProps<Props>(), {
valueType: 'str',
selectType: 'select'
})
// 获得字典配置
const getDictOptions = computed(() => {
switch (props.valueType) {
case 'str':
return getStrDictOptions(props.dictType)
case 'int':
return getIntDictOptions(props.dictType)
case 'bool':
return getBoolDictOptions(props.dictType)
default:
return []
}
})
</script>
@@ -0,0 +1,248 @@
import request from '@/config/axios'
import { isEmpty } from '@/utils/is'
import { ApiSelectProps } from '@/components/FormCreate/src/type'
import { jsonParse } from '@/utils'
export const useApiSelect = (option: ApiSelectProps) => {
return defineComponent({
name: option.name,
props: {
// 选项标签
labelField: {
type: String,
default: () => option.labelField ?? 'label'
},
// 选项的值
valueField: {
type: String,
default: () => option.valueField ?? 'value'
},
// api 接口
url: {
type: String,
default: () => option.url ?? ''
},
// 请求类型
method: {
type: String,
default: 'GET'
},
// 选项解析函数
parseFunc: {
type: String,
default: ''
},
// 请求参数
data: {
type: String,
default: ''
},
// 选择器类型,下拉框 select、多选框 checkbox、单选框 radio
selectType: {
type: String,
default: 'select'
},
// 是否多选
multiple: {
type: Boolean,
default: false
},
// 是否远程搜索
remote: {
type: Boolean,
default: false
},
// 远程搜索时携带的参数
remoteField: {
type: String,
default: 'label'
}
},
setup(props) {
const attrs = useAttrs()
const options = ref<any[]>([]) // 下拉数据
const loading = ref(false) // 是否正在从远程获取数据
const queryParam = ref<any>() // 当前输入的值
const getOptions = async () => {
options.value = []
// 接口选择器
if (isEmpty(props.url)) {
return
}
switch (props.method) {
case 'GET':
let url: string = props.url
if (props.remote) {
url = `${url}?${props.remoteField}=${queryParam.value}`
}
parseOptions(await request.get({ url: url }))
break
case 'POST':
const data: any = jsonParse(props.data)
if (props.remote) {
data[props.remoteField] = queryParam.value
}
parseOptions(await request.post({ url: props.url, data: data }))
break
}
}
function parseOptions(data: any) {
// 情况一:如果有自定义解析函数优先使用自定义解析
if (!isEmpty(props.parseFunc)) {
options.value = parseFunc()?.(data)
return
}
// 情况二:返回的直接是一个列表
if (Array.isArray(data)) {
parseOptions0(data)
return
}
// 情况二:返回的是分页数据,尝试读取 list
data = data.list
if (!!data && Array.isArray(data)) {
parseOptions0(data)
return
}
// 情况三:不是 yudao-vue-pro 标准返回
console.warn(
`接口[${props.url}] 返回结果不是 yudao-vue-pro 标准返回建议采用自定义解析函数处理`
)
}
function parseOptions0(data: any[]) {
if (Array.isArray(data)) {
options.value = data.map((item: any) => ({
label: parseExpression(item, props.labelField),
value: parseExpression(item, props.valueField)
}))
return
}
console.warn(`接口[${props.url}] 返回结果不是一个数组`)
}
function parseFunc() {
let parse: any = null
if (!!props.parseFunc) {
// 解析字符串函数
parse = new Function(`return ${props.parseFunc}`)()
}
return parse
}
function parseExpression(data: any, template: string) {
// 检测是否使用了表达式
if (template.indexOf('${') === -1) {
return data[template]
}
// 正则表达式匹配模板字符串中的 ${...}
const pattern = /\$\{([^}]*)}/g
// 使用replace函数配合正则表达式和回调函数来进行替换
return template.replace(pattern, (_, expr) => {
// expr 是匹配到的 ${} 内的表达式(这里是属性名),从 data 中获取对应的值
const result = data[expr.trim()] // 去除前后空白,以防用户输入带空格的属性名
if (!result) {
console.warn(
`接口选择器选项模版[${template}][${expr.trim()}] 解析值失败结果为[${result}], 请检查属性名称是否存在于接口返回值中,存在则忽略此条!!!`
)
}
return result
})
}
const remoteMethod = async (query: any) => {
if (!query) {
return
}
loading.value = true
try {
queryParam.value = query
await getOptions()
} finally {
loading.value = false
}
}
onMounted(async () => {
await getOptions()
})
const buildSelect = () => {
if (props.multiple) {
// fix:多写此步是为了解决 multiple 属性问题
return (
<el-select
class="w-1/1"
multiple
loading={loading.value}
{...attrs}
remote={props.remote}
{...(props.remote && { remoteMethod: remoteMethod })}
>
{options.value.map((item, index) => (
<el-option key={index} label={item.label} value={item.value} />
))}
</el-select>
)
}
debugger
return (
<el-select
class="w-1/1"
loading={loading.value}
{...attrs}
remote={props.remote}
{...(props.remote && { remoteMethod: remoteMethod })}
>
{options.value.map((item, index) => (
<el-option key={index} label={item.label} value={item.value} />
))}
</el-select>
)
}
const buildCheckbox = () => {
if (isEmpty(options.value)) {
options.value = [
{ label: '选项1', value: '选项1' },
{ label: '选项2', value: '选项2' }
]
}
return (
<el-checkbox-group class="w-1/1" {...attrs}>
{options.value.map((item, index) => (
<el-checkbox key={index} label={item.label} value={item.value} />
))}
</el-checkbox-group>
)
}
const buildRadio = () => {
if (isEmpty(options.value)) {
options.value = [
{ label: '选项1', value: '选项1' },
{ label: '选项2', value: '选项2' }
]
}
return (
<el-radio-group class="w-1/1" {...attrs}>
{options.value.map((item, index) => (
<el-radio key={index} value={item.value}>
{item.label}
</el-radio>
))}
</el-radio-group>
)
}
return () => (
<>
{props.selectType === 'select'
? buildSelect()
: props.selectType === 'radio'
? buildRadio()
: props.selectType === 'checkbox'
? buildCheckbox()
: buildSelect()}
</>
)
}
})
}
@@ -0,0 +1,15 @@
import { useUploadFileRule } from './useUploadFileRule'
import { useUploadImgRule } from './useUploadImgRule'
import { useUploadImgsRule } from './useUploadImgsRule'
import { useDictSelectRule } from './useDictSelectRule'
import { useEditorRule } from './useEditorRule'
import { useSelectRule } from './useSelectRule'
export {
useUploadFileRule,
useUploadImgRule,
useUploadImgsRule,
useDictSelectRule,
useEditorRule,
useSelectRule
}
@@ -0,0 +1,181 @@
const selectRule = [
{
type: 'select',
field: 'selectType',
title: '选择器类型',
value: 'select',
options: [
{ label: '下拉框', value: 'select' },
{ label: '单选框', value: 'radio' },
{ label: '多选框', value: 'checkbox' }
],
// 参考 https://www.form-create.com/v3/guide/control 组件联动,单选框和多选框不需要多选属性
control: [
{
value: 'select',
condition: '==',
method: 'hidden',
rule: [
'multiple',
'clearable',
'collapseTags',
'multipleLimit',
'allowCreate',
'filterable',
'noMatchText',
'remote',
'remoteMethod',
'reserveKeyword',
'defaultFirstOption',
'automaticDropdown'
]
}
]
},
{
type: 'switch',
field: 'filterable',
title: '是否可搜索'
},
{ type: 'switch', field: 'multiple', title: '是否多选' },
{
type: 'switch',
field: 'disabled',
title: '是否禁用'
},
{ type: 'switch', field: 'clearable', title: '是否可以清空选项' },
{
type: 'switch',
field: 'collapseTags',
title: '多选时是否将选中值按文字的形式展示'
},
{
type: 'inputNumber',
field: 'multipleLimit',
title: '多选时用户最多可以选择的项目数,为 0 则不限制',
props: { min: 0 }
},
{
type: 'input',
field: 'autocomplete',
title: 'autocomplete 属性'
},
{ type: 'input', field: 'placeholder', title: '占位符' },
{ type: 'switch', field: 'allowCreate', title: '是否允许用户创建新条目' },
{
type: 'input',
field: 'noMatchText',
title: '搜索条件无匹配时显示的文字'
},
{ type: 'input', field: 'noDataText', title: '选项为空时显示的文字' },
{
type: 'switch',
field: 'reserveKeyword',
title: '多选且可搜索时,是否在选中一个选项后保留当前的搜索关键词'
},
{
type: 'switch',
field: 'defaultFirstOption',
title: '在输入框按下回车,选择第一个匹配项'
},
{
type: 'switch',
field: 'popperAppendToBody',
title: '是否将弹出框插入至 body 元素',
value: true
},
{
type: 'switch',
field: 'automaticDropdown',
title: '对于不可搜索的 Select,是否在输入框获得焦点后自动弹出选项菜单'
}
]
const apiSelectRule = [
{
type: 'input',
field: 'url',
title: 'url 地址',
props: {
placeholder: '/system/user/simple-list'
}
},
{
type: 'select',
field: 'method',
title: '请求类型',
value: 'GET',
options: [
{ label: 'GET', value: 'GET' },
{ label: 'POST', value: 'POST' }
],
control: [
{
value: 'GET',
condition: '!=',
method: 'hidden',
rule: [
{
type: 'input',
field: 'data',
title: '请求参数 JSON 格式',
props: {
autosize: true,
type: 'textarea',
placeholder: '{"type": 1}'
}
}
]
}
]
},
{
type: 'input',
field: 'labelField',
title: 'label 属性',
info: '可以使用 el 表达式:${属性},来实现复杂数据组合。如:${nickname}-${id}',
props: {
placeholder: 'nickname'
}
},
{
type: 'input',
field: 'valueField',
title: 'value 属性',
info: '可以使用 el 表达式:${属性},来实现复杂数据组合。如:${nickname}-${id}',
props: {
placeholder: 'id'
}
},
{
type: 'input',
field: 'parseFunc',
title: '选项解析函数',
info: `data 为接口返回值,需要写一个匿名函数解析返回值为选择器 options 列表
(data: any)=>{ label: string; value: any }[]`,
props: {
autosize: true,
rows: { minRows: 2, maxRows: 6 },
type: 'textarea',
placeholder: `
function (data) {
console.log(data)
return data.list.map(item=> ({label: item.nickname,value: item.id}))
}`
}
},
{
type: 'switch',
field: 'remote',
info: '是否可搜索',
title: '其中的选项是否从服务器远程加载'
},
{
type: 'input',
field: 'remoteField',
title: '请求参数',
info: '远程请求时请求携带的参数名称,如:name'
}
]
export { selectRule, apiSelectRule }
@@ -0,0 +1,64 @@
import { generateUUID } from '@/utils'
import * as DictDataApi from '@/api/system/dict/dict.type'
import { localeProps, makeRequiredRule } from '@/components/FormCreate/src/utils'
import { selectRule } from '@/components/FormCreate/src/config/selectRule'
import { cloneDeep } from 'lodash-es'
/**
* 字典选择器规则,如果规则使用到动态数据则需要单独配置不能使用 useSelectRule
*/
export const useDictSelectRule = () => {
const label = '字典选择器'
const name = 'DictSelect'
const rules = cloneDeep(selectRule)
const dictOptions = ref<{ label: string; value: string }[]>([]) // 字典类型下拉数据
onMounted(async () => {
const data = await DictDataApi.getSimpleDictTypeList()
if (!data || data.length === 0) {
return
}
dictOptions.value =
data?.map((item: DictDataApi.DictTypeVO) => ({
label: item.name,
value: item.type
})) ?? []
})
return {
icon: 'icon-doc-text',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false
}
},
props(_, { t }) {
return localeProps(t, name + '.props', [
makeRequiredRule(),
{
type: 'select',
field: 'dictType',
title: '字典类型',
value: '',
options: dictOptions.value
},
{
type: 'select',
field: 'dictValueType',
title: '字典值类型',
value: 'str',
options: [
{ label: '数字', value: 'int' },
{ label: '字符串', value: 'str' },
{ label: '布尔值', value: 'bool' }
]
},
...rules
])
}
}
}
@@ -0,0 +1,32 @@
import { generateUUID } from '@/utils'
import { localeProps, makeRequiredRule } from '@/components/FormCreate/src/utils'
export const useEditorRule = () => {
const label = '富文本'
const name = 'Editor'
return {
icon: 'icon-editor',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false
}
},
props(_, { t }) {
return localeProps(t, name + '.props', [
makeRequiredRule(),
{
type: 'input',
field: 'height',
title: '高度'
},
{ type: 'switch', field: 'readonly', title: '是否只读' }
])
}
}
}
@@ -0,0 +1,36 @@
import { generateUUID } from '@/utils'
import { localeProps, makeRequiredRule } from '@/components/FormCreate/src/utils'
import { selectRule } from '@/components/FormCreate/src/config/selectRule'
import { SelectRuleOption } from '@/components/FormCreate/src/type'
import { cloneDeep } from 'lodash-es'
/**
* 通用选择器规则 hook
*
* @param option 规则配置
*/
export const useSelectRule = (option: SelectRuleOption) => {
const label = option.label
const name = option.name
const rules = cloneDeep(selectRule)
return {
icon: option.icon,
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false
}
},
props(_, { t }) {
if (!option.props) {
option.props = []
}
return localeProps(t, name + '.props', [makeRequiredRule(), ...option.props, ...rules])
}
}
}
@@ -0,0 +1,80 @@
import { generateUUID } from '@/utils'
import { localeProps, makeRequiredRule } from '@/components/FormCreate/src/utils'
export const useUploadFileRule = () => {
const label = '文件上传'
const name = 'UploadFile'
return {
icon: 'icon-upload',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false
}
},
props(_, { t }) {
return localeProps(t, name + '.props', [
makeRequiredRule(),
{
type: 'select',
field: 'fileType',
title: '文件类型',
value: ['doc', 'xls', 'ppt', 'txt', 'pdf'],
options: [
{ label: 'doc', value: 'doc' },
{ label: 'xls', value: 'xls' },
{ label: 'ppt', value: 'ppt' },
{ label: 'txt', value: 'txt' },
{ label: 'pdf', value: 'pdf' }
],
props: {
multiple: true
}
},
{
type: 'switch',
field: 'autoUpload',
title: '是否在选取文件后立即进行上传',
value: true
},
{
type: 'switch',
field: 'drag',
title: '拖拽上传',
value: false
},
{
type: 'switch',
field: 'isShowTip',
title: '是否显示提示',
value: true
},
{
type: 'inputNumber',
field: 'fileSize',
title: '大小限制(MB)',
value: 5,
props: { min: 0 }
},
{
type: 'inputNumber',
field: 'limit',
title: '数量限制',
value: 5,
props: { min: 0 }
},
{
type: 'switch',
field: 'disabled',
title: '是否禁用',
value: false
}
])
}
}
}
@@ -0,0 +1,89 @@
import { generateUUID } from '@/utils'
import { localeProps, makeRequiredRule } from '@/components/FormCreate/src/utils'
export const useUploadImgRule = () => {
const label = '单图上传'
const name = 'UploadImg'
return {
icon: 'icon-upload',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false
}
},
props(_, { t }) {
return localeProps(t, name + '.props', [
makeRequiredRule(),
{
type: 'switch',
field: 'drag',
title: '拖拽上传',
value: false
},
{
type: 'select',
field: 'fileType',
title: '图片类型限制',
value: ['image/jpeg', 'image/png', 'image/gif'],
options: [
{ label: 'image/apng', value: 'image/apng' },
{ label: 'image/bmp', value: 'image/bmp' },
{ label: 'image/gif', value: 'image/gif' },
{ label: 'image/jpeg', value: 'image/jpeg' },
{ label: 'image/pjpeg', value: 'image/pjpeg' },
{ label: 'image/svg+xml', value: 'image/svg+xml' },
{ label: 'image/tiff', value: 'image/tiff' },
{ label: 'image/webp', value: 'image/webp' },
{ label: 'image/x-icon', value: 'image/x-icon' }
],
props: {
multiple: true
}
},
{
type: 'inputNumber',
field: 'fileSize',
title: '大小限制(MB)',
value: 5,
props: { min: 0 }
},
{
type: 'input',
field: 'height',
title: '组件高度',
value: '150px'
},
{
type: 'input',
field: 'width',
title: '组件宽度',
value: '150px'
},
{
type: 'input',
field: 'borderradius',
title: '组件边框圆角',
value: '8px'
},
{
type: 'switch',
field: 'disabled',
title: '是否显示删除按钮',
value: true
},
{
type: 'switch',
field: 'showBtnText',
title: '是否显示按钮文字',
value: true
}
])
}
}
}
@@ -0,0 +1,84 @@
import { generateUUID } from '@/utils'
import { localeProps, makeRequiredRule } from '@/components/FormCreate/src/utils'
export const useUploadImgsRule = () => {
const label = '多图上传'
const name = 'UploadImgs'
return {
icon: 'icon-upload',
label,
name,
rule() {
return {
type: name,
field: generateUUID(),
title: label,
info: '',
$required: false
}
},
props(_, { t }) {
return localeProps(t, name + '.props', [
makeRequiredRule(),
{
type: 'switch',
field: 'drag',
title: '拖拽上传',
value: false
},
{
type: 'select',
field: 'fileType',
title: '图片类型限制',
value: ['image/jpeg', 'image/png', 'image/gif'],
options: [
{ label: 'image/apng', value: 'image/apng' },
{ label: 'image/bmp', value: 'image/bmp' },
{ label: 'image/gif', value: 'image/gif' },
{ label: 'image/jpeg', value: 'image/jpeg' },
{ label: 'image/pjpeg', value: 'image/pjpeg' },
{ label: 'image/svg+xml', value: 'image/svg+xml' },
{ label: 'image/tiff', value: 'image/tiff' },
{ label: 'image/webp', value: 'image/webp' },
{ label: 'image/x-icon', value: 'image/x-icon' }
],
props: {
multiple: true
}
},
{
type: 'inputNumber',
field: 'fileSize',
title: '大小限制(MB)',
value: 5,
props: { min: 0 }
},
{
type: 'inputNumber',
field: 'limit',
title: '数量限制',
value: 5,
props: { min: 0 }
},
{
type: 'input',
field: 'height',
title: '组件高度',
value: '150px'
},
{
type: 'input',
field: 'width',
title: '组件宽度',
value: '150px'
},
{
type: 'input',
field: 'borderradius',
title: '组件边框圆角',
value: '8px'
}
])
}
}
}
@@ -0,0 +1,50 @@
import { Rule } from '@form-create/element-ui' //左侧拖拽按钮
// 左侧拖拽按钮
export interface MenuItem {
label: string
name: string
icon: string
}
// 左侧拖拽按钮分类
export interface Menu {
title: string
name: string
list: MenuItem[]
}
export interface MenuList extends Array<Menu> {}
// 拖拽组件的规则
export interface DragRule {
icon: string
name: string
label: string
children?: string
inside?: true
drag?: true | String
dragBtn?: false
mask?: false
rule(): Rule
props(v: any, v1: any): Rule[]
}
// 通用下拉组件 Props 类型
export interface ApiSelectProps {
name: string // 组件名称
labelField?: string // 选项标签
valueField?: string // 选项的值
url?: string // url 接口
isDict?: boolean // 是否字典选择器
}
// 选择组件规则配置类型
export interface SelectRuleOption {
label: string // label 名称
name: string // 组件名称
icon: string // 组件图标
props?: any[] // 组件规则
}
@@ -0,0 +1,100 @@
import {
useDictSelectRule,
useEditorRule,
useSelectRule,
useUploadFileRule,
useUploadImgRule,
useUploadImgsRule
} from './config'
import { Ref } from 'vue'
import { Menu } from '@/components/FormCreate/src/type'
import { apiSelectRule } from '@/components/FormCreate/src/config/selectRule'
/**
* 表单设计器增强 hook
* 新增
* - 文件上传
* - 单图上传
* - 多图上传
* - 字典选择器
* - 用户选择器
* - 部门选择器
* - 富文本
*/
export const useFormCreateDesigner = async (designer: Ref) => {
const editorRule = useEditorRule()
const uploadFileRule = useUploadFileRule()
const uploadImgRule = useUploadImgRule()
const uploadImgsRule = useUploadImgsRule()
/**
* 构建表单组件
*/
const buildFormComponents = () => {
// 移除自带的上传组件规则,使用 uploadFileRule、uploadImgRule、uploadImgsRule 替代
designer.value?.removeMenuItem('upload')
// 移除自带的富文本组件规则,使用 editorRule 替代
designer.value?.removeMenuItem('fc-editor')
const components = [editorRule, uploadFileRule, uploadImgRule, uploadImgsRule]
components.forEach((component) => {
// 插入组件规则
designer.value?.addComponent(component)
// 插入拖拽按钮到 `main` 分类下
designer.value?.appendMenuItem('main', {
icon: component.icon,
name: component.name,
label: component.label
})
})
}
const userSelectRule = useSelectRule({
name: 'UserSelect',
label: '用户选择器',
icon: 'icon-user-o'
})
const deptSelectRule = useSelectRule({
name: 'DeptSelect',
label: '部门选择器',
icon: 'icon-address-card-o'
})
const dictSelectRule = useDictSelectRule()
const apiSelectRule0 = useSelectRule({
name: 'ApiSelect',
label: '接口选择器',
icon: 'icon-server',
props: [...apiSelectRule]
})
/**
* 构建系统字段菜单
*/
const buildSystemMenu = () => {
// 移除自带的下拉选择器组件,使用 currencySelectRule 替代
// designer.value?.removeMenuItem('select')
// designer.value?.removeMenuItem('radio')
// designer.value?.removeMenuItem('checkbox')
const components = [userSelectRule, deptSelectRule, dictSelectRule, apiSelectRule0]
const menu: Menu = {
name: 'system',
title: '系统字段',
list: components.map((component) => {
// 插入组件规则
designer.value?.addComponent(component)
// 插入拖拽按钮到 `system` 分类下
return {
icon: component.icon,
name: component.name,
label: component.label
}
})
}
designer.value?.addMenu(menu)
}
onMounted(async () => {
await nextTick()
buildFormComponents()
buildSystemMenu()
})
}
Loaded 100 of 424 files, more files were not shown because too many files have changed in this diff. Show more