1396 Commits
Author SHA1 Message Date
芋道源码 fa6ec8f07f !338 修复公众号-素材管理 上传时缺少accountId参数
Merge pull request !338 from Evol郑天/N/A
2023-11-30 12:38:24 +00:00
芋道源码 c322959c40 !337 crm联系人review修改
Merge pull request !337 from zyna/master
2023-11-29 05:54:39 +00:00
Evol郑天 fd266516fe 修复公众号-素材管理 上传时缺少accountId参数
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-11-29 01:24:42 +00:00
zyna ed22e02b5b crm联系人review修改 2023-11-27 23:44:13 +08:00
芋道源码 57b20f1810 !336 同步公众号粉丝接口调用错误
Merge pull request !336 from Evol郑天/N/A
2023-11-27 12:35:25 +00:00
芋道源码 038f3d6ab0 !335 crm联系人review修改
Merge pull request !335 from zyna/master
2023-11-27 12:30:20 +00:00
Evol郑天 633965b07d 同步公众号粉丝接口调用错误
Signed-off-by: Evol郑天 <jpevol@163.com>
2023-11-27 07:07:32 +00:00
zyna 46a8755c93 联系人review修改 2023-11-26 21:54:50 +08:00
芋道源码 8aa17b673b !331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
2023-11-25 10:50:20 +00:00
芋道源码 54897b6d1b !332 同步最新的代码到 dev
Merge pull request !332 from 芋道源码/master
2023-11-25 02:27:11 +00:00
芋道源码 c6192a1918 !329 完善团队成员公共组件,crm-客户:集成团队成员
Merge pull request !329 from puhui999/dev-crm
2023-11-25 02:24:45 +00:00
Marvin b95b8008f7 feat: 菜单右上角加一个搜索图标 2023-11-25 03:52:59 +08:00
芋道源码 8f97155b43 !328 商城装修
Merge pull request !328 from 疯狂的世界/dev
2023-11-24 14:41:12 +00:00
owen c3cad3f3ee 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题 2023-11-24 20:54:47 +08:00
YunaiV 1744c6ec6f websocket 重新封装 2023-11-24 00:33:05 +08:00
puhui999 f8b56a8c46 crm-客户:公海数据区分 2023-11-23 09:35:59 +08:00
owen 253401ace3 营销:适配商城装修组件【优惠券】 2023-11-22 16:58:00 +08:00
puhui999 12b59200c1 crm-客户:集成团队成员 2023-11-22 15:45:10 +08:00
puhui999 19a0a83054 crm-数据权限:完善团队成员公共组件 2023-11-22 15:44:42 +08:00
YunaiV f74ddf46ae sms:移除 sendCode、sendMsg 字段 2023-11-21 22:53:49 +08:00
owen 1bb9df7b3c 商品中心:修复商品表格选择对话框,在多选时表头内的多选框不显示选中效果的问题 2023-11-21 10:27:29 +08:00
owen e0a731dd86 商品评论、优惠券模板复用组件【商品橱窗】 2023-11-20 10:53:02 +08:00
owen 3198688eb5 营销:适配商城装修组件【商品栏】 2023-11-19 18:27:25 +08:00
芋道源码 b0b669129b !314 会员中心商品收藏
Merge pull request !314 from niou233/featrue/mall_org
2023-11-18 16:32:02 +00:00
芋道源码 4423e9b804 !326 CRM 客户最新的代码
Merge pull request !326 from 芋道源码/dev
2023-11-18 16:30:42 +00:00
YunaiV ebb19cfe8c Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-19 00:30:02 +08:00
YunaiV b1f5ad55b8 crm:code review 权限列表 2023-11-19 00:28:22 +08:00
芋道源码 2e01944df9 !322 crm-团队成员:完善团队成员通用组件封装
Merge pull request !322 from puhui999/dev-to-dev
2023-11-18 16:13:06 +00:00
芋道源码 5f0b0bd21d !324 商城装修
Merge pull request !324 from 疯狂的世界/dev
2023-11-18 14:18:12 +00:00
芋道源码 9d7c578d48 !323 update src/views/Profile/components/UserSocial.vue.
Merge pull request !323 from 口口口/N/A
2023-11-18 14:17:55 +00:00
YunaiV 526172af60 crm:code review 客户配置管理 2023-11-18 22:11:42 +08:00
芋道源码 c06223decd !316 feat: CRM 客户公海配置 + CRM 客户限制 + review 修改
Merge pull request !316 from wanwan/dev
2023-11-18 13:45:48 +00:00
芋道源码 f07d37438d !321 修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Merge pull request !321 from 柯杨/master
2023-11-18 13:43:22 +00:00
YunaiV 85e953b920 crm:code review 联系人管理 2023-11-18 21:08:00 +08:00
YunaiV 7c5ae17d04 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/components/DiyEditor/components/ComponentContainer.vue
2023-11-18 20:39:31 +08:00
芋道源码 538783ce2d !317 crm联系人前端
Merge pull request !317 from zyna/master
2023-11-18 12:35:34 +00:00
YunaiV f1e3eccc8a Merge branch 'feature/sub-table' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-18 18:00:41 +08:00
YunaiV 652698b871 代码生成:增加说明文档 2023-11-18 18:00:19 +08:00
芋道源码 26dba8b457 !325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
2023-11-18 09:57:33 +00:00
owen f5d611968f Merge remote-tracking branch 'origin/dev' into dev 2023-11-17 21:51:42 +08:00
YunaiV a42d0695fe 代码生成:增加主子表 erp 模式的示例 2023-11-17 13:21:17 +08:00
口口口 68f6683e52 update src/views/Profile/components/UserSocial.vue.
在这里绑定,绑定成功后,列表重复

Signed-off-by: 口口口 <17975121@qq.com>
2023-11-17 05:17:17 +00:00
owen b4a1772584 营销:适配商城装修组件【商品卡片】 2023-11-17 10:14:26 +08:00
YunaiV 6c405ba420 代码生成:增加主子表 inner 模式的示例 2023-11-16 23:48:20 +08:00
YunaiV 9aca49c1ff 代码生成:增加主子表 normal 模式的示例 2023-11-16 23:24:03 +08:00
YunaiV bbc37613b6 代码生成:增加 tree 树形的示例 2023-11-16 20:39:12 +08:00
YunaiV 3d0c4f4422 代码生成:支持树形表结构的配置 2023-11-16 00:11:23 +08:00
YunaiV 40b1522ed0 代码生成:增加 crud 单表示例 2023-11-15 23:48:00 +08:00
Wanwan 22206b25e1 feat: CRM 客户限制 2023-11-15 21:55:44 +08:00
xingyu 821c804189 fix: stylelint 2023-11-14 21:56:54 +08:00
xingyu 249e0d21a3 fix: eslint 2023-11-14 21:56:02 +08:00
xingyu 8a74b954d0 docs: update deps 2023-11-14 21:53:30 +08:00
xingyu e56afbf80f chore: update deps 2023-11-14 21:49:49 +08:00
puhui999 8e0cf5c1e5 crm-团队成员:新增获得权限级别名称函数 getLevelName 2023-11-14 12:06:42 +08:00
puhui999 ba702d03bc Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-11-14 11:26:41 +08:00
puhui999 015a1640c1 crm-团队成员:完善团队成员通用组件封装 2023-11-14 11:26:07 +08:00
YunaiV 45656562a8 代码生成:支持设置主子表的信息 2023-11-14 09:50:54 +08:00
柯杨 8bb9dec328 【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
2023-11-14 01:43:59 +00:00
芋道源码 c1a92ba22a !319 商城装修
Merge pull request !319 from 疯狂的世界/dev
2023-11-14 00:31:55 +00:00
puhui999 27c9a0f32d crm-团队成员: 先提交一波 2023-11-13 17:49:27 +08:00
puhui999 2385cd9b9a fix:如果已经到重新登录页面则不进行弹窗提示 2023-11-13 15:48:21 +08:00
YunaiV 999d8de9e9 代码生成:增加主子表(内嵌)的示例 2023-11-13 13:57:15 +08:00
YunaiV f0f7886025 代码生成:增加主子表(普通)的示例 2023-11-12 22:33:38 +08:00
YunaiV 72c5eaae31 代码生成:增加 one 情况下的示例代码 2023-11-12 19:50:38 +08:00
owen 49ebadd748 营销:适配商城装修组件【广告魔方】 2023-11-12 19:29:24 +08:00
Wanwan 702f23e672 feat: CRM 客户限制 2023-11-12 14:34:25 +08:00
zyna ed26142bb0 crm联系人init 2023-11-11 23:35:18 +08:00
Wanwan a7f86dfd8b feat: CRM 客户限制 2023-11-11 21:06:11 +08:00
Wanwan 6369b334e3 feat: CRM 客户限制 2023-11-11 20:50:33 +08:00
YunaiV 55f6e4ca25 主子表:确认列表编辑的支持组件情况 2023-11-10 23:01:36 +08:00
Wanwan b63e2a9efb Merge remote-tracking branch 'origin/dev' into dev 2023-11-10 22:47:34 +08:00
YunaiV 9f9e0f8bda 主子表:同步三种模式的代码 2023-11-10 19:54:55 +08:00
niou233 af5d1cf25e update src/locales/zh-CN.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:36:11 +00:00
niou233 1ab5b44254 update src/locales/en.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:35:54 +00:00
niou233 2ff97758fd update src/hooks/web/useMessage.ts.
Signed-off-by: niou233 <2922564446@qq.com>
2023-11-10 11:34:32 +00:00
YunaiV 86d9a97ccb 主子表:暂时存储,参数校验-表单数据跑通 2023-11-10 08:51:01 +08:00
YunaiV d45ebd4fcf 主子表:暂时存储,样式跑通 2023-11-10 00:20:00 +08:00
YunaiV 4e413a10e6 主子表:暂时存储,准备重构 2023-11-09 23:10:54 +08:00
owen 55b477acdb unplugin-auto-import:排除自动导入店铺装修组件 2023-11-09 15:48:20 +08:00
芋道源码 6160c2fa8a !315 商城装修
Merge pull request !315 from 疯狂的世界/dev
2023-11-09 01:30:21 +00:00
YunaiV e9299c6710 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-09 09:20:21 +08:00
YunaiV a08e9bea7c 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-09 09:20:21 +08:00
owen 82aed175ab 营销:适配商城装修组件【菜单导航】 2023-11-09 09:18:46 +08:00
Wanwan 59b2d89a18 feat: CRM 客户公海配置 2023-11-09 00:08:09 +08:00
Wanwan 288aa72cdd feat: CRM 客户公海配置 2023-11-09 00:05:10 +08:00
owen ac42493659 营销:适配商城装修组件【宫格导航】 2023-11-08 22:22:35 +08:00
owen 325e2e4ff2 营销:适配商城装修组件【列表导航】 2023-11-08 21:10:05 +08:00
niou233 084009f7f2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-08 17:30:04 +08:00
niou233 f2c71d5836 refactor: 会员商品收藏 2023-11-08 17:29:57 +08:00
Wanwan 57474c0644 Merge remote-tracking branch 'origin/dev' into dev 2023-11-07 22:54:50 +08:00
Wanwan 7146fdc9b9 style: 客户 review 修改 2023-11-06 22:00:40 +08:00
YunaiV eb9f8c9f6f Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-06 21:43:55 +08:00
YunaiV 85ee558bef 多租户:登录界面,根据 host 域名获取对应的租户编号 2023-11-06 19:42:28 +08:00
YunaiV c0d5c76a06 多租户:调整 tenant 表的 domain 字段为 website,避免 dm 数据库的关键字冲突 2023-11-06 19:09:20 +08:00
芋道源码 821217501c !310 fix: 修复关闭拼团活动请求URL错误的问题
Merge pull request !310 from VicoHu/N/A
2023-11-06 07:03:30 +00:00
芋道源码 ead30e8cd9 !312 商城装修
Merge pull request !312 from 疯狂的世界/dev
2023-11-06 07:02:18 +00:00
owen 4253173a2a 营销:适配商城装修组件【轮播图】 2023-11-06 09:31:42 +08:00
owen 6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 2023-11-06 08:33:16 +08:00
owen bb2b7ffd03 营销:增加商城装修组件【视频播放】 2023-11-05 22:53:30 +08:00
VicoHu 3f803767c4 fix: 修复关闭拼团活动请求URL错误的问题
Signed-off-by: VicoHu <vicohu@163.com>
2023-11-05 13:59:28 +00:00
YunaiV 47bb88d892 code review:产品分类 2023-11-05 20:50:13 +08:00
YunaiV e1cff74f41 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:48:12 +08:00
owen fa710b560d 营销:增加商城装修组件【图片展示】 2023-11-05 20:42:50 +08:00
芋道源码 596ad888e1 !308 【增加CRM:产品以及产品分类】
Merge pull request !308 from ZanGe丶/master
2023-11-05 12:28:31 +00:00
YunaiV 17742988c9 code review:回款 2023-11-05 20:25:52 +08:00
YunaiV 65d85e30ca Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-11-05 20:23:56 +08:00
芋道源码 f0c45103e1 !309 完善回款管理和回款计划功能
Merge pull request !309 from souvc/master
2023-11-05 12:20:46 +00:00
owen 434aa864da 营销:优化装修编辑器 2023-11-05 12:40:32 +08:00
owen 0b0ba1f313 营销:优化装修编辑器样式 2023-11-05 10:08:03 +08:00
owen 984351fbf0 修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致 2023-11-05 09:47:54 +08:00
owen aedf014407 营销:装修页面适配搜索框 2023-11-04 22:06:40 +08:00
YunaiV 4f2f4f72b5 优化:社交登录、用户的管理 2023-11-04 20:43:36 +08:00
ZanGe丶 ff6f05df84 【crm:产品及产品分类】 2023-11-04 18:28:59 +08:00
YunaiV a9b91e7436 优化:社交登录、用户的管理 2023-11-04 14:37:23 +08:00
YunaiV ac7f1e29fb Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 10:50:04 +08:00
芋道源码 df646175dc !296 新增社交客户端 CRUD,新增社交用户 RUD
Merge pull request !296 from puhui999/dev_tmp
2023-11-04 02:49:27 +00:00
芋道源码 71e6d51c12 !299 update src/layout/components/Message/src/Message.vue.
Merge pull request !299 from lzy/N/A
2023-11-04 02:44:57 +00:00
YunaiV f79d31a64a code review:满减送活动 2023-11-04 10:39:39 +08:00
芋道源码 27defa7268 !291 满减页面布局
Merge pull request !291 from Bluemark/mall-backed
2023-11-04 02:30:50 +00:00
YunaiV a9faeb1bdb code review:客户管理 2023-11-04 10:12:40 +08:00
芋道源码 09c44cd4fe !306 feat: 客户详情 + review 修改
Merge pull request !306 from wanwan/dev
2023-11-04 01:50:33 +00:00
Wanwan 23f483ac45 feat: 客户详情 + review 修改 2023-11-04 03:21:01 +08:00
liuhongfeng 8ef5227f88 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 00:48:51 +08:00
芋道源码 188de1031b !302 update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
Merge pull request !302 from 风狗/N/A
2023-11-03 16:28:27 +00:00
芋道源码 f6adb4ebaf !303 商城装修
Merge pull request !303 from 疯狂的世界/dev
2023-11-03 15:07:04 +00:00
YunaiV de62a7a5b7 bugfix:注释掉 uno 的 transformerVariantGroup,解决 vite 监控到 css 变化,导致 Login.vue 登录时的重加载问题 2023-11-03 18:44:56 +08:00
jason fcc748dc63 Merge remote-tracking branch 'origin/dev' into dev 2023-11-03 08:47:57 +08:00
jason 753f5de81e 转账 - 新增转账订单查询 2023-11-03 08:46:53 +08:00
owen 3c0f3ceed5 营销:装修模板,底部导航适配APP 2023-11-03 06:47:46 +08:00
风狗 bf418653e4 update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
2023-11-02 02:08:26 +00:00
芋道源码 20c59b8122 !301 营销:完善商城装修
Merge pull request !301 from 疯狂的世界/dev
2023-11-01 00:48:16 +00:00
liuhongfeng 3d54ad3a6a 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-31 23:32:35 +08:00
owen 9bd33355e2 营销:装修编辑器样式优化 2023-10-31 17:17:46 +08:00
dongshanshan 18e2c33cef Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-31 16:53:48 +08:00
dongshanshan 9a3253ad20 feat: 会员商品收藏 2023-10-31 16:53:44 +08:00
owen 881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
2023-10-31 16:01:22 +08:00
xingyu 10483577b7 fix: types 2023-10-31 14:26:17 +08:00
xingyu 52755b38a9 fix: props 2023-10-31 14:25:49 +08:00
xingyu 13f31c19f5 chore: words warn 2023-10-31 14:25:41 +08:00
xingyu 4365ca6177 fix: title name 2023-10-31 14:10:05 +08:00
xingyu ce93c8d4e9 fix: name warn 2023-10-31 14:04:43 +08:00
xingyu 7321ff2136 chore: wh-full 2023-10-31 10:20:39 +08:00
xingyu af7c6f3b2c fix: url error 2023-10-31 10:17:00 +08:00
xingyu 80e72fd924 feat: coding 2023-10-31 10:13:22 +08:00
xingyu 2a029ba35b feat: add useTagsView hooks 2023-10-31 10:12:04 +08:00
xingyu 57e8256e9a feat: add useNow hooks 2023-10-31 10:11:55 +08:00
xingyu bdcef303ff perf: useValidator hooks 2023-10-31 10:11:43 +08:00
xingyu f8fdebffe6 feat: add useNetwork hooks 2023-10-31 10:11:34 +08:00
xingyu 4ba264e00d perf: use driver.js 2023-10-31 10:07:21 +08:00
xingyu f26a4cae10 feat: unocss add shortcuts 2023-10-31 10:04:31 +08:00
xingyu 899880bfe1 chore: update deps 2023-10-31 09:52:08 +08:00
liuhongfeng 2b84de7e09 【新增】负责人
【修改】规范命名:期数:indexNo-》period
2023-10-30 21:32:50 +08:00
lzy c269cab6b2 update src/layout/components/Message/src/Message.vue.
fix:  处理站内信内容过多回显问题

Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
2023-10-30 06:20:16 +00:00
jason c1534bf168 Merge remote-tracking branch 'origin/dev' into dev 2023-10-29 23:48:20 +08:00
jason 55a961e862 转账 - 管理后台新增转账示例 2023-10-29 23:48:10 +08:00
YunaiV 0c81a0d96a code review:客户表的实现 2023-10-29 22:29:03 +08:00
芋道源码 4fba270f1c !298 商城装修
Merge pull request !298 from 疯狂的世界/feature/mall_diy
2023-10-29 14:16:58 +00:00
owen e9ff8d3237 商城装修 2023-10-29 22:03:24 +08:00
YunaiV dc5cf9f24c code review:客户表的实现 2023-10-29 17:55:39 +08:00
YunaiV 690b208a4e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-29 10:38:48 +08:00
芋道源码 5d760d5450 !297 feat: 调整 crm 客户表的字段
Merge pull request !297 from wanwan/master
2023-10-29 02:37:30 +00:00
Wanwan 60d53126c4 feat: 调整客户表的字段 2023-10-29 00:33:38 +08:00
Wanwan 59cf0c29f0 feat: 调整客户表的字段 2023-10-29 00:03:11 +08:00
Wanwan 4cdab6fb3e feat: 调整客户表的字段 2023-10-28 19:50:42 +08:00
芋道源码 cca34e0acb !295 订单:解决列数据中的 table#header 数据不刷新的问题
Merge pull request !295 from puhui999/dev-to-dev
2023-10-27 15:03:42 +00:00
YunaiV b9ab22dad1 code review:客户表的实现 2023-10-27 23:01:00 +08:00
芋道源码 32b3c874f5 !294 feat: 客户表的 crud
Merge pull request !294 from wanwan/master
2023-10-27 14:41:47 +00:00
puhui999 a624db04e9 三方应用新增授权方的网页应用 agentId 属性 2023-10-26 17:00:13 +08:00
puhui999 88a22d90e5 解决钉钉绑定失败的问题 2023-10-26 16:19:22 +08:00
puhui999 6ee2492ff1 新增社交用户 RUD 2023-10-25 17:02:11 +08:00
puhui999 8935188a82 新增社交客户端 CRUD 2023-10-25 16:07:58 +08:00
puhui999 d060d27ab2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-25 11:14:26 +08:00
puhui999 ca385bc08e 解决列数据中的 table#header 数据不刷新的问题 2023-10-25 11:14:00 +08:00
xingyu 309c3f30d1 chore: remove vue-macros/volar 2023-10-25 10:43:03 +08:00
xingyu 238537df83 fix: ElLoading need import 2023-10-25 10:36:06 +08:00
xingyu bf2c59c6e0 chore: stylelint config 2023-10-25 10:35:30 +08:00
xingyu 50f1ae9524 chore: eslint config 2023-10-25 10:35:20 +08:00
xingyu 96db6ab538 chore: vscode setting 2023-10-25 10:35:10 +08:00
xingyu b8403c1b90 chore: update vue v3.3.7 2023-10-25 10:34:54 +08:00
Wanwan 044754cdb4 feat: 客户表的 crud 2023-10-25 00:24:20 +08:00
YunaiV ef334dfc66 1.8.3 版本发布 2023-10-24 21:07:51 +08:00
YunaiV 539352f598 修复 banner 返回字段不对 2023-10-24 20:29:23 +08:00
YunaiV 6644a4d4a6 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-10-24 20:12:39 +08:00
YunaiV e5d6a9dae1 code review:banner 逻辑 2023-10-24 20:07:48 +08:00
芋道源码 ed0f3a3043 !293 完善 banner 管理。商品 spu 剔除优惠卷相关逻辑
Merge pull request !293 from puhui999/dev-to-dev
2023-10-24 12:00:48 +00:00
puhui999 95d7d1eb42 优惠卷模版样式调整 2023-10-24 17:39:02 +08:00
puhui999 75135e1e4f 商品 spu 脱离优惠卷模块 2023-10-24 16:57:20 +08:00
puhui999 a7439ee08b 完善 banner 管理 2023-10-24 16:10:55 +08:00
KONGDY-PC\Kongdy 7c8f7d570f 满减页面布局 2023-10-23 10:37:39 +08:00
芋道源码 54cce467ab !286 feat: crm 线索表完善 review 提到的问题
Merge pull request !286 from wanwan/master
2023-10-21 13:58:13 +00:00
YunaiV 6c6c2cb058 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-10-21 21:56:41 +08:00
芋道源码 af79d4a653 !285 【新增】回款管理 功能
Merge pull request !285 from souvc/master
2023-10-21 13:56:12 +00:00
芋道源码 73578ce8b2 !290 【工作流】--加签减签review修改接口地址
Merge pull request !290 from Youkehai/feature/addSignAndSubSign
2023-10-21 13:06:19 +00:00
YunaiV 2dbfa77bee code review:banner 逻辑 2023-10-21 19:59:41 +08:00
芋道源码 4709c18a6e !284 完善 SPU,订单列表:完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
2023-10-21 11:08:44 +00:00
芋道源码 bb73a6edfd !287 reward
Merge pull request !287 from Bluemark/dev
2023-10-21 11:08:16 +00:00
芋道源码 929fa9a208 !289 满减页面布局
Merge pull request !289 from 落日晚风/master
2023-10-21 11:05:51 +00:00
YunaiV 423ea319e0 code review:限时折扣 2023-10-21 18:18:40 +08:00
kehaiyou 5cfb67d047 fix: 【工作流】--加签减签review修改接口地址 2023-10-21 18:16:39 +08:00
jason bb5945958b 钱包 - 优化
支付应用 - 证书模式增加应用私钥
2023-10-21 15:33:31 +08:00
芋道源码 e187c55408 !283 mall模块
Merge pull request !283 from zxiaoxiu/discount
2023-10-21 06:23:04 +00:00
puhui999 491b3a5018 新增 banner 管理 2023-10-21 02:40:20 +08:00
913752709@qq.com fb90a85e43 feat: crm 线索表完善 review 提到的问题 2023-10-21 00:53:32 +08:00
liuhongfeng 26780c3525 【新增】回款计划 功能 2023-10-20 23:48:39 +08:00
liuhongfeng 7ad1457f79 【新增】回款管理 功能 2023-10-20 22:17:05 +08:00
puhui999 0730e215d8 完善文章管理 review 提到的问题 2023-10-20 22:16:18 +08:00
puhui999 2a150cf0c0 修复合并差异 2023-10-20 21:42:50 +08:00
zhangshuai 9f77514c17 限时折扣 2023-10-20 20:51:18 +08:00
puhui999 d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
puhui999 1e8945de63 SPU: 新增完善活动优先级拖拽排序 2023-10-20 16:36:50 +08:00
puhui999 01d78429cc SPU: 完善优惠卷选择 2023-10-20 15:35:01 +08:00
puhui999 18df708b49 SPU: 完善优惠卷选择 2023-10-20 11:48:59 +08:00
YunaiV 2457665b55 code review:门店自提 2023-10-20 09:46:15 +08:00
芋道源码 826199dc22 !281 fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx
Merge pull request !281 from 陈晨成/master
2023-10-19 16:25:00 +00:00
芋道源码 83501f9b09 !279 交易:核销订单
Merge pull request !279 from 疯狂的世界/dev
2023-10-19 16:06:33 +00:00
芋道源码 6dc7315e17 !280 feat: CRM 线索表 crud
Merge pull request !280 from wanwan/master
2023-10-19 15:16:34 +00:00
1351515658@qq.com 3074adb1df fix 审批信息页面引入TaskDelegateForm.vue 不兼容liunx 2023-10-19 18:43:02 +08:00
puhui999 3464bb9c74 SPU: 新增优惠卷选择 2023-10-19 17:33:42 +08:00
puhui999 5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
puhui999 094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
puhui999 70778fd9e6 UserOrderList 重构完善 2023-10-19 10:54:10 +08:00
puhui999 5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00
913752709@qq.com 7af2a3bcc3 feat: CRM 线索表 crud 2023-10-18 20:02:59 +08:00
puhui999 04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
puhui999 d1a3fe5d5a 营销文章:新增表单属性移除浏览量 2023-10-18 11:33:42 +08:00
owen ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen 431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
owen 61b3bdfd4c 交易:核销订单 2023-10-17 23:18:07 +08:00
芋道源码 d6b0305d78 !277 修复前端支付渠道配置权限
Merge pull request !277 from 小玩家/master
2023-10-17 14:55:14 +00:00
YunaiV 8832eafaae code review:crm 合同流程 2023-10-17 22:52:24 +08:00
1163996518@qq.com 533b4e5006 支付渠道配置--修复权限 2023-10-17 21:27:13 +08:00
1163996518@qq.com d5328918ab 支付渠道配置--修复权限 2023-10-17 20:58:28 +08:00
芋道源码 40ec1b08ae !275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
2023-10-17 12:52:28 +00:00
芋道源码 0089d59d36 !274 CRM/合同管理 CRUD初稿
Merge pull request !274 from dhb52/master
2023-10-17 12:01:51 +00:00
YunaiV c27685285a code review:修复工作流的审批界面报错问题 2023-10-17 19:50:09 +08:00
YunaiV 63fd52828c Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 19:03:02 +08:00
YunaiV aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/statistics/member/index.vue
2023-10-17 19:02:37 +08:00
芋道源码 0242c84196 !267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
2023-10-17 11:01:18 +00:00
owen 57f6367596 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 16:09:55 +08:00
owen 6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
dhb52 dced551698 feat: CRM/合同 crud 2023-10-16 23:56:34 +08:00
jason c3f06f5fbe 钱包 - 钱包余额流水 2023-10-16 22:45:32 +08:00
jason 8626bccc4c 钱包 - 钱包余额流水 2023-10-16 22:32:10 +08:00
jason ae2c3f2ad5 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 22:27:39 +08:00
owen e3a0cfe5e9 统计:修复错误 2023-10-16 22:18:51 +08:00
owen 6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
YunaiV 66ec610801 code review:文章管理 2023-10-16 21:55:11 +08:00
芋道源码 7b9ea62e6b !273 商城首页
Merge pull request !273 from 疯狂的世界/dev
2023-10-16 12:11:23 +00:00
xingyu 8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
xingyu 5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
xingyu 1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
xingyu 42c8db4f34 chore: update deps 2023-10-16 15:03:55 +08:00
owen edfd03903f 统计:会员终端统计,处理未知终端情况 2023-10-16 14:26:04 +08:00
owen 2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
owen 661e72bcfd 统计:修复错误 2023-10-16 13:15:17 +08:00
owen 8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
xingyu a2ded16718 docs: element plus 2.4.0 2023-10-16 10:25:24 +08:00
xingyu de3fa7a765 chore: update deps 2023-10-16 10:24:35 +08:00
YunaiV 99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
owen 195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
owen 3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
芋道源码 cbb0cfefdb !272 营销活动:新增文章管理,文章分类管理
Merge pull request !272 from puhui999/dev-to-dev
2023-10-15 14:04:48 +00:00
YunaiV e2a08ddbac 恢复 SSO 界面的路由 2023-10-15 21:58:19 +08:00
芋道源码 04e83e268a !271 添加社交登录页面,修复登录多次重定向问题
Merge pull request !271 from dhb52/master
2023-10-15 13:37:55 +00:00
jason 90d6f4da9f 钱包- 钱包余额查询 2023-10-15 17:47:36 +08:00
puhui999 50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-15 16:14:32 +08:00
puhui999 befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
dhb52 89417ac393 fix: 删除SSOLogin.vue组建,解决登录界面不停重定向问题 2023-10-15 14:58:13 +08:00
dhb52 3587d1ef97 fix: 路由缺少name字段,ts不高兴 2023-10-15 14:29:16 +08:00
dhb52 4d77d7e136 feat: 社交平台登录 2023-10-15 14:26:20 +08:00
puhui999 36bb90fbb8 营销活动:新增文章分类管理 2023-10-15 00:54:28 +08:00
芋道源码 889334bc37 !266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
2023-10-14 10:19:37 +00:00
芋道源码 b57b45c96f !255 站内信测试增加 Member 用户类型支持
Merge pull request !255 from 风狗/dev
2023-10-14 10:18:54 +00:00
芋道源码 fa71f85221 !265 修复,刷新菜单缓存失效问题
Merge pull request !265 from 天痕/N/A
2023-10-14 10:15:13 +00:00
jason 8b6ca3028a Merge remote-tracking branch 'origin/dev' into dev 2023-10-14 11:33:15 +08:00
jason f9d0c1aa1c 钱包-充值套餐 2023-10-14 11:32:54 +08:00
YunaiV 529a821cdb Merge remote-tracking branch 'origin/master' 2023-10-13 18:44:27 +08:00
YunaiV 470fb23ae1 同步最新 README.md 功能列表 2023-10-13 18:35:44 +08:00
xingyu 9b09304c50 docs: update deps 2023-10-13 10:41:10 +08:00
xingyu e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00
xingyu 73b2030c7f chore: update deps 2023-10-13 10:31:36 +08:00
芋道源码 6ed7b3a69e !270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
2023-10-12 13:53:25 +00:00
芋道源码 532b237712 !268 统计:会员统计
Merge pull request !268 from 疯狂的世界/dev
2023-10-11 04:34:07 +00:00
YunaiV 855b37c1ab code review:拼团记录列表 2023-10-11 11:04:03 +08:00
芋道源码 19c19d78dd !269 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
Merge pull request !269 from puhui999/dev-to-dev
2023-10-11 02:40:01 +00:00
puhui999 b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:55:53 +08:00
puhui999 3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
youkehai 62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
owen ad4607db09 Merge remote-tracking branch 'owen/dev' into dev 2023-10-09 23:29:36 +08:00
owen 6b7040404e 统计:会员统计 2023-10-09 23:27:32 +08:00
owen d4a521eff1 统计:交易统计Review修改 2023-10-09 23:27:32 +08:00
owen 22adab8590 统计:会员统计 2023-10-09 23:27:09 +08:00
kehaiyou 683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
风狗 aa5f27bec7 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
2023-10-08 08:26:07 +00:00
YunaiV 86323f970b code review:拼团记录列表 2023-10-08 07:30:14 +08:00
芋道源码 523784ce41 !264 营销活动:添加拼团记录
Merge pull request !264 from puhui999/dev-to-dev
2023-10-07 23:06:18 +00:00
天痕 fff4cfd012 修复,刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
2023-10-07 10:51:56 +00:00
puhui999 5b4983a3e9 拼团记录:优化页面布局,添加日期快捷选项 2023-10-07 11:10:26 +08:00
puhui999 8c347e5990 拼团活动:表单添加虚拟成团控制按钮 2023-10-07 10:04:05 +08:00
puhui999 e86dfa30fd Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-06 22:21:10 +08:00
puhui999 c445173855 拼团记录:接口对接 2023-10-06 22:20:40 +08:00
YunaiV 24fc36e23a promotion:调整拼团活动的界面 2023-10-06 21:03:17 +08:00
puhui999 eee3d0fef5 拼团记录: 完成 UI 部分 2023-10-06 18:40:21 +08:00
owen c8a476ac7c Merge remote-tracking branch 'origin/dev' into dev 2023-10-06 14:17:13 +08:00
owen 2a58b04a98 统计:交易统计Review修改 2023-10-06 14:15:58 +08:00
YunaiV 78062dd474 promotion:调整拼团活动的界面 2023-10-06 10:58:31 +08:00
puhui999 869bac2501 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-05 21:50:33 +08:00
YunaiV cf7ac2cb10 promotion:新增记录记录列表 2023-10-05 12:42:00 +08:00
YunaiV 860872a890 promotion:新增砍价记录列表 2023-10-05 12:06:57 +08:00
YunaiV 42f0bf07f0 promotion:优化砍价活动的管理 2023-10-05 02:17:44 +08:00
芋道源码 4c2eb3d8b2 !262 核销
Merge pull request !262 from 疯狂的世界/dev
2023-10-04 09:34:20 +00:00
owen 58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
YunaiV 7c491ff62a promotion:优化秒杀活动的界面 2023-10-03 18:41:57 +08:00
YunaiV 40f44fc78e promotion:优化优惠劵的界面 2023-10-03 13:01:31 +08:00
YunaiV 59ab6218ca trade:优化分销界面的 width 列宽度,和一些非空判断 2023-10-03 12:16:24 +08:00
芋道源码 04a94ad941 !254 解决处理顶级非目录路由的组件名称逻辑缺失的问题
Merge pull request !254 from clockdotnet/master_pr
2023-10-03 02:27:37 +00:00
芋道源码 e6ee0ab445 !261 对齐面包屑的图标和文字
Merge pull request !261 from 疯狂的世界/dev
2023-10-02 16:00:45 +00:00
owen 6515e218e2 Merge branch 'dev' into dev_local 2023-10-02 23:58:41 +08:00
owen a06a63c1be Merge remote-tracking branch 'origin/dev' into dev 2023-10-02 23:52:23 +08:00
YunaiV ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 2023-10-02 21:18:31 +08:00
YunaiV a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
YunaiV bb08f6f54f trade:完善退款详情 2023-10-02 15:44:26 +08:00
owen df8a3941c1 对齐面包屑的图标和文字 2023-10-02 11:11:07 +08:00
owen 4c077711a1 对齐面包屑的图标和文字 2023-10-02 11:03:46 +08:00
YunaiV 4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
YunaiV 588ce1c9ae trade:微调 order 列表界面 2023-10-01 23:44:38 +08:00
芋道源码 a5808c9e9c !259 Review代码修改
Merge pull request !259 from 疯狂的世界/dev
2023-10-01 13:57:56 +00:00
YunaiV 17c31978f7 product:优化商品评论 2023-10-01 21:23:50 +08:00
YunaiV 8b7543acd5 product:优化属性列表 2023-10-01 21:11:47 +08:00
YunaiV 5f80d1611c product:优化分类列表 2023-10-01 20:55:51 +08:00
YunaiV 88677ee121 product:优化商品发布页 2023-10-01 20:16:02 +08:00
YunaiV 3a9668d632 product:优化商品列表的样式、实现代码 2023-10-01 19:44:13 +08:00
owen 3a96812d47 会员:会员配置的积分相关字段加上point前缀 2023-10-01 10:41:20 +08:00
owen 3ab1ed707f 会员:积分配置改为会员配置 2023-10-01 10:25:18 +08:00
owen 0066d79876 签到:签到后增加用户积分、经验 2023-10-01 09:53:52 +08:00
owen 6508d841f5 Merge remote-tracking branch 'origin/dev' into dev 2023-09-30 22:08:45 +08:00
owen 4b7e57e67d 会员详情,修改会员积分 2023-09-30 15:50:12 +08:00
owen 940a102546 会员:会员详情-推广用户列表 2023-09-30 14:10:15 +08:00
owen b48f19c646 会员:会员详情-优惠券列表 2023-09-30 13:55:42 +08:00
owen 675f3df5cb 会员详情,查询钱包信息 2023-09-30 12:40:21 +08:00
芋道源码 654094b4fd !258 交易统计
Merge pull request !258 from 疯狂的世界/dev
2023-09-30 03:24:07 +00:00
owen 6475f81534 Merge remote-tracking branch 'origin/dev' into dev 2023-09-29 21:08:48 +08:00
owen c322fb3d0d 统计:交易统计 2023-09-29 21:08:14 +08:00
owen 150c77cff0 fix eslint problems 2023-09-29 16:25:38 +08:00
YunaiV fb94ae9674 trade:退款理由的维护 2023-09-29 13:35:52 +08:00
kehaiyou a438353308 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:38:53 +08:00
kehaiyou b1469669e2 Merge branch 'feature/bpm-delegate'
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-29 12:37:32 +08:00
YunaiV 04e02ffbd2 trade:分佣界面的微调 2023-09-28 16:38:51 +08:00
YunaiV 74de8e9687 trade:优化交易配置的参数校验 2023-09-28 15:29:15 +08:00
YunaiV 2f82eff526 Merge remote-tracking branch 'origin/dev' into dev 2023-09-27 23:30:48 +08:00
YunaiV 888c1371c6 Merge remote-tracking branch 'origin/master' 2023-09-27 23:30:16 +08:00
YunaiV c6031ba2b2 增加 user detail 的 todo 2023-09-27 23:30:09 +08:00
芋道源码 65047b93a4 !250 【工作流】委派
Merge pull request !250 from Youkehai/feature/bpm-delegate
2023-09-25 12:10:52 +00:00
绮梦 f832d26a0d 站内信测试增加 Member 用户类型支持 2023-09-25 16:04:32 +08:00
shizhong 361e4fadda 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:25:33 +08:00
youkehai 0fba0d9a6a feat: 对齐后端-工作流委派的参数 2023-09-25 11:31:13 +08:00
youkehai 2aeba127b6 Merge remote-tracking branch 'upstream/master' into feature/bpm-delegate
# Conflicts:
#	src/views/bpm/processInstance/detail/index.vue
2023-09-25 09:37:22 +08:00
芋道源码 b9881f2941 !252 分销:Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
2023-09-25 00:37:31 +00:00
YunaiV 99a0c7c3e7 1.8.2 版本发布 2023-09-24 23:45:10 +08:00
owen a5dd7f4a81 分销:修正分享海报 2023-09-24 23:18:50 +08:00
YunaiV 245147223f code review:驳回逻辑 2023-09-24 23:05:33 +08:00
芋道源码 ada93a160b !251 【工作流】回退fix
Merge pull request !251 from Youkehai/master
2023-09-24 14:45:54 +00:00
owen 2c22ef8ef1 分销:重命名提现类型字段 2023-09-24 22:32:10 +08:00
kehaiyou f40d1de62a fix: 【工作流】--回退的高亮和api地址更换 2023-09-24 19:42:53 +08:00
kehaiyou 20fe343646 feat: 【工作流】--委派 2023-09-24 15:44:02 +08:00
芋道源码 0ffd07447b !248 【工作流】流程实例的任务节点回退
Merge pull request !248 from Youkehai/master
2023-09-24 07:18:26 +00:00
芋道源码 795847586a !249 合并最新商城代码
Merge pull request !249 from 芋道源码/dev
2023-09-24 04:11:34 +00:00
YunaiV ce78336fca Merge remote-tracking branch 'origin/dev' into dev 2023-09-24 12:10:14 +08:00
YunaiV 539f8a5bb5 修复 member 详情无法展示的问题 2023-09-24 12:10:03 +08:00
YunaiV e489627748 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
2023-09-24 12:00:10 +08:00
芋道源码 be589cfb99 !247 Trade: 完善配置
Merge pull request !247 from 疯狂的世界/brokerage
2023-09-24 01:55:48 +00:00
kehaiyou de79e79d91 feat: 支持回退按钮 2023-09-23 14:52:40 +08:00
owen 21c67b1b75 Trade: 完善配置 2023-09-22 22:51:45 +08:00
xingyu 2a58e3f691 style: unocss eslint 2023-09-22 17:49:11 +08:00
xingyu 57a7ed46e7 chore: add unocss eslint 2023-09-22 17:48:56 +08:00
xingyu 436cc8069c docs: update deps 2023-09-22 17:43:45 +08:00
xingyu ce5f303272 chore: update deps 2023-09-22 17:42:31 +08:00
puhui999 dd5a1f2d43 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-20 16:39:19 +08:00
芋道源码 df6a384321 !244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
2023-09-19 17:12:27 +00:00
芋道源码 f63d518d0d !243 订单详情页面 请求详情接口改为真实携带的id
Merge pull request !243 from 风狗/dev
2023-09-19 17:11:34 +00:00
owen 854acf6e70 trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
owen 18b6c70d1a trade: 分销业务review代码修改 2023-09-19 16:37:50 +08:00
绮梦 245301452c 订单详情页面 请求详情接口改为真实携带的id 2023-09-19 13:57:26 +08:00
YunaiV 1be57ea8d3 增加 404 的说明 2023-09-16 15:14:41 +08:00
xingyu a6b4908f45 !232 update src/components/Dialog/src/Dialog.vue.
Merge pull request !232 from AKING/N/A
2023-09-13 11:38:07 +00:00
puhui999 8778f5746f spu:分佣属性和分佣保持一致 2023-09-13 10:17:14 +08:00
芋道源码 de615c2387 !241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
2023-09-12 15:19:33 +00:00
YunaiV 8b65a2866e code review:订单相关的逻辑 2023-09-12 23:14:53 +08:00
芋道源码 ef15261926 !240 完善前端 mall-order 模块相关问题
Merge pull request !240 from puhui999/dev-to-dev
2023-09-12 15:08:34 +00:00
xingyu 4ae1722e72 fix: stylelint 2023-09-11 17:08:57 +08:00
xingyu 2035484a83 chore: vscode setting 2023-09-11 17:08:48 +08:00
xingyu 5494756a66 fix: eslint 2023-09-11 17:08:39 +08:00
xingyu 56a71f64e7 fix: #I7WY9N 2023-09-11 16:55:49 +08:00
xingyu 9a6d29b295 fix: avatar 2023-09-11 16:54:34 +08:00
xingyu 1fe950aea5 chore: 1.8.1-snapshot 2023-09-11 16:47:19 +08:00
xingyu 8f0c6625de docs: update version 2023-09-11 16:23:31 +08:00
xingyu 4664014fc4 chore: update deps 2023-09-11 16:22:11 +08:00
xingyu 4c5d0392d7 chore: vscode setting 2023-09-11 16:22:05 +08:00
owen 2e830d14d5 trade: 分销业务review代码修改 2023-09-11 00:54:11 +08:00
owen 0582d41972 trade: 分销业务后台功能:推广订单列表 2023-09-10 23:30:43 +08:00
owen 2aa372d8f4 trade: 分销业务后台功能:推广用户列表 2023-09-10 22:32:38 +08:00
puhui999 5dc0c6e3da spu:分佣属性和分佣保持一致 2023-09-09 23:14:02 +08:00
puhui999 615763d415 order:完善订单聚合搜索 2023-09-09 23:08:28 +08:00
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 2023-09-09 20:51:33 +08:00
owen 87ca916e69 trade: 分销业务后台功能:佣金格式化 2023-09-09 20:00:56 +08:00
owen 5ed909263a trade: 分销业务后台功能:修改上级推广人 2023-09-09 19:20:12 +08:00
owen 7ea3571356 trade: 分销业务后台功能:清除推广员、修改推广资格 2023-09-09 14:40:06 +08:00
puhui999 a79f1452b3 登录界面:姐姐点击登录后界面疯狂闪动的问题 2023-09-09 14:27:48 +08:00
YunaiV 0e2ea39591 code review:会员详情 2023-09-09 10:06:32 +08:00
YunaiV 30f0c1b351 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/utils/dict.ts
2023-09-09 09:50:13 +08:00
芋道源码 944565a241 !236 update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
Merge pull request !236 from 岁月不经谈/N/A
2023-09-09 01:47:40 +00:00
芋道源码 e3b9a15c26 !239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
2023-09-09 01:46:05 +00:00
YunaiV 3c315cf287 code review:完善订单详情和售后退款 TODO 提到的问题 2023-09-09 01:44:08 +08:00
芋道源码 dbfabcbbb5 !238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
2023-09-08 17:29:05 +00:00
owen dbb87e3850 trade: 分销员表格佣金字段格式化 2023-09-08 23:58:45 +08:00
芋道源码 1719debd11 !237 分销业务从 member 模块 转移到 trade模块
Merge pull request !237 from 疯狂的世界/brokerage
2023-09-08 15:18:32 +00:00
owen e9d5027e72 trade: 优化分销用户佣金字段名称 2023-09-08 23:10:04 +08:00
owen 7263315412 trade: 优化分销用户绑定用户编号、绑定时间字段名称 2023-09-08 22:51:04 +08:00
owen 34ce7f7ec5 trade: 分销用户管理 2023-09-08 11:05:31 +08:00
puhui999 b3639977a7 完善订单详情 2023-09-08 01:01:50 +08:00
puhui999 f44688d61c Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-09-08 01:00:59 +08:00
puhui999 73628d3930 完善订单详情和售后退款 TODO 提到的问题 2023-09-06 11:23:16 +08:00
owen 1e2120806d trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:41:20 +08:00
owen 2ed5d12be8 trade: 分销业务从 member 模块 转移到 trade模块 2023-09-06 00:33:59 +08:00
owen 35664d1f32 trade: 增加交易中心配置表 2023-09-05 22:31:35 +08:00
岁月不经谈 a1ce9eda2a update src/views/system/user/DeptTree.vue 部门树节点过滤不生效
部门树节点过滤不生效

