Commit Graph

567 Commits

Author SHA1 Message Date
wangding
ea81cbd520 add router search
(cherry picked from commit 43f3c67434)
2023-06-13 14:16:02 +08:00
wangding
1e096a47c0 新增路由搜索功能
(cherry picked from commit 6768cdea05)
2023-06-13 14:15:49 +08:00
jason
88439669c0 运费模板区域改成多选
(cherry picked from commit 70c5082776)
2023-06-13 14:15:44 +08:00
YunaiV
6e7ee28079 review + mall:快递公司管理
(cherry picked from commit b12aefe46e)
2023-06-13 14:15:31 +08:00
YunaiV
dfc3da744f review + mall:商品管理
(cherry picked from commit 349a39e72f)
2023-06-13 14:15:28 +08:00
shizhong
61396246a5 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev 2023-06-13 14:14:42 +08:00
YunaiV
4cd4327bc8 review + mall:商品管理
(cherry picked from commit 0fba3fd503)
2023-06-13 14:13:55 +08:00
puhui999
4eacb6dd8c fix: 完善善品导出
(cherry picked from commit d877bfd26e)
2023-06-13 14:12:49 +08:00
jason
4850c05614 运费模板表格样式调整
(cherry picked from commit c296c9e53d)
2023-06-13 14:12:45 +08:00
jason
bbe9e667c4 运费模板性能优化。区域选择使用懒加载
(cherry picked from commit af2fb4bf5f)
2023-06-13 14:12:41 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题)
(cherry picked from commit 4e69f15128)
2023-06-13 14:10:52 +08:00
puhui999
c254222b5f fix: 优化相关逻辑,修复遗留bug
(cherry picked from commit 38545e89c6)
2023-06-13 14:07:33 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 0c42b76a52)
2023-06-13 14:07:22 +08:00
xingyu
f26c72ced9 fix: echart color
(cherry picked from commit 9f0065f89f)
2023-06-13 14:07:09 +08:00
xingyu
484cd403fc fix: echart
(cherry picked from commit 45ee4116b7)
2023-06-13 14:06:53 +08:00
jason
4ec3d3fe72 新增快递公司菜单
(cherry picked from commit b0984c9013)
2023-06-13 14:06:19 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 4ddba9d454)
2023-06-13 14:06:16 +08:00
puhui999
d73a32106a fix: 修复 OtherSettingsForm TODO 优化相关算法,解决上一版本遗留的bug
(cherry picked from commit 3c4a39df01)
2023-06-13 14:06:02 +08:00
puhui999
085dbd6220 fix: 修复 SkuList TODO 优化相关算法
(cherry picked from commit 9c06832d7e)
2023-06-13 14:05:57 +08:00
puhui999
73b2809654 fix: 添加商品属性去掉备注
(cherry picked from commit 6ac8c78d57)
2023-06-13 14:05:53 +08:00
puhui999
74d926172c fix: 进一步完善商品列表,修复TODO
(cherry picked from commit 52bfc4dac0)
2023-06-13 14:05:48 +08:00
puhui999
478f02fa7c fix: 整合spu,移动相关类型到spu删除对应文件和文件夹
(cherry picked from commit 50b181318b)
2023-06-13 14:05:43 +08:00
puhui999
cafd74193f fix: 移动copyValueToTarget方法到utils/index中
(cherry picked from commit 43e541f944)
2023-06-13 14:05:38 +08:00
shizhong
82f02cd9f3 !148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现 2023-06-13 14:05:17 +08:00
shizhong
e81f8c51cb 修复后台”在线用户强退“功能 2023-06-13 14:03:52 +08:00
Chika
2989372c5c Redis监控用Echart组件整改
(cherry picked from commit fbac522149)
2023-06-13 14:00:09 +08:00
Chika
80f1c08951 Redis监控图标使用Echart组件整合
(cherry picked from commit bf629a9554)
2023-06-13 13:59:08 +08:00
YunaiV
7a5993c584 code review 商品管理的实现
(cherry picked from commit e92361ed40)
2023-06-13 13:56:48 +08:00
dhb52
fc4b46de2e refactor: mp/autoReply 拆分ReplyForm组件
(cherry picked from commit be49c381f6)
2023-06-13 13:56:27 +08:00
dhb52
3553b300d4 refactor: mp/wx-msg拆分Msg组件
(cherry picked from commit 2b84489969)
2023-06-13 13:56:12 +08:00
YunaiV
cc62e8ec79 code review 微信的实现
(cherry picked from commit 1c77ba8e04)
2023-06-13 13:56:08 +08:00
puhui999
b9fd7b7753 商品管理: 打通所有接口(第一版)
(cherry picked from commit 0c6e3a39c9)
2023-06-13 13:56:04 +08:00
puhui999
263ca68ff1 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显
(cherry picked from commit 9ee35fc165)
2023-06-13 13:55:51 +08:00
puhui999
2152573c5e 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 1116fb278b)
2023-06-13 13:55:48 +08:00
puhui999
72fd0b8ed5 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 6478d295df)
2023-06-13 13:55:44 +08:00
puhui999
cb45ea0753 商品管理: 完成商品属性批量添加
(cherry picked from commit 64f6f67ddd)
2023-06-13 13:55:20 +08:00
puhui999
d37540de1d 商品管理: 完成商品属性排列组合算法生成对应表数据
(cherry picked from commit ab1120b0ff)
2023-06-13 13:55:17 +08:00
puhui999
84ed1f7df3 商品管理: 保存属性值到数据库
(cherry picked from commit 35c3545e7c)
2023-06-13 13:55:13 +08:00
puhui999
4bb39f2578 商品管理: fix:根据商品属性动态生成表格值
(cherry picked from commit 538d1e0b6c)
2023-06-13 13:54:58 +08:00
puhui999
7368bd8c2a 商品管理: 修正添加属性和添加属性值时输入框显隐控制、输入框焦点获取错乱等bug
(cherry picked from commit 7a64eb5198)
2023-06-13 13:54:51 +08:00
puhui999
1a2d7a2f0e 商品管理: 初步完成相关组件
(cherry picked from commit 61218ae711)
2023-06-13 13:54:08 +08:00
puhui999
7a1a4e82d0 商品管理: 完善选择商品分类
(cherry picked from commit ab1685a741)
2023-06-13 13:53:11 +08:00
puhui999
083a0c4760 商品管理: 完善表单校验,优化信息提示,完成新建、编辑、提交逻辑
(cherry picked from commit c38abc365c)
2023-06-13 13:52:42 +08:00
YunaiV
6e604f9e07 调整商品分类的实现
(cherry picked from commit 9680a204ca)
2023-06-13 13:50:37 +08:00
AhJindeg
464fe953ad 🐞 fix(styles/index): Update .el-scrollbar__bar style
- 解决表格内容超过表格总宽度后,横向滚动条前端顶不到表格边缘的问题

