Commit Graph

528 Commits

Author SHA1 Message Date
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
dhb52
af546a04e3 refactor: MP消息管理 ts重构
(cherry picked from commit 3536077a34)
2023-06-13 12:27:16 +08:00
shizhong
a543ae0a4e fix: import type { FormInstance ...} from 'element-plus' 2023-06-13 12:26:54 +08:00
dhb52
3b44b42da8 fix: 去除WxLocation组件多余Location图标
(cherry picked from commit fbbf4131f6)
2023-06-13 12:26:30 +08:00
shizhong
bdcaf12091 refactor: mp模块ts重构 2023-06-13 12:26:16 +08:00
YunaiV
02b5447e12 REVIEW 公众号选择的下拉框
(cherry picked from commit fd447dc7a3)
2023-06-13 12:24:19 +08:00
shizhong
9b00e33ddb REVIEW 支付应用、支付订单 2023-06-13 12:22:27 +08:00
dhb52
bfec37fdf1 refactor: 【MP素材管理】使用【WxMpSelect】
(cherry picked from commit 1397767492)
2023-06-13 12:18:36 +08:00
dhb52
010fe5f43c refactor: 抽离WxMpSelect组件
(cherry picked from commit c7b296a8e5)
2023-06-13 12:18:26 +08:00
dhb52
9500ceab05 refactor: 【MP粉丝管理】应用【公众号选择器】组件
(cherry picked from commit 053ee54a16)
2023-06-13 12:13:52 +08:00
dhb52
8df788b537 refactor:【自动回复、图文】应用【公众号选择器】组件
(cherry picked from commit af18201ceb)
2023-06-13 12:13:46 +08:00
dhb52
eae9242a91 fix: 【MP自定义菜单】accountChanged参数错误
(cherry picked from commit 7711ceb3f3)
2023-06-13 12:12:16 +08:00
dhb52
1948bc9971 refactor: 【MP自定义菜单】应用【公众号选择器】组件
(cherry picked from commit 098b7305c9)
2023-06-13 12:12:11 +08:00
dhb52
f789af4582 refactor: WxMaterialSelect组件setup
(cherry picked from commit a8b4c16a7e)
2023-06-13 12:12:07 +08:00
dhb52
6b33f8c74f refactor: 【草稿,素材】应用【公众号选择器】组件
(cherry picked from commit e035eb2618)
2023-06-13 12:12:02 +08:00
dhb52
e480b68c08 refactor: 抽离组件【公众号下拉选择】
(cherry picked from commit c33e4de5a8)
2023-06-13 12:11:56 +08:00
shizhong
2afd089f51 REVIEW OA 请假 2023-06-13 12:11:43 +08:00
shizhong
c33a40623c REVIEW OA 请假 2023-06-13 12:11:09 +08:00
shizhong
ae48c07bbb REVIEW 公众号的自动回复 2023-06-13 12:09:57 +08:00
dhb52
910549f9ee fix: 删除未引入的formatDate
(cherry picked from commit a692674b24)
2023-06-13 12:09:34 +08:00
dhb52
6cd59a3440 fix: Merge后的修复
(cherry picked from commit 99166ee664)
2023-06-13 12:09:26 +08:00
shizhong
d4424fbcea fix: size="mini" & type="text"过时 2023-06-13 12:06:59 +08:00
dhb52
61106e9601 feat: 微信自动回复
(cherry picked from commit daa124a478)
2023-06-13 12:04:26 +08:00
shizhong
318b9aa8b5 REVIEW 公众号素材管理 2023-06-13 12:04:17 +08:00
puhui999
e261d7a2d6 修复token过期时路由跳转问题
(cherry picked from commit 46bf186ecc)
2023-06-13 12:02:18 +08:00
shizhong
68981b9153 REVIEW 单点登录界面 2023-06-13 12:02:05 +08:00
dhb52
7a2ccb8973 feat: 微信素材管理
(cherry picked from commit 7cf8ea8da8)
2023-06-13 12:00:12 +08:00
YunaiV
4f89c1edfe REVIEW 商品品牌
(cherry picked from commit 1e0f613449)
2023-06-13 12:00:03 +08:00
YunaiV
f9d0d5d38b REVIEW 公众号的粉丝管理
(cherry picked from commit 31dfa86783)
2023-06-13 11:59:55 +08:00
YunaiV
fc3be48cc7 REVIEW 公众号的菜单
(cherry picked from commit 40e23bd805)
2023-06-13 11:59:44 +08:00
dhb52
6833a67b82 feat: 微信粉丝管理
(cherry picked from commit 867b60a948)
2023-06-13 11:59:35 +08:00
Aix
7992cd951e 【feature】新增商品品牌功能
(cherry picked from commit ef4f6bda5c)
2023-06-13 11:59:25 +08:00
YunaiV
35d3262924 REVIEW 公众号的草稿箱
(cherry picked from commit f7fe794944)
2023-06-13 11:59:18 +08:00
shizhong
e7c5824f70 修改 2023-06-13 11:59:15 +08:00
shizhong
adc5bdae2e 微调微信公众号的回复和素材选择的排版 2023-06-13 11:55:41 +08:00
dhb52
1f6da4eb06 feat: 微信草稿箱
(cherry picked from commit 0ffa807343)
2023-06-13 11:53:40 +08:00
dhb52
0ccabe38ac feat: 微信自定义菜单
(cherry picked from commit d5d16e4e39)
2023-06-13 11:53:29 +08:00
dhb52
83904a2167 feat: 新增 WxEditor,暂时使用quill-editor
(cherry picked from commit 2e7edd94bc)
2023-06-13 11:53:16 +08:00
dhb52
8ab35b3811 fix: 修复WxReply、WxMaterialSelect组件bug
(cherry picked from commit 42a9715ff2)
2023-06-13 11:52:00 +08:00
dhb52
1285b362d1 fix: 图文显示有误,articles为数组
Signed-off-by: dhb52 <dhb52@126.com>
(cherry picked from commit a422ad4177)
2023-06-13 11:49:38 +08:00