Skip to content

Commit cfdcd3d

Browse files
author
pixel
committed
Merge remote-tracking branch 'origin/gin-vue-admin_v2_dev' into gin-vue-admin_v2_dev
2 parents 4df55c1 + 345cd77 commit cfdcd3d

File tree

6 files changed

+31
-32
lines changed

6 files changed

+31
-32
lines changed

‎web/src/style/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1039,4 +1039,4 @@ li {
10391039
width: 10px;
10401040
}
10411041
}
1042-
}
1042+
}

‎web/src/view/example/breakpoint/breakpoint.vue

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,24 @@
22
<div class="hello">
33
<el-divider content-position="left">大文件上传</el-divider>
44
<form id="fromCont" method="post" >
5-
<div class="fileUpload">
6-
选择文件<input @change="choseFile" id="file" multiple="multiple" type="file" />
5+
<div class="fileUpload" @click="inputChange">
6+
选择文件
7+
<input v-show="false" @change="choseFile" id="file" multiple="multiple" type="file" ref="Input" />
78
</div>
89
</form>
910
<el-button @click="getFile" :disabled="limitFileSize" type="primary" size="medium" class="uploadBtn">上传文件</el-button>
1011
<div class="el-upload__tip">请上传不超过5MB的文件</div>
1112
<div class="list">
12-
<transition-group name="list" tag="p">
13-
<div class="list-item" v-for="item in uploadList" :key="item.name" >
13+
<transition name="list" tag="p">
14+
<div class="list-item" v-if="file" >
1415
<i class="el-icon-document"></i>
15-
<span>{{ item.name }}</span>
16-
<span v-if="file" class="percentage" >{{percentage}}%</span>
16+
<span>{{ file.name }}</span>
17+
<span class="percentage" >{{percentage}}%</span>
1718
<el-progress :show-text='false' :text-inside="false" :stroke-width="2" :percentage="percentage"></el-progress>
1819
</div>
19-
</transition-group>
20+
</transition>
2021
</div>
21-
22-
<!-- <span
22+
<!-- <span
2323
v-if="this.file"
2424
>{{Math.floor(((this.formDataList.length-this.waitNum)/this.formDataList.length)*100)}}%</span> -->
2525
<div class="tips">此版本为先行体验功能测试版，样式美化和性能优化正在进行中，上传切片文件和合成的完整文件分别再QMPlusserver目录的breakpointDir文件夹和fileDir文件夹</div>
@@ -45,8 +45,7 @@ export default {
4545
limitFileSize: false,
4646
percentage:0,
4747
percentageFlage: true,
48-
customColor: '#409eff',
49-
uploadList:[]
48+
customColor: '#409eff'
5049
}
5150
},
5251
created(){
@@ -59,6 +58,7 @@ export default {
5958
const file = e.target.files[0] // 获取当前文件
6059
const maxSize = 5*1024*1024
6160
this.file = file // file 丢全局方便后面用 可以改进为func传参形式
61+
this.percentage = 0
6262
if(file.size<maxSize){
6363
fileR.readAsArrayBuffer(file) // 把文件读成ArrayBuffer 主要为了保持跟后端的流一致
6464
fileR.onload = async e => {
@@ -123,9 +123,6 @@ export default {
123123
this.percentageFlage = false
124124
}
125125
this.sliceFile() // 上传切片
126-
if(this.percentage == 100){
127-
this.uploadList.push(this.file)
128-
}
129126
},
130127
sliceFile() {
131128
this.waitUpLoad &&
@@ -164,6 +161,9 @@ export default {
164161
await removeChunk(params)
165162
}
166163
}
164+
},
165+
inputChange(){
166+
this.$refs.Input.dispatchEvent(new MouseEvent('click'))
167167
}
168168
}
169169
}
@@ -198,15 +198,14 @@ a {
198198
border-radius: 4px;
199199
overflow: hidden;
200200
display: inline-block;
201-
input{
202-
position: absolute;
203-
font-size: 100px;
204-
right: 0;
205-
top: 0;
206-
opacity: 0;
207-
cursor: pointer;
208-
}
209-
201+
input{
202+
position: absolute;
203+
font-size: 100px;
204+
right: 0;
205+
top: 0;
206+
opacity: 0;
207+
cursor: pointer;
208+
}
210209
}
211210
.fileName{
212211
display: inline-block;

‎web/src/view/example/customer/customer.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<el-table-column label="姓名" prop="customerName" width="120"></el-table-column>
2323
<el-table-column label="电话" prop="customerPhoneData" width="120"></el-table-column>
2424
<el-table-column label="接入人ID" prop="sysUserId" width="120"></el-table-column>
25-
<el-table-column label="按钮组">
25+
<el-table-column label="按钮组" min-width="160">
2626
<template slot-scope="scope">
2727
<el-button @click="updateCustomer(scope.row)" size="small" type="text">变更</el-button>
2828
<el-popover placement="top" width="160" v-model="scope.row.visible">

‎web/src/view/example/table/table.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
</el-table-column>
1717
<el-table-column label="姓名" prop="name" width="120"></el-table-column>
1818
<el-table-column label="年龄" prop="age" width="120"></el-table-column>
19-
<el-table-column label="住址" prop="address" show-overflow-tooltip></el-table-column>
20-
<el-table-column label="是否禁用" prop="switch">
19+
<el-table-column label="住址" prop="address" min-width="200" show-overflow-tooltip></el-table-column>
20+
<el-table-column label="是否禁用" prop="switch" width="180">
2121
<template slot-scope="scope">
2222
<el-switch active-text="开启" inactive-text="禁用" v-model="scope.row.switch"></el-switch>
2323
</template>
2424
</el-table-column>
25-
<el-table-column label="按钮组">
26-
<template slot-scope="scope">
25+
<el-table-column label="按钮组" width="200">
26+
<template slot-scope="scope" >
2727
<el-button type="text" size="small" @click="toggleSelection([scope.row])">按钮1</el-button>
2828
<el-button type="text" size="small" @click="toggleSelection([scope.row])">按钮2</el-button>
2929
<el-button type="text" size="small" @click="toggleSelection([scope.row])">按钮3</el-button>

‎web/src/view/example/upload/upload.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
prop="name"
3636
width="180"
3737
></el-table-column>
38-
<el-table-column label="链接" prop="url"></el-table-column>
38+
<el-table-column label="链接" prop="url" min-width="300"></el-table-column>
3939
<el-table-column label="标签" prop="tag" width="100">
4040
<template slot-scope="scope">
4141
<el-tag
@@ -45,7 +45,7 @@
4545
>
4646
</template>
4747
</el-table-column>
48-
<el-table-column label="操作" width="100">
48+
<el-table-column label="操作" width="160">
4949
<template slot-scope="scope">
5050
<el-button @click="downloadFile(scope.row)" size="small" type="text"
5151
>下载</el-button

‎web/src/view/superAdmin/authority/authority.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
>
1414
<el-table-column label="角色id" min-width="180" prop="authorityId"></el-table-column>
1515
<el-table-column label="角色名称" min-width="180" prop="authorityName"></el-table-column>
16-
<el-table-column fixed="right" label="操作" min-width="300">
16+
<el-table-column fixed="right" label="操作" width="460">
1717
<template slot-scope="scope">
1818
<el-button @click="opdendrawer(scope.row)" size="small" type="text">设置权限</el-button>
1919
<el-button @click="addAuthority(scope.row.authorityId)" size="small" type="text">新增子角色</el-button>

0 commit comments

Comments
 (0)