root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,123 Commits 8 Branches 11 Tags 16 MiB
c3884c5dfd
Commit Graph

1788 Commits

Author SHA1 Message Date
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
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
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
芋道源码
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
puhui999
40fe87920b form-create: 优化 select option 选项解析，增加 el 表达式解析、自定义函数解析 (data: any)=>{ label: string; value: any } 2024-05-09 14:35:57 +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
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
YunaiV
9402b29684 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2024-05-07 09:13:25 +08: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
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
山野羡民
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
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
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
769b63d9ca form-create：移除自带的下拉选择器组件，使用 currencySelectRule 替代 2024-04-30 00:07:25 +08:00
YunaiV
500b8632df 【优化】增加 pnpm-lock 保证大家更好的打包 2024-04-29 21:47:49 +08: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
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
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
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
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