centaline-data-driven 1.6.18 → 1.6.19
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/package.json +1 -1
- package/release-log.md +20 -0
- package/src/Form.vue +2 -2
- package/src/SearchList.vue +7 -1
- package/src/centaline/dynamicForm/src/dynamicForm.vue +32 -9
- package/src/centaline/dynamicForm/src/dynamicFormListTable.vue +47 -21
- package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +13 -7
- package/src/centaline/dynamicViewerFile/src/dynamicViewerFile.vue +2 -2
- package/src/centaline/dynamicViewerFile/src/dynamicViewerImage.vue +42 -55
- package/src/centaline/loader/src/ctl/Form.js +6 -0
- package/src/centaline/loader/src/ctl/FormList.js +7 -1
- package/src/centaline/loader/src/ctl/SearchTable.js +4 -4
- package/src/main.js +5 -4
- package/wwwroot/static/centaline/centaline-data-driven.js +127 -85
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
package/release-log.md
CHANGED
|
@@ -1,3 +1,23 @@
|
|
|
1
|
+
|
|
2
|
+
# v1.6.19
|
|
3
|
+
2024-09-05
|
|
4
|
+
|
|
5
|
+
优化
|
|
6
|
+
|
|
7
|
+
表格没有返回rows添加判断
|
|
8
|
+
|
|
9
|
+
文件预览组件,下载增加参数 download=1
|
|
10
|
+
|
|
11
|
+
表单列表数据非新增数据默认传flagNew=false
|
|
12
|
+
|
|
13
|
+
表单列表行操作位置改为api控制,默认最后一列
|
|
14
|
+
|
|
15
|
+
表单页面提示信息,显示在页面顶部并且悬停,支持html
|
|
16
|
+
|
|
17
|
+
js给表单列表赋值超过页面高度,保存按钮没有浮动处理
|
|
18
|
+
|
|
19
|
+
预览文件组件,图片拖动位置
|
|
20
|
+
|
|
1
21
|
# v1.6.18
|
|
2
22
|
2024-08-16
|
|
3
23
|
|
package/src/Form.vue
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="form-app" class="data-driven" style="width:100%;height:100%;overflow:auto">
|
|
3
3
|
<!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
|
|
4
|
-
<ct-form :api="'/
|
|
4
|
+
<ct-form :api="'/callcustomer/callcustpoolimport/getLayoutOfNew'" :apiParam="apiParam" :topHeight="topHeight" :documentHeight="'600px'"></ct-form>
|
|
5
5
|
<ct-dialog-list></ct-dialog-list>
|
|
6
6
|
</div>
|
|
7
7
|
</template>
|
|
@@ -12,7 +12,7 @@
|
|
|
12
12
|
data() {
|
|
13
13
|
return {
|
|
14
14
|
apiParam:{
|
|
15
|
-
|
|
15
|
+
"type":"top"
|
|
16
16
|
},
|
|
17
17
|
topHeight:10,
|
|
18
18
|
}
|
package/src/SearchList.vue
CHANGED
|
@@ -35,7 +35,9 @@
|
|
|
35
35
|
<!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/sunexpensemanage/sunexpenserecordlist/getLayoutOfSearch'" :searchDataApi="'/sunexpensemanage/sunexpenserecordlist/getList'"></ct-searchlist> -->
|
|
36
36
|
<!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customermanage/ProjectCustomerList/getLayoutOfSearch'" :searchDataApi="'/customermanage/ProjectCustomerList/getList'"></ct-searchlist> -->
|
|
37
37
|
<!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/workwxmanage/WorkWXApplicationList/getLayoutOfSearch'" :searchDataApi="'/workwxmanage/WorkWXApplicationList/getList'"></ct-searchlist> -->
|
|
38
|
-
<ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/UrgentResponsiblePersonList/getLayoutOfSearch'" :searchDataApi="'/salemattersmanage/UrgentResponsiblePersonList/getList'"></ct-searchlist>
|
|
38
|
+
<!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/UrgentResponsiblePersonList/getLayoutOfSearch'" :searchDataApi="'/salemattersmanage/UrgentResponsiblePersonList/getList'"></ct-searchlist> -->
|
|
39
|
+
<!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/customerquery/publiccustcalltaskreferrallist/getLayoutOfSearch'" :searchDataApi="'/customerquery/publiccustcalltaskreferrallist/getList'"></ct-searchlist> -->
|
|
40
|
+
<ct-searchlist :apiParam="para" :searchConditionApi="'/salemattersmanage/agentuserlist/getLayoutOfSearch'" :searchDataApi="'/salemattersmanage/agentuserlist/getList'"></ct-searchlist>
|
|
39
41
|
<!-- CCES -->
|
|
40
42
|
|
|
41
43
|
<!-- <ct-searchlist :apiParam="para"
|
|
@@ -104,6 +106,10 @@
|
|
|
104
106
|
<!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/PropertyVRRealLookBalanceList/getLayoutOfSearchForOFI'" :searchDataApi="'/PropertyVRRealLookBalanceList/getListOfSearchModel'"></ct-searchlist> -->
|
|
105
107
|
|
|
106
108
|
|
|
109
|
+
<!-- <ct-searchlist :apiParam="apiParam" :searchConditionApi="'/propertyPublishList/getLayoutOfSearch'"
|
|
110
|
+
:searchDataApi="'/propertyPublishList/getListOfSearchModel'"
|
|
111
|
+
:searchStatsApi="'/propertyPublishList/getListStats'"></ct-searchlist> -->
|
|
112
|
+
|
|
107
113
|
|
|
108
114
|
<!-- <ct-searchlist :appRootUrl="appRootUrl" :searchConditionApi="'/cache/getLayoutOfSearchForCache'" :searchDataApi="'/cache/getListOfSearchModelForCache'"></ct-searchlist> -->
|
|
109
115
|
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div v-loading="loading" :style="{width:pageWidth?pageWidth+'px':'100%',margin:'auto','min-height': minHeight}">
|
|
3
3
|
<div v-if="model !== null && !loading" class="ct-form" :class="{'domDisabled':model.pageDisabled}" :key="formKey">
|
|
4
|
+
<div v-if="model.tip" class="tip-absolute" :style="{width:(tipWidth-20)+'px'}">
|
|
5
|
+
<span v-html="model.tip"></span>
|
|
6
|
+
</div>
|
|
7
|
+
|
|
4
8
|
<!--可根据场景判断显示el-card还是el-main-->
|
|
5
9
|
<component :is="model.showTitle?'el-main':'el-card'">
|
|
6
10
|
<div slot="header" class="clearfix" v-if="typeof model.title !== 'undefined' && model.flagShowTitle">
|
|
@@ -213,6 +217,7 @@
|
|
|
213
217
|
independentItem: [],//最后一个独立分组的行列布局
|
|
214
218
|
minHeight: 'auto',
|
|
215
219
|
downloadUrl:"",
|
|
220
|
+
tipWidth:0,
|
|
216
221
|
};
|
|
217
222
|
},
|
|
218
223
|
deactivated(){
|
|
@@ -220,18 +225,24 @@
|
|
|
220
225
|
},
|
|
221
226
|
mounted() {
|
|
222
227
|
this.init();
|
|
223
|
-
this.setCss();
|
|
228
|
+
this.setCss();
|
|
229
|
+
this.$nextTick(() => {
|
|
230
|
+
this.tipWidth=this.$el.clientWidth;
|
|
231
|
+
})
|
|
224
232
|
},
|
|
225
233
|
updated() {
|
|
226
|
-
this
|
|
227
|
-
let parentDom=this.$el.parentElement;
|
|
228
|
-
if (parentDom.scrollHeight > parentDom.clientHeight
|
|
229
|
-
&& this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
|
|
230
|
-
this.isScroll = true;
|
|
231
|
-
}
|
|
232
|
-
});
|
|
234
|
+
this.computeScroll();
|
|
233
235
|
},
|
|
234
236
|
methods: {
|
|
237
|
+
computeScroll(){
|
|
238
|
+
this.$nextTick(() => {
|
|
239
|
+
let parentDom=this.$el.parentElement;
|
|
240
|
+
if (parentDom.scrollHeight > parentDom.clientHeight
|
|
241
|
+
&& this.model && (!this.model.isHorizontalLayout || this.flagScroll)) {
|
|
242
|
+
this.isScroll = true;
|
|
243
|
+
}
|
|
244
|
+
});
|
|
245
|
+
},
|
|
235
246
|
init() {
|
|
236
247
|
var self = this;
|
|
237
248
|
//初始化
|
|
@@ -1497,7 +1508,6 @@
|
|
|
1497
1508
|
/* bottom: 6px; */
|
|
1498
1509
|
bottom: 0;
|
|
1499
1510
|
left: 0;
|
|
1500
|
-
right: 0;
|
|
1501
1511
|
border-radius: 0 0 4px 4px;
|
|
1502
1512
|
position: absolute;
|
|
1503
1513
|
line-height: 34px;
|
|
@@ -1506,4 +1516,17 @@
|
|
|
1506
1516
|
margin: auto;
|
|
1507
1517
|
box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
|
|
1508
1518
|
}
|
|
1519
|
+
|
|
1520
|
+
.tip-absolute {
|
|
1521
|
+
z-index: 100;
|
|
1522
|
+
top: 10;
|
|
1523
|
+
left: 10;
|
|
1524
|
+
position: absolute;
|
|
1525
|
+
line-height: 24px;
|
|
1526
|
+
background-color:#ffe7cc;
|
|
1527
|
+
color:#EC3D3D;
|
|
1528
|
+
border-radius: 5px;
|
|
1529
|
+
padding: 8px;
|
|
1530
|
+
font-size: 12px;
|
|
1531
|
+
}
|
|
1509
1532
|
</style>
|
|
@@ -27,7 +27,31 @@
|
|
|
27
27
|
<el-row>
|
|
28
28
|
<el-col :span="24">
|
|
29
29
|
<el-table size="mini" class="max-table--border" :data="model.tableData" border
|
|
30
|
-
style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
|
|
30
|
+
style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
|
|
31
|
+
<!--操作列-->
|
|
32
|
+
<template v-if="model.rowActionRoutersAlign === 1">
|
|
33
|
+
<el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
|
|
34
|
+
<template slot-scope="scope">
|
|
35
|
+
<template v-if="!model.tableDisabled">
|
|
36
|
+
<span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
|
|
37
|
+
{{scope.row.isSet?'保存':"修改"}}
|
|
38
|
+
</span>
|
|
39
|
+
<span v-if="scope.row.delete && !scope.row.isSet" class="el-tag el-tag--danger el-tag--mini" style="cursor: pointer;" @click="deleteRow(scope.$index, scope.row.$sourceIndex)">
|
|
40
|
+
删除
|
|
41
|
+
</span>
|
|
42
|
+
<span v-else-if="scope.row.isSet" class="el-tag el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
|
|
43
|
+
取消
|
|
44
|
+
</span>
|
|
45
|
+
<span v-for="(v,i) in model.buttons"
|
|
46
|
+
v-if="!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 )"
|
|
47
|
+
class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
|
|
48
|
+
{{v.label}}
|
|
49
|
+
</span>
|
|
50
|
+
</template>
|
|
51
|
+
</template>
|
|
52
|
+
</el-table-column>
|
|
53
|
+
</template>
|
|
54
|
+
|
|
31
55
|
<!--数据列-->
|
|
32
56
|
<el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" :width="v.width" :fixed="model.frozenColumns.includes(v.id)" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
|
|
33
57
|
<template slot="header" slot-scope="scope">
|
|
@@ -55,26 +79,28 @@
|
|
|
55
79
|
</el-table-column>
|
|
56
80
|
|
|
57
81
|
<!--操作列-->
|
|
58
|
-
<
|
|
59
|
-
<
|
|
60
|
-
<template
|
|
61
|
-
<
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
v-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
82
|
+
<template v-if="model.rowActionRoutersAlign !== 1">
|
|
83
|
+
<el-table-column label="操作" v-if="model.rows[0].edit || model.rows[0].delete || (model.buttons.length > 0 && model.buttonsShow.length > 0)" :fixed="fixedButtons" :width="'100%'" :render-header="renderHeader" :min-width="tableColumnWith">
|
|
84
|
+
<template slot-scope="scope">
|
|
85
|
+
<template v-if="!model.tableDisabled">
|
|
86
|
+
<span v-if="scope.row.edit || scope.row.isSet" class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,true)">
|
|
87
|
+
{{scope.row.isSet?'保存':"修改"}}
|
|
88
|
+
</span>
|
|
89
|
+
<span v-if="scope.row.delete && !scope.row.isSet" class="el-tag el-tag--danger el-tag--mini" style="cursor: pointer;" @click="deleteRow(scope.$index, scope.row.$sourceIndex)">
|
|
90
|
+
删除
|
|
91
|
+
</span>
|
|
92
|
+
<span v-else-if="scope.row.isSet" class="el-tag el-tag--mini" style="cursor: pointer;" @click="saveRow(scope.row,scope.$index,false)">
|
|
93
|
+
取消
|
|
94
|
+
</span>
|
|
95
|
+
<span v-for="(v,i) in model.buttons"
|
|
96
|
+
v-if="!scope.row.isSet && v.show && ( !v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1 )"
|
|
97
|
+
class="el-tag el-tag--info el-tag--mini" style="cursor: pointer;" @click="buttonClick(scope.row, v)">
|
|
98
|
+
{{v.label}}
|
|
99
|
+
</span>
|
|
100
|
+
</template>
|
|
101
|
+
</template>
|
|
102
|
+
</el-table-column>
|
|
103
|
+
</template>
|
|
78
104
|
</el-table>
|
|
79
105
|
</el-col>
|
|
80
106
|
</el-row>
|
|
@@ -349,15 +349,18 @@ export default {
|
|
|
349
349
|
thHeight = document.getElementById("thHeight").offsetHeight;
|
|
350
350
|
if (document.getElementById("theadTitle")) {
|
|
351
351
|
this.theadTitleWidth = document.getElementById("theadTitle").offsetWidth;
|
|
352
|
-
}
|
|
352
|
+
}
|
|
353
|
+
else {
|
|
353
354
|
this.theadTitleWidth = 0
|
|
354
355
|
}
|
|
355
|
-
}
|
|
356
|
+
}
|
|
357
|
+
else {
|
|
356
358
|
tagsViewHeight = 0;
|
|
357
359
|
thHeight = -10;
|
|
358
360
|
if (document.getElementById("theadTitle")) {
|
|
359
361
|
this.theadTitleWidth = document.getElementById("theadTitle").offsetWidth * 0.5;
|
|
360
|
-
}
|
|
362
|
+
}
|
|
363
|
+
else {
|
|
361
364
|
this.theadTitleWidth = 0
|
|
362
365
|
}
|
|
363
366
|
}
|
|
@@ -492,11 +495,13 @@ export default {
|
|
|
492
495
|
ev.currentTarget.canResize = true;
|
|
493
496
|
if (this.model.columnWidthSaveAction) {
|
|
494
497
|
this.theadTitleShow = true
|
|
495
|
-
}
|
|
498
|
+
}
|
|
499
|
+
else {
|
|
496
500
|
this.theadTitleShow = false
|
|
497
501
|
}
|
|
498
502
|
|
|
499
|
-
}
|
|
503
|
+
}
|
|
504
|
+
else {
|
|
500
505
|
ev.currentTarget.style.cursor = "default";
|
|
501
506
|
ev.currentTarget.canResize = false;
|
|
502
507
|
}
|
|
@@ -523,7 +528,8 @@ export default {
|
|
|
523
528
|
if (oldWidth != col.width && self.model.columnWidthSaveAction && self.model.columnWidthSaveAction.length > 0) {
|
|
524
529
|
var submitData = { 'columnName': col.id, columnWidth: col.width }
|
|
525
530
|
self.model.getAction(self.model.columnWidthSaveAction, submitData);
|
|
526
|
-
}
|
|
531
|
+
}
|
|
532
|
+
else if (!self.model.columnWidthSaveAction) {
|
|
527
533
|
window.localStorage.setItem(self.model.title + "_" + col.id, col.width);
|
|
528
534
|
}
|
|
529
535
|
|
|
@@ -2730,7 +2736,7 @@ export default {
|
|
|
2730
2736
|
}
|
|
2731
2737
|
|
|
2732
2738
|
.ct-searchtable .ct-search-table-tag {
|
|
2733
|
-
background-color: #
|
|
2739
|
+
background-color: #ffe7cc;
|
|
2734
2740
|
border-color: #faecd8;
|
|
2735
2741
|
width: 100%;
|
|
2736
2742
|
box-shadow: 0 2px 10px 0 rgb(0 0 0 / 10%);
|
|
@@ -289,10 +289,10 @@
|
|
|
289
289
|
handDownloadUrl(url){
|
|
290
290
|
let self = this;
|
|
291
291
|
if (url.indexOf("?") > -1) {
|
|
292
|
-
self.downloadUrl = self.getDownloadUrl(url) + "&" + Math.random();
|
|
292
|
+
self.downloadUrl = self.getDownloadUrl(url) + "&download=1&" + Math.random();
|
|
293
293
|
}
|
|
294
294
|
else {
|
|
295
|
-
self.downloadUrl = self.getDownloadUrl(url) + "?" + Math.random();
|
|
295
|
+
self.downloadUrl = self.getDownloadUrl(url) + "?download=1&" + Math.random();
|
|
296
296
|
}
|
|
297
297
|
setTimeout(function () {
|
|
298
298
|
self.downloadLoading = false;
|
|
@@ -39,10 +39,47 @@ export default {
|
|
|
39
39
|
},
|
|
40
40
|
mounted() {
|
|
41
41
|
this.loading = true;
|
|
42
|
-
this
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
);
|
|
42
|
+
var self = this;
|
|
43
|
+
this.$nextTick(function () {
|
|
44
|
+
// 获取容器和图片元素
|
|
45
|
+
var dragImg = document.getElementById('ViewerImage');
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
// 鼠标按下事件
|
|
49
|
+
dragImg.onmousedown = function (event) {
|
|
50
|
+
// 计算鼠标相对图片的位置
|
|
51
|
+
self.params.currentX = event.clientX;
|
|
52
|
+
self.params.currentY = event.clientY;
|
|
53
|
+
// 监听鼠标移动和松开事件
|
|
54
|
+
document.onmousemove = function (event) {
|
|
55
|
+
// 计算图片新的位置
|
|
56
|
+
|
|
57
|
+
let nowX = event.clientX,
|
|
58
|
+
nowY = event.clientY;
|
|
59
|
+
let disX = nowX - self.params.currentX,
|
|
60
|
+
disY = nowY - self.params.currentY;
|
|
61
|
+
dragImg.style.left = parseInt( self.params.left) + disX + "px";
|
|
62
|
+
dragImg.style.top = parseInt( self.params.top) + disY + "px";
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
document.onmouseup = function () {
|
|
66
|
+
// 鼠标松开,移除鼠标移动和松开事件的监听
|
|
67
|
+
document.onmousemove = null;
|
|
68
|
+
document.onmouseup = null;
|
|
69
|
+
if (self.getImgCss(dragImg, "left") !== "auto") {
|
|
70
|
+
self.params.left = self.getImgCss(dragImg, "left");
|
|
71
|
+
}
|
|
72
|
+
if (self.getImgCss(dragImg, "top") !== "auto") {
|
|
73
|
+
self.params.top = self.getImgCss(dragImg, "top");
|
|
74
|
+
}
|
|
75
|
+
};
|
|
76
|
+
};
|
|
77
|
+
|
|
78
|
+
// 防止默认事件(如图片拖动默认行为)
|
|
79
|
+
dragImg.ondragstart = function () {
|
|
80
|
+
return false;
|
|
81
|
+
};
|
|
82
|
+
})
|
|
46
83
|
},
|
|
47
84
|
watch: {
|
|
48
85
|
imgUrl(newValue, oldValue) {
|
|
@@ -81,57 +118,7 @@ export default {
|
|
|
81
118
|
? e.currentStyle[key]
|
|
82
119
|
: document.defaultView.getComputedStyle(e, false)[key];
|
|
83
120
|
},
|
|
84
|
-
|
|
85
|
-
let that = this;
|
|
86
|
-
if (that.getImgCss(target, "left") !== "auto") {
|
|
87
|
-
that.params.left = that.getImgCss(target, "left");
|
|
88
|
-
}
|
|
89
|
-
if (that.getImgCss(target, "top") !== "auto") {
|
|
90
|
-
that.params.top = that.getImgCss(target, "top");
|
|
91
|
-
}
|
|
92
|
-
bar.onmousedown = function (event) {
|
|
93
|
-
that.params.flag = true;
|
|
94
|
-
if (!event) {
|
|
95
|
-
event = window.event;
|
|
96
|
-
bar.onselectstart = function () {
|
|
97
|
-
return false;
|
|
98
|
-
};
|
|
99
|
-
}
|
|
100
|
-
let e = event;
|
|
101
|
-
that.params.currentX = e.clientX;
|
|
102
|
-
that.params.currentY = e.clientY;
|
|
103
|
-
};
|
|
104
|
-
document.onmouseup = function () {
|
|
105
|
-
that.params.flag = false;
|
|
106
|
-
if (that.getImgCss(target, "left") !== "auto") {
|
|
107
|
-
that.params.left = that.getImgCss(target, "left");
|
|
108
|
-
}
|
|
109
|
-
if (that.getImgCss(target, "top") !== "auto") {
|
|
110
|
-
that.params.top = that.getImgCss(target, "top");
|
|
111
|
-
}
|
|
112
|
-
};
|
|
113
|
-
document.onmousemove = function (event) {
|
|
114
|
-
let e = event ? event : window.event;
|
|
115
|
-
if (that.params.flag) {
|
|
116
|
-
let nowX = e.clientX,
|
|
117
|
-
nowY = e.clientY;
|
|
118
|
-
let disX = nowX - that.params.currentX,
|
|
119
|
-
disY = nowY - that.params.currentY;
|
|
120
|
-
target.style.left = parseInt(that.params.left) + disX + "px";
|
|
121
|
-
target.style.top = parseInt(that.params.top) + disY + "px";
|
|
122
|
-
if (typeof callback == "function") {
|
|
123
|
-
callback(
|
|
124
|
-
(parseInt(that.params.left) || 0) + disX,
|
|
125
|
-
(parseInt(that.params.top) || 0) + disY
|
|
126
|
-
);
|
|
127
|
-
}
|
|
128
|
-
if (event.preventDefault) {
|
|
129
|
-
event.preventDefault();
|
|
130
|
-
}
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
};
|
|
134
|
-
},
|
|
121
|
+
|
|
135
122
|
},
|
|
136
123
|
};
|
|
137
124
|
</script>
|
|
@@ -25,6 +25,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
|
|
|
25
25
|
set title(v) {
|
|
26
26
|
source.title = v;
|
|
27
27
|
},
|
|
28
|
+
get tip() {
|
|
29
|
+
return source.tip;
|
|
30
|
+
},
|
|
28
31
|
get flagShowTitle() {
|
|
29
32
|
let v=false;
|
|
30
33
|
if(source.flagShowTitle)v=source.flagShowTitle;
|
|
@@ -490,6 +493,9 @@ const Form = function (source, callBack, apiParam, failCallBack, isFormList) {
|
|
|
490
493
|
});
|
|
491
494
|
if(listData){
|
|
492
495
|
listData.insertRow(rows);
|
|
496
|
+
if(this.form && this.form.self){
|
|
497
|
+
this.form.self.computeScroll();
|
|
498
|
+
}
|
|
493
499
|
}
|
|
494
500
|
},
|
|
495
501
|
//新增或替换表格数据
|
|
@@ -13,6 +13,12 @@ const FormList = function (source, master) {
|
|
|
13
13
|
get id(){
|
|
14
14
|
return source.name;
|
|
15
15
|
},
|
|
16
|
+
get rowActionRoutersAlign(){
|
|
17
|
+
if(source.rowActionRoutersAlign != undefined && source.rowActionRoutersAlign != null && source.rowActionRoutersAlign != ""){
|
|
18
|
+
return source.rowActionRoutersAlign;
|
|
19
|
+
}
|
|
20
|
+
return 2;
|
|
21
|
+
},
|
|
16
22
|
get type() {
|
|
17
23
|
return master.controlType;
|
|
18
24
|
},
|
|
@@ -100,7 +106,7 @@ const FormList = function (source, master) {
|
|
|
100
106
|
Object.assign(rtnFormObj, s.getFormObj());
|
|
101
107
|
});
|
|
102
108
|
rtnFormObj.flagDeleted = rtn.rows[i].deleted;
|
|
103
|
-
rtnFormObj.flagNew = rtn.rows[i].isNewFlag;
|
|
109
|
+
rtnFormObj.flagNew = rtn.rows[i].isNewFlag || false;
|
|
104
110
|
rtnFormArr.push(rtnFormObj);
|
|
105
111
|
}
|
|
106
112
|
|
|
@@ -532,8 +532,8 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
|
|
|
532
532
|
self.$vue.searchEnd=Date.now();
|
|
533
533
|
}
|
|
534
534
|
self.isLoading = false;
|
|
535
|
-
if (response.rtnCode === Enum.ReturnCode.Successful) {
|
|
536
|
-
if (response.content.rows.length > 0) {
|
|
535
|
+
if (response.rtnCode === Enum.ReturnCode.Successful) {
|
|
536
|
+
if (response.content.rows && response.content.rows.length > 0) {
|
|
537
537
|
// rtn.setRow(response.content.rows);
|
|
538
538
|
response.content.rows.forEach((nr) => {
|
|
539
539
|
rtn.listData.push(nr);
|
|
@@ -584,7 +584,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
|
|
|
584
584
|
}
|
|
585
585
|
|
|
586
586
|
if (typeof callback !== 'undefined') {
|
|
587
|
-
if (response.content.rows.length > 0) {
|
|
587
|
+
if (response.content.rows && response.content.rows.length > 0) {
|
|
588
588
|
callback(true,response);
|
|
589
589
|
}
|
|
590
590
|
else {
|
|
@@ -654,7 +654,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
|
|
|
654
654
|
})
|
|
655
655
|
.then(function (response) {
|
|
656
656
|
if (response.rtnCode === Enum.ReturnCode.Successful) {
|
|
657
|
-
if (response.content.rows.length > 0) {
|
|
657
|
+
if (response.content.rows && response.content.rows.length > 0) {
|
|
658
658
|
if (router.flagAddRowAfterAction) {
|
|
659
659
|
// rtn.setStyleRow(response.content.rows);
|
|
660
660
|
response.content.rows.forEach((nr) => {
|
package/src/main.js
CHANGED
|
@@ -27,10 +27,11 @@ Vue.use(centaline, {
|
|
|
27
27
|
// baseUrl: "https://ccesutest.centaline.com.cn/service-api/v1/form/router",
|
|
28
28
|
// baseUrl: "http://10.88.22.69:8080/api/",
|
|
29
29
|
// baseUrl: "http://10.88.22.42:9999/service-api/",
|
|
30
|
-
baseUrl: "http://10.1.245.111:38908/service-api/",
|
|
30
|
+
// baseUrl: "http://10.1.245.111:38908/service-api/",
|
|
31
31
|
// baseUrl: "http://10.1.245.111:31574/service-api/",
|
|
32
32
|
// baseUrl: "https://tjcptest.centaline.com.cn/",
|
|
33
33
|
// baseUrl: "https://shccai.centaline.com.cn/api/",
|
|
34
|
+
// baseUrl:"http://10.88.22.66/IBS.Mvc/api/",
|
|
34
35
|
flagRouterSelf: true,
|
|
35
36
|
zindex: 999,
|
|
36
37
|
showRequestSuccessMessage: true,
|
|
@@ -64,14 +65,14 @@ Vue.use(centaline, {
|
|
|
64
65
|
return {
|
|
65
66
|
oldToken: 'c48263f0-1b23-4599-96de-323f4507dc61',
|
|
66
67
|
token:'1080-1762727915918856192',
|
|
67
|
-
// authObject: '{
|
|
68
|
+
// authObject: '{EmpID:"Token_6be80085-263f-4520-89bc-d789cb4717fb",MachineCode:"9c0cdf10-9296-4647-bd39-28eac046cf19",SSO_Token:"SSOToken_6be80085-263f-4520-89bc-d789cb4717fb",Platform:"WEB"}',
|
|
68
69
|
|
|
69
70
|
// originalRequestURL: 'http://10.88.22.67:8080',
|
|
70
71
|
EstateInfo: '{"estateId":"1c581b7c-d629-4670-8a7c-6d622860bc58","estateName":"0%E9%87%91%E9%9A%85%E4%BA%91%E7%AD%91%E5%A4%A9%E6%B4%A5","estDeptPath":"009.014.001.001"}',
|
|
71
72
|
estateId: '',
|
|
72
73
|
|
|
73
|
-
authObject: '{"currentEstate":{"estateId":"
|
|
74
|
-
AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.
|
|
74
|
+
authObject: '{"currentEstate":{"estateId":"20110926153136B3A34CC82D3D48FA7E","estateName":"%E6%98%9F%E6%B2%B3%E4%B8%B9%E5%A0%A4%E8%8A%B1%E5%9B%AD","estDeptPath":"009.007.003"},"platform":1,"osVersion":"","clientVersion":"","machineCode":"eeb8e2fc88b5bcbc2e4f297777142537","token":"","random":"3THBPx","time":1725429918833,"sign":"63188c3fbc0b7141ee6d9aee47588ef2","systemSource":"CCESU","empNo":"24988","empId":"202110201430497BB5FE89123A054CCA"}',
|
|
75
|
+
AuthorizationCode:'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjlkMDg2NDczLWZlMzItNGU5OS04ZmIyLWNmMzgxMDdiODcxNiJ9.AWKNVDiQ9IwZkwQKRU67O6ZG31NJsJqhMPgx_nbADd-EzSyEbdkTONxjKfQmgW6qGFcgn4BdBOhaT8lGTmFE_g',
|
|
75
76
|
};
|
|
76
77
|
},
|
|
77
78
|
// 请求完成事件,可判断是否登录过期执行响应操作
|