Signed-off-by: 岁月不经谈 <473831241@qq.com>
2023-09-05 10:14:42 +00:00
绮梦 2318f176a6 新增用户详情下订单页面 2023-09-05 10:15:12 +08:00
芋道源码 d8ca08a348 !235 会员:佣金记录、配置
Merge pull request !235 from 疯狂的世界/brokerage
2023-09-05 01:58:33 +00:00
绮梦 fe6cf7ce98 新增用户详情下成长值页面。 2023-09-04 15:02:41 +08:00
AKING d74f96fe17 update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
2023-09-04 03:31:35 +00:00
owen 73f8cef3b4 member: 佣金记录 2023-09-03 23:04:20 +08:00
owen 5a9764c08c member: 分销配置 2023-09-03 21:14:44 +08:00
YunaiV 881ec67236 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-09-03 19:25:33 +08:00
芋道源码 067f89f1d4 !226 update src/hooks/web/useCrudSchemas.ts.
Merge pull request !226 from AKING/N/A
2023-09-03 10:56:36 +00:00
芋道源码 130208959d !231 优惠券优化
Merge pull request !231 from 疯狂的世界/coupon
2023-09-03 10:55:35 +00:00
puhui999 46fd154e3a 完善订单详情和售后退款日志展示样式重构 2023-09-03 01:44:22 +08:00
owen 7887be6e92 mall:修复优惠券模板,固定日期范围保存失败 2023-09-02 10:42:55 +08:00
owen 5f557c7be5 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 2023-09-02 09:53:36 +08:00
owen a68acb096f mall:修复优惠券发券弹窗样式 2023-09-02 08:39:53 +08:00
YunaiV d10530c9f5 code review:优惠劵逻辑 2023-09-02 00:34:45 +08:00
芋道源码 9aa7ba3578 !230 mall:优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
2023-09-01 16:33:43 +00:00
YunaiV 4f7d6793fd code review:优惠劵逻辑 2023-09-02 00:12:21 +08:00
owen 76c4644b4b mall:优惠券发送优化 2023-09-01 23:50:26 +08:00
芋道源码 190c6e384c !225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
2023-09-01 14:55:30 +00:00
YunaiV 0743e4941c code review:订单列表 2023-09-01 20:03:08 +08:00
芋道源码 22d95fa0ac !229 完善订单管理和售后管理相关问题
Merge pull request !229 from puhui999/dev-to-dev
2023-09-01 11:41:17 +00:00
puhui999 f0249e94a5 订单管理:完善订单详情 2023-09-01 12:04:33 +08:00
puhui999 07a0530fc9 售后退款:完善售后管理(列表、详情) 2023-09-01 10:32:05 +08:00
puhui999 3e7945e437 fix: 修正合并差异 2023-09-01 01:24:46 +08:00
puhui999 5035fc77e7 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	src/views/mall/product/spu/components/index.ts
#	src/views/mall/product/spu/form/BasicInfoForm.vue
2023-09-01 01:20:08 +08:00
YunaiV 3918fab1ec code review 2023-09-01 00:49:42 +08:00
puhui999 dd3c9f8ddb Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-31 21:13:46 +08:00
puhui999 f9780b636c fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 2023-08-31 21:13:20 +08:00
芋道源码 5c7b2c8c5d !228 同步商城最新代码
Merge pull request !228 from 芋道源码/dev
2023-08-31 12:38:05 +00:00
YunaiV 135c88a473 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/router/modules/remaining.ts
2023-08-31 20:37:20 +08:00
芋道源码 2e945d29cc !227 商品列表:修复添加属性时会返回已存在属性值的问题
Merge pull request !227 from puhui999/dev-to-dev
2023-08-31 11:52:12 +00:00
puhui999 264a29e451 更新订单和售后退款详情页面路由 2023-08-31 16:39:48 +08:00
puhui999 688dad319e 订单列表:添加配送方式筛选 2023-08-31 16:26:24 +08:00
puhui999 5c7796ca6f 商品列表:修复添加属性时会返回已存在属性值的问题 2023-08-31 15:58:34 +08:00
puhui999 f5a1772464 订单售后列表:完善部分 TODO 2023-08-31 15:39:13 +08:00
AKING 3e67f3bc4c update src/hooks/web/useCrudSchemas.ts.
解决了当使用默认的dict选项时,form中事件不能触发的问题

Signed-off-by: AKING <2734339436@qq.com>
2023-08-31 03:50:51 +00:00
YunaiV 29b8d06ff2 code review:售后详情 2023-08-30 21:18:46 +08:00
owen 27219e1833 mall:优惠券 商品适用范围,增加商品分类 2023-08-30 20:54:20 +08:00
owen 60d2e3114b mall:优惠券 商品选择组件 2023-08-30 11:50:21 +08:00
芋道源码 09d216394e !224 订单售后退款:完善列表、详情、售后相关操作
Merge pull request !224 from puhui999/dev-to-dev
2023-08-29 01:55:37 +00:00
puhui999 eea285b141 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-29 09:49:34 +08:00
puhui999 ed739aec55 订单售后列表:完善售后详情及相关操作 2023-08-29 09:48:33 +08:00
YunaiV 8d026f0837 重构:商品详情界面的路由、文件路径 2023-08-28 18:56:37 +08:00
xingyu e6a9dd0e4c fix: 个人中心头像为空时不能修改 2023-08-28 17:53:45 +08:00
xingyu e8dce93d66 perf: add ep include 2023-08-28 17:44:59 +08:00
xingyu 54c41b4445 fix: router 2023-08-28 17:44:47 +08:00
xingyu 5724539caf docs: update deps 2023-08-28 17:41:09 +08:00
xingyu 547b1741fc fix: router 2023-08-28 17:40:15 +08:00
xingyu bd2d6adafa chore: update deps 2023-08-28 17:40:07 +08:00
puhui999 8a51c9c771 订单售后列表:初始化售后详情 2023-08-28 17:18:42 +08:00
puhui999 4f81468695 订单售后列表:重构列表 2023-08-28 14:00:09 +08:00
puhui999 8239ca474f 订单列表: 修复差异 2023-08-28 10:05:49 +08:00
芋道源码 ce84b14d15 !223 同步最新商城的代码
Merge pull request !223 from 芋道源码/dev
2023-08-27 13:03:31 +00:00
YunaiV 9507e2b687 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/member/user/detail/UserPointList.vue
2023-08-27 21:02:52 +08:00
芋道源码 df69c035e6 !213 update src/components/Dialog/src/Dialog.vue.
Merge pull request !213 from AKING/N/A
2023-08-27 03:25:00 +00:00
芋道源码 a9bfa36584 !216 update src/components/Pagination/index.vue.
Merge pull request !216 from AKING/N/A
2023-08-27 03:24:04 +00:00
owen beef6a0a94 mall: 完善后台发送优惠券 2023-08-26 22:29:55 +08:00
YunaiV 5cd01903e4 code review:商品评论 2023-08-26 21:23:10 +08:00
芋道源码 d09366b9bd !222 优化商品评论
Merge pull request !222 from 疯狂的世界/owen_dev
2023-08-26 12:58:49 +00:00
YunaiV 2d8d323767 code review:会员中心 2023-08-26 20:57:22 +08:00
芋道源码 a4841accc2 !221 账户信息组件 增加等级、成长值和积分的显示
Merge pull request !221 from 风狗/dev
2023-08-26 12:47:33 +00:00
绮梦 76e37a3ee7 Merge remote-tracking branch 'origin/dev' into dev-gitee 2023-08-26 13:58:11 +08:00
绮梦 45a6b3bcc7 账户信息组件 增加等级、成长值和积分的显示。
增加一些配套的svg 图标。
增加tab 的懒加载。
2023-08-26 13:48:43 +08:00
绮梦 afaf7749c2 调整icon的大小 2023-08-26 13:45:59 +08:00
owen 3a15390090 商品评论:回复表单提取到单独的组件中 2023-08-26 13:34:07 +08:00
绮梦 4d9ae73211 调整icon的对齐方式为中间居中 2023-08-26 13:24:23 +08:00
owen 15971b6feb 商品评论:
1.移除scores,由后端自动计算
2.SPU、SKU选择组件,放到SPU组件目录下
2023-08-26 13:09:14 +08:00
owen ec412f7a7f Merge remote-tracking branch 'origin/dev' into owen_dev 2023-08-26 13:05:30 +08:00
YunaiV b8ca5800c6 code review:订单列表 2023-08-26 11:41:43 +08:00
芋道源码 2605cb7de5 !217 完善 TODO 提到的问题,优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
2023-08-26 03:21:35 +00:00
YunaiV 84c5eb9942 code review:商品评论 2023-08-26 11:19:29 +08:00
芋道源码 343b6bbf18 !220 商品:完善商品评论功能
Merge pull request !220 from 疯狂的世界/owen_dev
2023-08-26 02:59:07 +00:00
owen bce427f702 Merge remote-tracking branch 'origin/dev' into owen_dev 2023-08-26 07:31:38 +08:00
YunaiV 1b6c9b2e29 code review:用户详情 2023-08-26 01:59:36 +08:00
YunaiV 415309469c Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/member/user/index.vue
2023-08-26 01:24:30 +08:00
owen 2c56345875 Merge remote-tracking branch 'origin/dev' into member_dev 2023-08-25 21:03:38 +08:00
owen 814b4631c9 商品:完善后台商品评论功能 2023-08-25 21:02:48 +08:00
绮梦 28951fb31d 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。 2023-08-25 11:27:47 +08:00
puhui999 6b487c7e68 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-24 14:39:09 +08:00
puhui999 58502b1241 订单列表:优化订单列表页面结构 2023-08-24 14:34:35 +08:00
芋道源码 5fb5c6cbcf !215 会员: 会员等级功能调整
Merge pull request !215 from 疯狂的世界/member_dev
2023-08-23 16:46:34 +00:00
puhui999 7db6c121bb 完善 code review 提到的问题 2023-08-23 15:04:46 +08:00
AKING ff8a8e7243 update src/components/Pagination/index.vue.
解决了当全局size为small的时候分页组件样式太大的问题,当组件为small时,则会显示小的分页组件,具体请参照ep官网:https://element-plus.org/zh-CN/component/pagination.html#%E9%99%84%E5%8A%A0%E5%8A%9F%E8%83%BD

