Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
cube-ui
提交
289db036
C
cube-ui
项目概览
DiDi
/
cube-ui
11 个月 前同步成功
通知
34
Star
9078
Fork
1508
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
cube-ui
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
289db036
编写于
4月 18, 2018
作者:
D
dolymood
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix issue #163 , array findIndex
上级
c288db8c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
11 deletion
+27
-11
src/common/helpers/util.js
src/common/helpers/util.js
+16
-1
src/components/date-picker/date-picker.vue
src/components/date-picker/date-picker.vue
+4
-4
src/components/select/select.vue
src/components/select/select.vue
+7
-6
未找到文件。
src/common/helpers/util.js
浏览文件 @
289db036
function
findIndex
(
ary
,
fn
)
{
if
(
ary
.
findIndex
)
{
return
ary
.
findIndex
(
fn
)
}
let
index
=
-
1
ary
.
some
(
function
(
item
,
i
,
ary
)
{
const
ret
=
fn
.
call
(
this
,
item
,
i
,
ary
)
if
(
ret
)
{
index
=
i
return
ret
}
})
return
index
}
function
deepAssign
(
to
,
from
)
{
for
(
let
key
in
from
)
{
if
(
!
to
[
key
]
||
typeof
to
[
key
]
!==
'
object
'
)
{
...
...
@@ -65,4 +80,4 @@ function resetTypeValue(obj, key, defVal) {
}
}
export
{
deepAssign
,
createAddAPI
,
toLocaleDateString
,
resetTypeValue
}
export
{
findIndex
,
deepAssign
,
createAddAPI
,
toLocaleDateString
,
resetTypeValue
}
src/components/date-picker/date-picker.vue
浏览文件 @
289db036
...
...
@@ -17,7 +17,7 @@
<
script
>
import
apiMixin
from
'
../../common/mixins/api
'
import
pickerMixin
from
'
../../common/mixins/picker
'
import
{
deepAssign
}
from
'
../../common/helpers/util
'
import
{
deepAssign
,
findIndex
}
from
'
../../common/helpers/util
'
import
{
computeNatureMaxDay
,
formatType
}
from
'
../../common/lang/date
'
const
COMPONENT_NAME
=
'
cube-date-picker
'
...
...
@@ -145,13 +145,13 @@
selectedIndex
()
{
let
selectedIndex
=
[]
let
data
=
this
.
data
let
findI
ndex
let
i
ndex
for
(
let
i
=
0
;
i
<
this
.
columnCount
&&
i
<
6
-
this
.
startIndex
;
i
++
)
{
findIndex
=
data
.
findIndex
(
(
item
)
=>
{
index
=
findIndex
(
data
,
(
item
)
=>
{
return
this
.
valueArray
[
i
]
&&
item
.
value
===
this
.
valueArray
[
i
]
})
selectedIndex
[
i
]
=
findIndex
!==
-
1
?
findI
ndex
:
0
selectedIndex
[
i
]
=
index
!==
-
1
?
i
ndex
:
0
data
=
data
[
selectedIndex
[
i
]].
children
}
...
...
src/components/select/select.vue
浏览文件 @
289db036
...
...
@@ -7,6 +7,7 @@
</
template
>
<
script
>
import
{
findIndex
}
from
'
../../common/helpers/util
'
const
COMPONENT_NAME
=
'
cube-select
'
const
EVENT_CHANGE
=
'
change
'
...
...
@@ -67,23 +68,23 @@
return
item
})]
},
find
Index
()
{
const
findIndex
=
this
.
adaptOptions
[
0
].
findIndex
(
(
item
)
=>
{
value
Index
()
{
const
index
=
findIndex
(
this
.
adaptOptions
[
0
],
(
item
)
=>
{
return
item
.
value
===
this
.
value
})
this
.
picker
&&
this
.
picker
.
setData
(
this
.
adaptOptions
,
findIndex
!==
-
1
?
[
findI
ndex
]
:
[
0
])
this
.
picker
&&
this
.
picker
.
setData
(
this
.
adaptOptions
,
index
!==
-
1
?
[
i
ndex
]
:
[
0
])
return
findI
ndex
return
i
ndex
},
selectedText
()
{
return
this
.
findIndex
!==
-
1
?
this
.
adaptOptions
[
0
][
this
.
find
Index
].
text
:
''
return
this
.
valueIndex
!==
-
1
?
this
.
adaptOptions
[
0
][
this
.
value
Index
].
text
:
''
}
},
created
()
{
this
.
picker
=
this
.
$createPicker
({
title
:
this
.
title
,
data
:
this
.
adaptOptions
,
selectedIndex
:
this
.
findIndex
!==
-
1
?
[
this
.
find
Index
]
:
[
0
],
selectedIndex
:
this
.
valueIndex
!==
-
1
?
[
this
.
value
Index
]
:
[
0
],
cancelTxt
:
this
.
cancelTxt
,
confirmTxt
:
this
.
confirmTxt
,
onSelect
:
this
.
hided
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录