yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
894 Commits
8 Branches
14 Tags
26 MiB
Commit Graph

777 Commits (86695606ab648d211304c66bf1b5eb7a9ca5eeec)

Author SHA1 Message Date
shizhong 28507236a7 BUG和多余的文件 2023-06-16 19:31:12 +08:00
shizhong 2489cf00d7 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-16 19:29:36 +08:00
周建 330a44fc98 下面列表 2023-06-16 18:25:58 +08:00
周建 0e15d393a6 代码格式化问题 2023-06-16 16:31:53 +08:00
周建 6ff7a3c9a9 支付订单问题 2023-06-14 14:24:29 +08:00
周建 38ea9cbcda 部分样式bug 2023-06-14 13:58:48 +08:00
shizhong e60c33e4b4 BUG 2023-06-13 21:53:35 +08:00
shizhong 99774fc622 将 highlight 代码高亮的全局引入，改成局部引入 2023-06-13 21:42:32 +08:00
shizhong 6f266fb967 给所有组件添加name属性预防未知bug!!! 2023-06-13 21:05:25 +08:00
shizhong 1e52823524 BUG 2023-06-13 15:35:13 +08:00
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
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
shizhong 789ac414e9 增加 swagger、druid、skywalking、admin 的自定义路径 2023-06-13 11:49:19 +08:00
dhb52 1ba37bfca4 fix: 获取FreePublic出错&分页溢出 
Signed-off-by: dhb52 <dhb52@126.com>
(cherry picked from commit 365915e37c)
 2023-06-13 11:43:34 +08:00
shizhong e83717e80e 修改 2023-06-13 11:43:05 +08:00
puhui999 fbff879504 完善SSO单点登录 
(cherry picked from commit e22363d061)
 2023-06-13 11:37:51 +08:00
puhui999 1103f8ff39 增加SSO单点登录 
(cherry picked from commit 2d019f1bf9)
 2023-06-13 11:36:09 +08:00
shizhong fb3a842131 修改 2023-06-13 11:35:06 +08:00
shizhong 47eac89d1e 1. 统一化代码 2. 增加 DocAlert 关联文档 2023-06-13 11:24:37 +08:00
shizhong e17913d038 修复在vue3+vite3 模块中使用顶层await打包的时候报错 2023-06-13 11:06:20 +08:00
shizhong ba4cc02bfd 项目全局使用formatDate方法移除parseTime方法 2023-06-13 11:03:33 +08:00
Chika 8be4f31a1b 流程-已办任务路由中增加详情Model 
(cherry picked from commit c1e760da6d)
 2023-06-13 10:58:46 +08:00
Chika 522bf82d0e 添加流程-已办任务路由 
(cherry picked from commit 900b51db86)
 2023-06-13 10:58:32 +08:00
马光祖 0e62153dd1 fix: 设置 vite basePath 后，重新登录跳转路由错误 
(cherry picked from commit d0d6a13285)
 2023-06-13 10:57:30 +08:00
shizhong 7cfb09fe3c 命名 2023-06-13 10:56:20 +08:00
gexinzhineng/gxzn27 38fa336816 格式 2023-05-31 17:28:22 +08:00
gexinzhineng/gxzn27 124213bb4c 解决代码生成模块无法复制 2023-05-31 15:56:43 +08:00
gexinzhineng/gxzn27 5f17504d3c 显示查询合理化 2023-05-30 13:45:14 +08:00
gexinzhineng/gxzn27 b603464771 租户列表编辑回显下拉位置调整 2023-05-29 14:03:04 +08:00
gexinzhineng/gxzn27 090791a38b 租户列表系统租户编辑回显bug 2023-05-29 13:48:46 +08:00
gexinzhineng/gxzn27 615ae3d651 重置vxe会导致新增表单无限增加用户名和密码 2023-05-26 15:46:22 +08:00
gexinzhineng/gxzn27 7c4025954a 退出系统重新登录会弹出重新登录弹窗 2023-05-23 13:31:34 +08:00
gexinzhineng/gxzn27 ad248250a1 新增岗位后端有验证，前端也加上 2023-05-19 14:29:31 +08:00
gexinzhineng/gxzn27 886c971447 导入失败无法继续上传 2023-04-13 15:23:17 +08:00
gexinzhineng/gxzn27 b2fda6d476 css类型 2023-04-12 18:30:28 +08:00
gexinzhineng/gxzn27 42035104ac 上传文件错误无法重新选择文件 2023-04-12 11:16:00 +08:00
gexinzhineng/gxzn27 946a189b82 样式问题 2023-04-10 17:31:06 +08:00
gexinzhineng/gxzn27 2dbb363b00 密码校验 2023-04-10 10:48:56 +08:00
gexinzhineng/gxzn27 af26859ba8 路由及相应重构回退vxe 2023-04-06 14:33:01 +08:00
gexinzhineng/gxzn27 561b617ca4 工作流文字显示错误 2023-04-04 09:54:37 +08:00
gexinzhineng/gxzn27 a5fedfe15b 接口修改 2023-04-03 18:02:31 +08:00
gexinzhineng/gxzn27 f1e801e9ad vxe回返bug 2023-04-03 17:48:38 +08:00
gexinzhineng/gxzn27 12c5116dfd 删除非vxe文件 2023-04-03 16:38:01 +08:00
gexinzhineng/gxzn27 b967c4e01e 错误提交 2023-04-03 16:11:12 +08:00
gexinzhineng/gxzn27 0e578f8d0a 回退vxe版本 2023-04-03 15:26:56 +08: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
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
YunaiV 7d84f86081 REVIEW 用户管理（分配用户角色） 2023-03-31 13:40:57 +08:00
YunaiV 643b387367 REVIEW 用户管理（列表） 2023-03-31 07:54:33 +08: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 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
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 c105f314f5 update: 添加短信渠道列表类型，解决找不到属性signature 2023-03-27 10:34:41 +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
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