221 Commits (441b91381f8ec1551d37680727b70b5aba4884bb)

Author SHA1 Message Date
owen b4ba1043d6 eslint 2 years ago
owen 08be359578 Merge remote-tracking branch 'origin/dev' into dev 2 years ago
owen 23a6bf5ef5 营销:商城装修增加控件【APP 链接选择】 2 years ago
dhb52 e106fb73b6 Merge remote-tracking branch 'yudao/master' into dhb52_master 2 years ago
芋道源码 8aa17b673b
!331 菜单右上角加一个搜索图标
Merge pull request !331 from boide/search-icon
2 years ago
owen d4dc105b4f 营销:适配商城装修组件【营销文章】 2 years ago
Marvin b95b8008f7 feat: 菜单右上角加一个搜索图标 2 years ago
owen c3cad3f3ee 商城:修复会员统计时间范围选择昨天时, 会强制查询两天的问题 3 years ago
dhb52 c2038b95bf Merge remote-tracking branch 'yudao/master' 3 years ago
owen 253401ace3 营销:适配商城装修组件【优惠券】 3 years ago
owen 3198688eb5 营销:适配商城装修组件【商品栏】 3 years ago
YunaiV ebb19cfe8c Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 3 years ago
芋道源码 5f0b0bd21d
!324 商城装修
Merge pull request !324 from 疯狂的世界/dev
3 years ago
芋道源码 f07d37438d
!321 修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Merge pull request !321 from 柯杨/master
3 years ago
YunaiV 7c5ae17d04 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/components/DiyEditor/components/ComponentContainer.vue
3 years ago
芋道源码 26dba8b457
!325 新增主子表、树表的代码生成
Merge pull request !325 from 芋道源码/feature/sub-table
3 years ago
owen b4a1772584 营销:适配商城装修组件【商品卡片】 3 years ago
xingyu 821c804189 fix: stylelint 3 years ago
xingyu 249e0d21a3 fix: eslint 3 years ago
柯杨 8bb9dec328
【bugfix】:修复滑块验证码无任何滑动直接点击验证时,x坐标空,导致后端NPE的问题
Signed-off-by: 柯杨 <key5230@163.com>
3 years ago
YunaiV 72c5eaae31 代码生成:增加 one 情况下的示例代码 3 years ago
owen 49ebadd748 营销:适配商城装修组件【广告魔方】 3 years ago
YunaiV 55f6e4ca25 主子表:确认列表编辑的支持组件情况 3 years ago
owen 82aed175ab 营销:适配商城装修组件【菜单导航】 3 years ago
owen ac42493659 营销:适配商城装修组件【宫格导航】 3 years ago
owen 325e2e4ff2 营销:适配商城装修组件【列表导航】 3 years ago
owen 4253173a2a 营销:适配商城装修组件【轮播图】 3 years ago
owen 6e9e1d0888 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
dhb52 89dbb8c9e8 perf: 优化.env配置 3 years ago
owen bb2b7ffd03 营销:增加商城装修组件【视频播放】 3 years ago
owen fa710b560d 营销:增加商城装修组件【图片展示】 3 years ago
YunaiV 65d85e30ca Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 3 years ago
owen 434aa864da 营销:优化装修编辑器 3 years ago
owen 0b0ba1f313 营销:优化装修编辑器样式 3 years ago
owen aedf014407 营销:装修页面适配搜索框 3 years ago
owen 3c0f3ceed5 营销:装修模板,底部导航适配APP 3 years ago
owen 9bd33355e2 营销:装修编辑器样式优化 3 years ago
owen 881c4f3a29 营销:完善商城装修
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器,默认选中组件判断
3 years ago
xingyu 10483577b7 fix: types 3 years ago
xingyu 52755b38a9 fix: props 3 years ago
xingyu 4365ca6177 fix: title name 3 years ago
xingyu ce93c8d4e9 fix: name warn 3 years ago
xingyu 7321ff2136 chore: wh-full 3 years ago
xingyu f26a4cae10 feat: unocss add shortcuts 3 years ago
owen e9ff8d3237 商城装修 3 years ago
owen ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
owen 431fff28ce 统计卡片修改为全局组件 3 years ago
YunaiV aa99c53729 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/statistics/member/index.vue
3 years ago
芋道源码 0242c84196
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
3 years ago
xingyu 1a1b70a350 style: stylelint 3 years ago
owen 3802fee661 商城:增加商城首页 3 years ago
kehaiyou 683e319c72 fix: 【工作流】--加签减签 3 years ago
owen 4c077711a1 对齐面包屑的图标和文字 3 years ago
owen 6475f81534 Merge remote-tracking branch 'origin/dev' into dev 3 years ago
owen c322fb3d0d 统计:交易统计 3 years ago
YunaiV 245147223f code review:驳回逻辑 3 years ago
kehaiyou f40d1de62a fix: 【工作流】--回退的高亮和api地址更换 3 years ago
kehaiyou de79e79d91 feat: 支持回退按钮 3 years ago
xingyu 2a58e3f691 style: unocss eslint 3 years ago
xingyu a6b4908f45
!232 update src/components/Dialog/src/Dialog.vue.
Merge pull request !232 from AKING/N/A
3 years ago
xingyu 5494756a66 fix: eslint 3 years ago
xingyu 9a6d29b295 fix: avatar 3 years ago
AKING d74f96fe17
update src/components/Dialog/src/Dialog.vue.
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
3 years ago
xingyu e6a9dd0e4c fix: 个人中心头像为空时不能修改 3 years ago
YunaiV 9507e2b687 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/views/member/user/detail/UserPointList.vue
3 years ago
芋道源码 df69c035e6
!213 update src/components/Dialog/src/Dialog.vue.
Merge pull request !213 from AKING/N/A
3 years ago
绮梦 afaf7749c2 调整icon的大小 3 years ago
绮梦 4d9ae73211 调整icon的对齐方式为中间居中 3 years ago
YunaiV 1b6c9b2e29 code review:用户详情 3 years ago
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>
3 years ago
AKING cba35d698f
update src/components/Dialog/src/Dialog.vue.
解决了单独使用elementplus diaolog组件时,样式被篡改的问题


