centaline-data-driven 1.1.47 → 1.1.51
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/centaline/common/index.js +6 -0
- package/src/centaline/css/common.css +11 -18
- package/src/centaline/dialogList/src/dialog.vue +10 -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 +17 -14
- package/src/centaline/dynamicPlaceHolder/index.js +1 -1
- package/src/centaline/dynamicSearchList/src/dynamicSearchCategory.vue +7 -1
- package/src/centaline/dynamicSearchList/src/dynamicSearchTable.vue +4 -2
- package/src/centaline/dynamicSearchList/src/dynamicTableStatistics.vue +11 -11
- package/src/centaline/dynamicSo/src/dynamicSo.vue +11 -13
- package/src/centaline/dynamicSos/src/dynamicSos.vue +11 -16
- package/src/centaline/dynamicTags/src/dynamicTags.vue +17 -14
- 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/SearchCategory.js +6 -2
- package/src/centaline/loader/src/ctl/SearchTable.js +0 -1
- package/src/centaline/loader/src/ctl/Tags.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: "销控房源列表" }
|
|
@@ -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;
|
|
@@ -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
|
}
|
|
@@ -56,9 +56,9 @@
|
|
|
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
|
-
|
|
59
|
+
'height': (self.vmodel.pane ? self.vmodel.pane.$el.offsetHeight : document.body.offsetHeight + 10) + 'px',
|
|
60
60
|
'width': '100%',
|
|
61
|
-
'height': '100%'
|
|
61
|
+
// 'height': '100%',
|
|
62
62
|
}
|
|
63
63
|
}, [
|
|
64
64
|
//h('div', {
|
|
@@ -143,6 +143,14 @@
|
|
|
143
143
|
}
|
|
144
144
|
}
|
|
145
145
|
|
|
146
|
+
var ph=0;
|
|
147
|
+
if(item.attrs.height){
|
|
148
|
+
ph=parseInt(item.attrs.height.replace('px',''));
|
|
149
|
+
}
|
|
150
|
+
if(self.vmodel.pane && self.vmodel.pane.$el.offsetHeight<ph){
|
|
151
|
+
item.attrs.height=(self.vmodel.pane.$el.offsetHeight-20)+'px';
|
|
152
|
+
}
|
|
153
|
+
|
|
146
154
|
return h('div', {
|
|
147
155
|
style: {
|
|
148
156
|
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
|
}
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
</span>
|
|
18
18
|
</div>
|
|
19
19
|
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']"
|
|
20
|
-
:trigger="(model.
|
|
20
|
+
:trigger="(!model.paramName || model.lock) ? 'manual' : 'click'" :disabled="model.lock">
|
|
21
21
|
<div>
|
|
22
22
|
<ct-select-option :model="model" :optionRowCount="optionRowCount" @click="selectOption($event)"></ct-select-option>
|
|
23
23
|
</div>
|
|
@@ -180,20 +180,18 @@
|
|
|
180
180
|
if (this.model.lock) {
|
|
181
181
|
return false;
|
|
182
182
|
}
|
|
183
|
-
if (this.model.
|
|
183
|
+
if (this.model.paramName) {
|
|
184
|
+
this.$set(this, 'showDrop', !this.showDrop);
|
|
185
|
+
if (this.showDrop) {
|
|
186
|
+
this.getOptions();
|
|
187
|
+
}
|
|
188
|
+
this.focusHandle();
|
|
189
|
+
}
|
|
190
|
+
else if (this.model.popupSearchListType === 1) {
|
|
184
191
|
this.popupSearchListHandle();
|
|
185
192
|
}
|
|
186
|
-
else {
|
|
187
|
-
|
|
188
|
-
this.$set(this, 'showDrop', !this.showDrop);
|
|
189
|
-
if (this.showDrop) {
|
|
190
|
-
this.getOptions();
|
|
191
|
-
}
|
|
192
|
-
this.focusHandle();
|
|
193
|
-
}
|
|
194
|
-
else if ((this.model.popupSearchListType === 0)) {
|
|
195
|
-
this.$message.warning("请配置参数paramName1");
|
|
196
|
-
}
|
|
193
|
+
else if ((this.model.popupSearchListType === 0)) {
|
|
194
|
+
this.$message.warning("请配置参数paramName1");
|
|
197
195
|
}
|
|
198
196
|
},
|
|
199
197
|
popupSearchListHandle: function () {
|
|
@@ -272,7 +270,12 @@
|
|
|
272
270
|
var self = this;
|
|
273
271
|
optionArr.forEach((s) => {
|
|
274
272
|
if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
|
|
275
|
-
|
|
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);
|
|
276
279
|
self.model.value.push(s[self.model.optionAttrs.value]);
|
|
277
280
|
}
|
|
278
281
|
});
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
<div class="ct-radios" :class="[model.showLabel?'showLabel':'',model.value !== ''?'hasValue':'']">
|
|
11
11
|
<el-radio-group v-model="model.value" @change="changeHandler1($event)">
|
|
12
12
|
<el-radio-button v-bind="model.attrs" v-for="(value, index) in model.segmentValue" :key="index" v-model="model.value"
|
|
13
|
-
:label="value[model.optionAttrs.value]" :disabled="model.lock">
|
|
13
|
+
:label="value[model.optionAttrs.value]" :displayLabel="value[model.optionAttrs.displayLabel]" :disabled="model.lock">
|
|
14
14
|
{{value[model.optionAttrs.label]}}
|
|
15
15
|
</el-radio-button >
|
|
16
16
|
</el-radio-group>
|
|
@@ -61,6 +61,12 @@
|
|
|
61
61
|
this.changeHandler(this.model.value);
|
|
62
62
|
},
|
|
63
63
|
changeHandler1: function (event) {
|
|
64
|
+
var self=this;
|
|
65
|
+
this.model.segmentValue.forEach((v, i) => {
|
|
66
|
+
if(v[self.model.optionAttrs.value]==event && v[self.model.optionAttrs.displayLabel]){
|
|
67
|
+
self.model.label=v[self.model.optionAttrs.displayLabel];
|
|
68
|
+
}
|
|
69
|
+
});
|
|
64
70
|
this.inputHandler(this.model.value);
|
|
65
71
|
this.changeHandler(this.model.value);
|
|
66
72
|
let parm={};
|
|
@@ -192,7 +192,7 @@
|
|
|
192
192
|
self.colHasWidth[vi] = 'nowidth';
|
|
193
193
|
}
|
|
194
194
|
});
|
|
195
|
-
|
|
195
|
+
|
|
196
196
|
self.isLoading = false;
|
|
197
197
|
self.$forceUpdate();
|
|
198
198
|
this.model.scripts.formData = this.model.formData;
|
|
@@ -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
|
},
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
|
|
8
8
|
{{model.label}}
|
|
9
9
|
</div>
|
|
10
|
-
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.
|
|
10
|
+
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
|
|
11
11
|
<div>
|
|
12
12
|
<ctSelectOptionVertical :model="model" @click="selectOption($event)"></ctSelectOptionVertical>
|
|
13
13
|
</div>
|
|
@@ -165,20 +165,18 @@
|
|
|
165
165
|
if (this.model.lock) {
|
|
166
166
|
return false;
|
|
167
167
|
}
|
|
168
|
-
if (this.model.
|
|
168
|
+
if (this.model.paramName) {
|
|
169
|
+
this.$set(this, 'showDrop', !this.showDrop);
|
|
170
|
+
if (this.showDrop) {
|
|
171
|
+
this.getOptions();
|
|
172
|
+
}
|
|
173
|
+
this.focusHandle();
|
|
174
|
+
}
|
|
175
|
+
else if (this.model.popupSearchListType === 1) {
|
|
169
176
|
this.popupSearchListHandle();
|
|
170
177
|
}
|
|
171
|
-
else {
|
|
172
|
-
|
|
173
|
-
this.$set(this, 'showDrop', !this.showDrop);
|
|
174
|
-
if (this.showDrop) {
|
|
175
|
-
this.getOptions();
|
|
176
|
-
}
|
|
177
|
-
this.focusHandle();
|
|
178
|
-
}
|
|
179
|
-
else if ((this.model.popupSearchListType === 0)){
|
|
180
|
-
this.$message.warning("请配置参数paramName1");
|
|
181
|
-
}
|
|
178
|
+
else if ((this.model.popupSearchListType === 0)){
|
|
179
|
+
this.$message.warning("请配置参数paramName1");
|
|
182
180
|
}
|
|
183
181
|
},
|
|
184
182
|
popupSearchListHandle: function () {
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
<div v-if="model.showLabel && model.label" class="el-input-group__prepend" :class="[model.labelClass]">
|
|
8
8
|
{{model.label}}
|
|
9
9
|
</div>
|
|
10
|
-
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(model.
|
|
10
|
+
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel?'showLabel':'']" :trigger="(!model.paramName || model.lock)? 'manual' : 'click'">
|
|
11
11
|
<div>
|
|
12
12
|
<div>
|
|
13
13
|
<el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
|
|
@@ -170,23 +170,18 @@
|
|
|
170
170
|
if (this.model.lock) {
|
|
171
171
|
return false;
|
|
172
172
|
}
|
|
173
|
-
if (this.model.
|
|
173
|
+
if (this.model.paramName) {
|
|
174
|
+
this.$set(this, 'showDrop', !this.showDrop);
|
|
175
|
+
if (this.showDrop) {
|
|
176
|
+
this.getOptions();
|
|
177
|
+
}
|
|
178
|
+
this.focusHandle();
|
|
179
|
+
}
|
|
180
|
+
else if (this.model.popupSearchListType === 1) {
|
|
174
181
|
this.popupSearchListHandle();
|
|
175
182
|
}
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
//}
|
|
179
|
-
else {
|
|
180
|
-
if (this.model.paramName) {
|
|
181
|
-
this.$set(this, 'showDrop', !this.showDrop);
|
|
182
|
-
if (this.showDrop) {
|
|
183
|
-
this.getOptions();
|
|
184
|
-
}
|
|
185
|
-
this.focusHandle();
|
|
186
|
-
}
|
|
187
|
-
else if ((this.model.popupSearchListType === 0)) {
|
|
188
|
-
this.$message.warning("请配置参数paramName1");
|
|
189
|
-
}
|
|
183
|
+
else if ((this.model.popupSearchListType === 0)) {
|
|
184
|
+
this.$message.warning("请配置参数paramName1");
|
|
190
185
|
}
|
|
191
186
|
},
|
|
192
187
|
popupSearchListHandle: function () {
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
</span>
|
|
18
18
|
</span>
|
|
19
19
|
</div>
|
|
20
|
-
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(model.
|
|
20
|
+
<el-popover ref="pop" placement="bottom-start" v-model="showDrop" :class="[model.showLabel1?'showLabel':'']" :trigger="(!model.paramName || model.lock) ? 'manual' : 'click'">
|
|
21
21
|
<div>
|
|
22
22
|
<div>
|
|
23
23
|
<el-input ref="searchInput" :size="model.attrs.size" suffix-icon="el-icon-search" v-model="searchText" @input="searchInputHandle"></el-input>
|
|
@@ -186,21 +186,19 @@
|
|
|
186
186
|
clickHandle: function () {
|
|
187
187
|
if (this.model.lock) {
|
|
188
188
|
return false;
|
|
189
|
+
}
|
|
190
|
+
if (this.model.paramName) {
|
|
191
|
+
this.$set(this, 'showDrop', !this.showDrop);
|
|
192
|
+
if (this.showDrop) {
|
|
193
|
+
this.getOptions();
|
|
194
|
+
}
|
|
195
|
+
this.focusHandle();
|
|
189
196
|
}
|
|
190
|
-
if
|
|
197
|
+
else if(this.model.popupSearchListType === 1) {
|
|
191
198
|
this.popupSearchListHandle();
|
|
192
199
|
}
|
|
193
|
-
else {
|
|
194
|
-
|
|
195
|
-
this.$set(this, 'showDrop', !this.showDrop);
|
|
196
|
-
if (this.showDrop) {
|
|
197
|
-
this.getOptions();
|
|
198
|
-
}
|
|
199
|
-
this.focusHandle();
|
|
200
|
-
}
|
|
201
|
-
else if ((this.model.popupSearchListType === 0)) {
|
|
202
|
-
this.$message.warning("请配置参数paramName1");
|
|
203
|
-
}
|
|
200
|
+
else if ((this.model.popupSearchListType === 0)) {
|
|
201
|
+
this.$message.warning("请配置参数paramName1");
|
|
204
202
|
}
|
|
205
203
|
},
|
|
206
204
|
popupSearchListHandle: function () {
|
|
@@ -281,7 +279,12 @@
|
|
|
281
279
|
var self = this;
|
|
282
280
|
optionArr.forEach((s) => {
|
|
283
281
|
if (!self.model.value.find((v) => { return v === s[self.model.optionAttrs.value] })) {
|
|
284
|
-
|
|
282
|
+
let op={};
|
|
283
|
+
op[self.model.optionAttrs.value]=s[self.model.optionAttrs.value];
|
|
284
|
+
op[self.model.optionAttrs.label]=s[self.model.optionAttrs.label];
|
|
285
|
+
op[self.model.optionAttrs.rowid]='';
|
|
286
|
+
op[self.model.optionAttrs.flagDeleted]=false;
|
|
287
|
+
self.model.options.push(op);
|
|
285
288
|
self.model.value.push(s[self.model.optionAttrs.value]);
|
|
286
289
|
}
|
|
287
290
|
});
|
|
@@ -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;
|