Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
schedule
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
schedule
Commits
34957fde
Commit
34957fde
authored
Oct 12, 2020
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:文件上传添加本地文件上传 文件大小展示格式化
parent
0d8c11ad
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
33 additions
and
11 deletions
+33
-11
fileList.axml
components/fileList/fileList.axml
+2
-2
fileList.js
components/fileList/fileList.js
+11
-3
meetingDetail.acss
pages/meetingDetail/meetingDetail.acss
+1
-0
meetingDetail.js
pages/meetingDetail/meetingDetail.js
+0
-4
uploadFile.js
pages/meetingDetail/uploadFile.js
+2
-1
meetingRoomList.js
pages/meetingRoomList/meetingRoomList.js
+4
-1
utils.js
utils/utils.js
+13
-0
No files found.
components/fileList/fileList.axml
View file @
34957fde
...
@@ -2,14 +2,14 @@
...
@@ -2,14 +2,14 @@
<view class="desc" a:if='{{fileView.remark}}'>
<view class="desc" a:if='{{fileView.remark}}'>
{{fileView.remark}}
{{fileView.remark}}
</view>
</view>
<view class="file-list {{customClass}}" a:for="{{file
Infos
}}">
<view class="file-list {{customClass}}" a:for="{{file
List
}}">
<view class="file-box {{isCanDelete ? 'file-box-close': ''}}" catchTap="preview" data-file="{{item}}">
<view class="file-box {{isCanDelete ? 'file-box-close': ''}}" catchTap="preview" data-file="{{item}}">
<view class="file-icon {{item.mimeType}}"></view>
<view class="file-icon {{item.mimeType}}"></view>
<view class="file-title">
<view class="file-title">
<text>{{item.name.slice(0, item.name.length - 5)}}</text>
<text>{{item.name.slice(0, item.name.length - 5)}}</text>
<text>{{item.name.slice(-5)}}</text>
<text>{{item.name.slice(-5)}}</text>
</view>
</view>
<view class="file-size">{{item.size}}</view>
<view class="file-size">{{item.size
Show
}}</view>
<view a:if="{{showName}}" class="file-showName">{{item.userDetail.name}}</view>
<view a:if="{{showName}}" class="file-showName">{{item.userDetail.name}}</view>
<view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
<view a:if="{{isCanDelete}}" class="iconfont iconicon_noAgreed1" catchTap="removeFile" data-id="{{item.fileId}}"></view>
</view>
</view>
...
...
components/fileList/fileList.js
View file @
34957fde
import
create
from
'dd-store'
;
import
create
from
'dd-store'
;
import
{
renderSize
}
from
"../../utils/utils"
import
pageStore
from
'../../pages/meetingDetail/store'
;
import
pageStore
from
'../../pages/meetingDetail/store'
;
import
{
previewPermissions
,
previewOss
,
uploadPermissions
,
getThirdUserPlatForm
}
from
'../../api/request.js'
import
{
uploadPermissions
}
from
'../../api/request.js'
import
openLink
from
"dingtalk-jsapi/api/biz/util/openLink"
;
create
.
Component
({
create
.
Component
({
store
:
pageStore
,
store
:
pageStore
,
mixins
:
[],
mixins
:
[],
data
:
{
data
:
{
logId
:
''
,
//store
logId
:
''
,
//store
fileList
:
[]
},
},
props
:
{
props
:
{
isCanEdit
:
true
,
isCanEdit
:
true
,
...
@@ -17,6 +17,14 @@ create.Component({
...
@@ -17,6 +17,14 @@ create.Component({
isPreview
:
true
,
// 是否点击预览,
isPreview
:
true
,
// 是否点击预览,
},
},
didMount
()
{
didMount
()
{
const
fileList
=
[]
for
(
let
i
=
0
;
i
<
this
.
props
.
fileInfos
.
length
;
i
++
)
{
this
.
props
.
fileInfos
[
i
].
sizeShow
=
renderSize
(
this
.
props
.
fileInfos
[
i
].
size
)
fileList
.
push
(
this
.
props
.
fileInfos
[
i
])
}
this
.
setData
({
fileList
:
fileList
})
},
},
didUpdate
()
{
didUpdate
()
{
...
...
pages/meetingDetail/meetingDetail.acss
View file @
34957fde
...
@@ -495,6 +495,7 @@ input {
...
@@ -495,6 +495,7 @@ input {
margin: 0 38rpx;
margin: 0 38rpx;
font-size: 16rpx;
font-size: 16rpx;
text-align: center;
text-align: center;
white-space: nowrap;
}
}
.footerBottom>view>.iconfont {
.footerBottom>view>.iconfont {
...
...
pages/meetingDetail/meetingDetail.js
View file @
34957fde
...
@@ -69,14 +69,10 @@ create.Page({
...
@@ -69,14 +69,10 @@ create.Page({
},
},
needNotice
:
0
,
needNotice
:
0
,
placeholder
:
''
,
placeholder
:
''
,
week
:
''
,
lock
:
false
,
mrReserveStatus
:
''
,
id
:
''
id
:
''
},
},
onShow
()
{
onShow
()
{
this
.
update
()
this
.
update
()
if
(
this
.
store
.
data
.
isNeedReloadList
)
{
if
(
this
.
store
.
data
.
isNeedReloadList
)
{
this
.
store
.
data
.
isNeedReloadList
=
false
this
.
store
.
data
.
isNeedReloadList
=
false
this
.
loadAffairList
();
this
.
loadAffairList
();
...
...
pages/meetingDetail/uploadFile.js
View file @
34957fde
...
@@ -22,7 +22,8 @@ export async function getFileInfo() {
...
@@ -22,7 +22,8 @@ export async function getFileInfo() {
dd
.
uploadAttachmentToDingTalk
({
dd
.
uploadAttachmentToDingTalk
({
image
:
{
multiple
:
true
,
compress
:
true
,
max
:
9
,
spaceId
:
permission
.
data
.
data
},
image
:
{
multiple
:
true
,
compress
:
true
,
max
:
9
,
spaceId
:
permission
.
data
.
data
},
space
:
{
spaceId
:
permission
.
data
.
data
,
compress
:
true
,
isCopy
:
1
,
max
:
9
},
space
:
{
spaceId
:
permission
.
data
.
data
,
compress
:
true
,
isCopy
:
1
,
max
:
9
},
types
:
[
"photo"
,
"camera"
,
"space"
],
file
:
{
spaceId
:
permission
.
data
.
data
,
max
:
9
},
types
:
[
"photo"
,
"camera"
,
"space"
,
"file"
],
success
:
(
res
)
=>
{
success
:
(
res
)
=>
{
console
.
log
(
res
)
console
.
log
(
res
)
resolve
(
res
)
resolve
(
res
)
...
...
pages/meetingRoomList/meetingRoomList.js
View file @
34957fde
...
@@ -173,7 +173,10 @@ create.Page({
...
@@ -173,7 +173,10 @@ create.Page({
},
},
// 获取当前id 的祖先
// 获取当前id 的祖先
getParentStr
(
parentId
)
{
getParentStr
(
parentId
)
{
if
(
parentId
!==
"0"
)
{
if
(
parentId
!==
"0"
&&
this
.
data
.
areaMap
.
get
(
parentId
))
{
// if ()) {
// return this.parentStr
// }
this
.
parentStr
=
this
.
parentStr
=
this
.
data
.
areaMap
.
get
(
parentId
).
name
+
"-"
+
this
.
parentStr
;
this
.
data
.
areaMap
.
get
(
parentId
).
name
+
"-"
+
this
.
parentStr
;
// 此处一定return
// 此处一定return
...
...
utils/utils.js
View file @
34957fde
...
@@ -296,4 +296,17 @@ export function selectedelRequired(select, require) {
...
@@ -296,4 +296,17 @@ export function selectedelRequired(select, require) {
return
!
require
.
includes
(
it
)
return
!
require
.
includes
(
it
)
})
})
}
}
// 文件格式化
export
function
renderSize
(
value
)
{
if
(
null
==
value
||
value
==
''
)
{
return
"0 B"
;
}
var
unitArr
=
new
Array
(
"B"
,
"K"
,
"M"
,
"G"
,
"T"
,
"P"
,
"E"
,
"Z"
,
"Y"
);
var
index
=
0
;
var
srcsize
=
parseFloat
(
value
);
index
=
Math
.
floor
(
Math
.
log
(
srcsize
)
/
Math
.
log
(
1024
));
var
size
=
srcsize
/
Math
.
pow
(
1024
,
index
);
size
=
size
.
toFixed
(
2
);
//保留的小数位数
return
size
+
unitArr
[
index
];
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment