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 |