Signed-off-by: AKING <2734339436@qq.com>
2023-08-23 05:51:24 +00:00
绮梦 f17bb9a7eb 重命名组件名称 2023-08-23 13:40:57 +08:00
绮梦 d1bb736973 会员详情页的跳转携带参数方式改为params 2023-08-23 13:12:05 +08:00
xingyu 65f9e3ee6c docs: update deps 2023-08-23 10:42:42 +08:00
xingyu 0207affd02 chore: update deps 2023-08-23 10:42:35 +08:00
xingyu e30d5559e6 fix: 路径错误 2023-08-23 10:40:03 +08:00
绮梦 451458eb1e 会员列表页面增加详情页的跳转。 2023-08-23 10:23:22 +08:00
owen 2e68a5239d Merge remote-tracking branch 'origin/dev' into member_dev
# Conflicts:
#	src/views/member/user/UserForm.vue
2023-08-23 10:22:03 +08:00
owen e9120f06cf 会员: 会员等级取消分页功能 2023-08-23 10:12:20 +08:00
YunaiV 55772cbba0 code review:用户详情 2023-08-23 01:41:25 +08:00
YunaiV 746bf864d9 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/mall/promotion/combination/record/index.vue
2023-08-23 00:49:48 +08:00
芋道源码 d096e6e712 !212 管理后台 用户详情
Merge pull request !212 from 风狗/用户详情
2023-08-22 16:49:17 +00:00
YunaiV cfbc2ed74c code review:订单列表、订单详情 2023-08-23 00:43:40 +08:00
芋道源码 69a66b2a06 !210 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
Merge pull request !210 from puhui999/dev-to-dev
2023-08-22 14:13:12 +00:00
YunaiV bb0c1cb536 code review:会员等级 2023-08-22 21:59:17 +08:00
puhui999 5dceda614a 订单列表:列表重构 添加门店、物流检索条件 2023-08-22 18:47:31 +08:00
puhui999 83e780da06 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注 2023-08-22 17:42:20 +08:00
puhui999 be143ea21b 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注 2023-08-22 17:36:47 +08:00
AKING cba35d698f update src/components/Dialog/src/Dialog.vue.
解决了单独使用elementplus diaolog组件时,样式被篡改的问题


Signed-off-by: AKING <2734339436@qq.com>
2023-08-22 09:06:09 +00:00
绮梦 c1a40e7c98 用户详情-积分tab 去除无用的组件。 2023-08-22 16:28:42 +08:00
绮梦 10d9f11fba 增加用户详情页以及 签到、积分等用户详情下的子tab页。
增加 用户、签到、积分 接口的VO,方便在组件中使用。
2023-08-22 16:14:25 +08:00
芋道源码 40711c0eb8 !209 会员:增加用户等级功能
Merge pull request !209 from 疯狂的世界/member_dev
2023-08-22 04:59:46 +00:00
owen 51738f8f6e 会员: 修改会员等级,使用单独的表单、接口 2023-08-22 11:23:08 +08:00
puhui999 ebcbe63d9b 订单列表:列表重构 ④ 移除测试数据 2023-08-22 11:01:20 +08:00
owen c5a703f488 会员:等级下拉框显示图标 2023-08-22 01:48:52 +08:00
puhui999 71f9337d82 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-22 00:39:11 +08:00
puhui999 0d202a7a85 订单列表:列表重构 ③ 添加备注表单和发货表单 2023-08-22 00:38:44 +08:00
owen 78917cd2be 会员:增加用户分组 2023-08-21 23:59:49 +08:00
puhui999 345c09ee6c 订单列表:列表重构 ② and 完善订单详情 2023-08-21 22:39:21 +08:00
owen 884bb055b0 会员:用户标签增加下拉框使用的 精简信息列表查询接口 2023-08-21 21:44:04 +08:00
owen 7bef240926 会员:后台调整会员等级 2023-08-21 21:31:15 +08:00
YunaiV 1db98698bd 优化商品属性的编辑按钮 2023-08-21 10:34:10 +08:00
芋道源码 5baccbd5bc !208 同步商城实现:会员列表、会员积分、会员签到、会员标签
Merge pull request !208 from 芋道源码/dev
2023-08-20 11:39:56 +00:00
YunaiV be485cc4ab code review:签到记录 2023-08-20 19:34:39 +08:00
YunaiV 82628ce780 code review:签到配置 2023-08-20 19:26:50 +08:00
YunaiV 4bc3f15571 code review:积分记录 2023-08-20 19:06:46 +08:00
owen f1735a4010 会员:增加会员等级增删改查 2023-08-20 15:54:05 +08:00
YunaiV 76a63e01c9 code review:会员签到配置 2023-08-20 10:14:36 +08:00
芋道源码 cbd3d6c9a2 !204 会员积分和会员签到模块todo修改
Merge pull request !204 from QingX/dev
2023-08-20 01:46:37 +00:00
芋道源码 12e0d6a921 !201 fix: 1.修复【个人中心】页面在英语环境下字段名过长被换行展示导致错位;2.修复【个人中心】页面【修改密码】校验失效。
Merge pull request !201 from baayso/master
2023-08-20 01:30:28 +00:00
芋道源码 5cef0ecc3c !200 打包报错 空vue 文件问题
Merge pull request !200 from 爱之小枫/fix_bug
2023-08-20 01:29:14 +00:00
芋道源码 a99a125c2b !207 会员管理:增加会员标签功能
Merge pull request !207 from 疯狂的世界/member_dev
2023-08-20 01:16:45 +00:00
puhui999 161feab244 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-20 02:16:19 +08:00
puhui999 2eb740765e 订单列表:列表重构 ① 2023-08-20 02:16:13 +08:00
owen 2964d55435 会员:
1.会员设置标签
2023-08-19 20:19:55 +08:00
owen 334962fe09 会员:
1.增加会员标签功能
2023-08-19 16:03:01 +08:00
芋道源码 f7dc7739ff !206 回退 'Pull Request !195 : 修复登录后通过登录页面无法再次登录的问题'
Merge pull request !206 from 芋道源码/revert-merge-195-master
2023-08-19 08:01:30 +00:00
芋道源码 b68f8be751 回退 'Pull Request !195 : 修复登录后通过登录页面无法再次登录的问题' 2023-08-19 08:01:09 +00:00
芋道源码 848b668979 !205 同步 master 代码到 dev
Merge pull request !205 from 芋道源码/master
2023-08-19 08:00:25 +00:00
YunaiV cb4c78b1ac 会员中心:会员管理 60% 2023-08-19 14:44:04 +08:00
xiaqing f96882c841 Merge remote-tracking branch 'origin/dev' into dev 2023-08-19 14:13:30 +08:00
YunaiV 4fd9dfd1f8 会员中心:会员管理 50% 2023-08-19 14:11:50 +08:00
xiaqing 19444021ca 会员积分和会员签到模块todo修改 2023-08-19 14:10:11 +08:00
baayso e4592442ed fix: 1.修复【个人中心】页面在英语环境下字段名过长被换行展示导致错位;2.修复【个人中心】页面【修改密码】校验失效。 2023-08-17 21:35:58 +08:00
puhui999 916e93ab2e fix: 解决右侧代码过长时不缩放啥也做不了的 bug 2023-08-17 14:56:13 +08:00
puhui999 44be35b5ce fix: 完善砍价活动管理对齐后端 2023-08-17 10:52:40 +08:00
芋道源码 a3f2a01eb0 !198 fix: 修复支付的一些小问题
Merge pull request !198 from dhb52/master
2023-08-15 13:22:50 +00:00
zws c368c9b232 fix
https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues/I7SZNW
2023-08-15 13:32:21 +08:00
dhb52 c7b8fdb884 fix: 支付/示例 queryParams 为 reactive 2023-08-13 21:48:41 +08:00
dhb52 5d364e268f fix: 支付/回调 修复ElDescriptions对齐问题 2023-08-13 21:38:58 +08:00
YunaiV e954ae6010 支付:修复支付应用的 mock 展示不正确 2023-08-13 16:30:36 +08:00
芋道源码 16369c001c !197 同步商城实现
Merge pull request !197 from 芋道源码/dev
2023-08-13 03:03:21 +00:00
YunaiV c3a8479eca 支付退款列表的 review 2023-08-13 11:02:12 +08:00
芋道源码 3f90ca3a57 !196 fix: 支付管理/退款订单 对标 vue2
Merge pull request !196 from dhb52/master
2023-08-13 02:55:03 +00:00
dhb52 10c121d62d fix: 修复ElDescriptions对齐问题 2023-08-13 01:53:08 +08:00
dhb52 620a2009c3 fix: 支付管理/退款订单 对标 vue2 2023-08-13 01:26:59 +08:00
YunaiV 7bf3e41c61 商城:
1. 微调砍价活动的代码
2023-08-13 00:49:17 +08:00
YunaiV 127e6b202e 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题
2023-08-13 00:07:04 +08:00
YunaiV ff8bde207d 商城:
1. 修复秒杀活动,修改商品的秒杀价格,会存在 *100 的问题
2023-08-12 16:25:05 +08:00
xingyu 2ec50bab15 chore: remove qrcode.vue use qrcode 2023-08-12 12:23:36 +08:00
xingyu b9477463fd fix: 提交后刷新列表 2023-08-12 12:23:17 +08:00
xingyu e262ab9504 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-08-12 12:06:00 +08:00
YunaiV 9984de0dc7 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置
2023-08-12 11:39:29 +08:00
YunaiV 815897ca8b 商城:优惠劵的前端完善 2023-08-12 11:09:12 +08:00
YunaiV 98477ef433 修复时间检索,value format 错误,导致无法搜索的问题 2023-08-12 10:13:32 +08:00
YunaiV 90f22934da Merge remote-tracking branch 'origin/dev' into dev 2023-08-12 09:43:01 +08:00
YunaiV 19cad3b873 code review:补全支付文档 2023-08-11 09:22:44 +08:00
YunaiV bf66727009 code review:优化支付订单的实现 2023-08-11 08:59:08 +08:00
YunaiV 1ab7ea0640 code review:优化支付通知的实现 2023-08-11 07:58:08 +08:00
YunaiV 26cf4ca64a code review:优化示例订单的实现 2023-08-11 00:02:52 +08:00
YunaiV 7625e6757c code review:优化收银台的实现,解决 TODO 2023-08-10 23:30:37 +08:00
YunaiV 551ebbd41d Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3
 Conflicts:
	src/utils/constants.ts
2023-08-10 22:21:55 +08:00
YunaiV b0e27b2201 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 2023-08-10 22:19:22 +08:00
芋道源码 6e5286f94d !195 修复登录后通过登录页面无法再次登录的问题
Merge pull request !195 from lehug/master
2023-08-10 13:22:56 +00:00
芋道源码 bcca3ee01f !193 update src/views/infra/fileConfig/FileConfigForm.vue.
Merge pull request !193 from 账号已删除/N/A
2023-08-10 13:21:11 +00:00
lehug 280f734f80 修复登录后通过登录页面无法再次登录的问题 2023-08-10 17:51:57 +08:00
xiaqing f8a4df8b77 会员积分针对代码格式、功能优化
1.修改积分抵扣单位,按照分显示
2023-08-09 22:33:09 +08:00
xiaqing f2e029dca6 会员积分针对代码格式、功能优化
1.修改积分抵扣单位,按照分显示
2023-08-09 22:32:13 +08:00
xiaqing de941ec6ba 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
2023-08-09 20:59:54 +08:00
xingyu b3513f97f7 chore: update deps 2023-08-09 19:28:25 +08:00
xiaqing f310f65842 会员签到针对代码格式、功能优化
1.优化todo建议
 2.删除无用代码
2023-08-09 16:14:00 +08:00
账号已删除 ad97fcb583 update src/views/infra/fileConfig/FileConfigForm.vue.
FTP传输模式错误

Signed-off-by: 账号已删除 <1100014+leniy@user.noreply.gitee.com>
2023-08-09 00:26:02 +00:00
芋道源码 ac0f387322 !190 完善砍价活动管理
Merge pull request !190 from puhui999/dev-to-dev
2023-08-07 11:31:37 +00:00
dhb52 a6eab3cc9a feat: 支付功能迁移(初稿) 2023-08-06 23:25:07 +08:00
puhui999 79413e0ae2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-08-06 20:23:19 +08:00
puhui999 4947716983 feat: 完善砍价活动管理 2023-08-06 18:12:07 +08:00
dhb52 64b40e7fdf feat: 添加支付图标文件 2023-08-06 16:54:12 +08:00
YunaiV 0139443909 Merge remote-tracking branch 'origin/master' 2023-08-05 14:32:25 +08:00
YunaiV ef31ec7aaf bugfix:分配角色菜单时,调用接口 404 问题 2023-08-05 14:32:16 +08:00
芋道源码 2ed13a2958 !189 同步最新商城的代码
Merge pull request !189 from 芋道源码/dev
2023-08-05 06:22:42 +00:00
芋道源码 7c87f94985 !187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
2023-08-05 06:20:20 +00:00
YunaiV a2fdff47df 支付应用:模拟支付的添加代码优化 2023-08-05 14:15:10 +08:00
YunaiV b3b1d97447 支付应用:微信支付的添加代码优化 2023-08-05 14:01:11 +08:00
YunaiV 86e0a375fa 支付应用:支付宝的添加代码优化 2023-08-05 13:50:02 +08:00
芋道源码 dae9bc131c !188 feat: 支付管理/应用信息
Merge pull request !188 from dhb52/master
2023-08-05 05:25:39 +00:00
芋道源码 d12887b60a Merge pull request #18 from SupGiant/master
request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000)
2023-08-05 12:23:33 +08:00
xingyu 945903d612 docs: up deps 2023-08-04 21:47:37 +08:00
xingyu 003751a41c fix: dialog 2023-08-04 21:44:55 +08:00
xingyu 4417dc8700 chore: scripts 2023-08-04 21:44:44 +08:00
xingyu 3c4f17a1ab fix: scripts preview 2023-08-04 21:34:02 +08:00
xingyu 784a1be8a1 chore: stylelint(use pnpm lint:style) 2023-08-04 21:33:00 +08:00
xingyu 71a874dfb4 fix: eslint 2023-08-04 21:32:38 +08:00
xingyu 85f93804b5 chore: update deps 2023-08-04 21:32:28 +08:00
dhb52 36268cf834 typo: apiclient_key.perm => apiclient_key.pem 2023-08-03 23:32:15 +08:00
dhb52 323417b0d4 feat: 支付管理/应用信息(alpha) 2023-08-03 23:07:22 +08:00
puhui999 c327f79177 fix: combinationActivity 调整 2023-08-02 23:58:32 +08:00
puhui999 39df9be988 fix: 修正合并代码后前端不能正常启动的问题 2023-08-02 23:05:45 +08:00
puhui999 0b06f36aa2 Merge remote-tracking branch 'yudao/master' into dev-to-dev 2023-08-02 21:14:06 +08:00
linr 0c334ff4d6 request支持传递axios原生参数,例如超时:request(method:'GET',url:'',timeout:1000) 2023-08-02 16:55:28 +08:00
puhui999 73b918b4e9 fix: 修正 combinationActivity.data.ts 2023-08-01 10:23:15 +08:00
xingyu bc258dbb8c docs: unocss 2023-07-29 16:03:47 +08:00
xingyu 29d493e2da fix: style 2023-07-29 15:54:44 +08:00
xingyu 2dcb73764f fix: eslint 2023-07-29 15:51:45 +08:00
xingyu 177d497588 chore: setting 2023-07-29 15:49:27 +08:00
xingyu 9976850c46 chore: unocss 2023-07-29 15:47:16 +08:00
xingyu b19d31ce4e chore: unocss 2023-07-29 15:47:11 +08:00
xingyu 5d9e713981 chore: unocss 2023-07-29 15:47:06 +08:00
xingyu e37fe5f4fe docs: unocss 2023-07-29 15:46:58 +08:00
xingyu 34817269a4 chore: vscode config 2023-07-29 14:44:16 +08:00
xingyu 4249465b7c wip: use unocss 2023-07-29 14:40:55 +08:00
xingyu 8e78975521 fix: eslint 2023-07-29 12:55:51 +08:00
xingyu 3f36b57363 docs: preview 2023-07-29 12:55:43 +08:00
xingyu 5037aa593e docs: update deps 2023-07-29 12:55:10 +08:00
xingyu af10ccb39a chore: update deps 2023-07-29 12:55:02 +08:00
YunaiV ee802d6335 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度 2023-07-29 09:28:45 +08:00
YunaiV 40a93caf89 发布 1.8.0 版本 2023-07-27 07:59:57 +08:00
芋道源码 b41d8f06ce !184 同步最新商城实现
Merge pull request !184 from 芋道源码/dev
2023-07-26 23:32:27 +00:00
YunaiV a003b59e39 review 秒杀、拼团活动的 CRUD 2023-07-26 19:22:26 +08:00
芋道源码 d7f0554f97 !179 完成拼团活动和秒杀活动相关表单操作和列表展示
Merge pull request !179 from puhui999/dev-to-dev
2023-07-26 04:59:47 +00:00
芋道源码 f908c12963 !183 同步商城实现
Merge pull request !183 from 芋道源码/dev
2023-07-26 04:56:22 +00:00
芋道源码 59de1d68ba !182 update src/views/Login/components/MobileForm.vue.
Merge pull request !182 from water/N/A
2023-07-26 04:52:34 +00:00
芋道源码 399d8af0b1 !180 定时任务,删除功能报错
Merge pull request !180 from 死歌/master
2023-07-26 04:50:22 +00:00
puhui999 dc39ad0cd1 fix: 完善拼团活动 CRUD 2023-07-14 17:35:35 +08:00
water b061c8f32b update src/views/Login/components/MobileForm.vue.
我发现,这个手机号登陆时,登陆成功了但是没有自动跳转,我手动路由到/,又自动跳转到登陆页面,应该是token没存进去,我就照这loginform的逻辑修改了一下

Signed-off-by: water <2778335106@qq.com>
2023-07-12 07:35:48 +00:00
蔚文纲 51198e12a2 fix: 修复src/views.infra/job/index中删除按钮因为传参错误导致删除功能报错 2023-07-10 17:51:10 +08:00
puhui999 3fd9f1b43e fix: mall SeckillConfig 2023-07-10 16:39:22 +08:00
xingyu 44efb13c0e fix: login error 2023-07-10 11:16:42 +08:00
xingyu ba1254f397 fix: eslint 2023-07-08 11:13:36 +08:00
xingyu 540d8496b3 chore: update deps 2023-07-08 11:13:28 +08:00
puhui999 b67fabcf1f fix: mall SeckillActivity 2023-07-05 22:26:18 +08:00
puhui999 4057130275 fix: mall SeckillActivity and CombinationActivity 2023-07-05 18:24:32 +08:00
puhui999 ce3ca7c6ce fix: mall SeckillActivity 2023-07-05 17:12:53 +08:00
puhui999 36c0bce184 fix: mall SeckillActivity 2023-07-05 11:32:32 +08:00
puhui999 b98149f1a7 fix: mall SeckillActivity 2023-07-03 12:07:19 +08:00
puhui999 a5330958ba Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-07-03 07:59:34 +08:00
YunaiV c85c57ce9a Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 2023-07-02 23:27:19 +08:00
芋道源码 13e0ede788 !155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题
Merge pull request !155 from OlyLis/master
2023-07-02 15:23:12 +00:00
YunaiV 4571f893ed review 积分配置 2023-07-02 23:18:45 +08:00
芋道源码 032d5a0a06 !178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
2023-07-02 13:48:08 +00:00
YunaiV b1ce2672e4 review 秒杀活动 2023-07-02 21:46:04 +08:00
芋道源码 a6fc5f775a !176 mall seckillActivity
Merge pull request !176 from puhui999/dev-to-dev
2023-07-02 12:40:33 +00:00
芋道源码 c0bf357d7a !177 修复useTable在total为0时的bug
Merge pull request !177 from nullcache/bug/add-fix-useTable
2023-07-02 12:40:04 +00:00
芋道源码 9f8e12de51 Merge pull request #10 from nullcache/bug/add-fix-useTable
修复useTable在total为0时的bug
2023-07-02 20:38:29 +08:00
puhui999 2e96b1c984 feat: mall CombinationActivity 2023-07-02 19:22:57 +08:00
xiaqing 4251dc5d61 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
2023-06-28 22:50:31 +08:00
nullcache 073679875b 修复useTable在total为0时的bug 2023-06-27 04:06:01 +00:00
nullcache 69c4995b52 修复useTable在total为0时的bug 2023-06-27 11:54:59 +08:00
puhui999 341303b014 fix: 完善 mall seckillActivity add 2023-06-25 17:16:26 +08:00
puhui999 51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 2023-06-25 16:43:49 +08:00
puhui999 76ccc54a35 fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式 2023-06-25 09:35:20 +08:00
YunaiV 5d613e69b3 review 营销活动 2023-06-24 18:53:57 +08:00
芋道源码 fa71d3e7dd !175 mall seckill
Merge pull request !175 from puhui999/dev-to-dev
2023-06-24 04:57:14 +00:00
puhui999 c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-24 01:48:36 +08:00
puhui999 b1e7f14963 fix:完善秒杀活动管理① 2023-06-24 01:48:07 +08:00
YunaiV 0395b8f138 review 订单 2023-06-23 21:28:41 +08:00
芋道源码 70a6d28edd !174 订单列表和详情 页面
Merge pull request !174 from 矿泉水/dev
2023-06-23 13:23:02 +00:00
YunaiV e1b1c134d9 合并 master 代码的冲突 2023-06-23 14:08:09 +08:00
YunaiV b159240824 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/infra/build/index.vue
	src/views/mall/product/spu/components/DescriptionForm.vue
	src/views/mall/product/spu/components/OtherSettingsForm.vue
	src/views/mall/product/spu/components/ProductPropertyAddForm.vue
	src/views/mall/product/spu/components/SkuList.vue
2023-06-23 13:54:43 +08:00
puhui999 3d47d6744e feat:添加秒杀活动管理 2023-06-22 17:31:36 +08:00
xingyu c1a4edf7b1 refactor: 统一 setup 格式 2023-06-21 19:35:11 +08:00
xingyu 9ac17b3ce2 chore: build size 2023-06-21 19:27:27 +08:00
xingyu 82c51e0c3e fix: eslint 2023-06-21 19:27:16 +08:00
xingyu d639401646 fix: style lint 2023-06-21 19:26:14 +08:00
xingyu 64dbcdabe0 docs: version 2023-06-21 19:24:14 +08:00
xingyu 33c460ad55 chore: remove vueSetupExtend 2023-06-21 19:24:09 +08:00
xingyu f2992ce8e8 fix: eslint 2023-06-21 19:18:05 +08:00
xingyu 922f83d99c refactor: vue3.3 defineOptions 2023-06-21 19:14:34 +08:00
puhui999 f3622d423a fix: 使 Table 组件支持列宽和固定列配置 2023-06-21 15:27:35 +08:00
puhui999 5064845d4e fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog,需要使用 append-to-body 属性 2023-06-21 15:26:43 +08:00
xingyu a5c7c886ee chore: stylelint 2023-06-21 11:15:30 +08:00
xingyu c05fbd7fdc fix: locales 2023-06-21 11:10:15 +08:00
xingyu 952f7b6268 chore: vscode setting 2023-06-21 11:07:46 +08:00
xingyu 37c41aeecc chore: eslint 2023-06-21 11:07:33 +08:00
xingyu 3d39b42e96 chore: eslint 2023-06-21 10:55:37 +08:00
xingyu 2df15acb26 chore: vscode setting use pnpm 2023-06-21 10:50:03 +08:00
xingyu 458bb22163 docs: readme 2023-06-21 10:48:18 +08:00
xingyu ca8238a84b chore: packageManager use pnpm 2023-06-21 10:45:35 +08:00
xingyu 91a015828d chore: update deps 2023-06-21 10:44:39 +08:00
xiaobai ca01b16096 提交订单列表和详情20230619 2023-06-19 15:57:20 +08:00
xiaobai 42a7aec0b5 提交订单页面和详情页面 20230619 2023-06-19 12:42:43 +08:00
puhui999 f7b195b226 feat: 完事秒杀时段管理 2023-06-19 10:20:43 +08:00
puhui999 ee698fd8b2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-17 21:21:33 +08:00
puhui999 a75720ec06 feat: 秒杀时段管理 2023-06-17 21:20:28 +08:00
YunaiV 91c53e2e3f code review:订单详情 2023-06-17 21:12:20 +08:00
YunaiV e3f250fff0 code review:订单列表 2023-06-17 21:02:29 +08:00
芋道源码 867c47de61 !165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
2023-06-17 11:04:12 +00:00
芋道源码 1e49a8eaf0 !170 Expiration time should not set on the refresh token
Merge pull request !170 from 呵呵大/N/A
2023-06-17 11:02:27 +00:00
芋道源码 226cc03d65 !167 修复授权类型选项bug
Merge pull request !167 from wangzhaoqiang/dev_
2023-06-17 10:57:00 +00:00
YunaiV 467256cece 修复 SmsChannelForm.vue 排版报错问题 2023-06-17 18:54:57 +08:00
YunaiV ae69492b53 code review:spu todo 去掉 2023-06-17 18:48:49 +08:00
芋道源码 8ed92bcd46 !166 短信渠道提交失败
Merge pull request !166 from 圆梦巨人/master
2023-06-17 10:48:26 +00:00
YunaiV 7908160e68 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/utils/dict.ts
2023-06-17 18:45:05 +08:00
YunaiV 5eaf054646 code review:会员积分配置 2023-06-17 18:33:07 +08:00
YunaiV 023539b0db Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	package.json
	src/utils/dict.ts
