centaline-data-driven 1.5.27 → 1.5.28
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 +15 -0
- package/src/SearchList.vue +7 -5
- package/src/centaline/dynamicContact/src/dynamicContact.vue +28 -8
- package/src/centaline/dynamicForm/src/dynamicForm.vue +1 -1
- package/src/centaline/dynamicForm/src/dynamicFormListTable.vue +51 -11
- package/src/centaline/dynamicSo/src/dynamicSo.vue +1 -1
- package/src/centaline/dynamicTimeSelect/src/dynamicTimeSelect.vue +27 -4
- package/src/centaline/loader/src/ctl/Cb.js +1 -1
- package/src/centaline/loader/src/ctl/Checkbox.js +12 -0
- package/src/centaline/loader/src/ctl/Contact.js +6 -2
- package/src/centaline/loader/src/ctl/Dtd.js +1 -1
- package/src/centaline/loader/src/ctl/DtdOld.js +1 -1
- package/src/centaline/loader/src/ctl/FormList.js +23 -5
- package/src/centaline/loader/src/ctl/Iti.js +1 -1
- package/src/centaline/loader/src/ctl/SearchTable.js +7 -1
- package/src/centaline/loader/src/ctl/TimeSelect.js +15 -1
- package/src/centaline/loader/src/ctl/Ttts.js +1 -1
- package/src/centaline/loader/src/ctl/lib/Enum.js +10 -0
- package/src/centaline/loader/src/ctl/lib/LibFunction.js +6 -5
- package/src/main.js +4 -4
- package/wwwroot/static/centaline/centaline-data-driven.js +2 -2
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
package/package.json
CHANGED
package/release-log.md
CHANGED
|
@@ -1,3 +1,16 @@
|
|
|
1
|
+
## v1.5.28
|
|
2
|
+
2023-06-30
|
|
3
|
+
|
|
4
|
+
优化
|
|
5
|
+
|
|
6
|
+
电话拨号控件
|
|
7
|
+
|
|
8
|
+
表单列表弹层新增修改时,数字区间、时间区间、多选等控件显示优化
|
|
9
|
+
|
|
10
|
+
表单列表的列是组类型过滤不显示
|
|
11
|
+
|
|
12
|
+
列表合并行,滚动加载后要重新计算
|
|
13
|
+
|
|
1
14
|
## v1.5.27
|
|
2
15
|
2023-06-27
|
|
3
16
|
|
|
@@ -11,6 +24,8 @@ formData添加submit方法
|
|
|
11
24
|
|
|
12
25
|
列表行删除完后,要关闭右侧
|
|
13
26
|
|
|
27
|
+
呼叫任务右侧栏固定按钮左对齐优化
|
|
28
|
+
|
|
14
29
|
## v1.5.26
|
|
15
30
|
2023-06-21
|
|
16
31
|
|
package/src/SearchList.vue
CHANGED
|
@@ -4,10 +4,10 @@
|
|
|
4
4
|
|
|
5
5
|
<!-- <ct-searchlist :searchConditionApi="'/PropertyRETList/getLayoutOfSearch'" :searchDataApi="'/PropertyRETList/getListOfSearchModel'" :searchCategoryApi="'/PropertyRETList/getLayoutOfSearchCategory'"></ct-searchlist> -->
|
|
6
6
|
|
|
7
|
-
<!-- <ct-searchlist :apiParam="para"
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
7
|
+
<!-- <ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
|
|
8
|
+
|
|
9
|
+
<ct-searchlist :apiParam="para" :searchConditionApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-layout'" :searchDataApi="'/api/third-dept-tran/tran-list/tran-emp-achievement-list'"></ct-searchlist>
|
|
10
|
+
|
|
11
11
|
|
|
12
12
|
<!-- <ct-searchlist :apiParam="para"
|
|
13
13
|
:searchConditionApi="'/api/transaction/adjustRecord/getLayoutOfSearch'"
|
|
@@ -60,6 +60,8 @@
|
|
|
60
60
|
:searchStatsApi="'/PropertyOFIList/getListStats'">
|
|
61
61
|
</ct-searchlist> -->
|
|
62
62
|
|
|
63
|
+
<!-- <ct-searchlist :searchConditionApi="'/CustomerList/getLayoutOfSearch'" :searchStatsApi="'/CustomerList/getListStats'" :searchDataApi="'/CustomerList/getListOfSearchModel'"></ct-searchlist> -->
|
|
64
|
+
|
|
63
65
|
<!-- <ct-searchlist :searchConditionApi="'/EstateList/getLayoutOfSearch'" :searchDataApi="'/EstateList/getListOfSearchModel'"></ct-searchlist> -->
|
|
64
66
|
|
|
65
67
|
<!-- <ct-searchlist :searchConditionApi="'/EstateBuildingList/getLayoutOfSearch'" :searchDataApi="'/EstateBuildingList/getListOfSearchModel'"></ct-searchlist> -->
|
|
@@ -68,7 +70,7 @@
|
|
|
68
70
|
|
|
69
71
|
<!-- <ct-searchlist :searchConditionApi="'/CustomerImportList/getLayoutOfSearch'" :searchDataApi="'/CustomerImportList/getListOfSearchModel'"></ct-searchlist> -->
|
|
70
72
|
|
|
71
|
-
<ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist>
|
|
73
|
+
<!-- <ct-searchlist :searchConditionApi="'/CallTaskList/getLayoutOfSearch'" :searchDataApi="'/CallTaskList/getListOfSearchModel'"></ct-searchlist> -->
|
|
72
74
|
|
|
73
75
|
<!-- <ct-searchlist :searchConditionApi="'/RoleList/getLayoutOfSearch'" :searchStatsApi="'/RoleList/getListStats'" :searchDataApi="'/RoleList/getListOfSearchModel'"></ct-searchlist> -->
|
|
74
76
|
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div ref="contact" id="contactWidth" v-if="
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
<div ref="contact" id="contactWidth" v-if="model && model.listData.length > 0" :class="[from=='form'?'ct-contact-form':'ct-contact']">
|
|
3
|
+
<div v-if="from=='form' && model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
|
|
4
|
+
{{model.label}}
|
|
5
|
+
</div>
|
|
6
|
+
<div class="ct-so" style="width:auto;margin-right: 10px;flex:1;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
|
|
6
7
|
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" trigger="click">
|
|
7
8
|
<div>
|
|
8
9
|
<ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
|
|
@@ -14,7 +15,7 @@
|
|
|
14
15
|
@change="changeHandler($event)" :disabled="model.lock"
|
|
15
16
|
:class="model.lock ? 'ct-is-disabled' : 'ct-input_inner'"></div>
|
|
16
17
|
</el-popover>
|
|
17
|
-
<span class="el-input__suffix" @click="clickHandle"
|
|
18
|
+
<span class="el-input__suffix" @click="clickHandle" :style="{top:'-4px'}"
|
|
18
19
|
:class="[model.attrs.size ? 'el-input--' + model.attrs.size : '']">
|
|
19
20
|
<span class="el-input__suffix-inner">
|
|
20
21
|
<i class="el-select__caret el-input__icon el-icon-arrow-up" :class="{ 'is-reverse': showDrop }"></i>
|
|
@@ -43,11 +44,16 @@ export default {
|
|
|
43
44
|
},
|
|
44
45
|
props: {
|
|
45
46
|
vmodel: Object,
|
|
47
|
+
source: Object,
|
|
46
48
|
api: String,
|
|
47
49
|
apiParam: Object,
|
|
48
50
|
apiRouter: {
|
|
49
51
|
Object,
|
|
50
|
-
default:
|
|
52
|
+
default: null
|
|
53
|
+
},
|
|
54
|
+
from: {
|
|
55
|
+
String,
|
|
56
|
+
default: ''
|
|
51
57
|
},
|
|
52
58
|
},
|
|
53
59
|
data() {
|
|
@@ -71,9 +77,7 @@ export default {
|
|
|
71
77
|
else if (typeof self.api !== 'undefined' && self.apiParam) {
|
|
72
78
|
self.loaderObj.Contact(self.api, self.apiParam, self.load);
|
|
73
79
|
}
|
|
74
|
-
|
|
75
80
|
});
|
|
76
|
-
|
|
77
81
|
},
|
|
78
82
|
activated() {
|
|
79
83
|
this.$nextTick(() => {
|
|
@@ -340,4 +344,20 @@ export default {
|
|
|
340
344
|
}
|
|
341
345
|
</script>
|
|
342
346
|
<style lang="scss" scoped>
|
|
347
|
+
.ct-contact{
|
|
348
|
+
border: 1px solid #ECEFF2;
|
|
349
|
+
box-shadow: 0 2px 4px 0 rgba(0,0,0,0.06);
|
|
350
|
+
border-radius: 6px;
|
|
351
|
+
padding-bottom: 10px;
|
|
352
|
+
padding-top: 10px;
|
|
353
|
+
padding-left: 10px;
|
|
354
|
+
display: flex;
|
|
355
|
+
font-size: 12px;
|
|
356
|
+
width:100%
|
|
357
|
+
}
|
|
358
|
+
.ct-contact-form{
|
|
359
|
+
display: flex;
|
|
360
|
+
font-size: 12px;
|
|
361
|
+
width:100%
|
|
362
|
+
}
|
|
343
363
|
</style>
|
|
@@ -1141,6 +1141,7 @@
|
|
|
1141
1141
|
z-index: 100;
|
|
1142
1142
|
/* bottom: 6px; */
|
|
1143
1143
|
bottom: 0;
|
|
1144
|
+
left: 0;
|
|
1144
1145
|
border-radius: 0 0 4px 4px;
|
|
1145
1146
|
position: absolute;
|
|
1146
1147
|
line-height: 34px;
|
|
@@ -1148,6 +1149,5 @@
|
|
|
1148
1149
|
width: 100%;
|
|
1149
1150
|
margin: auto;
|
|
1150
1151
|
box-shadow: 0 2px 20px 0 rgb(0 0 0 / 10%);
|
|
1151
|
-
margin-left: -20px;
|
|
1152
1152
|
}
|
|
1153
1153
|
</style>
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
<el-table size="mini" class="max-table--border" :data="model.tableData" :key="itemKey" border
|
|
18
18
|
style="width: 100%" highlight-current-row :show-summary="model.showSummary" :summary-method="getSummaries">
|
|
19
19
|
<!--数据列-->
|
|
20
|
-
<el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false" :render-header="renderHeader" :min-width="tableColumnWith">
|
|
20
|
+
<el-table-column v-for="(v,i) in model.rows[0].field" :key="i" :prop="v.id" :label="v.label" v-if="v.show !== false && v.type!==13" :render-header="renderHeader" :min-width="tableColumnWith">
|
|
21
21
|
<template slot="header" slot-scope="scope">
|
|
22
22
|
<div :class="[{'ct-table-required':v.required&&model.rows[0].edit&& model.rows[0].delete&&!model.tableDisabled},getHeadClass(v)]">
|
|
23
23
|
{{v.label}}
|
|
@@ -93,18 +93,58 @@
|
|
|
93
93
|
},
|
|
94
94
|
getLableShow(){
|
|
95
95
|
let labelShow=this.vmodel.labelValue;
|
|
96
|
-
if(this.vmodel.unitName){
|
|
96
|
+
if(labelShow && this.vmodel.unitName){
|
|
97
97
|
labelShow=labelShow+this.vmodel.unitName;
|
|
98
98
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
99
|
+
switch(this.vmodel.type){
|
|
100
|
+
case 6:
|
|
101
|
+
case 7:
|
|
102
|
+
if(this.vmodel.code2){
|
|
103
|
+
labelShow=this.vmodel.labelValue+this.vmodel.code2;
|
|
104
|
+
}
|
|
105
|
+
break;
|
|
106
|
+
case 4:
|
|
107
|
+
case 24:
|
|
108
|
+
if(this.vmodel.name1){
|
|
109
|
+
labelShow=this.vmodel.name1;
|
|
110
|
+
}
|
|
111
|
+
break;
|
|
112
|
+
case 19:
|
|
113
|
+
if(this.vmodel.code1 && this.vmodel.code2){
|
|
114
|
+
}
|
|
115
|
+
else if(this.vmodel.code1){
|
|
116
|
+
labelShow=this.vmodel.code1+(this.vmodel.unitName?this.vmodel.unitName:'')+'以上';
|
|
117
|
+
}
|
|
118
|
+
else if(this.vmodel.code2){
|
|
119
|
+
labelShow=this.vmodel.code2+(this.vmodel.unitName?this.vmodel.unitName:'')+'以下';
|
|
120
|
+
}
|
|
121
|
+
break;
|
|
122
|
+
case 20:
|
|
123
|
+
case 21:
|
|
124
|
+
if(this.vmodel.code1 && this.vmodel.code2){
|
|
125
|
+
}
|
|
126
|
+
else if(this.vmodel.code1){
|
|
127
|
+
labelShow=this.vmodel.code1+(this.vmodel.unitName?this.vmodel.unitName:'')+'以后';
|
|
128
|
+
}
|
|
129
|
+
else if(this.vmodel.code2){
|
|
130
|
+
labelShow=this.vmodel.code2+(this.vmodel.unitName?this.vmodel.unitName:'')+'以前';
|
|
131
|
+
}
|
|
132
|
+
break;
|
|
133
|
+
case 11:
|
|
134
|
+
case 22:
|
|
135
|
+
labelShow=this.vmodel.getFormListTableShow();
|
|
136
|
+
break;
|
|
137
|
+
case 31:
|
|
138
|
+
labelShow=this.vmodel.getCheckedName();;
|
|
139
|
+
break;
|
|
140
|
+
case 30:
|
|
141
|
+
labelShow=this.vmodel.value?'开启':'关闭';
|
|
142
|
+
break;
|
|
143
|
+
case 43:
|
|
144
|
+
labelShow=this.vmodel.value?'是':'否';
|
|
145
|
+
break;
|
|
146
|
+
default:
|
|
147
|
+
break;
|
|
108
148
|
}
|
|
109
149
|
return labelShow;
|
|
110
150
|
},
|
|
@@ -110,10 +110,33 @@
|
|
|
110
110
|
//不能共用的数据校验 单独每一个时间框的非空校验
|
|
111
111
|
selfValidExcute: function (eventName) {
|
|
112
112
|
if (eventName === "input"||eventName === "valid") {
|
|
113
|
-
if
|
|
114
|
-
this.
|
|
115
|
-
|
|
116
|
-
|
|
113
|
+
if(this.model.required){
|
|
114
|
+
if(!this.model.isRange){
|
|
115
|
+
if (this.model.value== "" || this.model.value== null) {
|
|
116
|
+
this.valid = false;
|
|
117
|
+
this.validMessage = "必填"
|
|
118
|
+
return false;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
else if (this.model.value1 == "" || this.model.value== "" || this.model.value== null || this.model.value1== null) {
|
|
122
|
+
this.valid = false;
|
|
123
|
+
this.validMessage = "必填"
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
else if(this.model.value && this.model.isRange){
|
|
128
|
+
if(this.model.value1 == "" || this.model.value1== null){
|
|
129
|
+
this.valid = false;
|
|
130
|
+
this.validMessage = "必填"
|
|
131
|
+
return false;
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
else if(this.model.value1 && this.model.isRange){
|
|
135
|
+
if(this.model.value == "" || this.model.value== null){
|
|
136
|
+
this.valid = false;
|
|
137
|
+
this.validMessage = "必填"
|
|
138
|
+
return false;
|
|
139
|
+
}
|
|
117
140
|
}
|
|
118
141
|
}
|
|
119
142
|
return true;
|
|
@@ -68,6 +68,18 @@ const box = function (source, callBack) {
|
|
|
68
68
|
}
|
|
69
69
|
return itemArr;
|
|
70
70
|
},
|
|
71
|
+
getCheckedName() {
|
|
72
|
+
var nameArr = '';
|
|
73
|
+
var checked = source.code1 === '' ? [] : [].concat(JSON.parse(source.code1));
|
|
74
|
+
checked.forEach((v) => {
|
|
75
|
+
if (v[this.optionAttrs.value]) {
|
|
76
|
+
if (!v[this.optionAttrs.flagDeleted]) {
|
|
77
|
+
nameArr = nameArr+ (nameArr?' ':'') +v[this.optionAttrs.label];
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
return nameArr;
|
|
82
|
+
},
|
|
71
83
|
//手动维护code1值
|
|
72
84
|
updateCode1() {
|
|
73
85
|
let self = this;
|
|
@@ -4,7 +4,7 @@ import Enum from './lib/Enum';
|
|
|
4
4
|
import common from '../../../common';
|
|
5
5
|
import Router from './Router';
|
|
6
6
|
import Vue from 'vue';
|
|
7
|
-
const
|
|
7
|
+
const Contact = function (source,para ,callBack,field) {
|
|
8
8
|
var init = function (data) {
|
|
9
9
|
var rtn = {
|
|
10
10
|
$vue: null,
|
|
@@ -325,6 +325,9 @@ const ContactList = function (source,para ,callBack) {
|
|
|
325
325
|
}
|
|
326
326
|
},
|
|
327
327
|
};
|
|
328
|
+
if(field){
|
|
329
|
+
rtn = base.copy(Base(field), rtn);
|
|
330
|
+
}
|
|
328
331
|
return rtn;
|
|
329
332
|
}
|
|
330
333
|
if (typeof source === 'string') {
|
|
@@ -349,6 +352,7 @@ const ContactList = function (source,para ,callBack) {
|
|
|
349
352
|
if (callBack) {
|
|
350
353
|
callBack(rtn);
|
|
351
354
|
}
|
|
355
|
+
return rtn;
|
|
352
356
|
}
|
|
353
357
|
}
|
|
354
|
-
export default
|
|
358
|
+
export default Contact;
|
|
@@ -368,7 +368,7 @@ const FormList = function (source, master) {
|
|
|
368
368
|
source: {
|
|
369
369
|
scripts: source.scripts,
|
|
370
370
|
parameterAction: self.OptApi,
|
|
371
|
-
fields:
|
|
371
|
+
fields: source.rows[index].columns,
|
|
372
372
|
colSpan: rtn.pageColumns,
|
|
373
373
|
buttons: [
|
|
374
374
|
{
|
|
@@ -392,8 +392,17 @@ const FormList = function (source, master) {
|
|
|
392
392
|
for (let findex = 0; findex < row.length; findex++) {//循环所在行的列
|
|
393
393
|
Vue.set(row[findex], 'code1', ev.formData.source.fields[findex].code1);
|
|
394
394
|
Vue.set(row[findex], 'name1', ev.formData.source.fields[findex].name1);
|
|
395
|
-
|
|
396
|
-
|
|
395
|
+
switch(ev.formData.source.fields[findex].controlType){
|
|
396
|
+
case 19:
|
|
397
|
+
case 20:
|
|
398
|
+
case 21:
|
|
399
|
+
case 22:
|
|
400
|
+
case 6:
|
|
401
|
+
case 7:
|
|
402
|
+
Vue.set(row[findex], 'code2', ev.formData.source.fields[findex].code2);
|
|
403
|
+
break;
|
|
404
|
+
default:
|
|
405
|
+
break;
|
|
397
406
|
}
|
|
398
407
|
}
|
|
399
408
|
|
|
@@ -463,8 +472,17 @@ const FormList = function (source, master) {
|
|
|
463
472
|
let field = row.columns[findex];
|
|
464
473
|
field.code1 = ev.formData.source.fields[findex].code1;
|
|
465
474
|
field.name1 = ev.formData.source.fields[findex].name1;
|
|
466
|
-
|
|
467
|
-
|
|
475
|
+
switch(ev.formData.source.fields[findex].controlType){
|
|
476
|
+
case 19:
|
|
477
|
+
case 20:
|
|
478
|
+
case 21:
|
|
479
|
+
case 22:
|
|
480
|
+
case 6:
|
|
481
|
+
case 7:
|
|
482
|
+
field.code2=ev.formData.source.fields[findex].code2;
|
|
483
|
+
break;
|
|
484
|
+
default:
|
|
485
|
+
break;
|
|
468
486
|
}
|
|
469
487
|
}
|
|
470
488
|
|
|
@@ -525,13 +525,14 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
|
|
|
525
525
|
self.isLoading = false;
|
|
526
526
|
if (response.rtnCode === Enum.ReturnCode.Successful) {
|
|
527
527
|
if (response.content.rows.length > 0) {
|
|
528
|
-
rtn.setRow(response.content.rows);
|
|
528
|
+
// rtn.setRow(response.content.rows);
|
|
529
529
|
response.content.rows.forEach((nr) => {
|
|
530
530
|
rtn.listData.push(nr);
|
|
531
531
|
});
|
|
532
532
|
rtn.dataDictionary = response.content.rows;
|
|
533
533
|
}
|
|
534
534
|
rtn.getSelectAll();
|
|
535
|
+
rtn.setRow(rtn.listData);
|
|
535
536
|
source.page.rows = response.page.rows;
|
|
536
537
|
source.page.rowCount = response.page.rowCount;
|
|
537
538
|
if (typeof response.content.foot !== 'undefined') {
|
|
@@ -868,6 +869,9 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
|
|
|
868
869
|
if(rtn.listData.length===0){
|
|
869
870
|
rtn.$vue.$emit('closeSideBar');
|
|
870
871
|
}
|
|
872
|
+
else{
|
|
873
|
+
rtn.setRow(rtn.listData);
|
|
874
|
+
}
|
|
871
875
|
break;
|
|
872
876
|
|
|
873
877
|
case Enum.ActionType.New: //新增
|
|
@@ -880,6 +884,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
|
|
|
880
884
|
rtn.dataDictionary = response.content;
|
|
881
885
|
|
|
882
886
|
source.page.rows = source.page.rows + response.content.length;
|
|
887
|
+
rtn.setRow(rtn.listData);
|
|
883
888
|
rtn.$vue.calculatingRowHeight()
|
|
884
889
|
}
|
|
885
890
|
else{
|
|
@@ -895,6 +900,7 @@ const SearchTable = function (data, callBack, searchModel, flagSearch, defaultSe
|
|
|
895
900
|
rtn.dataDictionary[row[rtn.primaryKey]][vkey] = row[vkey];
|
|
896
901
|
}
|
|
897
902
|
});
|
|
903
|
+
rtn.setRow(rtn.listData);
|
|
898
904
|
}
|
|
899
905
|
else{
|
|
900
906
|
rtn.$vue.updateCurrentRow({flagFreshCurrentRow:true},{responseData:response});
|
|
@@ -96,7 +96,21 @@ const TimeSelect = function (source, isRange, dateType) {
|
|
|
96
96
|
set placeholder2(v) {
|
|
97
97
|
source.placeholder2 = v;
|
|
98
98
|
}
|
|
99
|
-
}
|
|
99
|
+
},
|
|
100
|
+
getFormListTableShow(){
|
|
101
|
+
let formListTableShow='';
|
|
102
|
+
if(isRange){
|
|
103
|
+
if(source.code1 && source.code2){
|
|
104
|
+
formListTableShow=common.formatDate(source.code1, this.valueFormat)+'-'+common.formatDate(source.code2, this.valueFormat);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
else{
|
|
108
|
+
if(source.code1){
|
|
109
|
+
formListTableShow=common.formatDate(source.code1, this.valueFormat);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
return formListTableShow;
|
|
113
|
+
},
|
|
100
114
|
};
|
|
101
115
|
rtn = base.copy(Base(data), rtn);
|
|
102
116
|
rtn = base.copy(rtn, valid.Init(rtn));
|
|
@@ -208,6 +208,11 @@ const Enum = {
|
|
|
208
208
|
/// </summary>
|
|
209
209
|
SensitiveEye: 41,
|
|
210
210
|
|
|
211
|
+
/// <summary>
|
|
212
|
+
/// 查询分类
|
|
213
|
+
/// </summary>
|
|
214
|
+
SearchCategory: 42,
|
|
215
|
+
|
|
211
216
|
/// <summary>
|
|
212
217
|
/// 复选
|
|
213
218
|
/// </summary>
|
|
@@ -256,6 +261,11 @@ const Enum = {
|
|
|
256
261
|
/// </summary>
|
|
257
262
|
ContainerControl: 52,
|
|
258
263
|
|
|
264
|
+
/// <summary>
|
|
265
|
+
/// 电话拨号控件
|
|
266
|
+
/// </summary>
|
|
267
|
+
PhoneDial: 53,
|
|
268
|
+
|
|
259
269
|
},
|
|
260
270
|
|
|
261
271
|
//返回状态码
|
|
@@ -37,6 +37,7 @@ import Compound from '../Compound';
|
|
|
37
37
|
import RichText from '../RichText';
|
|
38
38
|
import DragSort from '../DragSort';
|
|
39
39
|
import Container from '../Container';
|
|
40
|
+
import Contact from '../Contact';
|
|
40
41
|
|
|
41
42
|
|
|
42
43
|
const LibFunction = {
|
|
@@ -109,6 +110,10 @@ const LibFunction = {
|
|
|
109
110
|
item = SosTt(field, moreActionRouter);
|
|
110
111
|
item.is = 'ct-sosTt';
|
|
111
112
|
break;
|
|
113
|
+
case Enum.ControlType.PhoneDial: //电话号码拨打
|
|
114
|
+
item = Contact({content:field.code1},null,null,field);
|
|
115
|
+
item.is = 'ct-contact';
|
|
116
|
+
break;
|
|
112
117
|
case Enum.ControlType.GroupSplitLine: //分割线
|
|
113
118
|
item = Gp(field);
|
|
114
119
|
item.is = 'ct-group-line';
|
|
@@ -204,10 +209,6 @@ const LibFunction = {
|
|
|
204
209
|
item = Dtd(field, 'datetime');
|
|
205
210
|
item.is = 'ct-dtd';
|
|
206
211
|
break;
|
|
207
|
-
//case 'mt':
|
|
208
|
-
// item = Mt(field);
|
|
209
|
-
// item.is = 'ct-mt';
|
|
210
|
-
// break;
|
|
211
212
|
case Enum.ControlType.List: //列表
|
|
212
213
|
var listobj = source.list.find((v1) => {
|
|
213
214
|
return v1.name === field.fieldName1;
|
|
@@ -421,7 +422,7 @@ const LibFunction = {
|
|
|
421
422
|
get excLine() {
|
|
422
423
|
return field.singleLine === true || field.controlType === Enum.ControlType.GroupSplitLine
|
|
423
424
|
|| field.controlType === Enum.ControlType.List || field.controlType === Enum.ControlType.File
|
|
424
|
-
|| field.controlType === Enum.ControlType.SliceUpload
|
|
425
|
+
|| field.controlType === Enum.ControlType.SliceUpload || field.controlType === Enum.ControlType.PhoneDial
|
|
425
426
|
|| field.controlType === Enum.ControlType.SearchPage;
|
|
426
427
|
},
|
|
427
428
|
showLabel: showLabel
|
package/src/main.js
CHANGED
|
@@ -14,7 +14,7 @@ Vue.use(ElementUI, { size: 'mini'});
|
|
|
14
14
|
// 关闭生产模式下给出的提示
|
|
15
15
|
Vue.config.productionTip = false;
|
|
16
16
|
Vue.use(centaline, {
|
|
17
|
-
baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
|
|
17
|
+
// baseUrl: "http://10.88.22.46:17070/max-uplink-api/",
|
|
18
18
|
// baseUrl: "http://10.88.22.13:17070/max-uplink-api/",
|
|
19
19
|
// baseUrl: "http://10.6.1.163:9000/max-uplink-api/v1/form/router",
|
|
20
20
|
// baseUrl: "http://10.25.10.67:9999/service-api/v1/form/router",
|
|
@@ -23,7 +23,7 @@ Vue.use(centaline, {
|
|
|
23
23
|
// baseUrl: "http://10.88.22.69:8080/api/",
|
|
24
24
|
// baseUrl: "http://10.88.22.40:8080/api/",
|
|
25
25
|
// baseUrl: "http://10.58.2.108:8080/",
|
|
26
|
-
|
|
26
|
+
baseUrl: "http://tjcptest.centaline.com.cn/",
|
|
27
27
|
// baseUrl: "http://tjcpuat.centaline.com.cn:9090/",
|
|
28
28
|
flagRouterSelf: true,
|
|
29
29
|
zindex: 999,
|
|
@@ -53,9 +53,9 @@ Vue.use(centaline, {
|
|
|
53
53
|
// 获取请求头
|
|
54
54
|
getRequestHeaders: function () {
|
|
55
55
|
return {
|
|
56
|
-
oldToken: '
|
|
56
|
+
oldToken: 'f9baa4f5-069e-4bae-8438-a89365fb067e',
|
|
57
57
|
token:'aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO_iOiv5s1570zn-NBwiIuBIoUIkkUCIuxMEdPRMMRq95s1dzOsgWmHIccikIFr0gKQsMJYCURKxKdKYlHr-BH7UNz26yCFkByg7Aiw2A-tYwLDtEubgUibRiHo9i1aRRy-dtdSIab-8gdNKvcA618uu3v5x7rRMm3YkOZAfR6BtAWp_3LQHBNI8KHbkqlHi8QQAAP__.RrBgBqaFlp478oO3g5k_EEtjPt_o8qpJBkzgSP78Wa4',
|
|
58
|
-
authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.
|
|
58
|
+
authObject: '{token:"aplus eyJhbGciOiJIUzI1NiIsInppcCI6IkRFRiJ9.eNrEjjsOwjAQRO-ydVbyZ22v08WbpOEQyCFGChUiiQRC3J0ghY6eV0zxipl5wrwOUEPLjSLpLUpnHFIbHDZ9YEzCrJIJlhIf4w7-iC9HrSkG7TtsYhAkTxZZC6OQF-rbzkpqoYJyv0Kt_dYejbGqgikvu1COP2Kdy-1QHv84d1mmbVaz8jmbM2blA1IeMw4jFSTjHBNTUOoErzcAAAD__w.G0v6h6v6Lns3jQ3YdJBc8hy4mdJVKnqd5t4YZ50aQT4"}',
|
|
59
59
|
|
|
60
60
|
originalRequestURL: 'http://10.88.22.67:8080',
|
|
61
61
|
EstateInfo: '{"estateId":"201806071109550C867184E8BCA56EC3","estateName":"C%E5%BE%A1%E6%9E%97%E5%B1%B1%E6%99%AF%E6%A5%BC"}',
|