Signed-off-by: AKING <2734339436@qq.com>
3 years ago
xingyu 003751a41c fix: dialog 3 years ago
xingyu 784a1be8a1 chore: stylelint(use pnpm lint:style) 3 years ago
xingyu 29d493e2da fix: style 3 years ago
xingyu 4249465b7c wip: use unocss 3 years ago
xingyu 8e78975521 fix: eslint 3 years ago
芋道源码 f908c12963
!183 同步商城实现
Merge pull request !183 from 芋道源码/dev
3 years ago
xingyu ba1254f397 fix: eslint 3 years ago
芋道源码 13e0ede788
!155 fix: 处理 window.bpmnInstances 有时候为 undefined 问题
Merge pull request !155 from OlyLis/master
3 years ago
puhui999 c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
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
3 years ago
xingyu c1a4edf7b1 refactor: 统一 setup 格式 3 years ago
xingyu 82c51e0c3e fix: eslint 3 years ago
xingyu d639401646 fix: style lint 3 years ago
xingyu f2992ce8e8 fix: eslint 3 years ago
xingyu 922f83d99c refactor: vue3.3 defineOptions 3 years ago
puhui999 5064845d4e fix: 使 Dialog 组件支持 Dialog 内部嵌套另一个 Dialog,需要使用 append-to-body 属性 3 years ago
YunaiV 023539b0db Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	package.json
	src/utils/dict.ts
3 years ago
puhui999 6a10a81f58 fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患 3 years ago
芋道源码 fa6bcacaef
!157 合并商城部分功能
Merge pull request !157 from 芋道源码/dev
3 years ago
wangding 43f3c67434 add router search 3 years ago
wangding 6768cdea05 新增路由搜索功能 3 years ago
duxz 6b3de50c69 fix: 处理 window.bpmnInstances 有时候为 undefined 问题 3 years ago
xingyu 9f0065f89f fix: echart color 3 years ago
xingyu 45ee4116b7 fix: echart 3 years ago
puhui999 4ddba9d454 fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记 3 years ago
AhJindeg 9dc361e708 🌈 style(Form/src): Modifying word spelling errors
- 修改ts类型 PlaceholderModel单词拼写
- 修改initModel方法 FormModel注释拼写
3 years ago
YunaiV d32537e3ef 移除 Form、Table、Search、XButton、XTextButton、DictTag、ContentWrap、Descriptions 的全局注册 3 years ago
YunaiV d5b569eefa 将 BPMNJS 全局引入,改成局部引入 3 years ago
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
3 years ago