2023-06-17 17:40:29 +08:00
YunaiV 8666307d47 code review:处理字典数据的冲突 2023-06-17 17:38:20 +08:00
芋道源码 b809945c19 !171 积分模块
Merge pull request !171 from QingX/master
2023-06-17 09:37:15 +00:00
xiaqing 1dca8476b3 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
2023-06-10 20:57:16 +08:00
呵呵大 5554d7c995 Expiration time should not set on the refresh token
登录接口返回的过期时间是`access token` 的过期时间,但是被错误地设置在了`refresh token` 上,这导致过了几分钟登录状态便失效要求重新登录
2023-06-10 03:19:03 +00:00
wangzhaoqiang 119b499a92 修复授权类型选项bug 2023-06-08 16:25:32 +08:00
puhui999 d31ade7a5f fix: 完善 SPU 相关路由 review 2023-06-07 18:31:28 +08:00
lwf bc34a73c9e 短信渠道提交失败 2023-06-07 13:45:33 +08:00
puhui999 20f3f72670 fix: 数组操作添加 ? 可选操作符,避免属性值为 null 时报错 2023-06-07 08:59:03 +08:00
puhui999 b89db1af55 fix: review 2023-06-06 16:22:58 +08:00
xiaobai e2d795f49d add trade order 20230606 2023-06-06 01:36:22 +08:00
xiaobai ec3b028d55 sync dev-20230606 2023-06-06 01:25:22 +08:00
xiaobai 985d764f62 20230606 add trade-order and details 2023-06-06 01:08:38 +08:00
puhui999 7fe8dee9ed Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-05 08:35:39 +08:00
YunaiV 51e76ffd53 code review:优惠劵管理 2023-06-03 23:15:11 +08:00
芋道源码 7c6d7e8061 !164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
2023-06-03 15:02:05 +00:00
puhui999 a1b45f80bc fix: 优化 spu 相关路由配置 2023-06-03 21:21:43 +08:00
YunaiV 158585670c code review:商品管理 2023-06-03 20:50:07 +08:00
芋道源码 541b23c8c1 !159 完善商品查看详情,修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
2023-06-03 12:09:43 +00:00
YunaiV 60c1604d49 code review:门店自提、快递运费 2023-06-03 19:52:14 +08:00
xiaobai 505f5cfa0c 临时提交 2023-06-02 16:10:33 +08:00
dhb52 c5a7d05821 style: 添加VO 2023-06-01 18:08:23 +08:00
puhui999 91a5f8044c Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-06-01 11:55:22 +08:00
puhui999 7fb6258bed fix: 修复善品测试发现的问题 2023-06-01 11:54:39 +08:00
puhui999 6a10a81f58 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-05-31 15:58:35 +08:00
puhui999 2ddb605076 fix: 完善 SPU 选择快递模版的功能 2023-05-31 15:37:26 +08:00
puhui999 39c92cb944 fix: 完善 SPU 查看详情 2023-05-31 14:42:45 +08:00
jason 000aa95012 新增门店自提管理 2023-05-30 21:21:04 +08:00
puhui999 e555977757 fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示 2023-05-30 18:14:40 +08:00
puhui999 820d8ab76a fix: pnpm 仓库中没有 video.js 8.0.4 这个版本,更改为 8.3.0 2023-05-30 10:00:04 +08:00
YunaiV 3e549a6862 v1.7.3 版本发布! 2023-05-29 23:04:11 +08:00
芋道源码 fa6bcacaef !157 合并商城部分功能
Merge pull request !157 from 芋道源码/dev
2023-05-29 15:03:34 +00:00
YunaiV ee12fa01c9 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3
 Conflicts:
	package.json
2023-05-29 22:34:07 +08:00
芋道源码 20426c43e3 !156 新增 路由搜索
Merge pull request !156 from 卡农ding/addRouterSearch
2023-05-29 14:33:03 +00:00
芋道源码 22c022bf90 Merge pull request #8 from HarryQQ/master
fix: 解决vue版本与pinia版本兼容问题
2023-05-29 22:31:56 +08:00
芋道源码 22eeb9c7c8 Merge pull request #9 from cn3lfs/master
fix: 公告内容不能为空
2023-05-29 22:29:05 +08:00
lour6498 257ad9f79f fix: 公告内容不能为空 2023-05-29 18:44:55 +08:00
dhb52 c3b0403ade Merge remote-tracking branch 'yudao/dev' into dev 2023-05-29 18:23:18 +08:00
qiuhuanran 12e6f08f1f fix: 解决vue版本与pinia版本兼容问题 2023-05-29 16:58:56 +08:00
wangding 43f3c67434 add router search 2023-05-29 11:26:51 +08:00
wangding 6768cdea05 新增路由搜索功能 2023-05-29 11:05:46 +08:00
jason 70c5082776 运费模板区域改成多选 2023-05-27 11:32:16 +08:00
dhb52 ed9f042975 feat: mall 优惠券 初稿 2023-05-26 18:19:39 +08:00
duxz 6b3de50c69 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 2023-05-25 15:34:13 +08:00
YunaiV b12aefe46e review + mall:快递公司管理 2023-05-24 23:40:46 +08:00
YunaiV 349a39e72f review + mall:商品管理 2023-05-24 20:32:38 +08:00
YunaiV ae49aaffcf Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/mall/product/spu/index.vue
2023-05-24 20:31:56 +08:00
YunaiV 0fba3fd503 review + mall:商品管理 2023-05-24 20:27:45 +08:00
puhui999 d877bfd26e fix: 完善善品导出 2023-05-23 12:04:21 +08:00
jason c296c9e53d 运费模板表格样式调整 2023-05-22 23:57:41 +08:00
jason af2fb4bf5f 运费模板性能优化。区域选择使用懒加载 2023-05-22 23:10:22 +08:00
芋道源码 855e4d3d02 !153 提交商品管理第二版
Merge pull request !153 from puhui999/dev-to-dev
2023-05-21 16:01:53 +00:00
jason 4e69f15128 mall: 订单中心->运费模板(第一版 性能有问题) 2023-05-21 23:41:36 +08:00
puhui999 39e329b8a3 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-05-20 12:06:00 +08:00
puhui999 38545e89c6 fix: 优化相关逻辑,修复遗留bug 2023-05-20 12:05:18 +08:00
puhui999 0c42b76a52 fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 2023-05-19 17:04:13 +08:00
xingyu 9f0065f89f fix: echart color 2023-05-19 15:37:01 +08:00
xingyu 8b3980400a chore: preview 2023-05-19 15:27:07 +08:00
xingyu ba33d8bfd5 docs: update deps 2023-05-19 15:25:09 +08:00
xingyu 45ee4116b7 fix: echart 2023-05-19 15:24:01 +08:00
xingyu 2bd750a3d6 chore: update deps 2023-05-19 15:23:41 +08:00
jason b0984c9013 新增快递公司菜单 2023-05-18 23:40:39 +08:00
puhui999 4ddba9d454 fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 2023-05-17 18:24:34 +08:00
puhui999 3c4a39df01 fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug 2023-05-17 01:41:30 +08:00
puhui999 9c06832d7e fix: 修复 SkuList TODO 优化相关算法 2023-05-17 01:39:51 +08:00
puhui999 6ac8c78d57 fix: 添加商品属性去掉备注 2023-05-17 01:37:21 +08:00
puhui999 52bfc4dac0 fix: 进一步完善商品列表,修复TODO 2023-05-17 01:17:17 +08:00
puhui999 50b181318b fix: 整合spu,移动相关类型到spu删除对应文件和文件夹 2023-05-16 10:53:36 +08:00
puhui999 43e541f944 fix: 移动copyValueToTarget方法到utils/index中 2023-05-16 10:12:10 +08:00
芋道源码 47f20e6d4c !152 合并最新的 Vue3 重构
Merge pull request !152 from 芋道源码/dev
2023-05-15 15:00:12 +00:00
YunaiV 16561b1238 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	build/vite/optimize.ts
2023-05-15 22:58:36 +08:00
YunaiV 3feb4828cd !148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现 2023-05-15 22:57:31 +08:00
芋道源码 ab7032f1ca !148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现
Merge pull request !148 from Chika/dev
2023-05-15 14:51:53 +00:00
芋道源码 c47cc18b24 !147 refactor: mp/autoReply 拆分ReplyForm组件
Merge pull request !147 from dhb52/dev
2023-05-15 14:49:49 +00:00
芋道源码 fa618ca44a !151 修复后台”在线用户强退“功能
Merge pull request !151 from cxr/master
2023-05-15 14:47:49 +00:00
cxr01 a788921d51 修复后台”在线用户强退“功能 2023-05-14 13:46:09 +08:00
Chika fbac522149 Redis监控用Echart组件整改 2023-05-12 16:10:14 +08:00
Chika 8456c671e8 Merge branch 'dev' of https://gitee.com/wangbosheng/yudao-ui-admin-vue3 into dev 2023-05-12 15:50:45 +08:00
Chika bf629a9554 Redis监控图标使用Echart组件整合 2023-05-12 15:30:01 +08:00
YunaiV e92361ed40 code review 商品管理的实现 2023-05-06 22:54:41 +08:00
dhb52 be49c381f6 refactor: mp/autoReply 拆分ReplyForm组件 2023-05-05 23:04:47 +08:00
芋道源码 4a965b8c14 !141 商品管理: 打通所有接口(第一版)
Merge pull request !141 from puhui999/dev-to-dev
2023-05-05 11:03:28 +00:00
芋道源码 f1cf125f0d !146 refactor: mp/wx-msg拆分Msg组件
Merge pull request !146 from dhb52/dev
2023-05-05 11:02:19 +00:00
芋道源码 63cb62e697 !139 fix(styles/index): Update .el-scrollbar__bar style
Merge pull request !139 from AhJindeg/fix_tab-scrollbar-style
2023-05-05 11:00:53 +00:00
芋道源码 7a64bbdea0 !145 修复【站内信】测试模板消息发送,接口调用错误问题
Merge pull request !145 from ZanGe丶/master
2023-05-05 10:54:50 +00:00
dhb52 2b84489969 refactor: mp/wx-msg拆分Msg组件 2023-05-04 22:45:12 +08:00
YunaiV 1c77ba8e04 code review 微信的实现 2023-05-04 21:00:49 +08:00
puhui999 0c6e3a39c9 商品管理: 打通所有接口(第一版) 2023-05-04 01:38:53 +08:00
puhui999 9ee35fc165 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显 2023-05-03 02:28:35 +08:00
puhui999 1116fb278b 商品管理: 调整相关组件优化逻辑 2023-05-02 02:20:58 +08:00
puhui999 6478d295df 商品管理: 调整相关组件优化逻辑 2023-05-01 19:01:24 +08:00
puhui999 64f6f67ddd 商品管理: 完成商品属性批量添加 2023-04-30 17:28:16 +08:00
puhui999 ab1120b0ff 商品管理: 完成商品属性排列组合算法生成对应表数据 2023-04-30 17:06:30 +08:00
puhui999 35c3545e7c 商品管理: 保存属性值到数据库 2023-04-30 17:04:31 +08:00
puhui999 538d1e0b6c 商品管理: fix:根据商品属性动态生成表格值 2023-04-30 02:26:35 +08:00
puhui999 7a64eb5198 商品管理: 修正添加属性和添加属性值时输入框显隐控制、输入框焦点获取错乱等bug 2023-04-29 23:10:18 +08:00
puhui999 61218ae711 商品管理: 初步完成相关组件 2023-04-29 21:39:25 +08:00
咱哥丶 d3b5535df9 修复【站内信】测试模板消息发送,接口调用错误问题 2023-04-29 16:44:58 +08:00
puhui999 ab1685a741 商品管理: 完善选择商品分类 2023-04-26 17:53:17 +08:00
puhui999 5c52c17227 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-04-26 17:21:46 +08:00
puhui999 c38abc365c 商品管理: 完善表单校验,优化信息提示,完成新建、编辑、提交逻辑 2023-04-26 17:17:39 +08:00
芋道源码 0ceddc9c91 !137 MP模块重构,功能增强
Merge pull request !137 from dhb52/dev
2023-04-25 13:38:22 +00:00
YunaiV 9680a204ca 调整商品分类的实现 2023-04-25 21:02:35 +08:00
AhJindeg ace8f9e302 🐞 fix(styles/index): Update .el-scrollbar__bar style
- 解决表格内容超过表格总宽度后,横向滚动条前端顶不到表格边缘的问题
2023-04-24 11:50:30 +08:00
puhui999 a0014bed65 商品管理初始界面结构设计 2023-04-24 11:42:44 +08:00
YunaiV 2ab8ea45da 增加 vben 预览 2023-04-24 09:13:31 +08:00
xingyu 53b6f0bdf4 docs: update deps 2023-04-23 19:36:34 +08:00
xingyu fc366f18c8 fix: type warn 2023-04-23 19:35:14 +08:00
xingyu 6b7d092c29 fix: api error 2023-04-23 19:35:06 +08:00
xingyu 148602556a fix: type error 2023-04-23 19:00:25 +08:00
xingyu 4b6103a6f7 chore: optimize 2023-04-23 18:59:09 +08:00
xingyu 462b5b55d8 chore: remove stylelint-config-prettier 2023-04-23 18:48:11 +08:00
xingyu e31f922b82 chore: update deps 2023-04-23 18:46:40 +08:00
AhJindeg 9dc361e708 🌈 style(Form/src): Modifying word spelling errors
- 修改ts类型 PlaceholderModel单词拼写
- 修改initModel方法 FormModel注释拼写
2023-04-23 11:44:03 +08:00
dhb52 88f4502715 Merge remote-tracking branch 'yudao/dev' into dev 2023-04-22 23:46:32 +08:00
dhb52 cb4527748e refactor: mp/wx-msg 采用ref来实现滚动 2023-04-22 23:45:14 +08:00
dhb52 198752868c refactor: mp模块统一accountId未初始化值为-1,删除QueryParams定义 2023-04-22 23:43:35 +08:00
芋道源码 118f32ad83 !136 同步 2023-04-22 最新迭代的内容
Merge pull request !136 from 芋道源码/dev
2023-04-22 13:22:52 +00:00
YunaiV c14b5c5bff 登录界面,增加“萌新必读” 2023-04-22 21:21:45 +08:00
dhb52 036c9b3366 fix: mp模块的一些小修复 2023-04-22 20:52:11 +08:00
芋道源码 4cf734d244 !135 MP模块重构,功能增强
Merge pull request !135 from dhb52/dev
2023-04-22 12:51:56 +00:00
dhb52 f848f3ba91 refactor: mp/wx-msg 拆分组件 2023-04-22 20:51:25 +08:00
dhb52 917b9d180a fix: mp/menu菜单拖动后激活菜单 2023-04-22 20:45:03 +08:00
YunaiV f27b93db59 菜单管理:添加刷新菜单缓存按钮 2023-04-22 20:44:32 +08:00
YunaiV 9f35ea9e82 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-22 19:48:58 +08:00
芋道源码 36d0916f56 !134 菜单管理:添加刷新菜单缓存按钮
Merge pull request !134 from puhui999/dev-to-dev
2023-04-22 11:48:35 +00:00
dhb52 ebacbbb9cf perf: mp/menu使用vuedraggable替换拖动的原生实现 2023-04-22 09:04:21 +08:00
dhb52 08eb72e568 style: mp/WxReply objCache => tabCache 2023-04-22 01:23:52 +08:00
dhb52 d99f9e98fb feat: mp/menu 拖动排序 2023-04-21 23:35:31 +08:00
dhb52 4925a66cc5 style: mp模块stylelint 2023-04-21 23:19:04 +08:00
dhb52 b45b85984c refactor: mp模块,一个大大的重构+fix 2023-04-21 20:22:11 +08:00
puhui999 ab52f8b18f 菜单管理:添加刷新菜单缓存按钮,提高易用性 2023-04-20 14:17:21 +08:00
dhb52 6662b04d12 Merge remote-tracking branch 'yudao/dev' into dev 2023-04-19 23:12:11 +08:00
芋道源码 a364d57438 !133 版本 1.7.2 发布
Merge pull request !133 from 芋道源码/dev
2023-04-19 12:22:06 +00:00
YunaiV 917a2441ef 版本 1.7.2 发布 2023-04-19 20:20:52 +08:00
YunaiV 75c4d6608c 修复角色管理数据权限回显问题 2023-04-19 20:16:36 +08:00
YunaiV 22e5b45d84 修复[流程分配规则]无法跳转的问题 2023-04-19 20:10:04 +08:00
YunaiV 730e287d86 优化“流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件”的命名 2023-04-19 20:04:06 +08:00
芋道源码 d87c02b232 !130 流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件,直接显示到审批页面,不再需要点击查看
Merge pull request !130 from puhui999/dev-to-dev
2023-04-19 11:44:47 +00:00
YunaiV bcf8cccf8b 讲 2023 重构剩余的任务,转成 TODO 到代码 2023-04-19 19:38:41 +08:00
YunaiV 5c58bc4e0c REVIEW 公众号的草稿管理 2023-04-19 19:28:04 +08:00
YunaiV 7997614a3c REVIEW 公众号的消息回复弹窗 2023-04-19 19:16:14 +08:00
YunaiV 48e50190e0 REVIEW 公众号的自动回复菜单 2023-04-19 19:07:45 +08:00
YunaiV a3b4edf505 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-19 18:48:39 +08:00
芋道源码 90b0af2e5d !129 refactor:mp模块拆分组件
Merge pull request !129 from dhb52/dev
2023-04-19 10:48:20 +00:00
芋道源码 9af70e5ea1 !132 fix(system): Update system module bug
Merge pull request !132 from AhJindeg/dev
2023-04-19 10:46:55 +00:00
puhui999 f74067023d 流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件,直接显示到审批页面,不再需要点击查看 2023-04-19 17:47:26 +08:00
puhui999 604b8867ce 修复流程表单:表单保存后返回列表页面且重新加载列表数据 2023-04-19 11:35:37 +08:00
puhui999 3d579b3a99 修复流程表单:新建的时候id传的是event需要排除 2023-04-19 11:21:42 +08:00
dhb52 f8a86cbc24 refactor: mp/WxReply重构,拆分组件 2023-04-19 11:07:51 +08:00
puhui999 7a0202e26d 修复用户分组新增保存时提示描述不能为空的bug 2023-04-19 11:01:21 +08:00
dhb52 cddf1ee878 refactor: 使用useUpload 2023-04-18 11:19:54 +08:00
dhb52 0beda6ecc3 refactor: 重构MP/autoReply, 拆分组件 2023-04-18 11:19:13 +08:00
dhb52 39d8ecbfc7 refactor: MP/wx-reply组件,抽离useUpload钩子 2023-04-18 11:18:37 +08:00
dhb52 c27be373d0 refactor: mp/menu 拆分组件 2023-04-17 23:58:58 +08:00
dhb52 82dc0054f2 fix: Mp/WxAccountSelect name字段更新 2023-04-17 16:21:41 +08:00
AhJindeg 5164036b4e 🐞 fix(system): Update system module bug
- 修改用户管理查询入参
- 修改站内信模板删除api调用
2023-04-17 14:55:13 +08:00
puhui999 8a1a770e8b 修复代码生成导入表后列表不刷新的问题 2023-04-17 10:41:16 +08:00
dhb52 68d00912a3 Merge branch 'dev', remote-tracking branch 'origin' into contrib 2023-04-16 23:36:30 +08:00
dhb52 84dcac77b1 refactor: 事件函数命名:onXxx 2023-04-16 22:32:59 +08:00
dhb52 b5fb700e4e refactor: mp/draft拆分组件 2023-04-16 22:30:00 +08:00
dhb52 30b8eeaccb Merge remote-tracking branch 'yudao/dev' into dev 2023-04-16 22:09:48 +08:00
YunaiV 738d15087a 增加 Vue3 演示环境 2023-04-16 11:53:09 +08:00
芋道源码 b368dd4027 !128 去除 BPMNJS、FormCreate、Highlight 的全局引入,降低打包后的大小(6.6M -> 1.3M)
Merge pull request !128 from 芋道源码/dev
2023-04-15 16:19:26 +00:00
YunaiV 9793734fdc 增加 Vue3 stage 配置,用于演示环境的部署 2023-04-16 00:02:05 +08:00
YunaiV f3869aa961 将 FcDesigner 改成局部注册,减少包大小 2023-04-15 22:46:45 +08:00
YunaiV d32537e3ef 移除 Form、Table、Search、XButton、XTextButton、DictTag、ContentWrap、Descriptions 的全局注册 2023-04-15 21:46:19 +08:00
YunaiV 30685bee75 将 highlight 代码高亮的全局引入,改成局部引入 2023-04-15 21:36:16 +08:00
YunaiV d5b569eefa 将 BPMNJS 全局引入,改成局部引入 2023-04-15 18:52:35 +08:00
芋道源码 130574358d !127 【众测版】合并最新的 Vue3 重构
Merge pull request !127 from 芋道源码/dev
2023-04-15 10:05:29 +00:00
YunaiV 06974ca3c0 修复打包会报错的问题 2023-04-15 17:28:33 +08:00
YunaiV e3660e0b20 REVIEW 站内信模版的发送 2023-04-15 17:07:41 +08:00
dhb52 ae74af59fc fix: 增加上传处理 2023-04-15 16:54:36 +08:00
芋道源码 97f9560c4d !124 重构VUE3【站内信-模板管理】
Merge pull request !124 from ZanGe丶/dev
2023-04-15 08:46:56 +00:00
YunaiV abf9b50c2f REVIEW 素材管理的重构 2023-04-15 16:37:11 +08:00
芋道源码 71fd9af2e1 !126 refactor: MP模块组件拆分
Merge pull request !126 from dhb52/dev
2023-04-15 08:20:48 +00:00
YunaiV f59e4a4622 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/bpm/oa/leave/create.vue
	src/views/bpm/oa/leave/detail.vue