(cherry picked from commit ace8f9e302)
2023-06-13 13:49:19 +08:00
puhui999
3c220cdb63 商品管理初始界面结构设计
(cherry picked from commit a0014bed65)
2023-06-13 13:48:52 +08:00
AhJindeg
ab531a8ec5 🌈 style(Form/src): Modifying word spelling errors
- 修改ts类型 PlaceholderModel单词拼写
- 修改initModel方法 FormModel注释拼写

(cherry picked from commit 9dc361e708)
2023-06-13 13:44:57 +08:00
dhb52
09c5f2e22f refactor: mp/wx-msg 采用ref来实现滚动
(cherry picked from commit cb4527748e)
2023-06-13 13:44:33 +08:00
dhb52
a737b267a8 refactor: mp模块统一accountId未初始化值为-1,删除QueryParams定义
(cherry picked from commit 198752868c)
2023-06-13 13:44:29 +08:00
YunaiV
64d4583805 登录界面,增加“萌新必读”
(cherry picked from commit c14b5c5bff)
2023-06-13 13:44:17 +08:00
dhb52
817ccc7511 fix: mp模块的一些小修复
(cherry picked from commit 036c9b3366)
2023-06-13 13:43:48 +08:00
dhb52
c85b99090d refactor: mp/wx-msg 拆分组件
(cherry picked from commit f848f3ba91)
2023-06-13 13:43:39 +08:00
dhb52
ac7202ec61 fix: mp/menu菜单拖动后激活菜单
(cherry picked from commit 917b9d180a)
2023-06-13 13:43:26 +08:00
shizhong
67f6db22c2 菜单管理:添加刷新菜单缓存按钮 2023-06-13 13:43:12 +08:00
dhb52
4601bd3428 perf: mp/menu使用vuedraggable替换拖动的原生实现
(cherry picked from commit ebacbbb9cf)
2023-06-13 13:42:04 +08:00
dhb52
88167a437e style: mp/WxReply objCache => tabCache
(cherry picked from commit 08eb72e568)
2023-06-13 13:41:58 +08:00
dhb52
0deb965db3 feat: mp/menu 拖动排序
(cherry picked from commit d99f9e98fb)
2023-06-13 13:41:53 +08:00
dhb52
94ab90d8ab style: mp模块stylelint
(cherry picked from commit 4925a66cc5)
2023-06-13 13:41:49 +08:00
dhb52
132e044c48 refactor: mp模块,一个大大的重构+fix
(cherry picked from commit b45b85984c)
2023-06-13 13:41:43 +08:00
shizhong
e3dce4ae2e 菜单管理:添加刷新菜单缓存按钮,提高易用性 2023-06-13 13:41:16 +08:00
YunaiV
ddefa8c2d3 讲 2023 重构剩余的任务,转成 TODO 到代码
(cherry picked from commit bcf8cccf8b)
2023-06-13 13:25:10 +08:00
YunaiV
16b4c71a77 REVIEW 公众号的草稿管理
(cherry picked from commit 5c58bc4e0c)
2023-06-13 13:24:55 +08:00
YunaiV
22278b7d2a REVIEW 公众号的消息回复弹窗
(cherry picked from commit 7997614a3c)
2023-06-13 13:24:49 +08:00
YunaiV
29f68781e5 REVIEW 公众号的自动回复菜单
(cherry picked from commit 48e50190e0)
2023-06-13 13:24:15 +08:00
shizhong
cbaa6bc355 流程表单:使用异步组件的方式动态加载业务表单指定的查看表单的组件,直接显示到审批页面,不再需要点击查看 2023-06-13 13:24:02 +08:00
dhb52
ddf8e7be2e refactor: mp/WxReply重构,拆分组件
(cherry picked from commit f8a86cbc24)
2023-06-13 13:21:07 +08:00
puhui999
2de3bad542 修复用户分组新增保存时提示描述不能为空的bug
(cherry picked from commit 7a0202e26d)
2023-06-13 13:20:21 +08:00
dhb52
a4172c3643 refactor: 使用useUpload
(cherry picked from commit cddf1ee878)
2023-06-13 13:16:52 +08:00
dhb52
4f04c9baeb refactor: 重构MP/autoReply, 拆分组件
(cherry picked from commit 0beda6ecc3)
2023-06-13 13:16:46 +08:00
dhb52
6a92ec1c76 refactor: MP/wx-reply组件,抽离useUpload钩子
(cherry picked from commit 39d8ecbfc7)
2023-06-13 13:16:38 +08:00
dhb52
0bf4dc7a81 refactor: mp/menu 拆分组件
(cherry picked from commit c27be373d0)
2023-06-13 13:16:29 +08:00
dhb52
732f65e22c fix: Mp/WxAccountSelect name字段更新
(cherry picked from commit 82dc0054f2)
2023-06-13 13:16:19 +08:00
dhb52
ec834f2893 refactor: 事件函数命名:onXxx
(cherry picked from commit 84dcac77b1)
2023-06-13 13:15:34 +08:00
dhb52
90990f48a9 refactor: mp/draft拆分组件
(cherry picked from commit b5fb700e4e)
2023-06-13 13:15:27 +08:00
shizhong
9c6408b7a9 将 FcDesigner 改成局部注册,减少包大小 2023-06-13 13:14:20 +08:00
YunaiV
2f16744652 移除 Form、Table、Search、XButton、XTextButton、DictTag、ContentWrap、Descriptions 的全局注册
(cherry picked from commit d32537e3ef)
2023-06-13 13:04:05 +08:00
YunaiV
d73118f386 将 highlight 代码高亮的全局引入,改成局部引入
(cherry picked from commit 30685bee75)
2023-06-13 13:03:23 +08:00
YunaiV
f9c2850d6b 将 BPMNJS 全局引入,改成局部引入 2023-06-13 13:02:14 +08:00
dhb52
8542bd8025 fix: 增加上传处理
(cherry picked from commit ae74af59fc)
2023-06-13 12:54:20 +08:00
YunaiV
1ad73b0625 REVIEW 素材管理的重构
(cherry picked from commit abf9b50c2f)
2023-06-13 12:54:10 +08:00
shizhong
6bbeeba455 优化 OA 请假,create 和 detail 使用独立路由,可接入工作流 2023-06-13 12:53:51 +08:00
dhb52
4d6369a514 refactor: MP消息管理-拆分组件
(cherry picked from commit 389c73d834)
2023-06-13 12:52:37 +08:00
puhui999
76be4d747e 修复差异
(cherry picked from commit 5910d53d8f)
2023-06-13 12:52:26 +08:00
shizhong
5466e93d3a 移除 css 的引入 2023-06-13 12:51:11 +08:00
YunaiV
c7172e9295 调整下排版
(cherry picked from commit f1f49fdf29)
2023-06-13 12:48:46 +08:00
YunaiV
01691827fc 1. 重命名 DataGrid 为 MessageTable,增加可读性
2. 调整素材管理,读取 API 接口

