centaline-data-driven 1.1.48 → 1.1.52
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/src/Edit.vue +36 -2
- package/src/Form.vue +5 -18
- package/src/SearchList.vue +2 -2
- package/src/SearchTree.vue +6 -2
- package/src/centaline/common/index.js +6 -0
- package/src/centaline/css/common.css +12 -19
- package/src/centaline/css/max.css +10 -6
- package/src/centaline/dialogList/src/dialog.vue +13 -2
- package/src/centaline/dialogList/src/dialogList.vue +2 -4
- package/src/centaline/dynamicFile/src/dynamicFile.vue +22 -3
- package/src/centaline/dynamicForm/src/dynamicForm.vue +2 -2
- package/src/centaline/dynamicHyperLink/index.js +1 -1
- package/src/centaline/dynamicMo/src/dynamicMo.vue +6 -1
- package/src/centaline/dynamicPlaceHolder/index.js +1 -1
- package/src/centaline/dynamicPopupSearchList/src/dynamicPopupSearchListTable.vue +3 -1
- package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +3 -1
- package/src/centaline/dynamicSearchList/src/dynamicTableStatistics.vue +11 -11
- package/src/centaline/dynamicSo/src/dynamicSo.vue +1 -1
- package/src/centaline/dynamicSos/src/dynamicSos.vue +1 -1
- package/src/centaline/dynamicTags/src/dynamicTags.vue +1 -1
- package/src/centaline/formData/index.js +2 -1
- package/src/centaline/loader/src/ctl/Base.js +3 -1
- package/src/centaline/loader/src/ctl/HyperLink.js +1 -1
- package/src/centaline/loader/src/ctl/Mo.js +1 -0
- package/src/centaline/loader/src/ctl/PlaceHolder.js +2 -2
- package/src/centaline/loader/src/ctl/Router.js +3 -2
- package/src/centaline/loader/src/ctl/SearchTable.js +0 -1
- package/src/centaline/loader/src/ctl.js +1 -0
- package/src/main.js +5 -12
- package/wwwroot/static/centaline/centaline-data-driven.js +1 -1
- package/wwwroot/static/centaline/centaline-data-driven.js.map +1 -1
- package/.vs/Centaline.Front_End.DataDriven/DesignTimeBuild/.dtbcache +0 -0
- package/.vs/Centaline.Front_End.DataDriven/v16/Server/sqlite3/db.lock +0 -0
- package/.vs/Centaline.Front_End.DataDriven/v16/Server/sqlite3/storage.ide +0 -0
- package/obj/Centaline.Front_End.DataDriven.csproj.nuget.dgspec.json +0 -73
- package/obj/Centaline.Front_End.DataDriven.csproj.nuget.g.props +0 -29
- package/obj/Centaline.Front_End.DataDriven.csproj.nuget.g.targets +0 -15
- package/obj/Debug/netcoreapp2.1/Centaline.Front_End.DataDriven.AssemblyInfo.cs +0 -23
- package/obj/Debug/netcoreapp2.1/Centaline.Front_End.DataDriven.RazorAssemblyInfo.cs +0 -20
- package/obj/project.assets.json +0 -11907
package/package.json
CHANGED
package/src/Edit.vue
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="app">
|
|
3
|
-
<formListTable></formListTable>
|
|
3
|
+
<!-- <formListTable></formListTable> -->
|
|
4
|
+
<el-button @click="copyField">test</el-button>
|
|
4
5
|
</div>
|
|
5
6
|
|
|
6
7
|
</template>
|
|
@@ -21,7 +22,40 @@
|
|
|
21
22
|
TestEdit() {
|
|
22
23
|
this.$api.post('http://10.88.22.52:2828//api/values/edit', { content: this.template }, (data) => {
|
|
23
24
|
});
|
|
24
|
-
}
|
|
25
|
+
},
|
|
26
|
+
copyField()
|
|
27
|
+
{
|
|
28
|
+
debugger;
|
|
29
|
+
var self = this;
|
|
30
|
+
var dialogOption = {
|
|
31
|
+
title: "复制控件",
|
|
32
|
+
content: [
|
|
33
|
+
{
|
|
34
|
+
component: "ct-form",
|
|
35
|
+
attrs: {
|
|
36
|
+
showTitle: false,
|
|
37
|
+
api: "/forminfo/readTargetDetail",
|
|
38
|
+
apiParam: {
|
|
39
|
+
formId: "1ae27876-a938-4ea5-aeab-fb2a7b067a2f",
|
|
40
|
+
actionType: 3,
|
|
41
|
+
},
|
|
42
|
+
width: "1300px",
|
|
43
|
+
height: "650px",
|
|
44
|
+
},
|
|
45
|
+
on: {
|
|
46
|
+
submit(ev) {
|
|
47
|
+
self.$common.closeDialog(dialogOption.dialog);
|
|
48
|
+
},
|
|
49
|
+
closeDialog() {
|
|
50
|
+
|
|
51
|
+
},
|
|
52
|
+
},
|
|
53
|
+
},
|
|
54
|
+
],
|
|
55
|
+
};
|
|
56
|
+
self.$common.openDialog(dialogOption);
|
|
57
|
+
|
|
58
|
+
},
|
|
25
59
|
},
|
|
26
60
|
created() {
|
|
27
61
|
//this.$api.get('http://10.88.22.52:2828//api/values/test', null, (data) => {
|
package/src/Form.vue
CHANGED
|
@@ -1,14 +1,11 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="app-form" class="data-driven" style="width:100%;height:100%;overflow:auto">
|
|
3
|
-
|
|
3
|
+
<ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
|
|
4
4
|
<!-- <ct-form :source="formdata.content" :apiParam="apiParam"></ct-form> -->
|
|
5
5
|
<!--:api="'FormSample/formdata'"-->
|
|
6
6
|
<!--<ct-form :source="formdata.content"></ct-form>-->
|
|
7
7
|
<!--<ct-form :api="'/api/form/formdata/contractDetail'" :apiParam="apiParam"></ct-form>-->
|
|
8
8
|
<!--<ct-form :api="'api/Form/formdata'"></ct-form>-->
|
|
9
|
-
<!-- <ct-form :api="'/forminfo/readDetail'" :apiParam="apiParam"></ct-form> -->
|
|
10
|
-
<ct-form :api="'PropertyKey/getLayoutOfNew'" :apiParam="apiParam"></ct-form>
|
|
11
|
-
<!-- <ct-form :api="'/api/distribution/transaction/add'" :apiParam="apiParam"></ct-form> -->
|
|
12
9
|
<ct-dialog-list></ct-dialog-list>
|
|
13
10
|
</div>
|
|
14
11
|
</template>
|
|
@@ -18,20 +15,10 @@
|
|
|
18
15
|
name: 'App',
|
|
19
16
|
data() {
|
|
20
17
|
return {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
apiParam: {chanceID: "1", actionType: 2} ,
|
|
26
|
-
// apiParam: {
|
|
27
|
-
// actionType: 2,
|
|
28
|
-
// agentId: "1450283160825425922",
|
|
29
|
-
// estateId: "B6E6B3D8-FDF2-4AF8-91E6-B348D637E993",
|
|
30
|
-
// pageOnly: true,
|
|
31
|
-
// pageStyle: 2,
|
|
32
|
-
// propertyId: "14102015-0736-9265-205A-451687BF7062",
|
|
33
|
-
// relProId: "1475708315466829833",
|
|
34
|
-
// }
|
|
18
|
+
apiParam: {
|
|
19
|
+
actionType: 2,
|
|
20
|
+
propertyID: "1"
|
|
21
|
+
} ,
|
|
35
22
|
}
|
|
36
23
|
},
|
|
37
24
|
methods: {
|
package/src/SearchList.vue
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="app-search" style="height:100%;position: fixed;">
|
|
3
3
|
<!-- <ct-searchlist :searchConditionApi="'/api/third-dept-tran/tran-list/layout'" :searchDataApi="'/api/third-dept-tran/tran-list'"></ct-searchlist> -->
|
|
4
|
-
|
|
4
|
+
<ct-searchlist :searchConditionApi="'/system/menulist/getLayoutOfSearch'" :searchDataApi="'/system/menulist/getList'"></ct-searchlist>
|
|
5
5
|
<!--<ct-searchlist :searchConditionApi="'/api/invoice-info/search-condition'" :searchDataApi="'/api/invoice-info/list'" :searchDataStatisticsApi="'api/ContractList/GetLayoutOfStatisticsTool'" :apiParam="para"></ct-searchlist>-->
|
|
6
6
|
<ct-dialog-list></ct-dialog-list>
|
|
7
7
|
</div>
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
<script>
|
|
11
11
|
import Vue from 'vue'
|
|
12
12
|
export default {
|
|
13
|
-
name: '
|
|
13
|
+
name: 'DataDrivenSearch',
|
|
14
14
|
data() {
|
|
15
15
|
return {
|
|
16
16
|
//para: { agentId: "1424932685198864386", estateId: "L201402181627000007233", estateName: "271医院宿舍区", pageOnly: "true", pageTitle: "销控房源列表" }
|
package/src/SearchTree.vue
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div id="app-Tree" style="height:100%;position: fixed;width:100%">
|
|
3
3
|
<ct-treelist :flagsearch="true" :apiParam="apiParam"
|
|
4
|
-
:searchConditionApi="'/SystemParameterCatalogList/
|
|
4
|
+
:searchConditionApi="'/SystemParameterCatalogList/getListOfSearchModel'"
|
|
5
5
|
:searchDataApi="'/SystemParameterCatalogList/getListOfSearchModel'" @loaded="loaded"></ct-treelist>
|
|
6
6
|
<ct-dialog-list></ct-dialog-list>
|
|
7
7
|
</div>
|
|
@@ -14,7 +14,11 @@
|
|
|
14
14
|
data() {
|
|
15
15
|
return {
|
|
16
16
|
isShowSearchlist: false,
|
|
17
|
-
apiParam: {
|
|
17
|
+
apiParam: {
|
|
18
|
+
flagSearch: true,
|
|
19
|
+
searchFields: {},
|
|
20
|
+
pageAttribute: {pageIndex: 1}
|
|
21
|
+
}
|
|
18
22
|
}
|
|
19
23
|
},
|
|
20
24
|
methods: {
|
|
@@ -272,6 +272,12 @@ const common = {
|
|
|
272
272
|
else if (evControl.$options.name === 'ctDialog') {
|
|
273
273
|
return evControl.vmodel.pane;
|
|
274
274
|
}
|
|
275
|
+
else if (parent.$options.name === 'DataDrivenSearch') {
|
|
276
|
+
return parent;
|
|
277
|
+
}
|
|
278
|
+
else if (parent.$options.name === 'DataDrivenForm') {
|
|
279
|
+
return parent;
|
|
280
|
+
}
|
|
275
281
|
else {
|
|
276
282
|
return this.getParentPane(parent);
|
|
277
283
|
}
|
|
@@ -140,7 +140,7 @@ html {
|
|
|
140
140
|
right: 0;
|
|
141
141
|
bottom: 0;
|
|
142
142
|
left: 0;
|
|
143
|
-
overflow: auto;
|
|
143
|
+
/* overflow: auto; */
|
|
144
144
|
background-color: #000;
|
|
145
145
|
background: rgba(0, 0, 0, 0.5);
|
|
146
146
|
align-items: center;
|
|
@@ -234,17 +234,14 @@ html {
|
|
|
234
234
|
font-size: 14px;
|
|
235
235
|
}
|
|
236
236
|
|
|
237
|
-
/* 有边框是26,无边框是28*/
|
|
238
237
|
.ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
|
|
239
|
-
min-height:
|
|
238
|
+
min-height: 26px;
|
|
240
239
|
line-height: 26px;
|
|
241
|
-
}
|
|
242
|
-
|
|
240
|
+
}
|
|
243
241
|
.ct-Seg.ct-Seg-small .ct-radios, .ct-Seg.ct-Seg-small .ct-radios .el-radio__label {
|
|
244
242
|
height: 32px;
|
|
245
243
|
line-height: 32px;
|
|
246
|
-
}
|
|
247
|
-
|
|
244
|
+
}
|
|
248
245
|
.ct-Seg.ct-Seg-medium .ct-radios, .ct-Seg.ct-Seg-medium .ct-radios .el-radio__label {
|
|
249
246
|
height: 36px;
|
|
250
247
|
line-height: 36px;
|
|
@@ -318,7 +315,7 @@ html {
|
|
|
318
315
|
}
|
|
319
316
|
.spanMessage {
|
|
320
317
|
font-size: 12px;
|
|
321
|
-
padding:
|
|
318
|
+
padding: 2px 2px;
|
|
322
319
|
}
|
|
323
320
|
.el-input__icon {
|
|
324
321
|
height:initial;
|
|
@@ -417,9 +414,9 @@ html {
|
|
|
417
414
|
|
|
418
415
|
|
|
419
416
|
/*主要按钮*/
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
}
|
|
417
|
+
.el-button{
|
|
418
|
+
height:26px
|
|
419
|
+
}
|
|
423
420
|
/*.el-button:active {
|
|
424
421
|
background-color: #b3caf5;
|
|
425
422
|
border: none;
|
|
@@ -431,7 +428,7 @@ html {
|
|
|
431
428
|
color: #fff;
|
|
432
429
|
|
|
433
430
|
} */
|
|
434
|
-
.el-button--mini, .el-button--mini.is-round{
|
|
431
|
+
.el-button--mini, .el-button--mini.is-round{
|
|
435
432
|
padding: 0px 19px;
|
|
436
433
|
}
|
|
437
434
|
.el-button--primary {
|
|
@@ -637,8 +634,8 @@ html {
|
|
|
637
634
|
padding: 0 15px 0 5px;
|
|
638
635
|
} */
|
|
639
636
|
.ct-Seg .ct-radios .el-input__icon.el-icon-circle-close{
|
|
640
|
-
min-height:
|
|
641
|
-
line-height:
|
|
637
|
+
min-height: 25px;
|
|
638
|
+
line-height: 25px;
|
|
642
639
|
|
|
643
640
|
}
|
|
644
641
|
.list-field .el-input-group__append, .list-field .el-input-group__prepend{
|
|
@@ -733,13 +730,9 @@ html {
|
|
|
733
730
|
height: 26px!important;
|
|
734
731
|
line-height: 26px!important;
|
|
735
732
|
}
|
|
736
|
-
.ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
|
|
737
|
-
min-height: 26px!important;
|
|
738
|
-
line-height: 26px;
|
|
739
|
-
}
|
|
740
733
|
.ct-rich-text {
|
|
741
734
|
min-height: 26px!important;
|
|
742
735
|
}
|
|
743
736
|
.ct-dialog_body .el-card__body{
|
|
744
|
-
padding
|
|
737
|
+
padding: 0px 3px 10px 10px!important;
|
|
745
738
|
}
|
|
@@ -43,18 +43,18 @@
|
|
|
43
43
|
border-radius: 6px;
|
|
44
44
|
}
|
|
45
45
|
/* 弹层新增按钮 */
|
|
46
|
-
.max-btn-add button{ /*list-button*/
|
|
46
|
+
.max-btn-add button,.max-btn-add{ /*list-button*/
|
|
47
47
|
height: 26px;
|
|
48
48
|
background: #EE6B6B;
|
|
49
49
|
border-color:#EE6B6B;
|
|
50
50
|
box-shadow: 0px 2px 4px 0px rgba(238,107,107,0.25);
|
|
51
51
|
border-radius: 6px;
|
|
52
52
|
}
|
|
53
|
-
.max-btn-add button:hover{
|
|
53
|
+
.max-btn-add button:hover,.max-btn-add:hover{
|
|
54
54
|
background-color:#FF9393;
|
|
55
55
|
border-color: #FF9393;
|
|
56
56
|
}
|
|
57
|
-
.max-btn-add button:focus,.max-btn-add button:active{
|
|
57
|
+
.max-btn-add button:focus,.max-btn-add button:active,.max-btn-add:focus,.max-btn-add:active{
|
|
58
58
|
background-color: #B33136;
|
|
59
59
|
border-color: #B33136;
|
|
60
60
|
}
|
|
@@ -168,13 +168,13 @@
|
|
|
168
168
|
text-align: left !important;
|
|
169
169
|
}
|
|
170
170
|
/* 重置input默认颜色 选中文字颜色 */
|
|
171
|
-
.ct-search-list input::-webkit-input-placeholder{
|
|
171
|
+
.ct-search-list input::-webkit-input-placeholder,.ct-iti-editor input::-webkit-input-placeholder{
|
|
172
172
|
color: #666666!important;
|
|
173
173
|
}
|
|
174
174
|
.ct-search-list .el-date-editor .el-range-input,.ct-search-list .el-input__inner{
|
|
175
175
|
color: #409eff;
|
|
176
176
|
}
|
|
177
|
-
.ct-so .ct-input_inner {
|
|
177
|
+
.ct-so .ct-input_inner,.ct-text .showLabel input{
|
|
178
178
|
color: #409eff!important;
|
|
179
179
|
}
|
|
180
180
|
.cover-list-item .el-checkbox__input.is-checked + .el-checkbox__label,.cover-list-item .el-checkbox__input.is-checked .el-checkbox__inner{
|
|
@@ -201,4 +201,8 @@
|
|
|
201
201
|
.ct-Seg.ct-Seg-mini .ct-radios, .ct-Seg.ct-Seg-mini .ct-radios .el-radio__label {
|
|
202
202
|
min-height: 26px;
|
|
203
203
|
line-height: 26px;
|
|
204
|
-
}
|
|
204
|
+
}
|
|
205
|
+
.el-input-group__append, .el-input-group__prepend {
|
|
206
|
+
color: #666;
|
|
207
|
+
border-color:#cecece;
|
|
208
|
+
}
|
|
@@ -56,10 +56,12 @@
|
|
|
56
56
|
style: {
|
|
57
57
|
'z-index': this.zindex,
|
|
58
58
|
//'wiidth': (this.vmodel.pane ? this.vmodel.pane.$el.offsetWidth : document.body.offsetWidth) + 'px',
|
|
59
|
-
//'height': (
|
|
59
|
+
// 'height': (self.vmodel.pane ? self.vmodel.pane.$el.offsetHeight : document.body.offsetHeight + 10) + 'px',
|
|
60
|
+
'height':'100%',
|
|
60
61
|
'width': '100%',
|
|
61
|
-
'height': '100%'
|
|
62
|
+
// 'height': '100%',
|
|
62
63
|
}
|
|
64
|
+
|
|
63
65
|
}, [
|
|
64
66
|
//h('div', {
|
|
65
67
|
// 'class': [
|
|
@@ -143,6 +145,15 @@
|
|
|
143
145
|
}
|
|
144
146
|
}
|
|
145
147
|
|
|
148
|
+
var ph=0;
|
|
149
|
+
if(item.attrs.height){
|
|
150
|
+
ph=parseInt(item.attrs.height.replace('px',''));
|
|
151
|
+
}
|
|
152
|
+
if(self.vmodel.pane && self.vmodel.pane.$el.offsetHeight<ph){
|
|
153
|
+
item.attrs.height=(self.vmodel.pane.$el.offsetHeight-30)+'px';
|
|
154
|
+
}
|
|
155
|
+
// console.log(document.body.offsetHeight);
|
|
156
|
+
// console.log(item.attrs.height)
|
|
146
157
|
return h('div', {
|
|
147
158
|
style: {
|
|
148
159
|
width: item.attrs.width,
|
|
@@ -34,8 +34,7 @@
|
|
|
34
34
|
}
|
|
35
35
|
},
|
|
36
36
|
methods: {
|
|
37
|
-
addDialog(vmodel) {
|
|
38
|
-
|
|
37
|
+
addDialog(vmodel) {
|
|
39
38
|
vmodel.id = (new Date()).getTime();
|
|
40
39
|
this.List.push(vmodel);
|
|
41
40
|
|
|
@@ -46,8 +45,7 @@
|
|
|
46
45
|
document.addEventListener("touchmove", mo, false);//禁止页面滑动
|
|
47
46
|
}
|
|
48
47
|
},
|
|
49
|
-
deleteDialog(model) {
|
|
50
|
-
|
|
48
|
+
deleteDialog(model) {
|
|
51
49
|
model.dialogTableVisible = false;
|
|
52
50
|
//改成删除
|
|
53
51
|
let index = this.List.findIndex(v => {
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
<div slot="file" slot-scope="{file}" :title="file.fileName">
|
|
20
20
|
<div class="cover-list-item">
|
|
21
21
|
<el-image fit="fill" :src="file.url"
|
|
22
|
-
style="width:
|
|
22
|
+
style="width: 100px; height: 100px"
|
|
23
23
|
:preview-src-list="getPreviewSrcList(file)"
|
|
24
24
|
:z-index="previewZIndex"
|
|
25
25
|
@click="handlePictureCardPreview(file)">
|
|
@@ -229,9 +229,12 @@
|
|
|
229
229
|
<style>
|
|
230
230
|
.ct-upload-display-none .el-upload--picture-card {
|
|
231
231
|
display: none;
|
|
232
|
+
|
|
232
233
|
}
|
|
233
|
-
|
|
234
|
-
|
|
234
|
+
.el-upload-list__item .is-ready{
|
|
235
|
+
width: 100px;
|
|
236
|
+
height: 100px;
|
|
237
|
+
} .ct-file .cover-list-item {
|
|
235
238
|
position: sticky;
|
|
236
239
|
}
|
|
237
240
|
|
|
@@ -261,4 +264,20 @@
|
|
|
261
264
|
.ct-file .el-icon-arrow-down {
|
|
262
265
|
font-size: 12px;
|
|
263
266
|
}
|
|
267
|
+
.el-collapse-item__content{
|
|
268
|
+
padding-bottom: 18px;
|
|
269
|
+
}
|
|
270
|
+
.el-upload--picture-card{
|
|
271
|
+
width: 100px;
|
|
272
|
+
height: 100px;
|
|
273
|
+
line-height:initial;
|
|
274
|
+
padding: 34px;
|
|
275
|
+
}
|
|
276
|
+
.el-upload--picture-card i{
|
|
277
|
+
font-size: 30px;
|
|
278
|
+
}
|
|
279
|
+
.el-upload-list--picture-card .el-upload-list__item{
|
|
280
|
+
width: 100px;
|
|
281
|
+
height: 100px;
|
|
282
|
+
}
|
|
264
283
|
</style>
|
|
@@ -410,12 +410,12 @@
|
|
|
410
410
|
var self = this;
|
|
411
411
|
var submitData = {};
|
|
412
412
|
var tempFormData = self.model.getFormObj();
|
|
413
|
+
|
|
413
414
|
var check = true;
|
|
414
415
|
var checkMsg;
|
|
415
416
|
router.submitFormField.forEach((v) => {
|
|
416
417
|
submitData[v] = tempFormData[v];
|
|
417
|
-
|
|
418
|
-
if (typeof tempFormData[v] === "undefined" || tempFormData[v] === '') {
|
|
418
|
+
if (typeof tempFormData[v] === "undefined") {
|
|
419
419
|
if (self.model.fieldsDic[v]) {
|
|
420
420
|
checkMsg = "请先录入" + self.model.fieldsDic[v].label;
|
|
421
421
|
}
|
|
@@ -270,7 +270,12 @@
|
|
|
270
270
|
var self = this;
|
|
271
271
|
optionArr.forEach((s) => {
|
|
272
272
|
if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
|
|
273
|
-
|
|
273
|
+
let op={};
|
|
274
|
+
op[self.model.optionAttrs.value]=s[self.model.optionAttrs.value];
|
|
275
|
+
op[self.model.optionAttrs.label]=s[self.model.optionAttrs.label];
|
|
276
|
+
op[self.model.optionAttrs.rowid]='';
|
|
277
|
+
op[self.model.optionAttrs.flagDeleted]=false;
|
|
278
|
+
self.model.options.push(op);
|
|
274
279
|
self.model.value.push(s[self.model.optionAttrs.value]);
|
|
275
280
|
}
|
|
276
281
|
});
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<template>
|
|
2
|
-
<div>
|
|
2
|
+
<div style="padding:0 8px 0 10px">
|
|
3
3
|
<div v-if="model !== null && !loading">
|
|
4
4
|
<el-table ref="multipleTable"
|
|
5
5
|
:data="tableData"
|
|
@@ -233,5 +233,7 @@
|
|
|
233
233
|
}
|
|
234
234
|
.el-table .el-table__header th {
|
|
235
235
|
background-color: #f4f7fa!important;
|
|
236
|
+
padding-left: 5px;
|
|
237
|
+
padding-right: 5px;
|
|
236
238
|
}
|
|
237
239
|
</style>
|
|
@@ -684,7 +684,9 @@
|
|
|
684
684
|
},
|
|
685
685
|
on: {
|
|
686
686
|
submit(ev) {
|
|
687
|
-
|
|
687
|
+
if (!field.flagFreshCurrentRow) {
|
|
688
|
+
self.model.doAction(ev);
|
|
689
|
+
}
|
|
688
690
|
self.$forceUpdate();
|
|
689
691
|
self.$refs.footer.$forceUpdate();
|
|
690
692
|
self.$common.closeDialog(dialogOption.dialog);
|
|
@@ -16,17 +16,17 @@
|
|
|
16
16
|
data() {
|
|
17
17
|
return {
|
|
18
18
|
activeName: '1',
|
|
19
|
-
editableTabs: [
|
|
20
|
-
{ name: '1', title: '用户管理' },
|
|
21
|
-
{ name: '2', title: '配置管理' },
|
|
22
|
-
{ name: '3', title: '角色管理' },
|
|
23
|
-
{ name: '4', title: '定时任务补偿' },
|
|
24
|
-
{ name: '5', title: '定时任务补偿2' },
|
|
25
|
-
{ name: '6', title: '定时任务补偿3' },
|
|
26
|
-
{ name: '7', title: '定时任务补偿4' },
|
|
27
|
-
{ name: '8', title: '定时任务补偿5' },
|
|
28
|
-
{ name: '9', title: '定时任务补偿6' },
|
|
29
|
-
{ name: '10', title: '定时任务补偿7' }
|
|
19
|
+
editableTabs: [
|
|
20
|
+
{ name: '1', title: '用户管理' },
|
|
21
|
+
{ name: '2', title: '配置管理' },
|
|
22
|
+
{ name: '3', title: '角色管理' },
|
|
23
|
+
{ name: '4', title: '定时任务补偿' },
|
|
24
|
+
{ name: '5', title: '定时任务补偿2' },
|
|
25
|
+
{ name: '6', title: '定时任务补偿3' },
|
|
26
|
+
{ name: '7', title: '定时任务补偿4' },
|
|
27
|
+
{ name: '8', title: '定时任务补偿5' },
|
|
28
|
+
{ name: '9', title: '定时任务补偿6' },
|
|
29
|
+
{ name: '10', title: '定时任务补偿7' }
|
|
30
30
|
],
|
|
31
31
|
}
|
|
32
32
|
},
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="field-top">
|
|
3
3
|
<div style="width:100%;display:flex;">
|
|
4
|
-
<div style="flex:1;
|
|
4
|
+
<div style="flex:1;" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
|
|
5
5
|
]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
|
|
6
6
|
<div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
|
|
7
7
|
<div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<template>
|
|
2
2
|
<div class="field-top">
|
|
3
3
|
<div style="width:100%;display:flex">
|
|
4
|
-
<div style="flex:1;
|
|
4
|
+
<div style="flex:1;" class="ct-so" :class="[(focus || showDrop)?'isfocus':'',model.attrs.size?'ct-so-'+model.attrs.size:''
|
|
5
5
|
]" @mouseover="mouseOverHandle" @mouseout="mouseOutHandle">
|
|
6
6
|
<div :class="[model.showLabel?'el-input-group el-input-group--prepend':'',!valid?'inputError':'']">
|
|
7
7
|
<div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import Vue from 'vue';
|
|
2
2
|
import common from '../common';
|
|
3
|
+
import Enum from '../loader/src/ctl/lib/Enum';
|
|
3
4
|
import Axios from 'axios';
|
|
4
5
|
const formData = {
|
|
5
6
|
install(Vue) {
|
|
@@ -230,7 +231,7 @@ const formData = {
|
|
|
230
231
|
//获取后台数据,并返回脚本。
|
|
231
232
|
execServerScript(action, object, successCallback) {
|
|
232
233
|
let formData = this;//作用域保存
|
|
233
|
-
|
|
234
|
+
debugger;
|
|
234
235
|
//是否是行内触发的
|
|
235
236
|
let data = this.getListField(this.form.scripts.$fd, null, null);
|
|
236
237
|
object.editMode = data ? 1 : 0;
|
|
@@ -151,7 +151,9 @@ const Base = function (source) {
|
|
|
151
151
|
return bind;
|
|
152
152
|
},
|
|
153
153
|
reset() {
|
|
154
|
-
this.
|
|
154
|
+
if(this.type!==Enum.ControlType.Hidden){
|
|
155
|
+
this.value = this.defaultValue;
|
|
156
|
+
}
|
|
155
157
|
},
|
|
156
158
|
searchObj:{
|
|
157
159
|
get dataType() { return source.dearchDataTyp; },
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import base from '../../index';
|
|
2
|
-
import Base from './Base';
|
|
2
|
+
import Base from './Base';
|
|
3
3
|
|
|
4
4
|
const PlaceHolder = function (source) {
|
|
5
5
|
var rtn = {
|
|
@@ -14,4 +14,4 @@ const PlaceHolder = function (source) {
|
|
|
14
14
|
return rtn;
|
|
15
15
|
};
|
|
16
16
|
|
|
17
|
-
export default PlaceHolder;
|
|
17
|
+
export default PlaceHolder;
|
|
@@ -146,7 +146,8 @@ const Router = function (source) {
|
|
|
146
146
|
return source.rightField;
|
|
147
147
|
},
|
|
148
148
|
get submitFormField() {
|
|
149
|
-
|
|
149
|
+
|
|
150
|
+
if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
|
|
150
151
|
return [];
|
|
151
152
|
}
|
|
152
153
|
var submitArr = [];
|
|
@@ -156,7 +157,7 @@ const Router = function (source) {
|
|
|
156
157
|
return submitArr;
|
|
157
158
|
},
|
|
158
159
|
get submitListField() {
|
|
159
|
-
if (typeof source.refFieldName === 'undefined' || source.refFieldName === null) {
|
|
160
|
+
if (typeof source.refFieldName === 'undefined' || source.refFieldName === null|| source.refFieldName.trim() === '') {
|
|
160
161
|
return [];
|
|
161
162
|
}
|
|
162
163
|
var submitArr = [];
|
|
@@ -29,6 +29,7 @@ const loader = {
|
|
|
29
29
|
File: require("./ctl/File.js").default,
|
|
30
30
|
Tree: require("./ctl/Tree.js").default,
|
|
31
31
|
SearchCategory: require("./ctl/SearchCategory.js").default,
|
|
32
|
+
HyperLink: require("./ctl/HyperLink.js").default,
|
|
32
33
|
Detail: require("./ctl/Detail.js").default,
|
|
33
34
|
};
|
|
34
35
|
|
package/src/main.js
CHANGED
|
@@ -12,8 +12,7 @@ Vue.use(ElementUI, { size: 'mini'});
|
|
|
12
12
|
// 关闭生产模式下给出的提示
|
|
13
13
|
Vue.config.productionTip = false;
|
|
14
14
|
Vue.use(centaline, {
|
|
15
|
-
baseUrl:
|
|
16
|
-
// baseUrl: "http://tjcptest.centaline.com.cn/v1/form/router",
|
|
15
|
+
baseUrl: 'http://10.88.22.13:7070/v1/form/router',
|
|
17
16
|
zindex: 999,
|
|
18
17
|
showRequestErrorMessage: true,
|
|
19
18
|
handler: {
|
|
@@ -21,12 +20,6 @@ Vue.use(centaline, {
|
|
|
21
20
|
openTab: function (action) {
|
|
22
21
|
alert("打开tab页:" + action)
|
|
23
22
|
},
|
|
24
|
-
openDetail: function (action) {
|
|
25
|
-
alert("打开tab页:" + action)
|
|
26
|
-
},
|
|
27
|
-
openPropertyDetailRET: function (submitData, pageTitle, parentModel) {
|
|
28
|
-
alert("打开tab页:" + pageTitle)
|
|
29
|
-
},
|
|
30
23
|
// 关闭当前tab
|
|
31
24
|
closeTab: function () {
|
|
32
25
|
alert("关闭当前tab")
|
|
@@ -34,10 +27,10 @@ Vue.use(centaline, {
|
|
|
34
27
|
// 获取请求头
|
|
35
28
|
getRequestHeaders: function () {
|
|
36
29
|
return {
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
30
|
+
Authorization: 'Bearer eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImI4Mzg3ZjkwLTI3YWItNDA4Yy1hNjRjLTE3ODIxNDM1M2FiNyJ9.4EFMLNBVU1ZCoJ5o-CjXum7IC-Lb2ljZsi-qCNAQcfdw8NIYp7Ul93in3iZCI69sLZz2N6F7Gnxh6Hbj5JLEJg',
|
|
31
|
+
oldToken: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQwY2ExYmMyLWNiNzMtNDI2Mi05NmM0LThiYjg0NDBkODE3ZCJ9.AIXWKaRyCwxYiPAqGhT0A01YN7tpX_nW9oU5YDwuC3GIRSn5DQS82Kh1Q7u6eHIz1BySWc-SOEqSTB3283_Z7A',
|
|
32
|
+
estateId: '201509230915485D942241BBA30FF49F',
|
|
33
|
+
originalRequestURL: 'http://localhost:8080'
|
|
41
34
|
};
|
|
42
35
|
},
|
|
43
36
|
// 请求完成事件,可判断是否登录过期执行响应操作
|