cloud-web-corejs 1.0.249 → 1.0.251
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/xform/form-designer/designer.js +1 -0
- package/src/components/xform/form-designer/setting-panel/form-setting.vue +3 -0
- package/src/components/xform/utils/util.js +1 -0
- package/src/views/bd/setting/formVersion/button.vue +55 -0
- package/src/views/bd/setting/formVersion/compareBasicSection.vue +125 -0
- package/src/views/bd/setting/formVersion/compareCodeSection.vue +539 -0
- package/src/views/bd/setting/formVersion/compareContMixin.scss +65 -0
- package/src/views/bd/setting/formVersion/compareContent.vue +63 -0
- package/src/views/bd/setting/formVersion/compareDialog.vue +88 -0
- package/src/views/bd/setting/formVersion/compareMixin.js +93 -0
- package/src/views/bd/setting/formVersion/fieldCompare.vue +54 -0
- package/src/views/bd/setting/formVersion/formScriptCompareView.vue +94 -0
- package/src/views/bd/setting/formVersion/formTemplateCompareView.vue +74 -0
- package/src/views/bd/setting/formVersion/ftHistoryDialog.vue +491 -0
- package/src/views/bd/setting/formVersion/link.vue +58 -0
- package/src/views/bd/setting/formVersion/preformDialog.vue +87 -0
- package/src/views/bd/setting/formVersion/reverButton.vue +82 -0
- package/src/views/bd/setting/formVersion/tableDetailDiff.js +99 -0
- package/src/views/bd/setting/formVersion/tableModelCompareView.vue +514 -0
- package/src/views/bd/setting/formVersion/textDiff.js +102 -0
- package/src/views/bd/setting/form_import_log/edit.vue +6 -3
- package/src/views/bd/setting/form_import_log/list.vue +5 -0
- package/src/views/bd/setting/form_script/edit.vue +196 -83
- package/src/views/bd/setting/form_script/edit1.vue +410 -220
- package/src/views/bd/setting/form_script/form_list.vue +19 -0
- package/src/views/bd/setting/form_script/list.vue +95 -21
- package/src/views/bd/setting/form_script/list1.vue +24 -0
- package/src/views/bd/setting/form_script/mixins/dialog.js +2 -2
- package/src/views/bd/setting/form_script/mixins/edit.js +265 -207
- package/src/views/bd/setting/form_script/mixins/edit1.js +259 -201
- package/src/views/bd/setting/form_script/mixins/form_list.js +322 -296
- package/src/views/bd/setting/form_script/mixins/list.js +163 -95
- package/src/views/bd/setting/form_script/mixins/list1.js +244 -155
- package/src/views/bd/setting/form_script/mixins/otherAuthDialog.js +1 -1
- package/src/views/bd/setting/form_template/batchWfObjConfigDialog.vue +1 -1
- package/src/views/bd/setting/form_template/edit.vue +355 -205
- package/src/views/bd/setting/form_template/formDesignerDialog.vue +171 -0
- package/src/views/bd/setting/form_template/list.vue +49 -74
- package/src/views/bd/setting/form_template/mixins/batchWfObjConfigDialog.js +3 -3
- package/src/views/bd/setting/form_template/mixins/edit.js +51 -8
- package/src/views/bd/setting/form_template/mixins/itemList.js +1 -1
- package/src/views/bd/setting/form_template/mixins/list.js +114 -82
- package/src/views/bd/setting/form_template/mixins/list2.js +3 -3
- package/src/views/bd/setting/form_template/mixins/otherAuthDialog.js +1 -1
- package/src/views/bd/setting/form_template/mixins/wf_list.js +3 -7
- package/src/views/bd/setting/form_template/wf_list.vue +161 -127
- package/src/views/bd/setting/request_setting/list.vue +15 -25
- package/src/views/bd/setting/table_model/edit.vue +702 -498
- package/src/views/bd/setting/table_model/list.vue +28 -0
- package/src/views/bd/setting/table_model/mixins/dialog.js +1 -1
- package/src/views/bd/setting/table_model/mixins/edit.js +228 -121
- package/src/views/bd/setting/table_model/mixins/list.js +55 -20
- package/src/views/bd/setting/table_model/mixins/otherAuthDialog.js +1 -1
- package/src/views/bd/setting/table_model/mixins/zdDialog.js +50 -46
- package/src/views/bd/setting/utils/index.js +15 -0
- package/src/views/user/form/vform/designer.vue +303 -287
- package/src/views/user/form/vform/formFieldMapping.js +2 -3
- package/src/views/user/form/vform/render.vue +8 -0
- package/src/views/user/form/view/list.vue +5 -1
|
@@ -1,54 +1,65 @@
|
|
|
1
1
|
import tableForm from "@base/components/table/tableForm.vue";
|
|
2
2
|
import editView from "@base/views/bd/setting/form_script/edit.vue";
|
|
3
|
-
import {getBdFlag} from "@base/api/user";
|
|
4
|
-
import {
|
|
3
|
+
import { getBdFlag } from "@base/api/user";
|
|
4
|
+
import { getJsxEditLink, getJsxStatus } from "@base/views/bd/setting/utils/index";
|
|
5
|
+
import formVersionButton from "@base/views/bd/setting/formVersion/link.vue";
|
|
6
|
+
import settingConfig from "@/settings";
|
|
5
7
|
|
|
6
8
|
let modules = {};
|
|
7
9
|
modules = {
|
|
8
|
-
name:
|
|
10
|
+
name: "form_script:list",
|
|
9
11
|
props: {
|
|
10
12
|
scriptType: {
|
|
11
13
|
type: Number,
|
|
12
|
-
default: 0
|
|
14
|
+
default: 0,
|
|
13
15
|
},
|
|
14
16
|
formCode: {
|
|
15
17
|
type: String,
|
|
16
|
-
default: null
|
|
17
|
-
}
|
|
18
|
+
default: null,
|
|
19
|
+
},
|
|
18
20
|
},
|
|
19
|
-
components: {tableForm, editView},
|
|
21
|
+
components: { tableForm, editView, formVersionButton },
|
|
20
22
|
data() {
|
|
21
23
|
return {
|
|
22
|
-
activeName:
|
|
24
|
+
activeName: "second",
|
|
23
25
|
dataId: 0,
|
|
24
26
|
showEdit: false,
|
|
25
27
|
vxeOption: {},
|
|
26
28
|
formData: {},
|
|
27
|
-
isDev: true
|
|
29
|
+
isDev: true,
|
|
28
30
|
};
|
|
29
31
|
},
|
|
32
|
+
computed: {
|
|
33
|
+
exportArchiveEnabled() {
|
|
34
|
+
return settingConfig.exportArchiveEnabled === true;
|
|
35
|
+
},
|
|
36
|
+
operationColumnWidth() {
|
|
37
|
+
const btnWidth = 47;
|
|
38
|
+
return this.exportArchiveEnabled ? btnWidth * 2 : btnWidth;
|
|
39
|
+
},
|
|
40
|
+
},
|
|
30
41
|
mounted() {
|
|
31
42
|
this.getBdEnv();
|
|
32
43
|
this.initTableList();
|
|
33
44
|
},
|
|
34
45
|
methods: {
|
|
35
46
|
searchEvent() {
|
|
36
|
-
this.$refs[
|
|
47
|
+
this.$refs["table-m1"].commitProxy("reload");
|
|
37
48
|
},
|
|
38
49
|
resetEvent() {
|
|
39
50
|
this.formData = {};
|
|
40
|
-
this.$refs[
|
|
51
|
+
this.$refs["table-m1"].commitProxy("reload");
|
|
41
52
|
},
|
|
42
53
|
openEditDialog(row) {
|
|
43
|
-
/*this.dataId = !id || typeof id
|
|
54
|
+
/*this.dataId = !id || typeof id === 'object' ? 0 : id;
|
|
44
55
|
this.activeName = 'first';
|
|
45
56
|
this.$openEditView('showEdit');*/
|
|
46
57
|
|
|
47
58
|
let dataId = row?.id || 0;
|
|
48
59
|
if (!dataId) {
|
|
49
60
|
this.dataId = dataId;
|
|
50
|
-
this.activeName =
|
|
51
|
-
this.$openEditView(
|
|
61
|
+
this.activeName = "first";
|
|
62
|
+
this.$openEditView("showEdit");
|
|
52
63
|
} else {
|
|
53
64
|
this.$refs.xTabs.openEditTab(row);
|
|
54
65
|
}
|
|
@@ -57,43 +68,53 @@ modules = {
|
|
|
57
68
|
return {
|
|
58
69
|
...this.formData,
|
|
59
70
|
formCode: this.formCode,
|
|
60
|
-
scriptType: this.scriptType
|
|
71
|
+
scriptType: this.scriptType,
|
|
61
72
|
};
|
|
62
73
|
},
|
|
63
74
|
initTableList() {
|
|
64
75
|
let that = this;
|
|
65
76
|
let tableOption = {
|
|
66
77
|
vue: this,
|
|
67
|
-
tableRef:
|
|
68
|
-
tableName:
|
|
69
|
-
path: USER_PREFIX +
|
|
78
|
+
tableRef: "table-m1",
|
|
79
|
+
tableName: "bd_form_script_list-m" + this.scriptType,
|
|
80
|
+
path: USER_PREFIX + "/formScript/listPage",
|
|
70
81
|
param: () => {
|
|
71
82
|
return this.getSearchParam();
|
|
72
83
|
},
|
|
73
84
|
columns: [
|
|
74
|
-
{type:
|
|
85
|
+
{ type: "checkbox", width: 48, resizable: false, fixed: "left" },
|
|
75
86
|
{
|
|
76
|
-
title: this.$t1(
|
|
77
|
-
field:
|
|
87
|
+
title: this.$t1("脚本名称"),
|
|
88
|
+
field: "scriptName",
|
|
78
89
|
width: 180,
|
|
79
|
-
fixed:
|
|
90
|
+
fixed: "left",
|
|
91
|
+
slots: {
|
|
92
|
+
default: ({ row }) => {
|
|
93
|
+
return getJsxEditLink({
|
|
94
|
+
content: row.scriptName,
|
|
95
|
+
onclick: () => {
|
|
96
|
+
this.openEditDialog(row);
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
},
|
|
100
|
+
},
|
|
80
101
|
},
|
|
81
102
|
{
|
|
82
|
-
title: this.$t1(
|
|
83
|
-
field:
|
|
84
|
-
width: 180
|
|
103
|
+
title: this.$t1("脚本编码"),
|
|
104
|
+
field: "scriptCode",
|
|
105
|
+
width: 180,
|
|
85
106
|
},
|
|
86
107
|
{
|
|
87
|
-
title: this.$t1(
|
|
88
|
-
field:
|
|
89
|
-
width: 250
|
|
108
|
+
title: this.$t1("脚本说明"),
|
|
109
|
+
field: "scriptRemark",
|
|
110
|
+
width: 250,
|
|
90
111
|
},
|
|
91
112
|
{
|
|
92
113
|
title: this.$t1("是否启用"),
|
|
93
114
|
field: "enabled",
|
|
94
115
|
width: 150,
|
|
95
116
|
slots: {
|
|
96
|
-
default: ({row}) => {
|
|
117
|
+
default: ({ row }) => {
|
|
97
118
|
if (row.enabled) {
|
|
98
119
|
return getJsxStatus(null, this.$t1("启用"));
|
|
99
120
|
} else {
|
|
@@ -103,141 +124,188 @@ modules = {
|
|
|
103
124
|
},
|
|
104
125
|
},
|
|
105
126
|
{
|
|
106
|
-
field:
|
|
107
|
-
title: this.$t1(
|
|
127
|
+
field: "transactions",
|
|
128
|
+
title: this.$t1("开启事务"),
|
|
108
129
|
width: 150,
|
|
109
130
|
slots: {
|
|
110
|
-
default: ({row}) => {
|
|
111
|
-
if (row.transactions
|
|
112
|
-
return getJsxStatus(null, this.$t1(
|
|
131
|
+
default: ({ row }) => {
|
|
132
|
+
if (row.transactions === 1) {
|
|
133
|
+
return getJsxStatus(null, this.$t1("是"));
|
|
113
134
|
} else {
|
|
114
|
-
return getJsxStatus(
|
|
135
|
+
return getJsxStatus("s-3", this.$t1("否"));
|
|
115
136
|
}
|
|
116
|
-
}
|
|
117
|
-
}
|
|
137
|
+
},
|
|
138
|
+
},
|
|
118
139
|
},
|
|
119
|
-
{field:
|
|
140
|
+
{ field: "serviceName", title: this.$t1("服务名"), width: 150 },
|
|
141
|
+
{ field: "version", title: this.$t1("版本号"), width: 150 },
|
|
120
142
|
{
|
|
121
|
-
field:
|
|
122
|
-
title: this.$t1(
|
|
123
|
-
width: 280
|
|
143
|
+
field: "sid",
|
|
144
|
+
title: this.$t1("唯一标识"),
|
|
145
|
+
width: 280,
|
|
124
146
|
},
|
|
125
147
|
{
|
|
126
|
-
field:
|
|
127
|
-
title: this.$t1(
|
|
128
|
-
width: 150
|
|
148
|
+
field: "createBy",
|
|
149
|
+
title: this.$t1("创建人"),
|
|
150
|
+
width: 150,
|
|
129
151
|
},
|
|
130
152
|
{
|
|
131
|
-
field:
|
|
132
|
-
title: this.$t1(
|
|
133
|
-
width: 150
|
|
153
|
+
field: "createDate",
|
|
154
|
+
title: this.$t1("创建时间"),
|
|
155
|
+
width: 150,
|
|
134
156
|
},
|
|
135
157
|
{
|
|
136
|
-
field:
|
|
137
|
-
title: this.$t1(
|
|
138
|
-
width: 150
|
|
158
|
+
field: "modifyBy",
|
|
159
|
+
title: this.$t1("更新人"),
|
|
160
|
+
width: 150,
|
|
139
161
|
},
|
|
140
162
|
{
|
|
141
|
-
field:
|
|
142
|
-
title: this.$t1(
|
|
143
|
-
width: 150
|
|
163
|
+
field: "modifyDate",
|
|
164
|
+
title: this.$t1("更新时间"),
|
|
165
|
+
width: 150,
|
|
144
166
|
},
|
|
145
167
|
{
|
|
146
|
-
width:
|
|
147
|
-
fixed:
|
|
148
|
-
title:
|
|
168
|
+
width: this.operationColumnWidth,
|
|
169
|
+
fixed: "right",
|
|
170
|
+
title: "",
|
|
149
171
|
sortable: false,
|
|
150
172
|
slots: {
|
|
151
|
-
default:
|
|
173
|
+
default: "operation",
|
|
174
|
+
/* default: ({ row }) => {
|
|
152
175
|
return getJsxBtn({
|
|
153
176
|
iconName: "el-icon-edit",
|
|
154
|
-
content: this.$t1(
|
|
177
|
+
content: this.$t1("查看"),
|
|
155
178
|
onclick: () => {
|
|
156
179
|
this.openEditDialog(row);
|
|
157
|
-
}
|
|
180
|
+
},
|
|
158
181
|
});
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
}
|
|
182
|
+
}, */
|
|
183
|
+
},
|
|
184
|
+
},
|
|
162
185
|
],
|
|
163
186
|
searchColumns: [
|
|
164
|
-
{
|
|
165
|
-
|
|
187
|
+
{
|
|
188
|
+
title: this.$t1("脚本名称"),
|
|
189
|
+
field: "scriptName",
|
|
190
|
+
type: "input",
|
|
191
|
+
common: true,
|
|
192
|
+
},
|
|
193
|
+
{
|
|
194
|
+
title: this.$t1("脚本编码"),
|
|
195
|
+
field: "scriptCode",
|
|
196
|
+
type: "input",
|
|
197
|
+
common: true,
|
|
198
|
+
},
|
|
166
199
|
{
|
|
167
200
|
title: this.$t1("是否启用"),
|
|
168
201
|
field: "enabled",
|
|
169
202
|
type: "select",
|
|
170
203
|
common: true,
|
|
171
204
|
itemOption: [
|
|
172
|
-
{label: this.$t1("启用"), value: true},
|
|
173
|
-
{label: this.$t1("禁用"), value: false},
|
|
205
|
+
{ label: this.$t1("启用"), value: true },
|
|
206
|
+
{ label: this.$t1("禁用"), value: false },
|
|
174
207
|
],
|
|
175
208
|
},
|
|
176
|
-
{title: this.$t1('脚本说明'), field: "scriptRemark", type: "input", common: true},
|
|
177
|
-
{title: this.$t1('脚本'), field: "script", type: "input", common: true},
|
|
178
|
-
{title: this.$t1('创建人'), field: "createBy", type: "input", common: false},
|
|
179
|
-
{title: this.$t1('更新人'), field: "modifyBy", type: "input", common: false},
|
|
180
209
|
{
|
|
181
|
-
title: this.$t1(
|
|
210
|
+
title: this.$t1("脚本说明"),
|
|
211
|
+
field: "scriptRemark",
|
|
212
|
+
type: "input",
|
|
213
|
+
common: true,
|
|
214
|
+
},
|
|
215
|
+
{
|
|
216
|
+
title: this.$t1("脚本"),
|
|
217
|
+
field: "script",
|
|
218
|
+
type: "input",
|
|
219
|
+
common: true,
|
|
220
|
+
},
|
|
221
|
+
{
|
|
222
|
+
title: this.$t1("创建人"),
|
|
223
|
+
field: "createBy",
|
|
224
|
+
type: "input",
|
|
225
|
+
common: false,
|
|
226
|
+
},
|
|
227
|
+
{
|
|
228
|
+
title: this.$t1("更新人"),
|
|
229
|
+
field: "modifyBy",
|
|
230
|
+
type: "input",
|
|
231
|
+
common: false,
|
|
232
|
+
},
|
|
233
|
+
{
|
|
234
|
+
title: this.$t1("操作日志"),
|
|
235
|
+
field: "logContent",
|
|
236
|
+
type: "input",
|
|
237
|
+
common: false,
|
|
238
|
+
},
|
|
239
|
+
{
|
|
240
|
+
title: this.$t1("创建时间"),
|
|
182
241
|
field: "startCreateDate",
|
|
183
242
|
field2: "endCreateDate",
|
|
184
243
|
type: "dateRange",
|
|
185
244
|
common: false,
|
|
186
245
|
widgetType: "datetime",
|
|
187
|
-
valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
246
|
+
valueFormat: "yyyy-MM-dd HH:mm:ss",
|
|
188
247
|
},
|
|
189
248
|
{
|
|
190
|
-
title: this.$t1(
|
|
249
|
+
title: this.$t1("更新时间"),
|
|
191
250
|
field: "startModifyDate",
|
|
192
251
|
field2: "endModifyDate",
|
|
193
252
|
type: "dateRange",
|
|
194
253
|
common: false,
|
|
195
254
|
widgetType: "datetime",
|
|
196
|
-
valueFormat: "yyyy-MM-dd HH:mm:ss"
|
|
197
|
-
}
|
|
198
|
-
]
|
|
255
|
+
valueFormat: "yyyy-MM-dd HH:mm:ss",
|
|
256
|
+
},
|
|
257
|
+
],
|
|
199
258
|
};
|
|
200
|
-
this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
|
|
259
|
+
this.$vxeTableUtil.initVxeTable(tableOption).then((opts) => {
|
|
201
260
|
this.vxeOption = opts;
|
|
202
261
|
});
|
|
203
262
|
},
|
|
204
263
|
jsonImport() {
|
|
205
264
|
this.$jsonImport({
|
|
206
|
-
saveUrl: USER_PREFIX +
|
|
265
|
+
saveUrl: USER_PREFIX + "/form_develop/importFormScript",
|
|
207
266
|
showResult: true,
|
|
208
267
|
resultColumns: [
|
|
209
268
|
{
|
|
210
|
-
title: this.$t1(
|
|
211
|
-
field:
|
|
269
|
+
title: this.$t1("脚本名称"),
|
|
270
|
+
field: "scriptName",
|
|
212
271
|
width: 180,
|
|
213
|
-
fixed:
|
|
272
|
+
fixed: "left",
|
|
214
273
|
},
|
|
215
274
|
{
|
|
216
|
-
title: this.$t1(
|
|
217
|
-
field:
|
|
218
|
-
width: 180
|
|
219
|
-
}
|
|
275
|
+
title: this.$t1("脚本编码"),
|
|
276
|
+
field: "scriptCode",
|
|
277
|
+
width: 180,
|
|
278
|
+
},
|
|
220
279
|
],
|
|
221
280
|
callback: () => {
|
|
222
281
|
this.searchEvent();
|
|
223
|
-
}
|
|
282
|
+
},
|
|
224
283
|
});
|
|
225
284
|
},
|
|
226
285
|
jsonExport() {
|
|
227
286
|
this.$jsonExport({
|
|
228
|
-
title:"通用脚本",
|
|
287
|
+
title: "通用脚本",
|
|
229
288
|
targetRef: "table-m1",
|
|
230
289
|
url: USER_PREFIX + "/form_develop/exportFormScript",
|
|
231
|
-
abcEnabled: true
|
|
232
|
-
})
|
|
290
|
+
abcEnabled: true,
|
|
291
|
+
});
|
|
292
|
+
},
|
|
293
|
+
jsonExportArchive(row) {
|
|
294
|
+
this.$jsonExport({
|
|
295
|
+
title: "通用脚本",
|
|
296
|
+
data: [row.id],
|
|
297
|
+
url: USER_PREFIX + "/form_develop/exportFormScript",
|
|
298
|
+
plaintext: 1,
|
|
299
|
+
abcEnabled: true,
|
|
300
|
+
});
|
|
233
301
|
},
|
|
234
302
|
getBdEnv() {
|
|
235
303
|
getBdFlag({
|
|
236
|
-
success: res => {
|
|
237
|
-
this.isDev = res.objx
|
|
238
|
-
}
|
|
304
|
+
success: (res) => {
|
|
305
|
+
this.isDev = res.objx === 1;
|
|
306
|
+
},
|
|
239
307
|
});
|
|
240
|
-
}
|
|
241
|
-
}
|
|
308
|
+
},
|
|
309
|
+
},
|
|
242
310
|
};
|
|
243
|
-
export default modules
|
|
311
|
+
export default modules;
|