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

2025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
e3b5905791 【合并】IM：合并最新 master 代码 2024-05-26 09:24:07 +08:00
YunaiV
b7d2521fff Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3 into feature/im 
# Conflicts:
#	package.json
 2024-05-26 09:14:40 +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
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
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
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
YunaiV
f75e8d1fd4 【新增】在菜单管理中，可通过“路由地址”添加 ? 拼接参数 2024-05-01 18:47:51 +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
khalidlife
ff14cf90f0 fix(useUpload.ts): 修复前端文件上传Content-Type异常问题 2024-04-30 09:30:43 +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
安浩浩
8eb43bdd01 修改：优化发送表情 2024-04-28 22:37:48 +08:00
安浩浩
da42381c8b 修改：移动到 IM 文件夹 2024-04-28 22:02:38 +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
安浩浩
a7e8433b27 新增：对话页面 2024-04-27 23:10:03 +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
安浩浩
de27cfa8f6 新增：IM 弹框 2024-04-24 20:54:13 +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