Commit Graph

188 Commits

Author SHA1 Message Date
YunaiV
e7886a1224 主子表:确认列表编辑的支持组件情况
(cherry picked from commit 55f6e4ca25)
2024-03-06 20:32:39 +08:00
owen
e8ec61a280 营销:适配商城装修组件【菜单导航】
(cherry picked from commit 82aed175ab)
2024-03-06 20:30:40 +08:00
owen
2d838325c9 营销:适配商城装修组件【宫格导航】
(cherry picked from commit ac42493659)
2024-03-06 20:30:15 +08:00
owen
9bf49b4d38 营销:适配商城装修组件【列表导航】
(cherry picked from commit 325e2e4ff2)
2024-03-06 20:30:10 +08:00
shizhong
800c6c83d9 BUG 2024-03-05 20:40:16 +08:00
owen
8f70c7f299 营销:适配商城装修组件【轮播图】
(cherry picked from commit 4253173a2a)
2024-03-05 17:52:32 +08:00
dhb52
fa174ba54e perf: 优化.env配置
(cherry picked from commit 89dbb8c9e8)
2024-03-05 17:52:24 +08:00
owen
8c2b96afc9 营销:增加商城装修组件【视频播放】
(cherry picked from commit bb2b7ffd03)
2024-03-05 17:52:08 +08:00
owen
11a28eb196 营销:增加商城装修组件【图片展示】
(cherry picked from commit fa710b560d)
2024-03-05 17:51:08 +08:00
owen
ce5314ab41 营销:优化装修编辑器
(cherry picked from commit 434aa864da)
2024-03-05 17:50:00 +08:00
owen
cf9691f993 营销:优化装修编辑器样式
(cherry picked from commit 0b0ba1f313)
2024-03-05 17:49:53 +08:00
owen
8cb041b57a 营销:装修页面适配搜索框
(cherry picked from commit aedf014407)
2024-03-05 17:49:29 +08:00
owen
2c485504e7 营销:装修模板,底部导航适配APP
(cherry picked from commit 3c0f3ceed5)
2024-03-05 17:41:50 +08:00
owen
0d5e6c4098 营销:装修编辑器样式优化
(cherry picked from commit 9bd33355e2)
2024-03-05 17:41:26 +08:00
owen
97a94cd29f 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断

(cherry picked from commit 881c4f3a29)
2024-03-05 17:41:01 +08:00
xingyu
d172595f14 fix: types
(cherry picked from commit 10483577b7)
2024-03-05 17:40:50 +08:00
xingyu
de9e45ba43 fix: props
(cherry picked from commit 52755b38a9)
2024-03-05 17:40:33 +08:00
shizhong
b0e4735936 fix: title name 2024-03-05 17:40:03 +08:00
xingyu
28485eaf61 fix: name warn
(cherry picked from commit ce93c8d4e9)
2024-03-05 17:35:30 +08:00
xingyu
1d518c2826 chore: wh-full
(cherry picked from commit 7321ff2136)
2024-03-05 17:35:17 +08:00
xingyu
8b8d7451e0 feat: unocss add shortcuts
(cherry picked from commit f26a4cae10)
2024-03-05 17:33:45 +08:00
owen
d12dcde81d 商城装修
(cherry picked from commit e9ff8d3237)
2024-03-05 17:31:22 +08:00
owen
d04c1f0213 统计卡片修改为全局组件
(cherry picked from commit 431fff28ce)
2024-03-05 17:08:22 +08:00
xingyu
d02f5570f5 style: stylelint
(cherry picked from commit 1a1b70a350)
2024-03-05 16:59:51 +08:00
owen
230d073fb8 商城:增加商城首页
(cherry picked from commit 3802fee661)
2024-03-05 16:52:31 +08:00
shizhong
f0cdee8e9a fix: 【工作流】--加签减签 2024-03-05 16:31:04 +08:00
owen
d4a9f844dc 对齐面包屑的图标和文字
(cherry picked from commit 4c077711a1)
2024-03-05 15:54:04 +08:00
owen
9b4bb4025b 统计:交易统计
(cherry picked from commit c322fb3d0d)
2024-03-05 15:50:37 +08:00
YunaiV
d46b9deb18 code review:驳回逻辑
(cherry picked from commit 245147223f)
2023-09-25 13:32:48 +08:00
kehaiyou
0bef9924fe fix: 【工作流】--回退的高亮和api地址更换
(cherry picked from commit f40d1de62a)
2023-09-25 13:30:17 +08:00
kehaiyou
6888fd90d1 feat: 支持回退按钮
(cherry picked from commit de79e79d91)
2023-09-25 13:15:55 +08:00
shizhong
969155c6cf style: unocss eslint 2023-09-25 13:14:05 +08:00
shizhong
b6e6b2c49d chore: stylelint(use pnpm lint:style) 2023-09-22 14:43:10 +08:00
shizhong
5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong
7e5ad60d1d refactor: vue3.3 defineOptions 2023-09-22 14:00:50 +08:00
shizhong
20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
xingyu
e2040244cf fix: eslint
(cherry picked from commit 5494756a66)
2023-09-20 12:42:48 +08:00
xingyu
0b7593fbd4 fix: avatar
(cherry picked from commit 9a6d29b295)
2023-09-20 12:42:31 +08:00
AKING
62aa0e794f update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit d74f96fe17)
2023-09-20 12:39:34 +08:00
绮梦
a5046fd527 调整icon的大小
(cherry picked from commit afaf7749c2)
2023-09-20 12:23:17 +08:00
绮梦
8c1772c64c 调整icon的对齐方式为中间居中
(cherry picked from commit 4d9ae73211)
2023-09-20 12:23:08 +08:00
YunaiV
e97a62fe06 code review:用户详情
(cherry picked from commit 1b6c9b2e29)
2023-09-20 12:22:09 +08:00
AKING
295d04e1f3 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>