2023-04-15 16:06:17 +08:00
YunaiV 4dabb710c5 优化 OA 请假,create 和 detail 使用独立路由,可接入工作流 2023-04-15 16:03:12 +08:00
dhb52 389c73d834 refactor: MP消息管理-拆分组件 2023-04-15 15:59:33 +08:00
puhui999 5910d53d8f 修复差异 2023-04-15 13:43:38 +08:00
puhui999 ec58321dd8 Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/views/Login/components/LoginForm.vue
#	src/views/Login/components/MobileForm.vue
#	src/views/mp/components/wx-editor/WxEditor.vue
2023-04-15 13:38:31 +08:00
咱哥丶 776eb3a7b0 重构VUE3【站内信-模板管理】 2023-04-15 12:25:11 +08:00
YunaiV de5b1216cd 修复字典数据和类型的 status 未校验的问题 2023-04-15 10:28:23 +08:00
YunaiV 168f751a24 修复 Vue3 管理后台新增租户时,未校验账号、密码是否为空 2023-04-15 09:19:37 +08:00
YunaiV 18742b8cc7 移除 css 的引入 2023-04-15 09:13:25 +08:00
芋道源码 60cc4357cb !123 【众测版】合并最新的 Vue3 重构
Merge pull request !123 from 芋道源码/dev
2023-04-15 00:56:29 +00:00
YunaiV f1f49fdf29 调整下排版 2023-04-15 08:50:50 +08:00
YunaiV 48c7b58b03 1. 重命名 DataGrid 为 MessageTable,增加可读性
2. 调整素材管理,读取 API 接口
2023-04-15 08:42:52 +08:00
芋道源码 a5a8773972 !121 refactor: 重构MP模块
Merge pull request !121 from dhb52/dev
2023-04-14 17:16:08 +00:00
YunaiV e9eb585977 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-15 01:13:11 +08:00
YunaiV 1170a9480f ep-admin: fix: 修复已知问题
0a6f3066 kailong321200875 <321200875@qq.com> on 2023/4/12 at 10:20 AM
2023-04-15 01:06:48 +08:00
YunaiV 9fba2886ab ep-admin: fix: 修复表格与搜索框字段不能不一致的问题 2023-04-15 00:53:07 +08:00
puhui999 b26bba9939 移除vex hooks自动导入,修复打包报错 2023-04-14 22:40:05 +08:00
puhui999 7564c43f16 改editor为editor_一点小问题 2023-04-14 22:06:27 +08:00
puhui999 02d98f2ce7 Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/views/mp/components/wx-editor/WxEditor.vue
#	src/views/mp/tag/TagForm.vue
2023-04-14 21:58:49 +08:00
puhui999 d62e607292 修正绑定第三方跳转扫码登录错误 2023-04-14 21:47:58 +08:00
puhui999 2bef7f707c 修改没必要的lang="tsx" 2023-04-14 21:46:34 +08:00
puhui999 b93491579c 给所有组件添加name属性预防未知bug!!! 2023-04-14 21:32:11 +08:00
dhb52 5f1aa86912 chore: 移除quill 2023-04-14 19:43:50 +08:00
dhb52 c4746fc804 refactor: 尝试拆分【消息管理】页面 2023-04-14 18:06:16 +08:00
dhb52 0b055b5db4 fix: type='text' => type='primary' link 2023-04-14 15:26:06 +08:00
dhb52 4f3e7ecaac fix: WxMpSelect => WxAccountSelect 2023-04-14 15:22:23 +08:00
dhb52 bb49c6bbda fix: 删除自动生成的auto-*.d.ts 2023-04-14 15:16:50 +08:00
dhb52 1aae769562 feat: 在vscode中折叠文件目录 2023-04-14 15:15:35 +08:00
dhb52 dc32b9242d refactor: 删除WxAccountSelect 2023-04-14 15:15:01 +08:00
dhb52 92da7e341b fix: 使用ElDialog:destroy-on-close属性解决对话框重新加载 2023-04-14 15:08:58 +08:00
dhb52 813e7d2776 refactor: 使用Editor组件替换WxEditor 2023-04-14 14:49:19 +08:00
dhb52 a00c612f36 Merge remote-tracking branch 'yudao/dev' into contrib 2023-04-13 23:20:57 +08:00
dhb52 f25a4d7343 Merge remote-tracking branch 'yudao/dev' into dev 2023-04-13 23:19:37 +08:00
YunaiV 1a1bfe0ebb REVIEW 公众号的实现 2023-04-13 22:25:35 +08:00
芋道源码 3aefedff6a !118 refactor: mp模块ts重构
Merge pull request !118 from dhb52/dev
2023-04-13 13:14:22 +00:00
YunaiV f436490165 修复 IconSelect 报错 2023-04-13 21:11:55 +08:00
芋道源码 44c18473d7 !119 【众测版】合并最新的 Vue3 重构
Merge pull request !119 from 芋道源码/dev
2023-04-13 00:18:55 +00:00
YunaiV c461800eea Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	.vscode/launch.json
2023-04-13 08:18:29 +08:00
YunaiV afc16706a9 Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-13 08:00:45 +08:00
芋道源码 b131320cc1 Merge pull request #2 from koutianyu/dev
修复新增或修改菜单时,无法选择菜单图标的bug
2023-04-13 07:58:15 +08:00
YunaiV 5d089161e0 代码生成,支持设置前端的模版 2023-04-13 07:54:37 +08:00
YunaiV f3c6249600 代码生成,支持设置前端的模版 2023-04-13 00:21:32 +08:00
dhb52 3536077a34 refactor: MP消息管理 ts重构 2023-04-12 14:37:59 +08:00
dhb52 357a4789f4 fix: import type { FormInstance ...} from 'element-plus' 2023-04-12 14:19:31 +08:00
dhb52 fbbf4131f6 fix: 去除WxLocation组件多余Location图标 2023-04-12 14:05:21 +08:00
dhb52 df3b381d6f refactor: mp模块ts重构 2023-04-12 13:29:24 +08:00
YunaiV ebbf47f509 正式移除 VXE 表格 2023-04-11 23:47:59 +08:00
YunaiV fd447dc7a3 REVIEW 公众号选择的下拉框 2023-04-11 23:28:59 +08:00
芋道源码 129766fca4 !113 refactor: 抽离组件【公众号下拉选择】并重构相关页面
Merge pull request !113 from dhb52/dev
2023-04-11 15:13:15 +00:00
芋道源码 232927952d !117 优化vscode代码debugger调试,使用vscode自带的功能,不使用插件
Merge pull request !117 from puhui999/master-vscode-debug
2023-04-11 15:09:04 +00:00
YunaiV 30cf8008ce REVIEW 退款订单 2023-04-11 23:01:51 +08:00
YunaiV 8863d1d080 REVIEW 支付应用、支付订单 2023-04-11 20:41:20 +08:00
dhb52 1397767492 refactor: 【MP素材管理】使用【WxMpSelect】 2023-04-11 11:14:20 +08:00
dhb52 c7b296a8e5 refactor: 抽离WxMpSelect组件 2023-04-11 11:13:46 +08:00
芋道源码 0d96645bb3 !116 【重构】Vue3 管理后台:[支付管理 -> 应用信息][支付管理 -> 支付订单][支付管理 -> 退款订单] 使用 Element Plus 原生实现
Merge pull request !116 from 东方白/dev
2023-04-11 00:37:02 +00:00
puhui999 fcb830b93e 优化vscode代码debugger调试,使用vscode自带的功能,不使用插件 2023-04-10 23:53:26 +08:00
芋道源码 a15307c837 !115 修复部门管理、岗位管理的小问题
Merge pull request !115 from &wxr/dev
2023-04-10 15:27:56 +00:00
YunaiV 1dd6c32790 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-10 23:23:48 +08:00
芋道源码 ecdaf84b24 !114 修复 debugger 位置异常
Merge pull request !114 from 黄爱武/hotfix/sourcemap_debugger
2023-04-10 15:23:21 +00:00
东方白 7cb859e976 【重构】Vue3 管理后台:[支付管理 -> 应用信息][支付管理 -> 支付订单][支付管理 -> 退款订单] 使用 Element Plus 原生实现 2023-04-10 22:29:50 +08:00
dhb52 a5cb7a50ab fix: vscode debug 2023-04-10 16:55:02 +08:00
dhb52 b9b8e99149 feat: 添加launch.json,修改.env.front配合debug 2023-04-10 12:42:29 +08:00
wuxiran df399647ed 1、修复岗位顺序没有新增输入的问题
2、修复部门管理中的错别字
2023-04-10 12:19:59 +08:00
answer.huang 48920f6bec feat: 使用 vite-plugin-vue-setup-extend-plus, 修复断点异常. 2023-04-10 09:30:22 +08:00
dhb52 053ee54a16 refactor: 【MP粉丝管理】应用【公众号选择器】组件 2023-04-10 01:20:37 +08:00
dhb52 b84298641c refactor:【MP标签】应用【公众号选择器】组件 2023-04-10 01:15:16 +08:00
dhb52 af18201ceb refactor:【自动回复、图文】应用【公众号选择器】组件 2023-04-10 01:07:04 +08:00
dhb52 7711ceb3f3 fix: 【MP自定义菜单】accountChanged参数错误 2023-04-10 01:05:13 +08:00
dhb52 098b7305c9 refactor: 【MP自定义菜单】应用【公众号选择器】组件 2023-04-10 00:46:18 +08:00
dhb52 a8b4c16a7e refactor: WxMaterialSelect组件setup 2023-04-10 00:26:43 +08:00
dhb52 e035eb2618 refactor: 【草稿,素材】应用【公众号选择器】组件 2023-04-10 00:25:45 +08:00
dhb52 c33e4de5a8 refactor: 抽离组件【公众号下拉选择】 2023-04-10 00:18:56 +08:00
dhb52 521b521d07 Merge remote-tracking branch 'yudao/dev' into dev 2023-04-09 21:22:33 +08:00
YunaiV 7e3f6190a5 REVIEW OA 请假 2023-04-09 18:49:54 +08:00
芋道源码 5e705776b8 !111 【众测版】合并最新的 Vue3 重构
Merge pull request !111 from 芋道源码/dev
2023-04-09 10:43:09 +00:00
YunaiV 47b5ce2f35 REVIEW OA 请假 2023-04-09 18:32:26 +08:00
芋道源码 50efd60e15 !108 重构VUE3【OA示例-请假查询】
Merge pull request !108 from ZanGe丶/dev
2023-04-09 10:20:39 +00:00
YunaiV 7bfb109acc REVIEW 公众号的自动回复 2023-04-09 18:14:58 +08:00
芋道源码 61bb2b8c99 !110 feat: 微信自动回复
Merge pull request !110 from dhb52/dev
2023-04-09 09:54:53 +00:00
dhb52 a692674b24 fix: 删除未引入的formatDate 2023-04-09 17:14:31 +08:00
dhb52 99166ee664 fix: Merge后的修复 2023-04-09 13:41:14 +08:00
YunaiV 642652bd08 修复系统管理-岗位管理-新增-表单中无法在岗位编码字段输入内容 #6 2023-04-09 13:19:20 +08:00
dhb52 75750c1bd3 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: dhb52 <dhb52@126.com>
2023-04-09 05:16:23 +00:00
dhb52 4465220ed7 fix: size="mini" & type="text"过时 2023-04-09 13:08:19 +08:00
咱哥丶 66856ae052 重构VUE3【OA示例-请假查询】 2023-04-09 12:27:22 +08:00
dhb52 daa124a478 feat: 微信自动回复 2023-04-09 11:59:15 +08:00
YunaiV d16ff6ff1c REVIEW 公众号素材管理 2023-04-09 09:56:42 +08:00
芋道源码 ee35fd6702 !105 feat: 微信素材管理
Merge pull request !105 from dhb52/dev
2023-04-09 01:22:29 +00:00
芋道源码 6b600ac04f !107 修复token过期时路由跳转问题
Merge pull request !107 from puhui999/dev2
2023-04-09 01:18:48 +00:00
puhui999 46bf186ecc 修复token过期时路由跳转问题 2023-04-09 00:39:52 +08:00
YunaiV 276e82c5a8 REVIEW 单点登录界面 2023-04-09 00:21:27 +08:00
dhb52 7cf8ea8da8 feat: 微信素材管理 2023-04-08 23:40:21 +08:00
芋道源码 0f0ba8b8a9 !95 新增SSO登录
Merge pull request !95 from puhui999/dev
2023-04-08 14:58:56 +00:00
YunaiV 1e0f613449 REVIEW 商品品牌 2023-04-08 22:49:51 +08:00
puhui999 841040b41e Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: puhui999 <puhui999@163.com>
2023-04-08 14:44:20 +00:00
芋道源码 5f10efbf39 !104 新增商品品牌功能
Merge pull request !104 from Aix/dev
2023-04-08 14:32:55 +00:00
YunaiV 31dfa86783 REVIEW 公众号的粉丝管理 2023-04-08 22:32:04 +08:00
芋道源码 eccfa116aa !103 feat: 微信粉丝管理
Merge pull request !103 from dhb52/dev
2023-04-08 13:39:56 +00:00
YunaiV 40e23bd805 REVIEW 公众号的菜单 2023-04-08 21:37:54 +08:00
dhb52 867b60a948 feat: 微信粉丝管理 2023-04-08 20:48:26 +08:00
Aix b133983eb6 Merge remote-tracking branch 'origin/dev' into dev 2023-04-08 20:32:03 +08:00
Aix ef4f6bda5c 【feature】新增商品品牌功能 2023-04-08 20:31:52 +08:00
YunaiV f7fe794944 REVIEW 公众号的草稿箱 2023-04-08 20:28:33 +08:00
YunaiV d0f8b5e116 Merge branch 'dev' of https://gitee.com/dhb52/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/mp/components/wx-material-select/main.vue
2023-04-08 18:05:31 +08:00
YunaiV e1a2d4b702 修复 dev 启动的环境设置错误 2023-04-08 18:04:26 +08:00
YunaiV 9bb2f628b2 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-04-08 17:45:55 +08:00
芋道源码 808d38f97b !101 chore: 增加依赖@element-plus/icons-vue
Merge pull request !101 from dhb52/N/A
2023-04-08 09:44:34 +00:00
YunaiV 40699edb57 微调微信公众号的回复和素材选择的排版 2023-04-08 17:30:30 +08:00
芋道源码 dd4be6093d !100 fix: 图文显示有误,articles为数组
Merge pull request !100 from dhb52/N/A
2023-04-08 09:21:42 +00:00
芋道源码 2d65c2a0c1 !96 fix: 获取FreePublic出错&分页溢出
Merge pull request !96 from dhb52/N/A
2023-04-08 09:03:01 +00:00
puhui999 b2a91aa1c8 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: puhui999 <puhui999@163.com>
2023-04-08 05:22:26 +00:00
dhb52 be95015c68 Merge branch 'master' into dev 2023-04-08 12:19:51 +08:00
YunaiV df57191cf0 所有菜单的 name 都加上模块的前缀,避免冲突 2023-04-08 11:48:37 +08:00
dhb52 0ffa807343 feat: 微信草稿箱 2023-04-08 10:18:10 +08:00
dhb52 d5d16e4e39 feat: 微信自定义菜单 2023-04-08 10:15:11 +08:00
dhb52 2e7edd94bc feat: 新增 WxEditor,暂时使用quill-editor 2023-04-08 10:14:20 +08:00
dhb52 42a9715ff2 fix: 修复WxReply、WxMaterialSelect组件bug 2023-04-08 10:13:22 +08:00
dhb52 f2ab791812 chore: 增加依赖@element-plus/icons-vue
Signed-off-by: dhb52 <dhb52@126.com>
2023-04-08 01:49:20 +00:00
dhb52 a422ad4177 fix: 图文显示有误,articles为数组
Signed-off-by: dhb52 <dhb52@126.com>
2023-04-07 16:23:02 +00:00
YunaiV 7cc8d9067c 增加 swagger、druid、skywalking、admin 的自定义路径 2023-04-07 23:26:09 +08:00
dhb52 365915e37c fix: 获取FreePublic出错&分页溢出
Signed-off-by: dhb52 <dhb52@126.com>
2023-04-07 14:42:45 +00:00
puhui999 d679a7a3be Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/config/axios/service.ts
#	src/types/auto-components.d.ts
2023-04-07 10:17:40 +08:00
puhui999 e22363d061 完善SSO单点登录 2023-04-07 10:15:21 +08:00
YunaiV 5fb61f8cb8 REVIEW 工作流 - 我的流程、待办任务 2023-04-07 09:09:05 +08:00
芋道源码 8f2acea7a5 !93 【重构】Vue3 管理后台:[流程管理 -> 待办流程][流程管理 -> 我的流程] 使用 Element Plus 原生实现
Merge pull request !93 from Chika/dev
2023-04-07 00:12:58 +00:00
puhui999 2d019f1bf9 增加SSO单点登录 2023-04-07 01:45:29 +08:00
puhui999 f16ea74abe 修复打包部署后加载不到资源的问题 2023-04-07 01:44:40 +08:00
YunaiV 87ac04d9a7 Redis 菜单的重构,移除对 key 的管理 2023-04-06 19:49:58 +08:00
Chika dbf51ff89c 删除我的流程process.data.ts 2023-04-06 16:15:48 +08:00
Chika d0bc7f0814 VUE3【流程管理-我的流程】elment-plus改造 2023-04-06 16:13:18 +08:00
Chika 173c375bce 流程管理-待办任务 2023-04-06 10:03:35 +08:00
YunaiV 06e1e27652 邮箱账号,增加详情弹窗 2023-04-05 20:45:19 +08:00
芋道源码 cf68b1e91d !91 【众测版】合并最新的 Vue3 重构
Merge pull request !91 from 芋道源码/dev
2023-04-05 12:16:39 +00:00
YunaiV 37ffc2bf37 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/config/axios/service.ts
2023-04-05 20:15:24 +08:00
YunaiV 4404554cfc 1. 统一化代码
2. 增加 DocAlert 关联文档
2023-04-05 20:13:35 +08:00
YunaiV bb88e3d77c REVIEW 已完成的任务列表 2023-04-05 00:12:12 +08:00
芋道源码 68564b77e9 !90 【重构】Vue3 管理后台:[流程管理 -> 已办任务] 使用 Element Plus 原生实现
Merge pull request !90 from Chika/dev
2023-04-04 15:44:21 +00:00
芋道源码 5daf0befe4 !89 设置 vite basePath 后,重新登录跳转路由错误
Merge pull request !89 from mgzu/master
2023-04-04 15:43:17 +00:00
芋道源码 b79a187534 !78 项目全局使用formatDate方法移除parseTime方法
Merge pull request !78 from puhui999/dev
2023-04-04 14:57:37 +00:00
puhui999 05019837d0 修复在vue3+vite3 模块中使用顶层await打包的时候报错 2023-04-04 22:08:17 +08:00
puhui999 5f6dc3c99f Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/types/auto-components.d.ts
2023-04-04 11:23:52 +08:00
puhui999 dc1393411c 项目全局使用formatDate方法移除parseTime方法 2023-04-04 11:19:58 +08:00
puhui999 933c710f36 Merge remote-tracking branch 'yudao/dev' into dev
# Conflicts:
#	src/types/auto-components.d.ts
2023-04-04 10:29:59 +08:00
Chika c1e760da6d 流程-已办任务路由中增加详情Model 2023-04-04 09:29:54 +08:00
Chika 900b51db86 添加流程-已办任务路由 2023-04-04 09:28:09 +08:00
Chika e0f9a74e78 VUE3重构改造-流程-已办任务 2023-04-04 09:26:13 +08:00
马光祖 d0d6a13285 fix: 设置 vite basePath 后,重新登录跳转路由错误 2023-04-03 14:29:46 +08:00
xingyu 094c3fe13f docs: add nodejs pnpm version
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
2023-04-03 03:03:34 +00:00
xingyu 89f28ab03e chore: nodejs v 16.0.0
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
2023-04-03 02:53:39 +00:00
YunaiV 0d6ecfb45c 1. 统一删除 dialog-footer,包括代码生成的模版
2. 查询参数列表,改下
3. 简化 formatDate
4. 看看是不是有部分新增的 plain 不对
5. modelVisible 改成 dialogVisible?modelTitle 改成 dialogTitle
2023-04-02 23:52:56 +08:00
芋道源码 d18ed70671 !88 【众测版】合并最新的 Vue3 重构
Merge pull request !88 from 芋道源码/dev
2023-04-02 14:49:34 +00:00
芋道源码 6cd625b573 !87 回退 'Pull Request !84 : 修改测试所提bug'
Merge pull request !87 from 芋道源码/revert-merge-84-master
2023-04-02 14:48:57 +00:00
芋道源码 c964ca78ee 回退 'Pull Request !84 : 修改测试所提bug' 2023-04-02 14:48:43 +00:00
YunaiV 87a5ddfd2c REVIEW 图文发表记录 2023-04-02 11:48:54 +08:00
YunaiV a56a2f6099 REVIEW OAuth2 客户端 2023-04-02 11:05:51 +08:00
YunaiV d50bbf01d7 Merge branch 'dev' of https://gitee.com/txyyj/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/system/oauth2/client/index.vue
2023-04-02 10:36:07 +08:00
YunaiV a319d090bb REVIEW 支付商户 2023-04-02 10:24:03 +08:00
芋道源码 aea1270d8f !81 Vue3 重构:支付管理 -> 商户信息
Merge pull request !81 from 凌太虚/dev
2023-04-02 01:51:10 +00:00
YunaiV b18bf8a95f REVIEW 商品属性 2023-04-02 09:46:45 +08:00
YunaiV 5a5202d483 REVIEW 商品属性 2023-04-02 01:25:31 +08:00
芋道源码 616243a0ab !83 商品属性模块
Merge pull request !83 from 孔思宇/feat/mall-product-property
2023-04-01 16:25:24 +00:00
YunaiV 00c3133391 REVIEW 商品分类 2023-04-02 00:17:56 +08:00
芋道源码 59c44d9819 !82 商品分类管理
Merge pull request !82 from 孔思宇/feat/mall-product-category
2023-04-01 14:49:58 +00:00
芋道源码 e94eb757a2 !84 修改测试所提bug
Merge pull request !84 from 周建/master
2023-04-01 14:45:06 +00:00
YunaiV 7b700d875c REVIEW 角色管理(设置数据权限) 2023-04-01 22:30:02 +08:00
YunaiV ecde723fa2 REVIEW 角色管理(设置菜单权限) 2023-04-01 17:45:31 +08:00
芋道源码 70fa36a262 !85 【REVIEW】Vue3 管理后台:[系统管理 -> 角色管理] 使用 Element Plus 原生实现
Merge pull request !85 from Chika/dev
2023-04-01 06:31:15 +00:00
YunaiV 8810cb953e REVIEW 定时日志 2023-04-01 14:26:29 +08:00
YunaiV 65663df3aa REVIEW 定时任务(详细) 2023-04-01 13:41:21 +08:00
YunaiV eace25d3a2 REVIEW 定时任务(表单) 2023-04-01 11:33:50 +08:00
Chika 20b3eacce9 【重构】Vue3 管理后台:[系统管理 -> 角色管理] 使用 Element Plus 原生实现 2023-04-01 10:03:11 +08:00
YunaiV f8878f7a76 REVIEW 定时任务(列表) 2023-04-01 09:14:59 +08:00
YunaiV cebe6f93db REVIEW 用户管理(导入用户) 2023-04-01 00:04:28 +08:00
YunaiV 0a69041602 REVIEW 用户管理(修改用户) 2023-03-31 23:34:19 +08:00
gexinzhineng/gxzn27 c4fc9ee565 修改相应bug 2023-03-31 16:40:26 +08:00
YunaiV 7d84f86081 REVIEW 用户管理(分配用户角色) 2023-03-31 13:40:57 +08:00
YunaiV 643b387367 REVIEW 用户管理(列表) 2023-03-31 07:54:33 +08:00
puhui999 60daa54d3b Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: puhui999 <puhui999@163.com>
2023-03-30 15:45:30 +00:00
YunaiV 1434cdabe0 REVIEW 用户管理(调整布局) 2023-03-30 22:59:29 +08:00
admin a2a3b90735 重写商户信息 2023-03-30 21:59:06 +08:00
admin e0469bf64e 重写商户 2023-03-30 21:42:42 +08:00
YunaiV 854bf851e8 REVIEW 租户套餐 2023-03-30 21:38:46 +08:00
Siyu Kong 1724f2c674 feat: 新增商品属性(值)模块页面 2023-03-30 16:58:06 +08:00
Siyu Kong fdbae2dd37 feat: 新增商品属性值路由配置 2023-03-30 16:57:48 +08:00
Siyu Kong 4906cecd14 feat: 新增商品属性api 2023-03-30 16:57:27 +08:00
puhui999 5459fadafd update: @ts-ignore 2023-03-30 16:13:43 +08:00
puhui999 eff7e25ad1 Merge remote-tracking branch 'yudao/dev' into dev 2023-03-30 16:09:32 +08:00
puhui999 ba5985943b update: 解决点击遮罩层弹窗关闭后,页面就操作不了了会一直转圈的问题 2023-03-30 16:04:46 +08:00
芋道源码 0606ef5748 !77 修复tree组件在已有展开节点后全部展开和折叠的bug
Merge pull request !77 from puhui999/dev
2023-03-30 05:55:53 +00:00
puhui999 ad16456379 update: 修复tree组件在已有展开节点后全部展开和折叠的bug 2023-03-30 10:18:11 +08:00
芋道源码 d28179d196 !76 用户管理代码二次重构
Merge pull request !76 from fessor/dev
2023-03-30 01:42:08 +00:00
YunaiV 84ab75b475 REVIEW 租户套餐 2023-03-30 09:35:35 +08:00
YunaiV 216ad84938 REVIEW 租户套餐 2023-03-29 23:43:22 +08:00
fengjingtao 3c6d96d9f0 fix: 恢复某些不上传git的文件 2023-03-29 23:28:23 +08:00
芋道源码 e30d32effb !75 Vue3重构租户套餐
Merge pull request !75 from puhui999/dev
2023-03-29 14:54:49 +00:00
YunaiV 98afdfc040 REVIEW 代码生成 2023-03-29 22:38:19 +08:00
YunaiV e6dac1ebda REVIEW 代码预览(PreviewCode) 2023-03-29 22:25:53 +08:00
fengjingtao 66460539ea feat: 优化重构用户管理代码 2023-03-29 22:07:53 +08:00
fengjingtao a1609e3046 Merge branch 'dev' of https://gitee.com/fessor/yudao-ui-admin-vue3 into dev 2023-03-29 20:35:30 +08:00
fengjingtao 29fd92e60c Merge branch 'dev' of https://gitee.com/fessor/yudao-ui-admin-vue3 into dev 2023-03-29 20:24:11 +08:00
fengjingtao ca1b6df5ca feat: 用户管理review以后 2023-03-29 20:21:58 +08:00
puhui999 a9df1463f0 add: Vue3重构租户套餐列表 2023-03-29 17:50:13 +08:00
puhui999 64b974deaf add: Vue3重构租户套餐列表 2023-03-29 17:49:17 +08:00
puhui999 86c6073f1f update:修复角色管理菜单权限表单tree组件一直显示加载中的问题 2023-03-29 15:31:34 +08:00
puhui999 cc41c20709 update:修复角色管理打不开权限表单的问题 2023-03-29 15:29:24 +08:00
YunaiV b1e74a1d05 REVIEW 代码生成(ImportTable) 2023-03-29 15:07:50 +08:00
YunaiV d5f3f0add1 REVIEW 代码生成 2023-03-29 13:57:16 +08:00
YunaiV 76c5c7c1de REVIEW 代码生成 2023-03-29 09:09:34 +08:00
芋道源码 95b7eb9856 !68 Vue3 重构:基础设施 -> 代码生成
Merge pull request !68 from xiaowuye/dev
2023-03-28 16:05:31 +00:00
芋道源码 e3bcfa50e9 !70 微信组件按照vue3的方式重写了一遍
Merge pull request !70 from &wxr/dev
2023-03-28 16:02:31 +00:00
YunaiV 17ef65df06 同步 master 最新代码 2023-03-29 00:01:39 +08:00
YunaiV 03db8fece4 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/bpm/form/formEditor.vue
	src/views/bpm/model/index.vue
	src/views/infra/config/form.vue
	src/views/infra/config/index.vue
	src/views/infra/fileConfig/index.vue
	src/views/infra/fileList/index.vue
	src/views/system/mail/log/log.data.ts
	src/views/system/tenant/tenant.data.ts
	src/views/system/user/index.vue
	src/views/system/user/user.data.ts
2023-03-28 23:57:47 +08:00
芋道源码 c65a9d92bb !71 测试所提bug修改
Merge pull request !71 from 周建/master
2023-03-28 15:57:02 +00:00
YunaiV ce936ed296 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	.gitignore
	src/views/infra/job/JobLog.vue