(cherry picked from commit 48c7b58b03)
2023-06-13 12:48:41 +08:00
YunaiV
f0ad6b706e ep-admin: fix: 修复已知问题
0a6f3066 kailong321200875 <321200875@qq.com> on 2023/4/12 at 10:20 AM

(cherry picked from commit 1170a9480f)
2023-06-13 12:48:15 +08:00
YunaiV
7c8794fc53 ep-admin: fix: 修复表格与搜索框字段不能不一致的问题
(cherry picked from commit 9fba2886ab)
2023-06-13 12:47:43 +08:00
puhui999
810482a6e0 修正绑定第三方跳转扫码登录错误
(cherry picked from commit d62e607292)
2023-06-13 12:45:22 +08:00
dhb52
dbb1a6fc98 refactor: 尝试拆分【消息管理】页面
(cherry picked from commit c4746fc804)
2023-06-13 12:41:49 +08:00
shizhong
1c7ab8da73 fix: type='text' => type='primary' link 2023-06-13 12:41:41 +08:00
dhb52
91649a74e7 fix: WxMpSelect => WxAccountSelect
(cherry picked from commit 4f3e7ecaac)
2023-06-13 12:40:23 +08:00
dhb52
c01cd5b66c fix: 删除自动生成的auto-*.d.ts
(cherry picked from commit bb49c6bbda)
2023-06-13 12:40:13 +08:00
dhb52
9ce836dc3d refactor: 删除WxAccountSelect
(cherry picked from commit dc32b9242d)
2023-06-13 12:39:41 +08:00
dhb52
6eb9588e4a fix: 使用ElDialog:destroy-on-close属性解决对话框重新加载
(cherry picked from commit 92da7e341b)
2023-06-13 12:39:35 +08:00
dhb52
2a242c770f refactor: 使用Editor组件替换WxEditor
(cherry picked from commit 813e7d2776)
2023-06-13 12:39:29 +08:00
YunaiV
df41b6860e REVIEW 公众号的实现
(cherry picked from commit 1a1bfe0ebb)
2023-06-13 12:37:37 +08:00
YunaiV
0da3c00dea 修复 IconSelect 报错
(cherry picked from commit f436490165)
2023-06-13 12:36:43 +08:00
shizhong
520292c902 Merge pull request #2 from koutianyu/dev 2023-06-13 12:36:01 +08:00
shizhong
76472bcd8e 代码生成,支持设置前端的模版 2023-06-13 12:34:01 +08:00