让企业管理更智慧、更快捷
Skip to content
GitLab
探索
登录
注册
源代码提交(4)
docs: update changelog
· 92648d85
由
丁阳
创作于
10月 31, 2022
92648d85
fix: 修复table筛选组件功能逻辑错误问题
· d1ff3c0f
由
丁阳
创作于
11月 03, 2022
d1ff3c0f
Merge branch 'dy-dev'
· 01268b62
由
丁阳
创作于
11月 03, 2022
01268b62
1.0.10
· a599697c
由
丁阳
创作于
11月 03, 2022
a599697c
隐藏空白变更内容
行内
左右并排
CHANGELOG.md
浏览文件 @
a599697c
## [1.0.9](http://git.leadwaycloud.com/package/lwc-ui-components/compare/v1.0.8...v1.0.9) (2022-10-31)
## [1.0.8](http://git.leadwaycloud.com/package/lwc-ui-components/compare/v1.0.7...v1.0.8) (2022-08-31)
...
...
package.json
浏览文件 @
a599697c
{
"name"
:
"@package/lwc-ui-components"
,
"version"
:
"1.0.
9
"
,
"version"
:
"1.0.
10
"
,
"private"
:
false
,
"description"
:
"立威云UI组件库"
,
"author"
:
""
,
...
...
src/plugins/vxe-table/renderer/filter/components/fillter-input.vue
浏览文件 @
a599697c
...
...
@@ -40,7 +40,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<span
class=
"el-icon-remove"
:style=
"
{position: 'absolute', top: '10px', right: '10px'}" @click.stop="removeFilters(index)">
</span>
<span
v-if=
"complexConfig.option.data.length > 1"
class=
"el-icon-remove"
:style=
"
{position: 'absolute', top: '10px', right: '10px'}" @click.stop="removeFilters(index)">
</span>
<!--
<el-tag
class=
"ml-2 filters-li-tag-right"
@
click.stop=
"item.conditionPanel = !item.conditionPanel"
>
{{
item
.
conditionLabel
}}
<i
class=
"el-icon-caret-right"
></i>
...
...
@@ -157,15 +157,17 @@ export default {
{
value
:
'
less
'
,
label
:
'
小于
'
},
{
value
:
'
le
'
,
label
:
'
小于或等于
'
},
],
dateGroups
:
[]
dateGroups
:
[
{
value
:
'
equal
'
,
label
:
'
等于
'
},
{
value
:
'
ne
'
,
label
:
'
不等于
'
},
{
value
:
'
greater-date
'
,
label
:
'
大于
'
,
divided
:
true
},
{
value
:
'
ge-date
'
,
label
:
'
大于或等于
'
},
{
value
:
'
less-date
'
,
label
:
'
小于
'
},
{
value
:
'
le-date
'
,
label
:
'
小于或等于
'
},
]
}
},
created
()
{
this
.
dateGroups
=
[
...
this
.
numberGroups
,
{
value
:
'
include
'
,
label
:
'
包含
'
,
divided
:
true
},
{
value
:
'
ex
'
,
label
:
'
不包含
'
}
]
this
.
onLoad
()
},
methods
:
{
...
...
@@ -185,6 +187,10 @@ export default {
this
.
complexConfig
.
title
=
column
.
title
let
{
type
=
"
string
"
,
...
other
}
=
this
.
filterConfig
||
{}
Object
.
assign
(
this
.
complexConfig
,
other
)
if
(
type
!=
'
string
'
)
{
defaultData
[
0
].
condition
=
"
equal
"
defaultData
[
0
].
conditionLabel
=
"
等于
"
}
if
(
this
.
complexConfig
.
multiple
)
{
this
.
complexConfig
.
option
.
data
=
this
.
complexConfig
.
option
.
data
||
defaultData
}
else
{
...
...
@@ -201,10 +207,6 @@ export default {
this
.
complexConfig
.
caseGroups
=
this
.
dateGroups
if
(
type
===
'
datetime
'
)
this
.
complexConfig
.
format
=
"
yyyy-MM-dd HH:mm:ss
"
}
if
(
type
!=
'
string
'
)
{
this
.
complexConfig
.
condition
=
"
equal
"
this
.
complexConfig
.
conditionLabel
=
"
等于
"
}
// console.log("complexConfig", complexConfig)
}
},
...
...
@@ -277,10 +279,10 @@ export default {
addFilters
()
{
this
.
complexConfig
.
option
.
data
.
push
({
conditionPanel
:
false
,
condition
:
"
equal
"
,
conditionLabel
:
"
等于
"
,
condition
:
"
include
"
,
conditionLabel
:
"
包含
"
,
value
:
""
,
and
:
tru
e
and
:
fals
e
})
},
// 移除筛选条件
...
...
src/plugins/vxe-table/renderer/filter/input.js
浏览文件 @
a599697c
...
...
@@ -43,6 +43,7 @@ export default {
if
(
cellValue
)
{
if
(
XEUtils
.
isArray
(
data
))
{
let
filterState
=
true
let
isAdd
=
data
.
length
===
1
data
.
map
(
item
=>
{
let
filterValue
=
false
switch
(
item
.
condition
)
{
...
...
@@ -59,11 +60,23 @@ export default {
filterValue
=
cellValue
>=
item
.
value
break
;
case
"
less
"
:
filterValue
=
cellValue
<
item
.
value
filterValue
=
cellValue
<
=
item
.
value
break
;
case
"
le
"
:
filterValue
=
cellValue
<=
item
.
value
break
;
case
"
greater-date
"
:
filterValue
=
new
Date
(
cellValue
).
getTime
()
>
new
Date
(
item
.
value
).
getTime
()
break
;
case
"
ge-date
"
:
filterValue
=
new
Date
(
cellValue
).
getTime
()
>=
new
Date
(
item
.
value
).
getTime
()
break
;
case
"
less-date
"
:
filterValue
=
new
Date
(
cellValue
).
getTime
()
<
new
Date
(
item
.
value
).
getTime
()
break
;
case
"
le-date
"
:
filterValue
=
new
Date
(
cellValue
).
getTime
()
<=
new
Date
(
item
.
value
).
getTime
()
break
;
case
"
include
"
:
filterValue
=
(
cellValue
+
""
).
indexOf
((
item
.
value
+
""
))
>=
0
break
;
...
...
@@ -78,7 +91,7 @@ export default {
filterValue
=
cellValue
.
substr
(
cellValue
.
length
-
item
.
value
.
length
,
item
.
value
.
length
)
==
item
.
value
break
;
}
filterState
=
item
.
and
?
(
filterState
&&
filterValue
)
:
(
filterState
||
filterValue
)
filterState
=
(
item
.
and
||
isAdd
)
?
(
filterState
&&
filterValue
)
:
(
filterState
||
filterValue
)
})
return
filterState
}
else
{
...
...
src/stories/changelog.stories.mdx
浏览文件 @
a599697c
...
...
@@ -8,6 +8,16 @@
`新特性`
`非兼容性更新`
---
### **v1.0.9 20221031**
#### Bug修复
- 修复 lwc-upload-image 组件 裁剪功能上传服务器错误
- 修复 lwc-data-display-steps 组件 外部变量更改后选中颜色错误问题
- 修复 lwc-timeline-approve-info 组件 外部变量更改后选中颜色错误问题
- 修复 lwc-icon-park 组件 外部变量更改后选中颜色错误问题
---
### **v1.0.8 20220831**
...
...
src/stories/select/down-table/src/index.js
浏览文件 @
a599697c
import
{
v4
as
uuidv4
}
from
'
uuid
'
;
import
{
v
}
from
'
vxe-table
'
;
import
XEUtils
from
'
xe-utils/ctor
'
/**
* @Author: dy
...
...