cloud-web-corejs 1.0.54-dev.340 → 1.0.54-dev.342
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/components/VabUpload/mixins.js +1490 -1
- package/src/components/excelExport/mixins.js +1 -1
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/data-table-editor.vue +364 -255
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +1 -1
- package/src/components/xform/form-render/container-item/data-table-mixin.js +3 -0
- package/src/views/bd/setting/request_async_setting/list.vue +171 -116
- package/src/views/bd/setting/request_setting/list.vue +148 -105
|
@@ -989,6 +989,9 @@ modules = {
|
|
|
989
989
|
}
|
|
990
990
|
|
|
991
991
|
let gridPageSize = this.widget.options.gridPageSize;
|
|
992
|
+
if(gridPageSize === 1){
|
|
993
|
+
gridPageSize = null;
|
|
994
|
+
}
|
|
992
995
|
let gridPageSizeList = this.widget.options.gridPageSizeList || [];
|
|
993
996
|
if (!gridPageSizeList || !gridPageSizeList.length) {
|
|
994
997
|
pagerConfig.pageSizes = [50, 100, 200, 500];
|
|
@@ -2,39 +2,78 @@
|
|
|
2
2
|
<div id="containt">
|
|
3
3
|
<el-tabs v-model="activeName" class="tab-box" @tab-click="changeActiveName">
|
|
4
4
|
<el-tab-pane :label="$t1('常规')" name="first">
|
|
5
|
-
<component
|
|
6
|
-
|
|
5
|
+
<component
|
|
6
|
+
v-if="showEdit"
|
|
7
|
+
visible-key="showEdit"
|
|
8
|
+
:is="editComponentName"
|
|
9
|
+
:_dataId.sync="dataId"
|
|
10
|
+
:serverName="serverName"
|
|
11
|
+
:parent-target="_self"
|
|
12
|
+
@reload="$reloadHandle"
|
|
13
|
+
></component>
|
|
7
14
|
</el-tab-pane>
|
|
8
15
|
<el-tab-pane :label="$t1('异步推送数据设置')" name="second">
|
|
9
16
|
<div class="grid-height">
|
|
10
|
-
<vxe-grid
|
|
11
|
-
|
|
17
|
+
<vxe-grid
|
|
18
|
+
ref="table-m1"
|
|
19
|
+
v-bind="vxeOption"
|
|
20
|
+
@resizable-change="$vxeTableUtil.onColumnWitchChange"
|
|
21
|
+
@custom="$vxeTableUtil.customHandle"
|
|
22
|
+
>
|
|
12
23
|
<template #form>
|
|
13
24
|
<div class="clearfix screen-btns">
|
|
14
25
|
<div class="fl">
|
|
15
|
-
<vxe-button
|
|
16
|
-
|
|
26
|
+
<vxe-button
|
|
27
|
+
status="primary"
|
|
28
|
+
class="button-sty"
|
|
29
|
+
icon="el-icon-plus"
|
|
30
|
+
@click="openEditDialog"
|
|
31
|
+
>
|
|
32
|
+
{{ $t1("新增") }}
|
|
17
33
|
</vxe-button>
|
|
18
34
|
</div>
|
|
19
35
|
<div class="fr">
|
|
20
|
-
<vxe-button
|
|
21
|
-
|
|
36
|
+
<vxe-button
|
|
37
|
+
icon="el-icon-brush"
|
|
38
|
+
class="button-sty"
|
|
39
|
+
@click="resetEvent"
|
|
40
|
+
type="text"
|
|
41
|
+
status="primary"
|
|
42
|
+
plain
|
|
43
|
+
>{{ $t1("重置") }}
|
|
22
44
|
</vxe-button>
|
|
23
|
-
<vxe-button
|
|
24
|
-
|
|
45
|
+
<vxe-button
|
|
46
|
+
status="warning"
|
|
47
|
+
icon="el-icon-search"
|
|
48
|
+
class="button-sty"
|
|
49
|
+
@click="searchEvent"
|
|
50
|
+
>
|
|
51
|
+
{{ $t1("搜索") }}
|
|
25
52
|
</vxe-button>
|
|
26
53
|
</div>
|
|
27
54
|
</div>
|
|
28
|
-
<vxe-form
|
|
29
|
-
|
|
55
|
+
<vxe-form
|
|
56
|
+
ref="form"
|
|
57
|
+
class="screen-box"
|
|
58
|
+
title-width="92px"
|
|
59
|
+
title-align="right"
|
|
60
|
+
:data="formData"
|
|
61
|
+
@submit="searchEvent"
|
|
62
|
+
@reset="searchEvent"
|
|
63
|
+
>
|
|
30
64
|
<vxe-form-item title="推送编码:" field="reqCode">
|
|
31
65
|
<template v-slot>
|
|
32
|
-
<el-input v-model="formData.reqCode" size="small" clearable/>
|
|
66
|
+
<el-input v-model="formData.reqCode" size="small" clearable />
|
|
33
67
|
</template>
|
|
34
68
|
</vxe-form-item>
|
|
35
69
|
<vxe-form-item title="推送名称:" field="reqName">
|
|
36
70
|
<template v-slot>
|
|
37
|
-
<el-input v-model="formData.reqName" size="small" clearable/>
|
|
71
|
+
<el-input v-model="formData.reqName" size="small" clearable />
|
|
72
|
+
</template>
|
|
73
|
+
</vxe-form-item>
|
|
74
|
+
<vxe-form-item title="执行组织编码:" field="exeCompanyCode">
|
|
75
|
+
<template v-slot>
|
|
76
|
+
<el-input v-model="formData.exeCompanyCode" size="small" clearable />
|
|
38
77
|
</template>
|
|
39
78
|
</vxe-form-item>
|
|
40
79
|
<vxe-form-item title="是否启用:" field="enabled">
|
|
@@ -52,12 +91,18 @@
|
|
|
52
91
|
</el-tab-pane>
|
|
53
92
|
<el-tab-pane :label="$t1('在途推送数据')" name="pushData">
|
|
54
93
|
<div class="grid-height">
|
|
55
|
-
<push_data_list
|
|
94
|
+
<push_data_list
|
|
95
|
+
@openEditDialog="openPushDataEditView"
|
|
96
|
+
v-if="showPushDataList"
|
|
97
|
+
></push_data_list>
|
|
56
98
|
</div>
|
|
57
99
|
</el-tab-pane>
|
|
58
100
|
<el-tab-pane :label="$t1('历史推送数据')" name="pushDataH">
|
|
59
101
|
<div class="grid-height">
|
|
60
|
-
<push_data_h_list
|
|
102
|
+
<push_data_h_list
|
|
103
|
+
@openEditDialog="openPushDataHEditView"
|
|
104
|
+
v-if="showPushDataHList"
|
|
105
|
+
></push_data_h_list>
|
|
61
106
|
</div>
|
|
62
107
|
</el-tab-pane>
|
|
63
108
|
</el-tabs>
|
|
@@ -65,19 +110,24 @@
|
|
|
65
110
|
</template>
|
|
66
111
|
|
|
67
112
|
<script>
|
|
68
|
-
import editView from
|
|
113
|
+
import editView from "./edit.vue";
|
|
69
114
|
import push_data_edit from "../push_data/edit.vue";
|
|
70
115
|
import push_data_h_edit from "../push_data_h/edit.vue";
|
|
71
116
|
import push_data_list from "../push_data/list.vue";
|
|
72
117
|
import push_data_h_list from "../push_data_h/list.vue";
|
|
73
118
|
|
|
74
|
-
|
|
75
119
|
export default {
|
|
76
|
-
name:
|
|
77
|
-
components: {
|
|
120
|
+
name: "request_async_setting:list",
|
|
121
|
+
components: {
|
|
122
|
+
editView,
|
|
123
|
+
push_data_list,
|
|
124
|
+
push_data_edit,
|
|
125
|
+
push_data_h_list,
|
|
126
|
+
push_data_h_edit,
|
|
127
|
+
},
|
|
78
128
|
data() {
|
|
79
129
|
return {
|
|
80
|
-
activeName:
|
|
130
|
+
activeName: "second",
|
|
81
131
|
dataId: 0,
|
|
82
132
|
copyId: 0,
|
|
83
133
|
showEdit: false,
|
|
@@ -88,7 +138,7 @@ export default {
|
|
|
88
138
|
editComponentName: null,
|
|
89
139
|
showPushDataList: false,
|
|
90
140
|
showPushDataHList: false,
|
|
91
|
-
serverName:null,
|
|
141
|
+
serverName: null,
|
|
92
142
|
};
|
|
93
143
|
},
|
|
94
144
|
mounted() {
|
|
@@ -96,72 +146,72 @@ export default {
|
|
|
96
146
|
},
|
|
97
147
|
methods: {
|
|
98
148
|
searchEvent() {
|
|
99
|
-
this.$refs[
|
|
149
|
+
this.$refs["table-m1"].commitProxy("reload");
|
|
100
150
|
},
|
|
101
151
|
resetEvent() {
|
|
102
152
|
this.formData = {};
|
|
103
153
|
this.advancedFormData = {};
|
|
104
|
-
this.$refs[
|
|
154
|
+
this.$refs["table-m1"].commitProxy("reload");
|
|
105
155
|
},
|
|
106
156
|
openEditDialog(id) {
|
|
107
157
|
this.copyId = 0;
|
|
108
|
-
this.dataId = !id || typeof id ==
|
|
109
|
-
this.editComponentName = "editView"
|
|
158
|
+
this.dataId = !id || typeof id == "object" ? 0 : id;
|
|
159
|
+
this.editComponentName = "editView";
|
|
110
160
|
this.serverName = null;
|
|
111
|
-
this.activeName =
|
|
112
|
-
this.$openEditView(
|
|
161
|
+
this.activeName = "first";
|
|
162
|
+
this.$openEditView("showEdit");
|
|
113
163
|
},
|
|
114
164
|
openPushDataEditView(id, serverName) {
|
|
115
|
-
this.dataId = !id || typeof id ==
|
|
116
|
-
this.editComponentName = "push_data_edit"
|
|
165
|
+
this.dataId = !id || typeof id == "object" ? 0 : id;
|
|
166
|
+
this.editComponentName = "push_data_edit";
|
|
117
167
|
this.serverName = serverName;
|
|
118
|
-
this.activeName =
|
|
119
|
-
this.$openEditView(
|
|
168
|
+
this.activeName = "first";
|
|
169
|
+
this.$openEditView("showEdit");
|
|
120
170
|
},
|
|
121
171
|
openPushDataHEditView(id, serverName) {
|
|
122
|
-
this.dataId = !id || typeof id ==
|
|
123
|
-
this.editComponentName = "push_data_h_edit"
|
|
172
|
+
this.dataId = !id || typeof id == "object" ? 0 : id;
|
|
173
|
+
this.editComponentName = "push_data_h_edit";
|
|
124
174
|
this.serverName = serverName;
|
|
125
|
-
this.activeName =
|
|
126
|
-
this.$openEditView(
|
|
175
|
+
this.activeName = "first";
|
|
176
|
+
this.$openEditView("showEdit");
|
|
127
177
|
},
|
|
128
178
|
initTableList() {
|
|
129
179
|
let that = this;
|
|
130
|
-
let pushTypeMap = {0:
|
|
180
|
+
let pushTypeMap = { 0: "异步推送", 1: "同步调用" };
|
|
131
181
|
let tableOption = {
|
|
132
182
|
vue: this,
|
|
133
|
-
tableRef:
|
|
134
|
-
tableName:
|
|
135
|
-
path: USER_PREFIX +
|
|
183
|
+
tableRef: "table-m1",
|
|
184
|
+
tableName: "bd_request_async_setting_list-m1",
|
|
185
|
+
path: USER_PREFIX + "/request_async_setting/listPage",
|
|
136
186
|
param: () => {
|
|
137
187
|
return {
|
|
138
188
|
...this.formData,
|
|
139
|
-
...this.advancedFormData
|
|
140
|
-
}
|
|
189
|
+
...this.advancedFormData,
|
|
190
|
+
};
|
|
141
191
|
},
|
|
142
192
|
columns: [
|
|
143
|
-
{type:
|
|
193
|
+
{ type: "checkbox", width: 48, resizable: false, fixed: "left" },
|
|
144
194
|
{
|
|
145
|
-
title:
|
|
146
|
-
field:
|
|
195
|
+
title: "推送名称",
|
|
196
|
+
field: "reqName",
|
|
147
197
|
width: 150,
|
|
148
|
-
fixed:
|
|
198
|
+
fixed: "left",
|
|
149
199
|
},
|
|
150
200
|
{
|
|
151
|
-
title:
|
|
152
|
-
field:
|
|
201
|
+
title: "推送编码",
|
|
202
|
+
field: "reqCode",
|
|
153
203
|
width: 150,
|
|
154
|
-
fixed:
|
|
204
|
+
fixed: "left",
|
|
155
205
|
},
|
|
156
206
|
{
|
|
157
|
-
title:
|
|
158
|
-
field:
|
|
159
|
-
width: 150
|
|
207
|
+
title: "请求Url",
|
|
208
|
+
field: "url",
|
|
209
|
+
width: 150,
|
|
160
210
|
},
|
|
161
211
|
{
|
|
162
|
-
title:
|
|
163
|
-
field:
|
|
164
|
-
width: 150
|
|
212
|
+
title: "请求头",
|
|
213
|
+
field: "header",
|
|
214
|
+
width: 150,
|
|
165
215
|
},
|
|
166
216
|
/*{
|
|
167
217
|
title: '连接超时',
|
|
@@ -174,111 +224,111 @@ export default {
|
|
|
174
224
|
width: 150
|
|
175
225
|
},*/
|
|
176
226
|
{
|
|
177
|
-
field:
|
|
178
|
-
title: this.$t1(
|
|
227
|
+
field: "enabled",
|
|
228
|
+
title: this.$t1("是否启用"),
|
|
179
229
|
width: 150,
|
|
180
230
|
slots: {
|
|
181
|
-
default: ({row}) => {
|
|
231
|
+
default: ({ row }) => {
|
|
182
232
|
if (row.enabled) {
|
|
183
233
|
return [
|
|
184
234
|
<div class="txt-status">
|
|
185
235
|
<span>启用</span>
|
|
186
|
-
</div
|
|
236
|
+
</div>,
|
|
187
237
|
];
|
|
188
238
|
} else {
|
|
189
239
|
return [
|
|
190
240
|
<div class="txt-status disable">
|
|
191
241
|
<span>禁用</span>
|
|
192
|
-
</div
|
|
242
|
+
</div>,
|
|
193
243
|
];
|
|
194
244
|
}
|
|
195
|
-
}
|
|
196
|
-
}
|
|
245
|
+
},
|
|
246
|
+
},
|
|
197
247
|
},
|
|
198
248
|
{
|
|
199
|
-
title:
|
|
200
|
-
field:
|
|
201
|
-
width: 150
|
|
249
|
+
title: "调度任务编码",
|
|
250
|
+
field: "taskCode",
|
|
251
|
+
width: 150,
|
|
202
252
|
},
|
|
203
253
|
{
|
|
204
|
-
title:
|
|
205
|
-
field:
|
|
206
|
-
width: 150
|
|
254
|
+
title: "备注",
|
|
255
|
+
field: "remark",
|
|
256
|
+
width: 150,
|
|
207
257
|
},
|
|
208
258
|
{
|
|
209
|
-
title:
|
|
210
|
-
field:
|
|
211
|
-
width: 150
|
|
259
|
+
title: "执行组织编码",
|
|
260
|
+
field: "exeCompanyCode",
|
|
261
|
+
width: 150,
|
|
212
262
|
},
|
|
213
263
|
{
|
|
214
|
-
field:
|
|
215
|
-
title: this.$t1(
|
|
264
|
+
field: "enabled",
|
|
265
|
+
title: this.$t1("是否启用"),
|
|
216
266
|
width: 150,
|
|
217
267
|
slots: {
|
|
218
|
-
default: ({row}) => {
|
|
268
|
+
default: ({ row }) => {
|
|
219
269
|
if (row.enabled) {
|
|
220
270
|
return [
|
|
221
271
|
<div class="txt-status">
|
|
222
272
|
<span>启用</span>
|
|
223
|
-
</div
|
|
273
|
+
</div>,
|
|
224
274
|
];
|
|
225
275
|
} else {
|
|
226
276
|
return [
|
|
227
277
|
<div class="txt-status disable">
|
|
228
278
|
<span>禁用</span>
|
|
229
|
-
</div
|
|
279
|
+
</div>,
|
|
230
280
|
];
|
|
231
281
|
}
|
|
232
|
-
}
|
|
233
|
-
}
|
|
282
|
+
},
|
|
283
|
+
},
|
|
234
284
|
},
|
|
235
285
|
{
|
|
236
|
-
title:
|
|
237
|
-
field:
|
|
238
|
-
width: 150
|
|
286
|
+
title: "参数1",
|
|
287
|
+
field: "param1",
|
|
288
|
+
width: 150,
|
|
239
289
|
},
|
|
240
290
|
{
|
|
241
|
-
title:
|
|
242
|
-
field:
|
|
243
|
-
width: 150
|
|
291
|
+
title: "参数2",
|
|
292
|
+
field: "param2",
|
|
293
|
+
width: 150,
|
|
244
294
|
},
|
|
245
295
|
{
|
|
246
|
-
title:
|
|
247
|
-
field:
|
|
248
|
-
width: 150
|
|
296
|
+
title: "参数3",
|
|
297
|
+
field: "param3",
|
|
298
|
+
width: 150,
|
|
249
299
|
},
|
|
250
300
|
{
|
|
251
|
-
title:
|
|
252
|
-
field:
|
|
253
|
-
width: 150
|
|
301
|
+
title: "参数4",
|
|
302
|
+
field: "param4",
|
|
303
|
+
width: 150,
|
|
254
304
|
},
|
|
255
305
|
{
|
|
256
|
-
field:
|
|
257
|
-
title: this.$t1(
|
|
258
|
-
width: 150
|
|
306
|
+
field: "createBy",
|
|
307
|
+
title: this.$t1("创建人"),
|
|
308
|
+
width: 150,
|
|
259
309
|
},
|
|
260
310
|
{
|
|
261
|
-
field:
|
|
262
|
-
title: this.$t1(
|
|
263
|
-
width: 150
|
|
311
|
+
field: "createDate",
|
|
312
|
+
title: this.$t1("创建时间"),
|
|
313
|
+
width: 150,
|
|
264
314
|
},
|
|
265
315
|
{
|
|
266
|
-
field:
|
|
267
|
-
title: this.$t1(
|
|
268
|
-
width: 150
|
|
316
|
+
field: "modifyBy",
|
|
317
|
+
title: this.$t1("更新人"),
|
|
318
|
+
width: 150,
|
|
269
319
|
},
|
|
270
320
|
{
|
|
271
|
-
field:
|
|
272
|
-
title: this.$t1(
|
|
273
|
-
width: 150
|
|
321
|
+
field: "modifyDate",
|
|
322
|
+
title: this.$t1("更新时间"),
|
|
323
|
+
width: 150,
|
|
274
324
|
},
|
|
275
325
|
{
|
|
276
326
|
width: 47,
|
|
277
|
-
fixed:
|
|
278
|
-
title:
|
|
327
|
+
fixed: "right",
|
|
328
|
+
title: "",
|
|
279
329
|
sortable: false,
|
|
280
330
|
slots: {
|
|
281
|
-
default: ({row}) => {
|
|
331
|
+
default: ({ row }) => {
|
|
282
332
|
return [
|
|
283
333
|
<div>
|
|
284
334
|
<a
|
|
@@ -288,19 +338,24 @@ export default {
|
|
|
288
338
|
this.openEditDialog(row.id);
|
|
289
339
|
}}
|
|
290
340
|
>
|
|
291
|
-
<el-tooltip
|
|
292
|
-
|
|
293
|
-
|
|
341
|
+
<el-tooltip
|
|
342
|
+
enterable={false}
|
|
343
|
+
effect="dark"
|
|
344
|
+
content={this.$t1("查看")}
|
|
345
|
+
placement="top"
|
|
346
|
+
popper-class="tooltip-skin"
|
|
347
|
+
>
|
|
348
|
+
<i class="el-icon-edit" />
|
|
294
349
|
</el-tooltip>
|
|
295
350
|
</a>
|
|
296
|
-
</div
|
|
351
|
+
</div>,
|
|
297
352
|
];
|
|
298
|
-
}
|
|
299
|
-
}
|
|
300
|
-
}
|
|
301
|
-
]
|
|
353
|
+
},
|
|
354
|
+
},
|
|
355
|
+
},
|
|
356
|
+
],
|
|
302
357
|
};
|
|
303
|
-
this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
|
|
358
|
+
this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
|
|
304
359
|
this.vxeOption = opts;
|
|
305
360
|
});
|
|
306
361
|
},
|
|
@@ -311,7 +366,7 @@ export default {
|
|
|
311
366
|
if (this.activeName == "pushDataH") {
|
|
312
367
|
this.showPushDataHList = true;
|
|
313
368
|
}
|
|
314
|
-
}
|
|
315
|
-
}
|
|
369
|
+
},
|
|
370
|
+
},
|
|
316
371
|
};
|
|
317
372
|
</script>
|