vue2-client 1.2.71 → 1.2.74
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,9 +1,18 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
> 所有关于本项目的变化都在该文档里。
|
|
3
3
|
|
|
4
|
-
**1.2.
|
|
4
|
+
**1.2.74 -2022-06-17 @张振宇**
|
|
5
|
+
- 功能修改：
|
|
6
|
+
- 拖拽样式修改
|
|
7
|
+
|
|
8
|
+
**1.2.73 -2022-06-16 @江超**
|
|
9
|
+
- 功能修改：
|
|
10
|
+
- 现在表格列排序不再通过前端判断，而是从后端生成了
|
|
11
|
+
|
|
12
|
+
**1.2.71 - 1.2.72 2022-06-16 @张振宇**
|
|
5
13
|
- 功能修改：
|
|
6
14
|
- 基础表单bug修改
|
|
15
|
+
- 数据字段可以拖拽了
|
|
7
16
|
|
|
8
17
|
**1.2.71 2022-06-15 @苗艳强**
|
|
9
18
|
- 功能修改：
|
package/package.json
CHANGED
|
@@ -64,17 +64,29 @@
|
|
|
64
64
|
</a-form-model-item>
|
|
65
65
|
<a-form-model-item label="数据字段" prop="column">
|
|
66
66
|
<a-button type="primary" @click="addColumnItem()">增加</a-button>
|
|
67
|
-
<div
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
<div
|
|
68
|
+
v-for="(columnItem, index) in form.column"
|
|
69
|
+
:key="index"
|
|
70
|
+
draggable="true"
|
|
71
|
+
class="column_item"
|
|
72
|
+
@dragstart="handleDragStart($event, columnItem)"
|
|
73
|
+
@dragover.prevent="handleDragOver($event, columnItem)"
|
|
74
|
+
@dragenter="handleDragEnter($event, columnItem)"
|
|
75
|
+
@dragend="handleDragEnd($event, columnItem)">
|
|
76
|
+
<a-row v-if="ending && dragging && columnItem.key === ending.key && dragging.key !== ending.key" class="dragTipsWarp">
|
|
77
|
+
<span class="dragTips">拖到此处放置</span>
|
|
78
|
+
</a-row>
|
|
79
|
+
<a-row :gutter="24">
|
|
80
|
+
<a-col :span="20">
|
|
70
81
|
<span style="font-weight: bold">{{ columnItem.title }}（{{ columnItem.key }}）</span>
|
|
71
82
|
</a-col>
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
83
|
+
<!-- 江超说先不要上下移动了 因为可以拖动了-->
|
|
84
|
+
<!-- <a-col v-if="index > 0 && form.column.length > 1" :span="2">-->
|
|
85
|
+
<!-- <a-icon type="up-square" @click="upColumnItem(columnItem.key,index)"/>-->
|
|
86
|
+
<!-- </a-col>-->
|
|
87
|
+
<!-- <a-col v-if="(index !== form.column.length - 1) && form.column.length > 1" :span="2">-->
|
|
88
|
+
<!-- <a-icon type="down-square" @click="downColumnItem(columnItem.key,index)"/>-->
|
|
89
|
+
<!-- </a-col>-->
|
|
78
90
|
<a-col :span="2">
|
|
79
91
|
<a-icon type="edit" @click="editColumnItem(columnItem.key,index)"/>
|
|
80
92
|
</a-col>
|
|
@@ -173,6 +185,8 @@ export default {
|
|
|
173
185
|
tableName: [{ required: true, message: '请输入查询表名', trigger: 'blur' }],
|
|
174
186
|
orderBy: [{ required: true, message: '请输入排序方式', trigger: 'blur' }]
|
|
175
187
|
},
|
|
188
|
+
ending: null,
|
|
189
|
+
dragging: null
|
|
176
190
|
}
|
|
177
191
|
},
|
|
178
192
|
mounted () {
|
|
@@ -475,9 +489,51 @@ export default {
|
|
|
475
489
|
return false
|
|
476
490
|
}
|
|
477
491
|
}
|
|
492
|
+
},
|
|
493
|
+
// 拖拽事件
|
|
494
|
+
handleDragStart (e, item) {
|
|
495
|
+
this.dragging = item
|
|
496
|
+
},
|
|
497
|
+
handleDragEnd (e, item) {
|
|
498
|
+
if (this.ending.key === this.dragging.key) {
|
|
499
|
+
return
|
|
500
|
+
}
|
|
501
|
+
const newItems = [...this.form.column]
|
|
502
|
+
const src = newItems.indexOf(this.dragging)
|
|
503
|
+
const dst = newItems.indexOf(this.ending)
|
|
504
|
+
// newItems.splice(src, 1, ...newItems.splice(dst, 1, newItems[src])) 替换位置
|
|
505
|
+
// 挪移位置
|
|
506
|
+
newItems.splice(src, 1)
|
|
507
|
+
newItems.splice(dst, 0, this.dragging)
|
|
508
|
+
this.form.column = newItems
|
|
509
|
+
this.$nextTick(() => {
|
|
510
|
+
this.dragging = null
|
|
511
|
+
this.ending = null
|
|
512
|
+
})
|
|
513
|
+
},
|
|
514
|
+
handleDragOver (e) {
|
|
515
|
+
// 首先把div变成可以放置的元素，即重写dragenter/dragover
|
|
516
|
+
// e.dataTransfer.dropEffect="move";//在dragenter中针对放置目标来设置!
|
|
517
|
+
e.dataTransfer.dropEffect = 'move'
|
|
518
|
+
},
|
|
519
|
+
handleDragEnter (e, item) {
|
|
520
|
+
// 为需要移动的元素设置dragstart事件
|
|
521
|
+
e.dataTransfer.effectAllowed = 'move'
|
|
522
|
+
this.ending = item
|
|
478
523
|
}
|
|
479
524
|
}
|
|
480
525
|
}
|
|
481
526
|
</script>
|
|
482
527
|
<style lang="less" scoped>
|
|
528
|
+
.column_item :hover {
|
|
529
|
+
background-color:rgba(64, 169, 255,0.25);
|
|
530
|
+
}
|
|
531
|
+
.dragTips{
|
|
532
|
+
display:block;
|
|
533
|
+
text-align: center;
|
|
534
|
+
border:1px dashed rgba(64, 169, 255,0.55);
|
|
535
|
+
}
|
|
536
|
+
.dragTipsWarp{
|
|
537
|
+
padding: .5rem 2rem;
|
|
538
|
+
}
|
|
483
539
|
</style>
|
package/vue.config.js
CHANGED
|
@@ -35,8 +35,8 @@ const isProd = process.env.NODE_ENV === 'production'
|
|
|
35
35
|
// }
|
|
36
36
|
|
|
37
37
|
const server = 'http://121.36.106.17:8400'
|
|
38
|
-
|
|
39
|
-
const local = 'http://123.60.214.109:8405/webmeter'
|
|
38
|
+
const local = 'http://localhost:8445/webmeter'
|
|
39
|
+
// const local = 'http://123.60.214.109:8405/webmeter'
|
|
40
40
|
|
|
41
41
|
module.exports = {
|
|
42
42
|
devServer: {
|