(cherry picked from commit ff8a8e7243)
2023-09-20 12:18:03 +08:00
AKING
70b1161ec1 update src/components/Dialog/src/Dialog.vue.
解决了单独使用elementplus diaolog组件时,样式被篡改的问题


Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit cba35d698f)
2023-09-20 12:12:35 +08:00
xingyu
c4fd56dbcd fix: dialog
(cherry picked from commit 003751a41c)
2023-09-19 20:31:53 +08:00
xingyu
9ae54036fa fix: style
(cherry picked from commit 29d493e2da)
2023-09-19 20:14:31 +08:00
xingyu
4f81427aa0 wip: use unocss
(cherry picked from commit 4249465b7c)
2023-09-19 20:08:38 +08:00
xingyu
c7d6d35642 fix: eslint
(cherry picked from commit 8e78975521)
2023-09-19 20:02:03 +08:00
xingyu
bdaeb75ccc fix: 个人中心头像为空时不能修改
(cherry picked from commit e6a9dd0e4c)
2023-09-11 16:10:27 +08:00
shizhong
b376e8e2a8 增加部门和菜单的详情,解决个人中心无法上传图片的问题 2023-08-22 17:33:04 +08:00
shizhong
5620a9da6a 发布 1.8.0 版本 2023-07-27 23:33:28 +08:00
xingyu
a7fe002abd fix: eslint
(cherry picked from commit ba1254f397)
2023-07-27 19:43:38 +08:00
shizhong
e8088415d9 !155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 Merge pull request !155 from OlyLis/master 2023-07-27 19:40:20 +08:00
xingyu
3d36bc4f56 fix: eslint
(cherry picked from commit 82c51e0c3e)
2023-07-27 19:26:41 +08:00
xingyu
1745a61d04 fix: style lint
(cherry picked from commit d639401646)
2023-07-27 19:26:28 +08:00
xingyu
cf75e6801c fix: eslint
(cherry picked from commit f2992ce8e8)
2023-07-27 19:25:38 +08:00
puhui999
1e0b6e9efc fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog,需要使用 append-to-body 属性
(cherry picked from commit 5064845d4e)
2023-07-27 19:19:56 +08:00
shizhong
c2168466f3 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 2023-07-27 18:36:06 +08:00
周建
7ca76a5304 修复一些命名和拼写错误问题,修复一些BUG 2023-06-25 13:34:27 +08:00
shizhong
2489cf00d7 将 highlight 代码高亮的全局引入,改成局部引入 2023-06-16 19:29:36 +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
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
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
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 4ddba9d454)
2023-06-13 14:06:16 +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
YunaiV
2f16744652 移除 Form、Table、Search、XButton、XTextButton、DictTag、ContentWrap、Descriptions 的全局注册
(cherry picked from commit d32537e3ef)
2023-06-13 13:04:05 +08:00
YunaiV
f9c2850d6b 将 BPMNJS 全局引入,改成局部引入 2023-06-13 13:02:14 +08:00
shizhong
1c7ab8da73 fix: type='text' => type='primary' link 2023-06-13 12:41:41 +08:00
dhb52
2a242c770f refactor: 使用Editor组件替换WxEditor
(cherry picked from commit 813e7d2776)
2023-06-13 12:39:29 +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
9b00e33ddb REVIEW 支付应用、支付订单 2023-06-13 12:22:27 +08:00
shizhong
d4424fbcea fix: size="mini" & type="text"过时 2023-06-13 12:06:59 +08:00
shizhong
318b9aa8b5 REVIEW 公众号素材管理 2023-06-13 12:04:17 +08:00
shizhong
47eac89d1e 1. 统一化代码 2. 增加 DocAlert 关联文档 2023-06-13 11:24:37 +08:00
shizhong
ba4cc02bfd 项目全局使用formatDate方法移除parseTime方法 2023-06-13 11:03:33 +08:00
gexinzhineng/gxzn27
946a189b82 样式问题 2023-04-10 17:31:06 +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
eace25d3a2 REVIEW 定时任务(表单) 2023-04-01 11:33:50 +08:00
YunaiV
1854b85b40 Vue3 重构:流程模型的列表和新增、修改 2023-03-26 00:16:28 +08: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
YunaiV
6b194bb95f Vue3 重构:REVIEW 短信日志 2023-03-24 23:07:51 +08:00
gexinzhineng/gxzn27
23b23f9200 xTable查询框前间隔,退出系统按钮点击有时会无法成功 2023-03-24 17:05:24 +08:00
芋道源码
2a3fe7d2bc
!45 重构:短信模板和短信日志vue2改vue3
Merge pull request !45 from puhui999/master
2023-03-23 15:56:36 +00:00
xingyuv
9edd3c5f80 fix: 修改 Editor 的 z-index 使其不会遮挡 2023-03-23 09:25:43 +08:00
xingyuv
b56a5e06c9 fix:Descriptions去掉mb-10px 2023-03-23 09:23:48 +08:00
puhui999
5057e755e2 Merge remote-tracking branch 'yudao/dev' 2023-03-22 23:54:24 +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
YunaiV
a784bc7db2 Form 组件:增加 vLoading 加载中 2023-03-17 23:23:24 +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
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
chiwenda
8c9217166d fix:修改菜单找不到图标时报错 2023-03-12 17:22:51 +08:00