Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
啊嘞嘞EC
vue-vben-admin
提交
3c441a05
V
vue-vben-admin
项目概览
啊嘞嘞EC
/
vue-vben-admin
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vue-vben-admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
3c441a05
编写于
4月 12, 2021
作者:
V
Vben
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
style(eslint): fix eslint error
上级
26adbc92
变更
15
隐藏空白更改
内联
并排
Showing
15 changed file
with
62 addition
and
53 deletion
+62
-53
src/components/Application/src/search/AppSearchKeyItem.vue
src/components/Application/src/search/AppSearchKeyItem.vue
+3
-1
src/components/Application/src/search/AppSearchModal.vue
src/components/Application/src/search/AppSearchModal.vue
+3
-3
src/components/CountDown/src/CountButton.vue
src/components/CountDown/src/CountButton.vue
+1
-1
src/components/Cropper/src/index.vue
src/components/Cropper/src/index.vue
+13
-12
src/components/Form/src/components/FormAction.vue
src/components/Form/src/components/FormAction.vue
+3
-3
src/components/Form/src/components/FormItem.vue
src/components/Form/src/components/FormItem.vue
+3
-3
src/components/SimpleMenu/src/SimpleMenuTag.vue
src/components/SimpleMenu/src/SimpleMenuTag.vue
+1
-1
src/components/SimpleMenu/src/SimpleSubMenu.vue
src/components/SimpleMenu/src/SimpleSubMenu.vue
+1
-1
src/components/SimpleMenu/src/components/Menu.vue
src/components/SimpleMenu/src/components/Menu.vue
+2
-2
src/components/Table/src/components/HeaderCell.vue
src/components/Table/src/components/HeaderCell.vue
+1
-1
src/components/Table/src/components/editable/EditableCell.vue
...components/Table/src/components/editable/EditableCell.vue
+1
-1
src/components/Table/src/components/settings/index.vue
src/components/Table/src/components/settings/index.vue
+1
-1
src/layouts/default/setting/components/SelectItem.vue
src/layouts/default/setting/components/SelectItem.vue
+1
-1
src/locales/useLocale.ts
src/locales/useLocale.ts
+2
-2
src/views/demo/comp/cropper/index.vue
src/views/demo/comp/cropper/index.vue
+26
-20
未找到文件。
src/components/Application/src/search/AppSearchKeyItem.vue
浏览文件 @
3c441a05
<
template
>
<span
:class=
"$attrs.class"
>
<
g-i
con
:icon=
"icon"
/>
<
I
con
:icon=
"icon"
/>
</span>
</
template
>
<
script
lang=
"ts"
>
import
{
defineComponent
}
from
'
vue
'
;
import
{
Icon
}
from
'
/@/components/Icon
'
;
export
default
defineComponent
({
components
:
{
Icon
},
props
:
{
icon
:
String
,
},
...
...
src/components/Application/src/search/AppSearchModal.vue
浏览文件 @
3c441a05
...
...
@@ -4,7 +4,7 @@
<div
:class=
"getClass"
@
click.stop
v-if=
"visible"
>
<div
:class=
"`$
{prefixCls}-content`" v-click-outside="handleClose">
<div
:class=
"`$
{prefixCls}-input__wrapper`">
<
a-i
nput
<
I
nput
:class=
"`$
{prefixCls}-input`"
:placeholder="t('common.searchText')"
allow-clear
...
...
@@ -14,7 +14,7 @@
<!--
<Icon
icon=
"ion:search"
/>
-->
<SearchOutlined
/>
</
template
>
</
a-i
nput>
</
I
nput>
<span
:class=
"`${prefixCls}-cancel`"
@
click=
"handleClose"
>
{{ t('common.cancelText') }}
</span>
...
...
@@ -76,7 +76,7 @@
export
default
defineComponent
({
name
:
'
AppSearchModal
'
,
components
:
{
Icon
,
SearchOutlined
,
AppSearchFooter
,
[
Input
.
name
]:
Input
},
components
:
{
Icon
,
SearchOutlined
,
AppSearchFooter
,
Input
},
directives
:
{
clickOutside
,
},
...
...
src/components/CountDown/src/CountButton.vue
浏览文件 @
3c441a05
...
...
@@ -21,7 +21,7 @@
name
:
'
CountButton
'
,
components
:
{
Button
},
props
:
{
value
:
propTypes
.
string
,
value
:
propTypes
.
any
,
count
:
propTypes
.
number
.
def
(
60
),
beforeStartFunc
:
{
type
:
Function
as
PropType
<
()
=>
boolean
>
,
...
...
src/components/Cropper/src/index.vue
浏览文件 @
3c441a05
...
...
@@ -57,18 +57,19 @@
default
:
'
360px
'
,
},
crossorigin
:
{
type
:
String
,
type
:
String
as
PropType
<
''
|
'
anonymous
'
|
'
use-credentials
'
|
undefined
>
,
default
:
undefined
,
},
imageStyle
:
{
type
:
Object
as
PropType
<
CSSProperties
>
,
default
:
{},
default
:
()
=>
{},
},
options
:
{
type
:
Object
as
PropType
<
Options
>
,
default
:
{},
default
:
()
=>
{},
},
},
emits
:
[
'
cropperedInfo
'
],
setup
(
props
,
ctx
)
{
const
imgElRef
=
ref
<
ElRef
<
HTMLImageElement
>>
(
null
);
const
cropper
:
any
=
ref
<
Nullable
<
Cropper
>>
(
null
);
...
...
@@ -109,17 +110,17 @@
// event: return base64 and width and height information after cropping
const
croppered
=
():
void
=>
{
let
imgInfo
=
cropper
.
value
.
getData
();
cropper
.
value
.
getCroppedCanvas
().
toBlob
(
blob
=>
{
let
fileReader
:
FileReader
=
new
FileReader
()
cropper
.
value
.
getCroppedCanvas
().
toBlob
(
(
blob
)
=>
{
let
fileReader
:
FileReader
=
new
FileReader
();
fileReader
.
onloadend
=
(
e
:
any
)
=>
{
ctx
.
emit
(
"
cropperedInfo
"
,
{
ctx
.
emit
(
'
cropperedInfo
'
,
{
imgBase64
:
e
.
target
.
result
,
imgInfo
})
}
fileReader
.
readAsDataURL
(
blob
)
},
'
image/jpeg
'
)
}
imgInfo
,
})
;
}
;
fileReader
.
readAsDataURL
(
blob
)
;
},
'
image/jpeg
'
)
;
}
;
onMounted
(
init
);
...
...
src/components/Form/src/components/FormAction.vue
浏览文件 @
3c441a05
...
...
@@ -67,15 +67,15 @@
showAdvancedButton
:
propTypes
.
bool
.
def
(
true
),
resetButtonOptions
:
{
type
:
Object
as
PropType
<
ButtonOptions
>
,
default
:
{},
default
:
()
=>
{},
},
submitButtonOptions
:
{
type
:
Object
as
PropType
<
ButtonOptions
>
,
default
:
{},
default
:
()
=>
{},
},
actionColOptions
:
{
type
:
Object
as
PropType
<
Partial
<
ColEx
>>
,
default
:
{},
default
:
()
=>
{},
},
actionSpan
:
propTypes
.
number
.
def
(
6
),
isAdvanced
:
propTypes
.
bool
,
...
...
src/components/Form/src/components/FormItem.vue
浏览文件 @
3c441a05
...
...
@@ -28,15 +28,15 @@
},
formProps
:
{
type
:
Object
as
PropType
<
FormProps
>
,
default
:
{},
default
:
()
=>
{},
},
allDefaultValues
:
{
type
:
Object
as
PropType
<
Recordable
>
,
default
:
{},
default
:
()
=>
{},
},
formModel
:
{
type
:
Object
as
PropType
<
Recordable
>
,
default
:
{},
default
:
()
=>
{},
},
setFormModel
:
{
type
:
Function
as
PropType
<
(
key
:
string
,
value
:
any
)
=>
void
>
,
...
...
src/components/SimpleMenu/src/SimpleMenuTag.vue
浏览文件 @
3c441a05
...
...
@@ -14,7 +14,7 @@
props
:
{
item
:
{
type
:
Object
as
PropType
<
Menu
>
,
default
:
{},
default
:
()
=>
{},
},
dot
:
propTypes
.
bool
,
collapseParent
:
propTypes
.
bool
,
...
...
src/components/SimpleMenu/src/SimpleSubMenu.vue
浏览文件 @
3c441a05
...
...
@@ -64,7 +64,7 @@
props
:
{
item
:
{
type
:
Object
as
PropType
<
Menu
>
,
default
:
{},
default
:
()
=>
{},
},
parent
:
propTypes
.
bool
,
collapsedShowTitle
:
propTypes
.
bool
,
...
...
src/components/SimpleMenu/src/components/Menu.vue
浏览文件 @
3c441a05
...
...
@@ -30,7 +30,7 @@
activeName
:
propTypes
.
oneOfType
([
propTypes
.
string
,
propTypes
.
number
]),
openNames
:
{
type
:
Array
as
PropType
<
string
[]
>
,
default
:
[],
default
:
()
=>
[],
},
accordion
:
propTypes
.
bool
.
def
(
true
),
width
:
propTypes
.
string
.
def
(
'
100%
'
),
...
...
@@ -39,7 +39,7 @@
collapse
:
propTypes
.
bool
.
def
(
true
),
activeSubMenuNames
:
{
type
:
Array
as
PropType
<
(
string
|
number
)[]
>
,
default
:
[],
default
:
()
=>
[],
},
},
emits
:
[
'
select
'
,
'
open-change
'
],
...
...
src/components/Table/src/components/HeaderCell.vue
浏览文件 @
3c441a05
...
...
@@ -23,7 +23,7 @@
props
:
{
column
:
{
type
:
Object
as
PropType
<
BasicColumn
>
,
default
:
{},
default
:
()
=>
{},
},
},
setup
(
props
)
{
...
...
src/components/Table/src/components/editable/EditableCell.vue
浏览文件 @
3c441a05
...
...
@@ -60,7 +60,7 @@
},
column
:
{
type
:
Object
as
PropType
<
BasicColumn
>
,
default
:
{},
default
:
()
=>
{},
},
index
:
propTypes
.
number
,
},
...
...
src/components/Table/src/components/settings/index.vue
浏览文件 @
3c441a05
...
...
@@ -30,7 +30,7 @@
props
:
{
setting
:
{
type
:
Object
as
PropType
<
TableSetting
>
,
default
:
{},
default
:
()
=>
{},
},
},
setup
(
props
)
{
...
...
src/layouts/default/setting/components/SelectItem.vue
浏览文件 @
3c441a05
...
...
@@ -41,7 +41,7 @@
},
options
:
{
type
:
Array
as
PropType
<
LabelValueOptions
>
,
default
:
[],
default
:
()
=>
[],
},
},
setup
(
props
)
{
...
...
src/locales/useLocale.ts
浏览文件 @
3c441a05
...
...
@@ -34,8 +34,8 @@ export function useLocale() {
const
getLocale
=
computed
(()
=>
localeStore
.
getLocale
);
const
getShowLocalePicker
=
computed
(()
=>
localeStore
.
getShowPicker
);
const
getAntdLocale
=
computed
(()
=>
{
return
i18n
.
global
.
getLocaleMessage
(
unref
(
getLocale
))?.
antdLocale
;
const
getAntdLocale
=
computed
(()
:
any
=>
{
return
i18n
.
global
.
getLocaleMessage
(
unref
(
getLocale
))?.
antdLocale
??
{}
;
});
// Switching the language will change the locale of useI18n
...
...
src/views/demo/comp/cropper/index.vue
浏览文件 @
3c441a05
<
template
>
<PageWrapper
title=
"图片裁剪示例"
contentBackground
>
<div
class=
"cropper-container"
>
<CropperImage
ref=
"refCropper"
src=
"https://fengyuanchen.github.io/cropperjs/images/picture.jpg"
@
cropperedInfo=
"cropperedInfo"
style=
"width:40%"
/>
<CropperImage
ref=
"refCropper"
src=
"https://fengyuanchen.github.io/cropperjs/images/picture.jpg"
@
cropperedInfo=
"cropperedInfo"
style=
"width: 40%"
/>
<a-button
type=
"primary"
@
click=
"onCropper"
>
裁剪
</a-button>
<img
:src=
"cropperImg"
class=
"croppered"
v-if=
"cropperImg"
/>
</div>
...
...
@@ -20,41 +25,42 @@
},
setup
()
{
let
vm
:
any
;
let
info
=
ref
(
""
);
let
cropperImg
=
ref
(
""
);
let
info
=
ref
(
''
);
let
cropperImg
=
ref
(
''
);
const
onCropper
=
():
void
=>
{
vm
.
refs
.
refCropper
.
croppered
();
}
}
;
onBeforeMount
(()
=>
{
onBeforeMount
(()
=>
{
vm
=
getCurrentInstance
();
})
})
;
function
cropperedInfo
({
imgBase64
,
imgInfo
})
{
info
.
value
=
imgInfo
cropperImg
.
value
=
imgBase64
}
function
cropperedInfo
({
imgBase64
,
imgInfo
})
{
info
.
value
=
imgInfo
;
cropperImg
.
value
=
imgBase64
;
}
return
{
img
,
info
,
cropperImg
,
onCropper
,
cropperedInfo
cropperedInfo
,
};
},
});
</
script
>
<
style
scoped
>
.cropper-container
{
display
:
flex
;
justify-content
:
space-around
;
align-items
:
center
;
}
.croppered
{
width
:
50%
;
height
:
100%
;
}
.cropper-container
{
display
:
flex
;
justify-content
:
space-around
;
align-items
:
center
;
}
.croppered
{
width
:
50%
;
height
:
100%
;
}
</
style
>
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录