Commit Graph

1469 Commits

Author SHA1 Message Date
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
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
YunaiV
02fe7e31d0 【新增】AI:API 密钥管理 2024-05-09 23:02:57 +08:00
cherishsince
5525bc2257 【优化】优化 ai chat 主框架布局 2024-05-09 22:13:23 +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
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
YunaiV
66c6463f44 【修复】商城:seckill 导致打包失败的问题 2024-05-05 11:20:08 +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
芋道源码
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
e2fe04749b 【修复】商城系统:管理后台的商城订单统计数据有问题 2024-05-02 09:24:45 +08:00
YunaiV
20a9780654 【修复】商城:秒杀时段点击编辑报错 2024-05-01 20:53:01 +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
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
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