2023-03-28 23:55:19 +08:00
芋道源码 8b9d2c7e29 !65 refactor: 重构定时任务模块
Merge pull request !65 from 孔思宇/refector/job
2023-03-28 15:52:40 +00:00
YunaiV 7ab8aa7168 Vue3 重构:REVIEW 用户管理 2023-03-28 23:50:32 +08:00
YunaiV c9e63c320e Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-03-28 23:35:32 +08:00
芋道源码 696d359f7f !67 Vue3重构: 用户管理
Merge pull request !67 from fessor/dev
2023-03-28 15:33:27 +00:00
YunaiV 337b80ca3d Vue3 重构:REVIEW 公众号统计 2023-03-28 23:28:29 +08:00
芋道源码 80b690b305 !72 Vue3重构:公众号统计优化
Merge pull request !72 from kinlon92/dev
2023-03-28 15:24:36 +00:00
YunaiV a4dea6c254 Vue3 重构:REVIEW 站内信 2023-03-28 23:18:10 +08:00
Siyu Kong b8ce330c12 feat: 新增产品分类模块页面&api 2023-03-28 20:35:31 +08:00
kinlon92 658150c1c8 Vue3重构:公众号统计优化 TODO 2023-03-28 18:23:58 +08:00
gexinzhineng/gxzn27 0503b7d078 新的租户需要选择岗位才能修改,暂将其设成必填 2023-03-28 18:00:18 +08:00
gexinzhineng/gxzn27 46fc6ce1b7 最小值为0会报错 2023-03-28 17:24:20 +08:00
gexinzhineng/gxzn27 ffd2b5b8ee 系统管理/租户管理/租户列表新增时账号额度默认为1
用户管理不选择性别 修改时选择框为0
2023-03-28 16:10:07 +08:00
gexinzhineng/gxzn27 90959702ee 邮件记录详情,创建时间显示不正确
编辑参数键名,键不能修改,修改时只读,新增时正常
租户套餐显示备注及搜索条件显示(同vue2)
2023-03-28 13:41:56 +08:00
芋道源码 969c83a8dc !53 重构VUE3【站内信-消息记录】
Merge pull request !53 from 咱哥丶/dev
2023-03-28 04:15:58 +00:00
gexinzhineng/gxzn27 944015484a 1、配合地区管理接口的api文件,后端修改相应字段可以不要此文件
2、基础设施/文件管理/文件列表 上传失败无法上传只能刷新页面才能上传bug
3、基础设施/文件管理/文件列表 新增是下拉框显示0 设置为null
2023-03-28 11:27:08 +08:00
YunaiV 66d412c10a Vue3 重构:REVIEW 公众号标签统计 2023-03-28 09:24:12 +08:00
芋道源码 c4e5419d65 !69 Vue3重构:公众号统计
Merge pull request !69 from kinlon92/dev
2023-03-28 00:12:13 +00:00
YunaiV d7891fe759 Vue3 重构:流程实例的创建 2023-03-28 08:10:11 +08:00
YunaiV ddd6bbbee1 Vue3 重构:流程实例的创建的目录调整 2023-03-28 07:51:46 +08:00
YunaiV 7587acedb0 Vue3 重构:流程实例的详情(流程任务列表) 2023-03-28 07:45:18 +08:00
YunaiV 4388d6565a Vue3 重构:流程实例的详情(流程任务列表) 2023-03-28 07:29:32 +08:00
YunaiV 9e6da44881 Vue3 重构:流程实例的详情(流程图预览) 2023-03-28 01:19:25 +08:00
wuxiran 16c5e3ea01 1、微信组件更新第三波,消息页面能正常展示了。但是页面可能还要错乱 2023-03-28 01:18:37 +08:00
YunaiV c5a3fa1f94 Vue3 重构:流程实例的详情 2023-03-28 00:10:42 +08:00
zhangjinlong 51344a5967 Vue3重构:公众号统计 2023-03-27 18:18:29 +08:00
dlarmor bedcd2205e update: 解决合并问题 2023-03-27 14:18:35 +08:00
dlarmor 0c71d0dd93 Merge remote-tracking branch 'origin/dev' into dev 2023-03-27 14:15:53 +08:00
dlarmor 636e07fcf6 Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	src/views/infra/codegen/components/BasicInfoForm.vue
#	src/views/infra/codegen/components/ImportTable.vue
2023-03-27 14:09:20 +08:00
dlarmor f33935868d Vue3 重构:基础设施 -> 代码生成 2023-03-27 14:06:30 +08:00
fessor 1ef6563429 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: fessor <352475718@qq.com>
2023-03-27 04:43:26 +00:00
fessor 4563f6a947 删除文件 src/views/system/user/user.data.ts 2023-03-27 04:32:33 +00:00
YunaiV 1a4311309d Vue3 重构:REVIEW 角色管理 2023-03-27 12:29:34 +08:00
芋道源码 17395a4980 !66 修复了角色管理页面打不开及功能失效和其它的一些问题
Merge pull request !66 from puhui999/dev
2023-03-27 04:20:13 +00:00
puhui999 c462bbace5 update:添加类型解决ts报错 2023-03-27 12:11:40 +08:00
puhui999 581b301eed update: 修复角色管理系列问题,解决页面打不开按钮功能失效等问题!! 2023-03-27 12:02:43 +08:00
Siyu Kong dd763019ba refactor: 重构定时任务模块
1.修改crud写法
2.修复dropdown组件与v-hasPermi冲突问题
3.优化详情页后续执行时间
2023-03-27 11:46:33 +08:00
puhui999 e08dcc9d8d update: 重构用户管理部门回显方法 2023-03-27 11:37:58 +08:00
puhui999 7c6e263623 Merge remote-tracking branch 'yudao/dev' into dev 2023-03-27 10:39:08 +08:00
puhui999 2c50854be1 add: 把Icon、DictTag添加到全局 2023-03-27 10:37:11 +08:00
puhui999 e87df6439f update: 去除没必要的declare 2023-03-27 10:35:49 +08:00
puhui999 c105f314f5 update: 添加短信渠道列表类型,解决找不到属性signature 2023-03-27 10:34:41 +08:00
puhui999 6e321c4946 update: 去除没必要的declare 2023-03-27 10:32:17 +08:00
fessor 3dbcbf4cf0 fix: 修改api定义与命名
Signed-off-by: fessor <352475718@qq.com>
2023-03-27 02:18:41 +00:00
fessor d9e79250e2 fix: 格式问题
Signed-off-by: fessor <352475718@qq.com>
2023-03-27 02:12:18 +00:00
fessor 6ce9ab875c feat: ep重写用户管理
Signed-off-by: fessor <352475718@qq.com>
2023-03-27 01:44:23 +00:00
wuxiran ed5990f229 1、微信组件更新vue3.視頻組件更新使用video.js 6.0.0版本。
2、目前mp中視頻組件可以簡單的使用了。
2023-03-27 03:18:25 +08:00
芋道源码 72ddb0c0d8 !63 【重构】Vue3 管理后台:[系统管理 -> 角色管理] 使用 Element Plus 原生实现
Merge pull request !63 from Chika/dev
2023-03-26 15:38:36 +00:00
YunaiV f5177337cb Vue3 重构:REVIEW 图文发表记录 2023-03-26 23:31:41 +08:00
YunaiV 708aef3e10 Vue3 重构:REVIEW 公众号消息,修复 WxVoicePlayer 的 icon 报错 2023-03-26 23:15:38 +08:00
YunaiV e00834adf7 Vue3 重构:REVIEW 公众号消息,修复 WxLocation 的 icon 报错 2023-03-26 23:03:30 +08:00
Chika 7380165bf0 角色管理ep重构 2023-03-26 22:57:18 +08:00
YunaiV 9ab791867a Vue3 重构:REVIEW 公众号消息,先不报错 2023-03-26 22:47:53 +08:00
芋道源码 f7f5704284 !58 微信公众号功能
Merge pull request !58 from &wxr/dev
2023-03-26 14:19:23 +00:00
YunaiV 56e2f21d1a Vue3 重构:REVIEW 菜单 2023-03-26 22:15:45 +08:00
芋道源码 d72101b194 !54 完成菜单模块
Merge pull request !54 from Theo/master
2023-03-26 13:36:39 +00:00
芋道源码 d6f2eafbde !56 动态表单选择select出错bug
Merge pull request !56 from 周建/master
2023-03-26 13:22:42 +00:00
YunaiV 9c869dee5f Vue3 重构:REVIEW 敏感词 2023-03-26 21:16:16 +08:00
yj441106 e0b57b8055 客户端重构 2023-03-26 20:21:31 +08:00
芋道源码 7f8f43aff5 !55 敏感词模块 TODO 内容修改
Merge pull request !55 from syd/dev
2023-03-26 11:49:22 +00:00
芋道源码 6f7d064a58 !59 客户端重构
Merge pull request !59 from yj441106/dev
2023-03-26 11:42:45 +00:00
YunaiV f5d900db29 Vue3 重构:流程分配规则 2023-03-26 19:32:19 +08:00
yj441106 eead9efc5e 客户端重构 2023-03-26 15:22:51 +08:00
YunaiV 3c6bf37879 Vue3 重构:流程定义列表 2023-03-26 08:46:04 +08:00
wuxiran 1134921a0a 1、微信组件更新vue3,部分功能可能还有问题。 2023-03-26 04:25:34 +08:00
YunaiV b587d7634c Vue3 重构:流程模型的各种操作 2023-03-26 01:36:27 +08:00
YunaiV e83d5914f0 Vue3 重构:流程模型的各种操作 2023-03-26 00:46:32 +08:00
YunaiV 1854b85b40 Vue3 重构:流程模型的列表和新增、修改 2023-03-26 00:16:28 +08:00
YunaiV d0ed5edb6e Vue3 重构:form 和 model 编辑器,调整路由 2023-03-25 19:45:56 +08:00
YunaiV 9e798fb7f8 Vue3 重构:去除 modelEditor.vue 冗余代码 2023-03-25 18:51:09 +08:00
Theo 8535409d02 完成菜单模块 2023-03-25 16:47:20 +08:00
YunaiV 7463eea243 Vue3 重构:REVIEW 表单构建 2023-03-25 16:22:43 +08:00
gexinzhineng/gxzn27 6c12505771 动态表单选择select出错bug 2023-03-25 15:31:29 +08:00
咱哥丶 ca4bdb4639 重构VUE3【站内信消息记录】:1、表格增加自适应高度(简单实现)2、我的站内信每条记录分为查阅(未读状态)和详情(已读状态) 2023-03-25 11:33:40 +08:00
YunaiV 2abc7eca67 Vue3 重构:REVIEW 公众号标签 2023-03-25 11:20:35 +08:00
YunaiV c0d5a5663c Vue3 重构:REVIEW 部门管理 2023-03-25 09:11:46 +08:00
YunaiV 44dc02a02e Vue3 重构:简化 formatDate 2023-03-25 01:01:50 +08:00
YunaiV eb29f8e2c5 Vue3 重构:移除多余的 dialog-footer 2023-03-25 00:59:14 +08:00
芋道源码 1d9664d893 !50 翻写公众号管理-标签管理
Merge pull request !50 from 矿泉水/dev
2023-03-24 16:48:30 +00:00
YunaiV 4abe40d413 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/api/system/area/index.ts
	src/views/system/area/index.vue
2023-03-25 00:46:42 +08:00
芋道源码 9d72a375f4 !51 测试所提bug修改
Merge pull request !51 from 周建/master
2023-03-24 16:46:08 +00:00
YunaiV fa32194772 Vue3 重构:REVIEW 短信渠道 2023-03-25 00:41:06 +08:00
YunaiV 74aeffec12 Vue3 重构:REVIEW 短信模版 2023-03-25 00:29:09 +08:00
syd 21cce9812d update: 敏感词模块提交TODO 内容 2023-03-24 23:26:15 +08:00
YunaiV 6b194bb95f Vue3 重构:REVIEW 短信日志 2023-03-24 23:07:51 +08:00
gexinzhineng/gxzn27 23b23f9200 xTable查询框前间隔,退出系统按钮点击有时会无法成功 2023-03-24 17:05:24 +08:00
xiaobai e8dfe53053 翻写公众号管理-标签管理20230324 2023-03-24 11:43:37 +08:00
xiaobai 8b56388de0 翻写公众号管理-标签管理20230324 2023-03-24 11:37:44 +08:00
芋道源码 2a3fe7d2bc !45 重构:短信模板和短信日志vue2改vue3
Merge pull request !45 from puhui999/master
2023-03-23 15:56:36 +00:00
YunaiV 4481964182 Vue3 重构:REVIEW 登录日志 2023-03-23 23:50:14 +08:00
芋道源码 8e032d988b !41 Vue3 重构:登录日志
Merge pull request !41 from lour6498/dev
2023-03-23 15:41:37 +00:00
YunaiV 12b60da942 Vue3 重构:REVIEW API 日志 2023-03-23 23:37:15 +08:00
芋道源码 3575e6adbb !48 访问日志重构
Merge pull request !48 from oldBaby/dev
2023-03-23 15:25:07 +00:00
YunaiV 8a8154e124 Vue3 重构:REVIEW 公众号账号 2023-03-23 23:16:53 +08:00
芋道源码 202031d42e !49 Vue3重构:公众号账号管理
Merge pull request !49 from kinlon92/dev
2023-03-23 14:56:53 +00:00
YunaiV abbaeabc3a Vue3 重构:重构工作流的表单 2023-03-23 22:50:48 +08:00
zhangjinlong 62b7c7bf92 vue重构:公众号账号管理 2023-03-23 18:15:02 +08:00
xiaobai c640b33728 翻写 公众号-标签管理 mp/tag/ 2023-03-23 16:50:25 +08:00
dtsz aad57e2840 访问日志重构 2023-03-23 13:21:38 +08:00
dtsz 98b9bdd4fa fix:权限标识名称的错误 2023-03-23 13:21:01 +08:00
Siyu Kong a422300cc1 chore: 过滤ide文件 2023-03-23 10:45:40 +08:00
YunaiV 6f8499c4d0 Merge remote-tracking branch 'origin/dev' into dev 2023-03-23 09:43:01 +08:00
YunaiV 7c92735aff Vue3 重构:REVIEW 租户管理 2023-03-23 09:42:53 +08:00
xingyuv e6ccfbddb6 chore: update vite 4.2 2023-03-23 09:42:01 +08:00
xingyuv 69acb5bb33 chore: update deps 2023-03-23 09:41:16 +08:00
xingyuv 8bd47446cf fix: api error 2023-03-23 09:40:32 +08:00
xingyuv 9edd3c5f80 fix: 修改 Editor 的 z-index 使其不会遮挡 2023-03-23 09:25:43 +08:00
xingyuv 55dafabdf3 fix: 面包屑:1.修复使用动态路由的时候,无法显示的bug 2023-03-23 09:24:52 +08:00
xingyuv b56a5e06c9 fix:Descriptions去掉mb-10px 2023-03-23 09:23:48 +08:00
puhui999 c735cd72ff update 2023-03-23 00:39:20 +08:00
puhui999 94a6305fce update 2023-03-23 00:36:25 +08:00
puhui999 993a96757f update: !!!请保留这个属性,防止tsconfig.json文件报错 2023-03-23 00:34:55 +08:00
puhui999 5fedc6674b update: 修改了一些TODO提到的问题,简化时间格式化方法 2023-03-23 00:33:40 +08:00
puhui999 d44ceda588 update: 修改了一些TODO提到的问题 2023-03-23 00:08:14 +08:00
puhui999 5057e755e2 Merge remote-tracking branch 'yudao/dev' 2023-03-22 23:54:24 +08:00
puhui999 42128709aa update: 修改使用el-descriptions展示详情 2023-03-22 23:53:39 +08:00
fengjingtao 80d540790e feat: 用户管理重写-部门树,表格渲染 2023-03-22 23:37:29 +08:00
芋道源码 3db7b26e68 !40 Vue3 重构:系统管理->租户管理:租户列表
Merge pull request !40 from 东方白/dev
2023-03-22 15:21:04 +00:00
芋道源码 665ab046b0 !36 采用ep重写dept部门管理页面
Merge pull request !36 from 凌太虚/dev
2023-03-22 14:42:35 +00:00
YunaiV 2d4e7e7d08 Vue3 重构:REVIEW 错误日志 2023-03-22 22:40:56 +08:00
凌太虚 8f49426cc3 Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: 凌太虚 <343015202@qq.com>
2023-03-22 14:26:18 +00:00
芋道源码 944b70c072 !43 错误日志重构
Merge pull request !43 from oldBaby/dev
2023-03-22 14:15:16 +00:00
YunaiV c424ee76e4 Vue3 重构:REVIEW 岗位 2023-03-22 22:11:03 +08:00
芋道源码 320cffee19 !44 [系统管理 -> 岗位管理] 使用 Element Plus 原生实现
Merge pull request !44 from Chika/master
2023-03-22 14:00:20 +00:00
YunaiV 67de9fc567 Vue3 重构:工作流分组 2023-03-22 21:50:44 +08:00
puhui999 ef3fbc5a04 update: 修复查看详情报错的问题,解决表单ref命名和表单数据变量命名冲突问题 2023-03-22 18:13:28 +08:00
puhui999 36729f5282 add: 短信日志vue2迁移到vue3,使用ts改写 2023-03-22 17:53:55 +08:00
puhui999 9e2c3476c8 add: 短信日志vue2迁移到vue3,使用ts改写 2023-03-22 17:52:06 +08:00
puhui999 496862e197 delete 2023-03-22 17:50:25 +08:00
puhui999 b4093ab97e update: 修复value-format属性失效的问题,应全部都用大写value-format="YYYY-MM-DD" 2023-03-22 17:49:52 +08:00
puhui999 25668ac558 add: 迁移v2版本的日期格式化函数到vue3中 2023-03-22 17:47:08 +08:00
Chika 7cda6f554b [系统管理 -> 岗位管理] 使用 Element Plus 原生实现 2023-03-22 16:47:45 +08:00
puhui999 bf2b4ced8c update: 修复检索表单短信下拉菜单undefined问题 2023-03-22 16:02:04 +08:00
fengjingtao 6d8ed5ee3c feat: 用户管理重写尝试 2023-03-21 23:33:40 +08:00
dtsz 7d1d87a1ac 错误日志重构 2023-03-21 20:18:07 +08:00
puhui999 16c4bb5dca update: 修复测试短信发送成功后弹窗不关闭的问题 2023-03-21 16:46:16 +08:00
puhui999 6e90bbe2e1 add: 改造vue2中的短信模板到vue3中 2023-03-21 16:29:11 +08:00
puhui999 c1b1ffa467 add: 改造vue2中的RightToolbar到vue3中 2023-03-21 16:21:23 +08:00
puhui999 9adf80c914 add: 改造vue2中的RightToolbar到vue3中 2023-03-21 16:20:03 +08:00
puhui999 7697e5c358 add: 添加获取指定字典指定值对应的label数据 2023-03-21 16:17:44 +08:00
lour6498 a750332210 Vue3 重构:登录日志 2023-03-21 10:01:27 +08:00
lour6498 33a9b5af86 fix(数据源配置): 页面api未同步修改 2023-03-21 10:00:32 +08:00
东方白 d88fda7d3b Vue3 重构:系统管理->租户管理:租户列表 2023-03-21 09:22:31 +08:00
YunaiV 812300cc04 Vue3 重构:REVIEW 错误码 2023-03-20 08:53:28 +08:00
芋道源码 7534a08315 !39 Vue3重构:错误码管理
Merge pull request !39 from kinlon92/dev
2023-03-20 00:47:51 +00:00
YunaiV c40de03302 Vue3 重构:统一 form 的样式 2023-03-20 00:20:24 +08:00
zhangjl 030ecd3137 重构:错误码管理 2023-03-19 23:20:49 +08:00
YunaiV 40bd2c57f8 Vue3 重构:Review 字典数据界面 2023-03-19 22:14:55 +08:00
admin d034e9b2b5 重写dept 2023-03-19 21:56:23 +08:00
admin 1846ba150e 重新dept模块 2023-03-19 21:44:13 +08:00
芋道源码 2b52683e3c !38 完成字典模块
Merge pull request !38 from Theo/master
2023-03-19 13:32:10 +00:00
YunaiV cf959599c6 Vue3 重构:Review 敏感词管理 2023-03-19 21:30:53 +08:00
芋道源码 45058a9a48 !37 vue3 重构:敏感词模块
Merge pull request !37 from syd/dev
2023-03-19 13:16:38 +00:00
YunaiV 1883293553 Vue3 重构:令牌管理 2023-03-19 20:56:11 +08:00
Theo 5d062d5877 完成字典模块 2023-03-19 16:48:27 +08:00
syd 26a11d77aa vue3 重构:敏感词模块 2023-03-19 14:45:01 +08:00
admin 15ac1d9d8b 采用ep重写dept页面 2023-03-19 13:04:59 +08:00
YunaiV 2cf384d7ab Vue3 重构:地区接入 TableV2 高性能表格 2023-03-18 22:29:08 +08:00
YunaiV c56a887767 Vue3 重构:地区接入 TableV2 高性能表格 2023-03-18 21:45:58 +08:00
YunaiV e669dffddc Vue3 重构:操作日志的详情 2023-03-18 20:09:30 +08:00
YunaiV c9a30e6fbf Vue3 重构:操作日志的列表 2023-03-18 19:00:58 +08:00
YunaiV 0f4c74fef0 Vue3 重构:邮件日志的列表 2023-03-18 13:56:17 +08:00
YunaiV 3c75d6065d Vue3 重构:邮件日志的列表 2023-03-18 12:24:21 +08:00
YunaiV e8d83d4718 Vue3 重构:基本完善完 邮件模版 的重构 2023-03-18 11:40:55 +08:00
YunaiV 7d22328d69 Table 组件:增加对字典数据的支持 2023-03-18 11:02:40 +08:00
YunaiV ba327cd8ae Vue3 重构:邮件模版的新增和修改操作 2023-03-18 10:39:19 +08:00
YunaiV 4d03e46142 Vue3 重构:邮件模版的列表 2023-03-18 01:23:07 +08:00
YunaiV 90cd829737 Vue3 重构:邮件模版的列表 2023-03-18 00:42:25 +08:00
YunaiV e42a9aa60c Vue3 重构:基本完善完 邮件账号 的重构 2023-03-17 23:24:21 +08:00
YunaiV a784bc7db2 Form 组件:增加 vLoading 加载中 2023-03-17 23:23:24 +08:00
YunaiV 4aeee48582 增加 useCrudSchemas、useTable 的 autoimport 实现 2023-03-17 22:58:49 +08:00
YunaiV 3f2a77f2d2 Vue3 重构:邮件账号的重构部分提交 2023-03-17 22:33:30 +08:00
YunaiV 96e0ce9866 Table 组件:1)增加 tableMethods 属性,提升代码的可阅读性;2)Table 和 Pagination 组件的逻辑统一 2023-03-17 22:32:25 +08:00
YunaiV 714dd661c4 Search 组件:1)修改 search 按钮的样式;2)增加 search 按钮后的 actionMore slot;3)修改 Form 向下减少 15px 间距,更紧凑 2023-03-17 21:48:00 +08:00
YunaiV d73b8431a1 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/infra/fileConfig/fileConfig.data.ts
	src/views/system/sms/smsChannel/sms.channel.data.ts
2023-03-17 01:36:21 +08:00
YunaiV 262874a117 vue3 重构:邮件账号的新增 + 修改 + 删除 2023-03-17 01:35:38 +08:00
YunaiV f1a80fe558 vue3 重构:邮件账号的列表 + 搜索 2023-03-17 00:02:45 +08:00
gexinzhineng/gxzn27 b583be5465 系统管理中的地区管理页面 2023-03-16 13:51:54 +08:00
芋道源码 763dce6fcd !33 短信渠道翻写
Merge pull request !33 from 矿泉水/dev
2023-03-15 14:25:10 +00:00
xiaobai a94172d7a5 短信渠道翻写vue2->vue3 20230315 2023-03-15 22:20:28 +08:00
xiaobai 4c143c1c6c 短信渠道翻写vue2->vue3 20230315 2023-03-15 22:20:12 +08:00
YunaiV 11d4e2ea17 补全 fileSizeFormatter 的注释 2023-03-15 20:35:18 +08:00
芋道源码 07d79e3286 !29 Vue3 重构:基础设施 -> 文件管理功能 优化部分代码
Merge pull request !29 from xiaowuye/dev
2023-03-15 12:25:47 +00:00
芋道源码 aad49fd5e9 !32 测试人员所提bug修改
Merge pull request !32 from 周建/master
2023-03-15 12:24:52 +00:00
gexinzhineng/gxzn27 629c177c99 1、应用管理缺少字段导致添加不了
2、短信模板添加缺少字段
3、短信日志导出接口错误
4、基础设施中英切换暂无用,先注释,生成json数据格式化
5、日志表格不显示链路地址(同vue2)
6、搜索框前字宽换行问题
2023-03-15 18:09:03 +08:00
gexinzhineng/gxzn27 c1be4339d6 1、bpmnjs中template中不能写注释,会导致报错
2、租客列表添加显示账号密码,修改不显示
2023-03-15 14:33:04 +08:00
dlarmor b6e3a583ff file finished todo 2023-03-15 10:07:27 +08:00
YunaiV d46812483f file 重构的 review 代码 2023-03-14 21:08:00 +08:00
芋道源码 ba909325f9 !28 Vue3 重构:基础设施 -> 文件管理功能
Merge pull request !28 from xiaowuye/dev
2023-03-14 12:56:26 +00:00
芋道源码 f9f3c2040f !27 修改测试所提bug
Merge pull request !27 from 周建/master
2023-03-14 12:56:09 +00:00
gexinzhineng/gxzn27 be6e307ba0 id显示为序号bug 2023-03-14 13:10:31 +08:00
dlarmor 1a7f89a8e2 重构:基础设施 -> 文件管理 接口文件调整 2023-03-14 11:50:31 +08:00
dlarmor fe2fa21d44 重构:基础设施 -> 文件管理 接口文件调整 2023-03-14 11:48:35 +08:00
dlarmor fee8245f4e 重构:基础设施 -> 文件管理 文件配置 2023-03-14 11:45:37 +08:00
dlarmor f1313b1f1c 重构:基础设施 -> 文件管理 文件列表 2023-03-14 10:47:52 +08:00
gexinzhineng/gxzn27 c634214213 1、调度日志点击详情无数据显示
2、id显示序号问题
3、租户详情修改中不显示名称密码
2023-03-13 09:53:43 +08:00
YunaiV 2323946ce2 notice 重构补充:
1. 移除 API 方法的后缀
2. 公告内容使用 Editor 富文本编辑器
3. 列表的状态检索的修改
2023-03-12 18:22:21 +08:00
芋道源码 42421f509f !26 用elemen plus重写公告通知模块
Merge pull request !26 from babylazsss/master
2023-03-12 09:24:17 +00:00
chiwenda 8c9217166d fix:修改菜单找不到图标时报错 2023-03-12 17:22:51 +08:00
chiwenda 1757515b14 fix:公告通知 2023-03-12 12:54:28 +08:00
YunaiV a1292fbf0a 重构:微调【数据源菜单】的重构 2023-03-11 17:57:22 +08:00
YunaiV a8bbccfb42 Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-03-11 17:49:20 +08:00
芋道源码 21827d43f1 !25 Vue3 重构:基础设施 -> 数据源配置功能
Merge pull request !25 from xiaowuye/dev
2023-03-11 09:45:24 +00:00
dlarmor 8eb8748142 重构:基础设施 -> 数据源配置功能 权限标识 2023-03-11 16:00:01 +08:00
dlarmor 6359ffe766 重构:基础设施 -> 数据源配置功能 2023-03-11 15:54:45 +08:00
LinkLi 58a3af8c84 !22 issue#I6KY0M 修复建议
* feat: 增加全局权限判断函数#I6KY0M
2023-03-11 01:59:27 +00:00
芋道源码 7d43157f64 !23 修复ProcessDesigner.vue编译错误(eslint)
Merge pull request !23 from 孔思宇/feat-eslintformat
2023-03-11 01:56:17 +00:00
芋道源码 b347ca1ede !24 Vue3 重构:基础设施 -> 配置管理功能
Merge pull request !24 from 芋道源码/dev
2023-03-11 01:12:25 +00:00
YunaiV 26e15ef2e8 重构:优化 config 的列表样式 2023-03-11 00:46:21 +08:00
YunaiV 74d225cce4 重构:在 config 列表,完整引入分页 2023-03-11 00:11:48 +08:00
YunaiV 0506c4e54d 重构:在 config 列表,引入分页组件 2023-03-10 23:09:30 +08:00
YunaiV ba563f76c6 重构:将 config 表单的 visible 改成从字典数据里获取 2023-03-10 21:30:54 +08:00
YunaiV 30dea302a9 重构:调整 formData 使用 ref。原因是,原本的 reactive 无法整个赋值 2023-03-10 21:24:20 +08:00
YunaiV d989fa2081 重构:优化配置管理的列表展示 2023-03-10 21:19:18 +08:00
Siyu Kong b2665afe2a fix: 修复ProcessDesigner.vue错误换行导致的编译错误问题 2023-03-10 18:11:05 +08:00
YunaiV 922c4a1b6c 重构:优化配置管理的操作宽度不正确的问题 2023-03-10 09:51:19 +08:00
YunaiV 0dd3b77f2d 重构:优化配置管理的 date 格式化 2023-03-10 09:45:40 +08:00
YunaiV 72b0ec23f5 重构:完善配置管理的导出功能 2023-03-10 08:15:30 +08:00
YunaiV faaa47abdc 重构:完善配置管理的删除功能 2023-03-10 08:04:14 +08:00
YunaiV 5c675995cb 修复配置管理的图标 2023-03-10 00:53:23 +08:00
YunaiV f474e06b00 移除 ConfigPageReqVO,简化理解成本 2023-03-09 23:18:26 +08:00
YunaiV 7540a4e2e7 1. 修复化配置管理的 formRef 有问题的逻辑 2023-03-09 22:58:54 +08:00
YunaiV 6f7a785c80 1. 优化配置管理的 loading 设置 2023-03-09 22:24:55 +08:00
芋道源码 67873d93af !21 尝试修改包含字典表的页面加载时报错
Merge pull request !21 from 毕梅/master
2023-03-09 14:13:28 +00:00
YunaiV d24d9e690a 1. 优化配置管理的 loading 设置 2023-03-09 21:45:39 +08:00
YunaiV 74846a11bd 1. 优化 Dialog 组件,增加 scroll 标识滚动
2. 优化配置管理的 :default-time 设置
2023-03-09 19:36:57 +08:00
gexinzhineng/gxzn27 3354462b75 修改测试所提bug 2023-03-09 18:50:19 +08:00
gexinzhineng/gxzn27 0ea6b1b749 解决TODO 2023-03-09 13:28:11 +08:00
YunaiV dcc796696a vue3 重构:配置管理,微调 2023-03-09 00:06:53 +08:00
YunaiV 9ef85e144c vue3 重构:配置管理,新增表单 2023-03-08 23:38:07 +08:00
芋道源码 1f2af1fce0 !20 修改lssues的bug
Merge pull request !20 from 周建/master
2023-03-08 15:30:04 +00:00
YunaiV 64b249e743 1. 修复 DictTag 对 boolean 的 false 处理不展示
2. vue 重构:增加配置管理的 form 表单
2023-03-08 22:51:07 +08:00
bimei aa3b299ee2 1. 修改icon图标展示 2.尝试修改包含字典表的页面加载时报错 2023-03-08 17:37:06 +08:00
gexinzhineng/gxzn27 9285f3809b 浏览器缩放会导致保存按钮被下面的bpmnjs图挡住 2023-03-08 10:42:57 +08:00
YunaiV 4c47ca9166 vue3 重构:增加操作栏、搜索栏 2023-03-08 09:49:14 +08:00
YunaiV ee9474fdb4 vue3 重构:使用 el 原生实现 2023-03-08 08:15:49 +08:00
YunaiV 4d16795eab Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/types/auto-components.d.ts
2023-03-07 20:30:32 +08:00
芋道源码 e2895bafa5 !15 修复了一些小问题
Merge pull request !15 from puhui999/master
2023-03-07 12:13:16 +00:00
芋道源码 03bf50d605 !18 系统管理中id显示序号bug
Merge pull request !18 from 周建/master
2023-03-07 12:11:49 +00:00
芋道源码 1c5be6ecbf !19 Vite 由于 optimize.ts 缺少部门文件,导致二次 reload 的问题
Merge pull request !19 from 芋道源码/feat/optimize_vite
2023-03-07 12:08:20 +00:00
YunaiV 281bddcd40 增加 optimize 文件列表,避免 reload 2023-03-07 19:57:46 +08:00
YunaiV 5df7a8c951 增加 optimize 文件列表,避免 reload 2023-03-07 19:40:04 +08:00
YunaiV 7f336bbe92 暂时取消 https 加速方案,主要考虑 server 端没有 https 2023-03-07 19:21:39 +08:00
YunaiV 6cf76691a1 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into feat/optimize_vite
 Conflicts:
	package.json
	src/types/auto-imports.d.ts
