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

2116 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
芋道源码
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
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
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