2023-03-07 19:05:26 +08:00
Theo bc5df9b143 修复新增或修改菜单时,无法选择菜单图标的bug 2023-03-07 18:44:21 +08:00
gexinzhineng/gxzn27 dac20068cc 系统管理中id显示序号bug 2023-03-07 16:22:40 +08:00
puhui999 585a667352 Merge remote-tracking branch 'yudao/master' 2023-03-07 10:34:21 +08:00
xingyuv cab8c9ad15 fix: search warn 2023-03-07 10:29:27 +08:00
puhui999 dd473c02ca Merge remote-tracking branch 'origin/master' 2023-03-07 10:19:40 +08:00
puhui999 211298c55a Merge remote-tracking branch 'yudao/master' 2023-03-07 10:12:34 +08:00
xingyuv 50478da759 chore: up 1.7.1 2023-03-07 10:05:57 +08:00
xingyuv 7fea89f5f9 feat: aotu import 2023-03-07 10:05:45 +08:00
xingyuv d35d27d197 fix: devmode 2023-03-07 10:01:29 +08:00
puhui999 212681a419 Merge remote-tracking branch 'yudao/master'
# Conflicts:
#	src/components/XTable/src/XTable.vue
#	src/components/bpmnProcessDesigner/package/penal/task/task-components/ReceiveTask.vue
2023-03-07 10:00:25 +08:00
puhui999 1cde03fbbf Merge branch 'master' of gitee.com:yudaocode/yudao-ui-admin-vue3 into master
Signed-off-by: puhui999 <puhui999@163.com>
2023-03-07 01:48:51 +00:00
xingyuv 004d214a11 fix: bugs 2023-03-07 09:41:01 +08:00
xingyuv 65e3652534 style: 抽屉弹出样式问题 2023-03-07 09:38:58 +08:00
xingyuv 01971a94b4 style: 调整主题切换样式 2023-03-07 09:37:59 +08:00
xingyuv 0cb57e5a51 dcos: update deps 2023-03-07 09:35:44 +08:00
xingyuv 4ea5137904 chore: update deps 2023-03-07 09:33:53 +08:00
芋道源码 19de304f32 !17 xTable警告
Merge pull request !17 from 周建/master
2023-03-07 00:33:42 +00:00
gexinzhineng/gxzn27 71219a2f93 xTable报错 2023-03-06 22:58:05 +08:00
芋道源码 016472b829 !16 1.角色提交问题修改 2.XTable var修改
Merge pull request !16 from 毕梅/master
2023-03-06 13:51:00 +00:00
芋道源码 3af544f1eb !14 补充测试bug
Merge pull request !14 from 周建/master
2023-03-06 13:48:37 +00:00
gexinzhineng/gxzn27 c5d05f1d45 id警告问题 2023-03-06 20:53:19 +08:00
gexinzhineng/gxzn27 28f659f5bc 注释 2023-03-06 19:42:47 +08:00
gexinzhineng/gxzn27 68e7b76775 注释 2023-03-06 19:30:06 +08:00
bimei ece4cf2760 Merge branch 'master' of https://gitee.com/meibe/yudao-ui-admin-vue3 2023-03-06 18:20:20 +08:00
gexinzhineng/gxzn27 cc7fb7e43f loading问题 2023-03-06 15:57:06 +08:00
puhui999 01837ad502 解决导入css报警告的问题
解决方法来源 https://github.com/vitejs/vite/pull/10762
2023-03-06 15:34:38 +08:00
puhui999 d95de359e3 解决运行时报Variable 'id' is already declared in the upper scope vue/no-template-shadow 2023-03-06 15:33:34 +08:00
gexinzhineng/gxzn27 269aabd6df 详情动态表单按钮不显示,我的流程流程分类显示问题 2023-03-06 15:28:10 +08:00
gexinzhineng/gxzn27 6b25601936 手机号必填 2023-03-06 13:29:27 +08:00
puhui999 cbc21c33b1 1、解决自定义字典标签值为零时标签不渲染的问题
2、添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题
2023-03-06 11:48:39 +08:00
puhui999 84e802fe93 使用const let替换掉var 2023-03-06 11:46:40 +08:00
puhui999 0c34ce1962 修复编译器全局类型找不到报错的问题 2023-03-06 11:44:33 +08:00
answer.huang 000b0059c6 feat: 改用 https,加快首次打开页面 2023-03-05 23:04:20 +08:00
bimei 7c325ee96d fix: 主题切换XTable颜色修改 2023-03-03 13:13:42 +08:00
bimei 21e20021e8 Merge branch 'master' of https://gitee.com/meibe/yudao-ui-admin-vue3 2023-03-02 09:56:43 +08:00
bimei a16751f258 底座bug修改 2023-03-02 09:47:36 +08:00
answer-huang 1cd74f445b fix: 修改命名冲突 2023-02-18 21:42:44 +08:00
xingyuv 46b94aed33 feat: pagination 2023-02-14 16:40:15 +08:00
xingyuv 4d4f8841dc fix: style 2023-02-14 16:13:59 +08:00
xingyuv 2ebcb72215 feat: style 2023-02-14 16:02:01 +08:00
xingyuv 4a1a1ab297 refactor: table-v2 2023-02-14 15:48:23 +08:00
971 changed files with 75817 additions and 17751 deletions

No files matched your search

+2
View File
@@ -13,3 +13,5 @@ VITE_APP_TENANT_ENABLE=true
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=true
# 百度统计
VITE_APP_BAIDU_CODE = a1ff8825baa73c3a78eb96aa40325abc
+2 -2
View File
@@ -4,10 +4,10 @@ NODE_ENV=development
VITE_DEV=true
# 请求路径
VITE_BASE_URL='http://localhost:48080'
VITE_BASE_URL='http://127.0.0.1:48080'
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
VITE_UPLOAD_URL='http://127.0.0.1:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=/dev-api
+5 -5
View File
@@ -1,5 +1,5 @@
# 开发环境
NODE_ENV=production
NODE_ENV=development
VITE_DEV=false
@@ -16,16 +16,16 @@ VITE_API_BASEPATH=/dev-api
VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/dist-dev/
VITE_BASE_PATH=/
# 是否删除debugger
VITE_DROP_DEBUGGER=false
VITE_DROP_DEBUGGER=true
# 是否删除console.log
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=true
VITE_SOURCEMAP=false
# 输出路径
VITE_OUT_DIR=dist-dev
VITE_OUT_DIR=dist
+15
View File
@@ -17,3 +17,18 @@ VITE_API_URL=/admin-api
# 打包路径
VITE_BASE_PATH=/
# 项目本地运行端口号, 与.vscode/launch.json配合
VITE_PORT=80
# 是否删除debugger
VITE_DROP_DEBUGGER=false
# 是否删除console.log
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=true
# 验证码的开关
VITE_APP_CAPTCHA_ENABLE=false
+31
View File
@@ -0,0 +1,31 @@
# 生产环境
NODE_ENV=production
VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://api-dashboard.yudao.iocoder.cn'
# 上传路径
VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
# 是否删除debugger
VITE_DROP_DEBUGGER=true
# 是否删除console.log
VITE_DROP_CONSOLE=true
# 是否sourcemap
VITE_SOURCEMAP=false
# 打包路径
VITE_BASE_PATH='http://static-vue3.yudao.iocoder.cn/'
# 输出路径
VITE_OUT_DIR=dist-stage
-31
View File
@@ -1,31 +0,0 @@
# 测试环境
NODE_ENV=production
VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://localhost:48080'
# 上传路径
VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload'
# 接口前缀
VITE_API_BASEPATH=
# 接口地址
VITE_API_URL=/admin-api
# 是否删除debugger
VITE_DROP_DEBUGGER=false
# 是否删除console.log
VITE_DROP_CONSOLE=false
# 是否sourcemap
VITE_SOURCEMAP=true
# 打包路径
VITE_BASE_PATH=/dist-test/
# 输出路径
VITE_OUT_DIR=dist-test
+8 -4
View File
@@ -22,9 +22,10 @@ module.exports = defineConfig({
'plugin:@typescript-eslint/recommended',
'prettier',
'plugin:prettier/recommended',
'./.eslintrc-auto-import.json'
'@unocss'
],
rules: {
'vue/no-setup-props-destructure': 'off',
'vue/script-setup-uses-vars': 'error',
'vue/no-reserved-component-names': 'off',
'@typescript-eslint/ban-ts-ignore': 'off',
@@ -39,8 +40,8 @@ module.exports = defineConfig({
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/no-non-null-assertion': 'off',
'@typescript-eslint/explicit-module-boundary-types': 'off',
'@typescript-eslint/no-unused-vars': 'error',
'no-unused-vars': 'error',
'@typescript-eslint/no-unused-vars': 'off',
'no-unused-vars': 'off',
'space-before-function-paren': 'off',
'vue/attributes-order': 'off',
@@ -52,6 +53,7 @@ module.exports = defineConfig({
'vue/attribute-hyphenation': 'off',
'vue/require-default-prop': 'off',
'vue/require-explicit-emits': 'off',
'vue/require-toggle-inside-transition': 'off',
'vue/html-self-closing': [
'error',
{
@@ -64,6 +66,8 @@ module.exports = defineConfig({
math: 'always'
}
],
'vue/multi-word-component-names': 'off'
'vue/multi-word-component-names': 'off',
'vue/no-v-html': 'off',
'prettier/prettier': 'off' // 芋艿:默认关闭 prettier 的 ESLint 校验,因为我们使用的是 IDE 的 Prettier 插件
}
})
+3
View File
@@ -6,3 +6,6 @@ dist-ssr
/dist*
*-lock.*
pnpm-debug
auto-*.d.ts
.idea
.history
Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 142 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 95 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 139 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 201 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 160 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 150 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 83 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 69 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 78 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 87 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 208 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 97 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 116 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 173 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 125 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 80 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 129 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 102 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 73 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 109 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 62 KiB

+7 -3
View File
@@ -1,15 +1,19 @@
{
"recommendations": [
"voorjaar.windicss-intellisense",
"christian-kohler.path-intellisense",
"vscode-icons-team.vscode-icons",
"davidanson.vscode-markdownlint",
"stylelint.vscode-stylelint",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"vue.volar",
"mrmlnc.vscode-less",
"lokalise.i18n-ally",
"redhat.vscode-yaml",
"csstools.postcss",
"mikestead.dotenv",
"eamodio.gitlens",
"antfu.iconify"
"antfu.iconify",
"antfu.unocss",
"Vue.volar"
]
}
+16
View File
@@ -0,0 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "msedge",
"request": "launch",
"name": "Launch Edge against localhost",
"url": "http://localhost",
"webRoot": "${workspaceFolder}/src",
"sourceMaps": true
}
]
}
+118 -18
View File
@@ -1,44 +1,144 @@
{
"typescript.tsdk": "node_modules/typescript/lib",
"prettier.enable": true,
"editor.formatOnType": true,
"editor.formatOnSave": true,
"editor.formatOnPaste": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"npm.packageManager": "pnpm",
"editor.tabSize": 2,
"prettier.printWidth": 100, // 超过最大值换行
"editor.defaultFormatter": "esbenp.prettier-vscode",
"files.eol": "\n",
"search.exclude": {
"**/node_modules": true,
"**/*.log": true,
"**/*.log*": true,
"**/bower_components": true,
"**/dist": true,
"**/elehukouben": true,
"**/.git": true,
"**/.gitignore": true,
"**/.svn": true,
"**/.DS_Store": true,
"**/.idea": true,
"**/.vscode": false,
"**/yarn.lock": true,
"**/tmp": true,
"out": true,
"dist": true,
"node_modules": true,
"CHANGELOG.md": true,
"examples": true,
"res": true,
"screenshots": true,
"yarn-error.log": true,
"**/.yarn": true
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"files.exclude": {
"**/.cache": true,
"**/.editorconfig": true,
"**/.eslintcache": true,
"**/bower_components": true,
"**/.idea": true,
"**/tmp": true,
"**/.git": true,
"**/.svn": true,
"**/.hg": true,
"**/CVS": true,
"**/.DS_Store": true
},
"[javascript]": {
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true,
"**/.vscode/**": true,
"**/node_modules/**": true,
"**/tmp/**": true,
"**/bower_components/**": true,
"**/dist/**": true,
"**/yarn.lock": true
},
"stylelint.enable": true,
"stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"],
"path-intellisense.mappings": {
"@/": "${workspaceRoot}/src"
},
"[javascriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
"[typescriptreact]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
},
"[less]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[scss]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"[vue]": {
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
},
"i18n-ally.localesPaths": ["src/locales"],
"i18n-ally.keystyle": "nested",
"i18n-ally.sortKeys": true,
"i18n-ally.namespace": true,
"i18n-ally.namespace": false,
"i18n-ally.enabledParsers": ["ts"],
"i18n-ally.sourceLanguage": "en",
"i18n-ally.displayLanguage": "zh-CN",
"i18n-ally.enabledFrameworks": ["vue", "react"],
"god.tsconfig": "./tsconfig.json",
"vue-i18n.i18nPaths": "src/locales"
"cSpell.words": [
"brotli",
"browserslist",
"codemirror",
"commitlint",
"cropperjs",
"echart",
"echarts",
"esnext",
"esno",
"iconify",
"INTLIFY",
"lintstagedrc",
"logicflow",
"nprogress",
"pinia",
"pnpm",
"qrcode",
"sider",
"sortablejs",
"stylelint",
"svgs",
"unocss",
"unplugin",
"unref",
"videojs",
"VITE",
"vitejs",
"vueuse",
"wangeditor",
"xingyu",
"yudao",
"zxcvbn"
],
// 控制相关文件嵌套展示
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
"explorer.fileNesting.patterns": {
"*.ts": "$(capture).test.ts, $(capture).test.tsx",
"*.tsx": "$(capture).test.ts, $(capture).test.tsx",
"*.env": "$(capture).env.*",
"package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
},
"terminal.integrated.scrollback": 10000,
"nuxt.isNuxtApp": false
}
+75 -62
View File
@@ -9,7 +9,10 @@
## 🐶 新手必读
* 演示地址:<http://dashboard.yudao.iocoder.cn>
* nodejs > 16.18.0 && pnpm > 8.6.0 (强制使用pnpm)
* 演示地址【Vue3 + element-plus】:<http://dashboard-vue3.yudao.iocoder.cn>
* 演示地址【Vue3 + vben(ant-design-vue)】:<http://dashboard-vben.yudao.iocoder.cn>
* 演示地址【Vue2 + element-ui】:<http://dashboard.yudao.iocoder.cn>
* 启动文档:<https://doc.iocoder.cn/quick-start/>
* 视频教程:<https://doc.iocoder.cn/video/>
@@ -17,11 +20,11 @@
**芋道**,以开发者为中心,打造中国第一流的快速开发平台,全部开源,个人与企业可 100% 免费使用。
* 采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin)
* 改换saas,自动引入等功能 [vue-element-plus-admin](https://gitee.com/yudaocode/vue-element-plus-admin)
* 采用 [vue-element-plus-admin](https://gitee.com/kailong110120130/vue-element-plus-admin) 实现
* 改换 saas,自动引入等功能
* 使用 Element Plus 免费开源的中后台模版,具备如下特性:
![首页](preview/home.png)
![首页](public/home.png)
* **最新技术栈**:使用 Vue3、Vite4 等前端前沿技术开发
* **TypeScript**: 应用程序级 JavaScript 的语言
@@ -35,17 +38,16 @@
| 框架 | 说明 | 版本 |
|----------------------------------------------------------------------|------------------|--------|
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.2.47 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.1.1 |
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.2.30 |
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 4.9.5 |
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.0.30 |
| [vueuse](https://vueuse.org/) | 常用工具集 | 9.12.0 |
| [vxe-table](https://vxetable.cn/) | Vue 最强表单 | 4.3.10 |
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.2.2 |
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.1.6 |
| [windicss](https://cn.windicss.org/) | 下一代工具优先的 CSS 框架 | 3.5.6 |
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.0.1 |
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.8 |
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.5.0 |
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.4.2 |
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 |
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.7 |
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.6.1 |
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.6.5 |
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 |
| [unocss](https://uno.antfu.me/) | 原子 css | 0.57.4 |
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
## 开发工具
@@ -54,16 +56,28 @@
| 插件名 | 功能 |
|-------------------------------|--------------------------|
| TypeScript Vue Plugin (Volar) | 用于 TypeScript 的 Vue 插件 |
| TypeScript Vue Plugin (Volar) | 用于 TypeScript 的 Vue 插件 |
| Vue Language Features (Volar) | Vue3.0 语法支持 |
| WindiCSS IntelliSense | 自动完成、语法突出显示、代码折叠和构建等高级功能 |
| Iconify IntelliSense | Iconify 预览和搜索 |
| i18n Ally | 国际化智能提示 |
| unocss | unocss for vscode |
| Iconify IntelliSense | Iconify 预览和搜索 |
| i18n Ally | 国际化智能提示 |
| Stylelint | Css 格式化 |
| Prettier | 代码格式化 |
| ESLint | 脚本代码检查 |
| Prettier | 代码格式化 |
| ESLint | 脚本代码检查 |
| DotENV | env 文件高亮 |
## 🔥 后端架构
支持 Spring Boot、Spring Cloud 两种架构:
① Spring Boot 单体架构:<https://github.com/YunaiV/ruoyi-vue-pro>
![架构图](/.image/common/ruoyi-vue-pro-architecture.png)
② Spring Cloud 微服务架构:<https://github.com/YunaiV/yudao-cloud>
![架构图](/.image/common/yudao-cloud-architecture.png)
## 内置功能
系统内置多种多种业务功能,可以用于快速你的业务系统:
@@ -134,7 +148,7 @@ ps:核心功能已经实现,正在对接微信小程序中...
| | 表单构建 | 拖动表单元素生成相应的 HTML 代码,支持导出 JSON、Vue 文件 |
| 🚀 | 配置管理 | 对系统动态配置常用参数,支持 SpringBoot 加载 |
| ⭐️ | 定时任务 | 在线(添加、修改、删除)任务调度包含执行结果日志 |
| 🚀 | 文件服务 | 支持将文件存储到 S3(MinIO、阿里云、腾讯云、七牛云)、本地、FTP、数据库等 |
| 🚀 | 文件服务 | 支持将文件存储到 S3(MinIO、阿里云、腾讯云、七牛云)、本地、FTP、数据库等 |
| 🚀 | API 日志 | 包括 RESTful API 访问日志、异常日志两部分,方便排查 API 相关的问题 |
| | MySQL 监控 | 监视当前系统数据库连接池状态,可进行分析SQL找出系统性能瓶颈 |
| | Redis 监控 | 监控 Redis 数据库的使用情况,使用的 Redis Key 管理 |
@@ -172,62 +186,61 @@ ps:核心功能已经实现,正在对接微信小程序中...
### 商城系统
建设中...
![功能图](/.image/common/mall-feature.png)
![功能图](http://static.iocoder.cn/mall%20%E5%8A%9F%E8%83%BD%E5%9B%BE-min.png)
![功能图](/.image/common/mall-preview.png)
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-admin-min.gif)
_前端基于 crmeb uniapp 经过授权重构,优化代码实现,接入芋道快速开发平台_
![GIF 图-耐心等待](https://raw.githubusercontent.com/YunaiV/Blog/master/Mall/onemall-h5-min.gif)
演示地址:<https://doc.iocoder.cn/mall-preview/>
## 🐷 演示图
### 系统功能
| 模块 | biu | biu | biu |
|------------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
| 登录 & 首页 | ![登录](https://static.iocoder.cn/images/ruoyi-vue-pro/登录.jpg?imageView2/2/format/webp/w/1280) | ![首页](https://static.iocoder.cn/images/ruoyi-vue-pro/首页.jpg?imageView2/2/format/webp/w/1280) | ![个人中心](https://static.iocoder.cn/images/ruoyi-vue-pro/个人中心.jpg?imageView2/2/format/webp/w/1280) |
| 用户 & 应用 | ![用户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/用户管理.jpg?imageView2/2/format/webp/w/1280) | ![令牌管理](https://static.iocoder.cn/images/ruoyi-vue-pro/令牌管理.jpg?imageView2/2/format/webp/w/1280) | ![应用管理](https://static.iocoder.cn/images/ruoyi-vue-pro/应用管理.jpg?imageView2/2/format/webp/w/1280) |
| 租户 & 套餐 | ![租户管理](https://static.iocoder.cn/images/ruoyi-vue-pro/租户管理.jpg?imageView2/2/format/webp/w/1280) | ![租户套餐](https://static.iocoder.cn/images/ruoyi-vue-pro/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](https://static.iocoder.cn/images/ruoyi-vue-pro/部门管理.jpg?imageView2/2/format/webp/w/1280) | ![岗位管理](https://static.iocoder.cn/images/ruoyi-vue-pro/岗位管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 菜单 & 角色 | ![菜单管理](https://static.iocoder.cn/images/ruoyi-vue-pro/菜单管理.jpg?imageView2/2/format/webp/w/1280) | ![角色管理](https://static.iocoder.cn/images/ruoyi-vue-pro/角色管理.jpg?imageView2/2/format/webp/w/1280) | - |
| 审计日志 | ![操作日志](https://static.iocoder.cn/images/ruoyi-vue-pro/操作日志.jpg?imageView2/2/format/webp/w/1280) | ![登录日志](https://static.iocoder.cn/images/ruoyi-vue-pro/登录日志.jpg?imageView2/2/format/webp/w/1280) | - |
| 短信 | ![短信渠道](https://static.iocoder.cn/images/ruoyi-vue-pro/短信渠道.jpg?imageView2/2/format/webp/w/1280) | ![短信模板](https://static.iocoder.cn/images/ruoyi-vue-pro/短信模板.jpg?imageView2/2/format/webp/w/1280) | ![短信日志](https://static.iocoder.cn/images/ruoyi-vue-pro/短信日志.jpg?imageView2/2/format/webp/w/1280) |
| 字典 & 敏感词 | ![字典类型](https://static.iocoder.cn/images/ruoyi-vue-pro/字典类型.jpg?imageView2/2/format/webp/w/1280) | ![字典数据](https://static.iocoder.cn/images/ruoyi-vue-pro/字典数据.jpg?imageView2/2/format/webp/w/1280) | ![敏感词](https://static.iocoder.cn/images/ruoyi-vue-pro/敏感词.jpg?imageView2/2/format/webp/w/1280) |
| 错误码 & 通知 | ![错误码管理](https://static.iocoder.cn/images/ruoyi-vue-pro/错误码管理.jpg?imageView2/2/format/webp/w/1280) | ![通知公告](https://static.iocoder.cn/images/ruoyi-vue-pro/通知公告.jpg?imageView2/2/format/webp/w/1280) | - |
| 模块 | biu | biu | biu |
|----------|-----------------------------|---------------------------|--------------------------|
| 登录 & 首页 | ![登录](/.image/登录.jpg) | ![首页](/.image/首页.jpg) | ![个人中心](/.image/个人中心.jpg) |
| 用户 & 应用 | ![用户管理](/.image/用户管理.jpg) | ![令牌管理](/.image/令牌管理.jpg) | ![应用管理](/.image/应用管理.jpg) |
| 租户 & 套餐 | ![租户管理](/.image/租户管理.jpg) | ![租户套餐](/.image/租户套餐.png) | - |
| 部门 & 岗位 | ![部门管理](/.image/部门管理.jpg) | ![岗位管理](/.image/岗位管理.jpg) | - |
| 菜单 & 角色 | ![菜单管理](/.image/菜单管理.jpg) | ![角色管理](/.image/角色管理.jpg) | - |
| 审计日志 | ![操作日志](/.image/操作日志.jpg) | ![登录日志](/.image/登录日志.jpg) | - |
| 短信 | ![短信渠道](/.image/短信渠道.jpg) | ![短信模板](/.image/短信模板.jpg) | ![短信日志](/.image/短信日志.jpg) |
| 字典 & 敏感词 | ![字典类型](/.image/字典类型.jpg) | ![字典数据](/.image/字典数据.jpg) | ![敏感词](/.image/敏感词.jpg) |
| 错误码 & 通知 | ![错误码管理](/.image/错误码管理.jpg) | ![通知公告](/.image/通知公告.jpg) | - |
### 工作流程
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 流程模型 | ![流程模型-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-列表.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-设计](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-设计.jpg?imageView2/2/format/webp/w/1280) | ![流程模型-定义](https://static.iocoder.cn/images/ruoyi-vue-pro/流程模型-定义.jpg?imageView2/2/format/webp/w/1280) |
| 表单 & 分组 | ![流程表单](https://static.iocoder.cn/images/ruoyi-vue-pro/流程表单.jpg?imageView2/2/format/webp/w/1280) | ![用户分组](https://static.iocoder.cn/images/ruoyi-vue-pro/用户分组.jpg?imageView2/2/format/webp/w/1280) | - |
| 我的流程 | ![我的流程-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-列表.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-发起.jpg?imageView2/2/format/webp/w/1280) | ![我的流程-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/我的流程-详情.jpg?imageView2/2/format/webp/w/1280) |
| 待办 & 已办 | ![任务列表-审批](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-审批.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-待办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-待办.jpg?imageView2/2/format/webp/w/1280) | ![任务列表-已办](https://static.iocoder.cn/images/ruoyi-vue-pro/任务列表-已办.jpg?imageView2/2/format/webp/w/1280) |
| OA 请假 | ![OA请假-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-列表.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-发起](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-发起.jpg?imageView2/2/format/webp/w/1280) | ![OA请假-详情](https://static.iocoder.cn/images/ruoyi-vue-pro/OA请假-详情.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------|---------------------------------|---------------------------------|---------------------------------|
| 流程模型 | ![流程模型-列表](/.image/流程模型-列表.jpg) | ![流程模型-设计](/.image/流程模型-设计.jpg) | ![流程模型-定义](/.image/流程模型-定义.jpg) |
| 表单 & 分组 | ![流程表单](/.image/流程表单.jpg) | ![用户分组](/.image/用户分组.jpg) | - |
| 我的流程 | ![我的流程-列表](/.image/我的流程-列表.jpg) | ![我的流程-发起](/.image/我的流程-发起.jpg) | ![我的流程-详情](/.image/我的流程-详情.jpg) |
| 待办 & 已办 | ![任务列表-审批](/.image/任务列表-审批.jpg) | ![任务列表-待办](/.image/任务列表-待办.jpg) | ![任务列表-已办](/.image/任务列表-已办.jpg) |
| OA 请假 | ![OA请假-列表](/.image/OA请假-列表.jpg) | ![OA请假-发起](/.image/OA请假-发起.jpg) | ![OA请假-详情](/.image/OA请假-详情.jpg) |
### 基础设施
| 模块 | biu | biu | biu |
|---------------|----------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------|
| 代码生成 | ![代码生成](https://static.iocoder.cn/images/ruoyi-vue-pro/代码生成.jpg?imageView2/2/format/webp/w/1280) | ![生成效果](https://static.iocoder.cn/images/ruoyi-vue-pro/生成效果.jpg?imageView2/2/format/webp/w/1280) | - |
| 文档 | ![系统接口](https://static.iocoder.cn/images/ruoyi-vue-pro/系统接口.jpg?imageView2/2/format/webp/w/1280) | ![数据库文档](https://static.iocoder.cn/images/ruoyi-vue-pro/数据库文档.jpg?imageView2/2/format/webp/w/1280) | - |
| 文件 & 配置 | ![文件配置](https://static.iocoder.cn/images/ruoyi-vue-pro/文件配置.jpg?imageView2/2/format/webp/w/1280) | ![文件管理](https://static.iocoder.cn/images/ruoyi-vue-pro/文件管理2.jpg?imageView2/2/format/webp/w/1280) | ![配置管理](https://static.iocoder.cn/images/ruoyi-vue-pro/配置管理.jpg?imageView2/2/format/webp/w/1280) |
| 定时任务 | ![定时任务](https://static.iocoder.cn/images/ruoyi-vue-pro/定时任务.jpg?imageView2/2/format/webp/w/1280) | ![任务日志](https://static.iocoder.cn/images/ruoyi-vue-pro/任务日志.jpg?imageView2/2/format/webp/w/1280) | - |
| API 日志 | ![访问日志](https://static.iocoder.cn/images/ruoyi-vue-pro/访问日志.jpg?imageView2/2/format/webp/w/1280) | ![错误日志](https://static.iocoder.cn/images/ruoyi-vue-pro/错误日志.jpg?imageView2/2/format/webp/w/1280) | - |
| MySQL & Redis | ![MySQL](https://static.iocoder.cn/images/ruoyi-vue-pro/MySQL.jpg?imageView2/2/format/webp/w/1280) | ![Redis](https://static.iocoder.cn/images/ruoyi-vue-pro/Redis.jpg?imageView2/2/format/webp/w/1280) | - |
| 监控平台 | ![Java监控](https://static.iocoder.cn/images/ruoyi-vue-pro/Java监控.jpg?imageView2/2/format/webp/w/1280) | ![链路追踪](https://static.iocoder.cn/images/ruoyi-vue-pro/链路追踪.jpg?imageView2/2/format/webp/w/1280) | ![日志中心](https://static.iocoder.cn/images/ruoyi-vue-pro/日志中心.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|---------------|-------------------------------|-----------------------------|---------------------------|
| 代码生成 | ![代码生成](/.image/代码生成.jpg) | ![生成效果](/.image/生成效果.jpg) | - |
| 文档 | ![系统接口](/.image/系统接口.jpg) | ![数据库文档](/.image/数据库文档.jpg) | - |
| 文件 & 配置 | ![文件配置](/.image/文件配置.jpg) | ![文件管理](/.image/文件管理2.jpg) | ![配置管理](/.image/配置管理.jpg) |
| 定时任务 | ![定时任务](/.image/定时任务.jpg) | ![任务日志](/.image/任务日志.jpg) | - |
| API 日志 | ![访问日志](/.image/访问日志.jpg) | ![错误日志](/.image/错误日志.jpg) | - |
| MySQL & Redis | ![MySQL](/.image/MySQL.jpg) | ![Redis](/.image/Redis.jpg) | - |
| 监控平台 | ![Java监控](/.image/Java监控.jpg) | ![链路追踪](/.image/链路追踪.jpg) | ![日志中心](/.image/日志中心.jpg) |
### 支付系统
| 模块 | biu | biu | biu |
|---------|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
| 商家 & 应用 | ![商户信息](https://static.iocoder.cn/images/ruoyi-vue-pro/商户信息.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-列表](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-列表.jpg?imageView2/2/format/webp/w/1280) | ![应用信息-编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/应用信息-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 支付 & 退款 | ![支付订单](https://static.iocoder.cn/images/ruoyi-vue-pro/支付订单.jpg?imageView2/2/format/webp/w/1280) | ![退款订单](https://static.iocoder.cn/images/ruoyi-vue-pro/退款订单.jpg?imageView2/2/format/webp/w/1280) | --- |
| 模块 | biu | biu | biu |
|---------|---------------------------|---------------------------------|---------------------------------|
| 商家 & 应用 | ![商户信息](/.image/商户信息.jpg) | ![应用信息-列表](/.image/应用信息-列表.jpg) | ![应用信息-编辑](/.image/应用信息-编辑.jpg) |
| 支付 & 退款 | ![支付订单](/.image/支付订单.jpg) | ![退款订单](/.image/退款订单.jpg) | --- |
### 数据报表
| 模块 | biu | biu | biu |
|-------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|
| 报表设计器 | ![数据报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-数据报表.jpg?imageView2/2/format/webp/w/1280) | ![图形报表](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-图形报表.jpg?imageView2/2/format/webp/w/1280) | ![报表设计器-打印设计](https://static.iocoder.cn/images/ruoyi-vue-pro/报表设计器-打印设计.jpg?imageView2/2/format/webp/w/1280) |
| 大屏设计器 | ![大屏列表](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-列表.jpg?imageView2/2/format/webp/w/1280) | ![大屏预览](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-预览.jpg?imageView2/2/format/webp/w/1280) | ![大屏编辑](https://static.iocoder.cn/images/ruoyi-vue-pro/大屏设计器-编辑.jpg?imageView2/2/format/webp/w/1280) |
| 模块 | biu | biu | biu |
|-------|---------------------------------|---------------------------------|---------------------------------------|
| 报表设计器 | ![数据报表](/.image/报表设计器-数据报表.jpg) | ![图形报表](/.image/报表设计器-图形报表.jpg) | ![报表设计器-打印设计](/.image/报表设计器-打印设计.jpg) |
| 大屏设计器 | ![大屏列表](/.image/大屏设计器-列表.jpg) | ![大屏预览](/.image/大屏设计器-预览.jpg) | ![大屏编辑](/.image/大屏设计器-编辑.jpg) |
+20 -18
View File
@@ -1,33 +1,36 @@
import { resolve } from 'path'
import Vue from '@vitejs/plugin-vue'
import VueJsx from '@vitejs/plugin-vue-jsx'
import WindiCSS from 'vite-plugin-windicss'
import progress from 'vite-plugin-progress'
import EslintPlugin from 'vite-plugin-eslint'
import PurgeIcons from 'vite-plugin-purge-icons'
import { ViteEjsPlugin } from 'vite-plugin-ejs'
// @ts-ignore
import ElementPlus from 'unplugin-element-plus/vite'
import AutoImport from 'unplugin-auto-import/vite'
import Components from 'unplugin-vue-components/vite'
import { ElementPlusResolver } from 'unplugin-vue-components/resolvers'
import viteCompression from 'vite-plugin-compression'
import vueSetupExtend from 'vite-plugin-vue-setup-extend'
import topLevelAwait from 'vite-plugin-top-level-await'
import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite'
import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
export function createVitePlugins(VITE_APP_TITLE: string) {
import UnoCSS from 'unocss/vite'
export function createVitePlugins() {
const root = process.cwd()
// 路径查找
function pathResolve(dir: string) {
return resolve(root, '.', dir)
}
return [
Vue(),
VueJsx(),
WindiCSS(),
UnoCSS(),
progress(),
PurgeIcons(),
vueSetupExtend(),
ElementPlus(),
ElementPlus({}),
AutoImport({
include: [
/\.[tj]sx?$/, // .ts, .tsx, .js, .jsx
@@ -38,11 +41,12 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
imports: [
'vue',
'vue-router',
// 可额外添加需要 autoImport 的组件
{
'@/hooks/web/useI18n': ['useI18n'],
'@/hooks/web/useXTable': ['useXTable'],
'@/hooks/web/useMessage': ['useMessage'],
'@/hooks/web/useVxeCrudSchemas': ['useVxeCrudSchemas'],
'@/hooks/web/useTable': ['useTable'],
'@/hooks/web/useCrudSchemas': ['useCrudSchemas'],
'@/utils/formRules': ['required'],
'@/utils/dict': ['DICT_TYPE']
}
@@ -56,18 +60,11 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
}
}),
Components({
// 要搜索组件的目录的相对路径
dirs: ['src/components'],
// 组件的有效文件扩展名
extensions: ['vue', 'md'],
// 搜索子目录
deep: true,
include: [/\.vue$/, /\.vue\?vue/],
// 生成自定义 `auto-components.d.ts` 全局声明
dts: 'src/types/auto-components.d.ts',
// 自定义组件的解析器
resolvers: [ElementPlusResolver()],
exclude: [/[\\/]node_modules[\\/]/]
globs: ["src/components/**/**.{vue, md}", '!src/components/DiyEditor/components/mobile/**']
}),
EslintPlugin({
cache: false,
@@ -91,8 +88,13 @@ export function createVitePlugins(VITE_APP_TITLE: string) {
ext: '.gz', // 生成的压缩包后缀
deleteOriginFile: false //压缩后是否删除源文件
}),
ViteEjsPlugin({
title: VITE_APP_TITLE
ViteEjsPlugin(),
topLevelAwait({
// https://juejin.cn/post/7152191742513512485
// The export name of top-level await promise for each chunk module
promiseExportName: '__tla',
// The function to generate import names of top-level await promise in each chunk module
promiseImportName: (i) => `__tla_${i}`
})
]
}
+75 -38
View File
@@ -8,20 +8,14 @@ const include = [
'pinia',
'dayjs',
'qrcode',
'windicss',
'unocss',
'vue-router',
'vue-types',
'vue-i18n',
'xe-utils',
'crypto-js',
'cropperjs',
'lodash-es',
'nprogress',
'animate.css',
'vxe-table',
'vxe-table/es/style',
'vxe-table/lib/locale/lang/zh-CN',
'vxe-table/lib/locale/lang/en-US',
'web-storage-cache',
'@iconify/iconify',
'@vueuse/core',
@@ -37,37 +31,80 @@ const include = [
'element-plus/es',
'element-plus/es/locale/lang/zh-cn',
'element-plus/es/locale/lang/en',
'element-plus/es/components/backtop/style/index',
'element-plus/es/components/form/style/index',
'element-plus/es/components/radio-group/style/index',
'element-plus/es/components/radio/style/index',
'element-plus/es/components/checkbox/style/index',
'element-plus/es/components/checkbox-group/style/index',
'element-plus/es/components/switch/style/index',
'element-plus/es/components/time-picker/style/index',
'element-plus/es/components/date-picker/style/index',
'element-plus/es/components/col/style/index',
'element-plus/es/components/form-item/style/index',
'element-plus/es/components/alert/style/index',
'element-plus/es/components/breadcrumb/style/index',
'element-plus/es/components/select/style/index',
'element-plus/es/components/input/style/index',
'element-plus/es/components/breadcrumb-item/style/index',
'element-plus/es/components/tag/style/index',
'element-plus/es/components/pagination/style/index',
'element-plus/es/components/table/style/index',
'element-plus/es/components/table-column/style/index',
'element-plus/es/components/card/style/index',
'element-plus/es/components/row/style/index',
'element-plus/es/components/button/style/index',
'element-plus/es/components/menu/style/index',
'element-plus/es/components/sub-menu/style/index',
'element-plus/es/components/menu-item/style/index',
'element-plus/es/components/option/style/index',
'element-plus/es/components/dropdown/style/index',
'element-plus/es/components/dropdown-menu/style/index',
'element-plus/es/components/dropdown-item/style/index',
'element-plus/es/components/skeleton/style/index'
'element-plus/es/components/avatar/style/css',
'element-plus/es/components/space/style/css',
'element-plus/es/components/backtop/style/css',
'element-plus/es/components/form/style/css',
'element-plus/es/components/radio-group/style/css',
'element-plus/es/components/radio/style/css',
'element-plus/es/components/checkbox/style/css',
'element-plus/es/components/checkbox-group/style/css',
'element-plus/es/components/switch/style/css',
'element-plus/es/components/time-picker/style/css',
'element-plus/es/components/date-picker/style/css',
'element-plus/es/components/descriptions/style/css',
'element-plus/es/components/descriptions-item/style/css',
'element-plus/es/components/link/style/css',
'element-plus/es/components/tooltip/style/css',
'element-plus/es/components/drawer/style/css',
'element-plus/es/components/dialog/style/css',
'element-plus/es/components/checkbox-button/style/css',
'element-plus/es/components/option-group/style/css',
'element-plus/es/components/radio-button/style/css',
'element-plus/es/components/cascader/style/css',
'element-plus/es/components/color-picker/style/css',
'element-plus/es/components/input-number/style/css',
'element-plus/es/components/rate/style/css',
'element-plus/es/components/select-v2/style/css',
'element-plus/es/components/tree-select/style/css',
'element-plus/es/components/slider/style/css',
'element-plus/es/components/time-select/style/css',
'element-plus/es/components/autocomplete/style/css',
'element-plus/es/components/image-viewer/style/css',
'element-plus/es/components/upload/style/css',
'element-plus/es/components/col/style/css',
'element-plus/es/components/form-item/style/css',
'element-plus/es/components/alert/style/css',
'element-plus/es/components/breadcrumb/style/css',
'element-plus/es/components/select/style/css',
'element-plus/es/components/input/style/css',
'element-plus/es/components/breadcrumb-item/style/css',
'element-plus/es/components/tag/style/css',
'element-plus/es/components/pagination/style/css',
'element-plus/es/components/table/style/css',
'element-plus/es/components/table-v2/style/css',
'element-plus/es/components/table-column/style/css',
'element-plus/es/components/card/style/css',
'element-plus/es/components/row/style/css',
'element-plus/es/components/button/style/css',
'element-plus/es/components/menu/style/css',
'element-plus/es/components/sub-menu/style/css',
'element-plus/es/components/menu-item/style/css',
'element-plus/es/components/option/style/css',
'element-plus/es/components/dropdown/style/css',
'element-plus/es/components/dropdown-menu/style/css',
'element-plus/es/components/dropdown-item/style/css',
'element-plus/es/components/skeleton/style/css',
'element-plus/es/components/skeleton/style/css',
'element-plus/es/components/backtop/style/css',
'element-plus/es/components/menu/style/css',
'element-plus/es/components/sub-menu/style/css',
'element-plus/es/components/menu-item/style/css',
'element-plus/es/components/dropdown/style/css',
'element-plus/es/components/tree/style/css',
'element-plus/es/components/dropdown-menu/style/css',
'element-plus/es/components/dropdown-item/style/css',
'element-plus/es/components/badge/style/css',
'element-plus/es/components/breadcrumb/style/css',
'element-plus/es/components/breadcrumb-item/style/css',
'element-plus/es/components/image/style/css',
'element-plus/es/components/collapse-transition/style/css',
'element-plus/es/components/timeline/style/css',
'element-plus/es/components/timeline-item/style/css',
'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'
]
const exclude = ['@iconify/json']
+2 -2
View File
@@ -13,7 +13,7 @@
name="description"
content="芋道管理系统 基于 vue3 + CompositionAPI + typescript + vite3 + element plus 的后台开源免费管理系统!"
/>
<title><%= title %></title>
<title>%VITE_APP_TITLE%</title>
</head>
<body>
<div id="app">
@@ -137,7 +137,7 @@
<div class="app-loading-wrap">
<div class="app-loading-title">
<img src="/logo.gif" class="app-loading-logo" alt="Logo" />
<div class="app-loading-title"><%= title %></div>
<div class="app-loading-title">%VITE_APP_TITLE%</div>
</div>
<div class="app-loading-item">
<div class="app-loading-outter"></div>
+96 -89
View File
@@ -1,6 +1,6 @@
{
"name": "yudao-ui-admin-vue3",
"version": "1.7.0-snapshot.1922",
"version": "1.8.3-snapshot",
"description": "基于vue3、vite4、element-plus、typesScript",
"author": "xingyu",
"private": false,
@@ -9,123 +9,125 @@
"dev": "vite --mode base",
"front": "vite --mode front",
"ts:check": "vue-tsc --noEmit",
"build:pro": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode pro",
"build:dev": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode dev",
"build:test": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode test",
"build:static": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode static",
"build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro",
"build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev",
"build:base": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode base",
"build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage",
"build:static": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode static",
"build:front": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode front",
"serve:pro": "vite preview --mode pro",
"serve:dev": "vite preview --mode dev",
"serve:test": "vite preview --mode test",
"npm:check": "npx npm-check-updates",
"preview": "pnpm build:base && vite preview",
"clean": "npx rimraf node_modules",
"clean:cache": "npx rimraf node_modules/.cache",
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
"lint:format": "prettier --write --loglevel warn \"src/**/*.{js,ts,json,tsx,css,less,scss,vue,html,md}\"",
"lint:style": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:lint-staged": "lint-staged -c ",
"lint:pretty": "pretty-quick --staged"
"lint:style": "stylelint --fix \"./src/**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
"lint:lint-staged": "lint-staged -c "
},
"dependencies": {
"@form-create/designer": "^3.1.0",
"@form-create/element-ui": "^3.1.17",
"@iconify/iconify": "^3.1.0",
"@vueuse/core": "^9.12.0",
"@element-plus/icons-vue": "^2.1.0",
"@form-create/designer": "^3.1.3",
"@form-create/element-ui": "^3.1.24",
"@iconify/iconify": "^3.1.1",
"@videojs-player/vue": "^1.0.0",
"@vueuse/core": "^10.6.1",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.10",
"@zxcvbn-ts/core": "^2.2.1",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.3.3",
"axios": "^1.6.1",
"benz-amr-recorder": "^1.1.5",
"bpmn-js-token-simulation": "^0.10.0",
"camunda-bpmn-moddle": "^7.0.1",
"cropperjs": "^1.5.13",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.7",
"diagram-js": "^11.6.0",
"echarts": "^5.4.1",
"cropperjs": "^1.6.1",
"crypto-js": "^4.2.0",
"dayjs": "^1.11.10",
"diagram-js": "^12.8.0",
"driver.js": "^1.3.1",
"echarts": "^5.4.3",
"echarts-wordcloud": "^2.1.0",
"element-plus": "2.2.30",
"fast-xml-parser": "^4.1.2",
"highlight.js": "^11.7.0",
"intro.js": "^6.0.0",
"jsencrypt": "^3.3.1",
"element-plus": "2.4.2",
"fast-xml-parser": "^4.3.2",
"highlight.js": "^11.9.0",
"jsencrypt": "^3.3.2",
"lodash-es": "^4.17.21",
"min-dash": "^4.0.0",
"mitt": "^3.0.0",
"min-dash": "^4.1.1",
"mitt": "^3.0.1",
"nprogress": "^0.2.0",
"pinia": "^2.0.30",
"qrcode": "^1.5.1",
"qs": "^6.11.0",
"pinia": "^2.1.7",
"qrcode": "^1.5.3",
"qs": "^6.11.2",
"sortablejs": "^1.15.0",
"steady-xml": "^0.1.0",
"url": "^0.11.0",
"vue": "3.2.47",
"vue-i18n": "9.2.2",
"vue-router": "^4.1.6",
"vue-types": "^5.0.2",
"url": "^0.11.3",
"video.js": "^7.21.5",
"vue": "^3.3.8",
"vue-dompurify-html": "^4.1.4",
"vue-i18n": "^9.6.5",
"vue-router": "^4.2.5",
"vue-types": "^5.1.1",
"vuedraggable": "^4.1.0",
"vxe-table": "^4.3.10",
"web-storage-cache": "^1.1.1",
"xe-utils": "^3.5.7",
"xml-js": "^1.6.11"
},
"devDependencies": {
"@commitlint/cli": "^17.4.3",
"@commitlint/config-conventional": "^17.4.3",
"@iconify/json": "^2.2.21",
"@intlify/unplugin-vue-i18n": "^0.8.2",
"@commitlint/cli": "^18.4.1",
"@commitlint/config-conventional": "^18.4.0",
"@iconify/json": "^2.2.142",
"@intlify/unplugin-vue-i18n": "^1.5.0",
"@purge-icons/generated": "^0.9.0",
"@types/intro.js": "^5.1.0",
"@types/lodash-es": "^4.17.6",
"@types/node": "^18.13.0",
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.5.0",
"@types/qs": "^6.9.7",
"@typescript-eslint/eslint-plugin": "^5.52.0",
"@typescript-eslint/parser": "^5.52.0",
"@vitejs/plugin-legacy": "^4.0.1",
"@vitejs/plugin-vue": "^4.0.0",
"@vitejs/plugin-vue-jsx": "^3.0.0",
"autoprefixer": "^10.4.13",
"bpmn-js": "^8.9.0",
"bpmn-js-properties-panel": "^0.46.0",
"consola": "^2.15.3",
"eslint": "^8.34.0",
"eslint-config-prettier": "^8.6.0",
"eslint-define-config": "^1.15.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.9.0",
"lint-staged": "^13.1.2",
"postcss": "^8.4.21",
"@types/lodash-es": "^4.17.11",
"@types/node": "^20.9.0",
"@types/nprogress": "^0.2.3",
"@types/qrcode": "^1.5.5",
"@types/qs": "^6.9.10",
"@types/sortablejs": "^1.15.5",
"@typescript-eslint/eslint-plugin": "^6.11.0",
"@typescript-eslint/parser": "^6.11.0",
"@unocss/transformer-variant-group": "^0.57.4",
"@unocss/eslint-config": "^0.57.4",
"@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-vue": "^4.4.1",
"@vitejs/plugin-vue-jsx": "^3.0.2",
"autoprefixer": "^10.4.16",
"bpmn-js": "8.9.0",
"bpmn-js-properties-panel": "0.46.0",
"consola": "^3.2.3",
"eslint": "^8.53.0",
"eslint-config-prettier": "^9.0.0",
"eslint-define-config": "^1.24.1",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-vue": "^9.18.1",
"lint-staged": "^15.1.0",
"postcss": "^8.4.31",
"postcss-html": "^1.5.0",
"postcss-scss": "^4.0.6",
"prettier": "^2.8.4",
"rimraf": "^4.1.2",
"rollup": "^3.15.0",
"sass": "^1.58.1",
"stylelint": "^15.1.0",
"postcss-scss": "^4.0.9",
"prettier": "^3.1.0",
"rimraf": "^5.0.5",
"rollup": "^4.4.1",
"sass": "^1.69.5",
"stylelint": "^15.11.0",
"stylelint-config-html": "^1.1.0",
"stylelint-config-prettier": "^9.0.5",
"stylelint-config-recommended": "^10.0.1",
"stylelint-config-standard": "^30.0.1",
"stylelint-order": "^6.0.2",
"terser": "^5.16.3",
"typescript": "4.9.5",
"unplugin-auto-import": "^0.14.2",
"unplugin-element-plus": "^0.6.0",
"unplugin-vue-components": "^0.23.0",
"vite": "4.1.1",
"stylelint-config-recommended": "^13.0.0",
"stylelint-config-standard": "^34.0.0",
"stylelint-order": "^6.0.3",
"terser": "^5.24.0",
"typescript": "5.2.2",
"unocss": "^0.57.4",
"unplugin-auto-import": "^0.16.7",
"unplugin-element-plus": "^0.8.0",
"unplugin-vue-components": "^0.25.2",
"vite": "4.5.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-ejs": "^1.6.4",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-progress": "^0.0.6",
"vite-plugin-progress": "^0.0.7",
"vite-plugin-purge-icons": "^0.9.2",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vite-plugin-windicss": "^1.8.10",
"vue-tsc": "^1.0.24",
"windicss": "^3.5.6"
},
"engines": {
"node": ">=16.0.0"
"vite-plugin-top-level-await": "^1.3.1",
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.22"
},
"license": "MIT",
"repository": {
@@ -135,5 +137,10 @@
"bugs": {
"url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues"
},
"homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3"
"homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3",
"packageManager": "pnpm@8.6.0",
"engines": {
"node": ">= 16.0.0",
"pnpm": ">=8.6.0"
}
}
View File
File renamed without changes.

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

+10 -2
View File
@@ -1,8 +1,11 @@
<script setup lang="ts">
<script lang="ts" setup>
import { isDark } from '@/utils/is'
import { useAppStore } from '@/store/modules/app'
import { useDesign } from '@/hooks/web/useDesign'
import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
import routerSearch from '@/components/RouterSearch/index.vue'
defineOptions({ name: 'APP' })
const { getPrefixCls } = useDesign()
const prefixCls = getPrefixCls('app')
@@ -24,25 +27,30 @@ setDefaultTheme()
<template>
<ConfigGlobal :size="currentSize">
<RouterView :class="greyMode ? `${prefixCls}-grey-mode` : ''" />
<routerSearch />
</ConfigGlobal>
</template>
<style lang="scss">
$prefix-cls: #{$namespace}-app;
.size {
width: 100%;
height: 100%;
}
html,
body {
@extend .size;
padding: 0 !important;
margin: 0;
overflow: hidden;
@extend .size;
#app {
@extend .size;
}
}
.#{$prefix-cls}-grey-mode {
filter: grayscale(100%);
}
Loaded 100 of 971 files, more files were not shown because too many files have changed in this diff. Show more