cloud-web-corejs 1.0.54-dev.206 → 1.0.54-dev.208
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/wf/wf.js +1771 -1
- package/src/components/xform/form-designer/designer.js +4 -1
- package/src/components/xform/form-designer/setting-panel/form-setting.vue +135 -2
- package/src/components/xform/form-designer/setting-panel/property-editor/project-tag-editor.vue +141 -1
- package/src/components/xform/form-designer/widget-panel/widgetsConfig.js +1 -1
- package/src/components/xform/form-render/indexMixin.js +300 -141
- package/src/components/xform/utils/util.js +3 -0
|
@@ -82,7 +82,10 @@ let chartContainers = [],
|
|
|
82
82
|
formScriptSuccess: null,
|
|
83
83
|
saveScriptCode: "saveUpdate",
|
|
84
84
|
wfConfig: null,
|
|
85
|
-
wfStartBindSave:false
|
|
85
|
+
wfStartBindSave:false,
|
|
86
|
+
wfAgreenBindSave:false,
|
|
87
|
+
wfConfigDataEnabled:false,
|
|
88
|
+
wfConfigData:[],
|
|
86
89
|
},
|
|
87
90
|
dataSources: [], //数据源
|
|
88
91
|
|
|
@@ -17,6 +17,20 @@
|
|
|
17
17
|
<el-form-item :label="i18nt('流程启动时自动保存表单数据')">
|
|
18
18
|
<el-switch v-model="formConfig.wfStartBindSave"></el-switch>
|
|
19
19
|
</el-form-item>
|
|
20
|
+
|
|
21
|
+
<el-form-item :label="i18nt('流程通过时自动保存表单数据')">
|
|
22
|
+
<el-switch v-model="formConfig.wfAgreenBindSave"></el-switch>
|
|
23
|
+
</el-form-item>
|
|
24
|
+
<el-form-item :label="i18nt('启用流程节点可编辑表单')">
|
|
25
|
+
<el-switch v-model="formConfig.wfConfigDataEnabled"></el-switch>
|
|
26
|
+
</el-form-item>
|
|
27
|
+
<el-form-item :label="i18nt('流程节点可编辑表单设置')">
|
|
28
|
+
<a href="javascript:void(0);" class="a-link link-oneLind" @click="openWfConfigDataDialog">
|
|
29
|
+
<span>{{ formConfig.wfConfigData && formConfig.wfConfigData.length ? "已维护" : "" }}</span>
|
|
30
|
+
<i class="el-icon-edit"></i>
|
|
31
|
+
</a>
|
|
32
|
+
</el-form-item>
|
|
33
|
+
|
|
20
34
|
<el-form-item :label="i18nt('默认流程单据类型名称')">
|
|
21
35
|
<el-input type="text" v-model="designer.vueInstance.reportTemplate.objTypeName"></el-input>
|
|
22
36
|
</el-form-item>
|
|
@@ -319,6 +333,102 @@
|
|
|
319
333
|
</el-button>
|
|
320
334
|
</div>
|
|
321
335
|
</el-dialog>
|
|
336
|
+
<el-dialog
|
|
337
|
+
v-if="dialogVisible"
|
|
338
|
+
custom-class="dialog-style list-dialog"
|
|
339
|
+
:title="i18nt('流程节点信息')"
|
|
340
|
+
:visible.sync="dialogVisible"
|
|
341
|
+
:show-close="!0"
|
|
342
|
+
:append-to-body="true"
|
|
343
|
+
:modal="false"
|
|
344
|
+
:close-on-click-modal="!1"
|
|
345
|
+
:close-on-press-escape="!1"
|
|
346
|
+
:destroy-on-close="!0"
|
|
347
|
+
width="1220px"
|
|
348
|
+
top="5vh"
|
|
349
|
+
v-dialog-drag
|
|
350
|
+
:fullscreen="true"
|
|
351
|
+
>
|
|
352
|
+
<div class="cont" style="padding-bottom: 8px;">
|
|
353
|
+
<el-table
|
|
354
|
+
ref="singleTable"
|
|
355
|
+
width="100%"
|
|
356
|
+
:data="wfConfigData"
|
|
357
|
+
height="100%"
|
|
358
|
+
border=""
|
|
359
|
+
row-key="columnId"
|
|
360
|
+
stripe=""
|
|
361
|
+
style="margin-bottom: 0px;"
|
|
362
|
+
>
|
|
363
|
+
<el-table-column type="index" width="35" fixed="left"></el-table-column>
|
|
364
|
+
<el-table-column :label="i18nt('服务')" width="150">
|
|
365
|
+
<template slot-scope="{row}">
|
|
366
|
+
<el-select v-model="row.serveType" @change="changeServeType(row)">
|
|
367
|
+
<el-option :value="1" label="正式"></el-option>
|
|
368
|
+
<el-option :value="2" label="UAT"></el-option>
|
|
369
|
+
<el-option :value="3" label="测试"></el-option>
|
|
370
|
+
<el-option :value="4" label="自定义"></el-option>
|
|
371
|
+
</el-select>
|
|
372
|
+
</template>
|
|
373
|
+
</el-table-column>
|
|
374
|
+
<el-table-column :label="i18nt('自定义服务')" width="150">
|
|
375
|
+
<template slot-scope="{row}">
|
|
376
|
+
<el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
|
|
377
|
+
</template>
|
|
378
|
+
</el-table-column>
|
|
379
|
+
<el-table-column :label="i18nt('组织编码')" width="250">
|
|
380
|
+
<template slot-scope="{row,$index}">
|
|
381
|
+
<el-input v-model="row.companyCodes" clearable></el-input>
|
|
382
|
+
</template>
|
|
383
|
+
</el-table-column>
|
|
384
|
+
<el-table-column :label="i18nt('流程模板编码')" width="150">
|
|
385
|
+
<template slot-scope="{row}">
|
|
386
|
+
<el-input v-model="row.modelKey" clearable></el-input>
|
|
387
|
+
</template>
|
|
388
|
+
</el-table-column>
|
|
389
|
+
<el-table-column :label="i18nt('节点步骤')" width="250">
|
|
390
|
+
<template slot-scope="{row}">
|
|
391
|
+
<el-input v-model="row.taskSteps" clearable></el-input>
|
|
392
|
+
</template>
|
|
393
|
+
</el-table-column>
|
|
394
|
+
<!-- <el-table-column :label="i18nt('设置')" width="150">
|
|
395
|
+
<template slot-scope="{row}">
|
|
396
|
+
<el-select v-model="row.type" clearable>
|
|
397
|
+
<el-option :value="1" label="可编辑"></el-option>
|
|
398
|
+
<el-option :value="2" label="仅显示"></el-option>
|
|
399
|
+
<el-option :value="3" label="隐藏"></el-option>
|
|
400
|
+
</el-select>
|
|
401
|
+
</template>
|
|
402
|
+
</el-table-column>-->
|
|
403
|
+
<el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
|
|
404
|
+
<template #header>
|
|
405
|
+
<span>{{ i18nt('designer.setting.actionColumn') }}</span>
|
|
406
|
+
<el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
|
|
407
|
+
icon="el-icon-plus" @click="addItem"></el-button>
|
|
408
|
+
</template>
|
|
409
|
+
<template slot-scope="scope">
|
|
410
|
+
<el-button
|
|
411
|
+
:title="i18nt('designer.setting.deleteTableColumn')"
|
|
412
|
+
size="mini"
|
|
413
|
+
type=""
|
|
414
|
+
circle=""
|
|
415
|
+
icon="el-icon-minus"
|
|
416
|
+
@click="addItem"
|
|
417
|
+
></el-button>
|
|
418
|
+
</template>
|
|
419
|
+
</el-table-column>
|
|
420
|
+
|
|
421
|
+
</el-table>
|
|
422
|
+
</div>
|
|
423
|
+
<div class="dialog-footer" slot="footer">
|
|
424
|
+
<el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
|
|
425
|
+
{{ i18nt('designer.hint.cancel') }}
|
|
426
|
+
</el-button>
|
|
427
|
+
<el-button type="primary" @click="confirmWfConfigDataDialog" class="button-sty" icon="el-icon-check">
|
|
428
|
+
{{ i18nt('designer.hint.confirm') }}
|
|
429
|
+
</el-button>
|
|
430
|
+
</div>
|
|
431
|
+
</el-dialog>
|
|
322
432
|
|
|
323
433
|
<formTemplateDialog v-if="showFormTemplateDialog" :visiable.sync="showFormTemplateDialog"
|
|
324
434
|
@confirm="confirmFormTemplate" multi="false"/>
|
|
@@ -388,7 +498,10 @@ export default {
|
|
|
388
498
|
formScriptSuccess: null,
|
|
389
499
|
showFormScriptSuccessDialog: false,
|
|
390
500
|
wfObjConfigs: [],
|
|
391
|
-
showWfObjConfigDialog: false
|
|
501
|
+
showWfObjConfigDialog: false,
|
|
502
|
+
|
|
503
|
+
dialogVisible: false,
|
|
504
|
+
wfConfigData: []
|
|
392
505
|
};
|
|
393
506
|
},
|
|
394
507
|
created() {
|
|
@@ -609,7 +722,27 @@ export default {
|
|
|
609
722
|
changeWfEnabled(val) {
|
|
610
723
|
this.designer.vueInstance.reportTemplate.objTypeName = null;
|
|
611
724
|
this.designer.vueInstance.reportTemplate.fromWfFormCode = null;
|
|
612
|
-
}
|
|
725
|
+
},
|
|
726
|
+
openWfConfigDataDialog() {
|
|
727
|
+
let wfConfigData = this.formConfig.wfConfigData || [];
|
|
728
|
+
this.dialogVisible = true;
|
|
729
|
+
this.wfConfigData = this.$baseLodash.cloneDeep(wfConfigData)
|
|
730
|
+
},
|
|
731
|
+
addItem() {
|
|
732
|
+
let newItem = {
|
|
733
|
+
type: null,
|
|
734
|
+
serveType: null,
|
|
735
|
+
serveName: null,
|
|
736
|
+
modelKey: null,
|
|
737
|
+
taskSteps: null,
|
|
738
|
+
companyCodes: null
|
|
739
|
+
}
|
|
740
|
+
this.wfConfigData.push(newItem);
|
|
741
|
+
},
|
|
742
|
+
confirmWfConfigDataDialog() {
|
|
743
|
+
this.dialogVisible = !1;
|
|
744
|
+
this.formConfig.wfConfigData = this.wfConfigData;
|
|
745
|
+
},
|
|
613
746
|
}
|
|
614
747
|
};
|
|
615
748
|
</script>
|
package/src/components/xform/form-designer/setting-panel/property-editor/project-tag-editor.vue
CHANGED
|
@@ -134,6 +134,120 @@
|
|
|
134
134
|
</el-button>
|
|
135
135
|
</div>
|
|
136
136
|
</el-dialog>
|
|
137
|
+
<el-dialog
|
|
138
|
+
v-if="dialogVisible"
|
|
139
|
+
custom-class="dialog-style list-dialog"
|
|
140
|
+
:title="i18nt('流程节点信息')"
|
|
141
|
+
:visible.sync="dialogVisible"
|
|
142
|
+
:show-close="!0"
|
|
143
|
+
:append-to-body="true"
|
|
144
|
+
:modal="false"
|
|
145
|
+
:close-on-click-modal="!1"
|
|
146
|
+
:close-on-press-escape="!1"
|
|
147
|
+
:destroy-on-close="!0"
|
|
148
|
+
width="1220px"
|
|
149
|
+
top="5vh"
|
|
150
|
+
v-dialog-drag
|
|
151
|
+
:fullscreen="true"
|
|
152
|
+
>
|
|
153
|
+
<div class="cont" style="padding-bottom: 8px;">
|
|
154
|
+
<el-table
|
|
155
|
+
ref="singleTable"
|
|
156
|
+
width="100%"
|
|
157
|
+
:data="tableData"
|
|
158
|
+
height="100%"
|
|
159
|
+
border=""
|
|
160
|
+
row-key="columnId"
|
|
161
|
+
stripe=""
|
|
162
|
+
style="margin-bottom: 0px;"
|
|
163
|
+
>
|
|
164
|
+
<el-table-column type="index" width="35" fixed="left"></el-table-column>
|
|
165
|
+
<el-table-column :label="i18nt('服务')" width="150">
|
|
166
|
+
<template slot-scope="{row}">
|
|
167
|
+
<el-select v-model="row.serveType" @change="changeServeType(row)">
|
|
168
|
+
<el-option :value="1" label="正式"></el-option>
|
|
169
|
+
<el-option :value="2" label="UAT"></el-option>
|
|
170
|
+
<el-option :value="3" label="测试"></el-option>
|
|
171
|
+
<el-option :value="4" label="自定义"></el-option>
|
|
172
|
+
</el-select>
|
|
173
|
+
</template>
|
|
174
|
+
</el-table-column>
|
|
175
|
+
<el-table-column :label="i18nt('自定义服务')" width="150">
|
|
176
|
+
<template slot-scope="{row}">
|
|
177
|
+
<el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
|
|
178
|
+
</template>
|
|
179
|
+
</el-table-column>
|
|
180
|
+
<el-table-column :label="i18nt('组织编码')" width="250">
|
|
181
|
+
<template slot-scope="{row,$index}">
|
|
182
|
+
<el-input v-model="row.companyCodes" clearable></el-input>
|
|
183
|
+
</template>
|
|
184
|
+
</el-table-column>
|
|
185
|
+
<el-table-column :label="i18nt('流程模板编码')" width="150">
|
|
186
|
+
<template slot-scope="{row}">
|
|
187
|
+
<el-input v-model="row.modelKey" clearable></el-input>
|
|
188
|
+
</template>
|
|
189
|
+
</el-table-column>
|
|
190
|
+
<el-table-column :label="i18nt('节点步骤')" width="250">
|
|
191
|
+
<template slot-scope="{row}">
|
|
192
|
+
<el-input v-model="row.taskSteps" clearable></el-input>
|
|
193
|
+
</template>
|
|
194
|
+
</el-table-column>
|
|
195
|
+
<el-table-column :label="i18nt('设置')" width="150">
|
|
196
|
+
<template slot-scope="{row}">
|
|
197
|
+
<el-select v-model="row.type" clearable>
|
|
198
|
+
<el-option :value="1" label="可编辑"></el-option>
|
|
199
|
+
<el-option :value="2" label="仅显示"></el-option>
|
|
200
|
+
<el-option :value="3" label="隐藏"></el-option>
|
|
201
|
+
</el-select>
|
|
202
|
+
</template>
|
|
203
|
+
</el-table-column>
|
|
204
|
+
<!-- <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
|
|
205
|
+
<template slot-scope="scope">
|
|
206
|
+
<el-select v-model="scope.row.modelId" @change="changeModelId">
|
|
207
|
+
<el-option v-for="(wfDefItem,index) in wfDefItems" :key="index" :value="wfDefItem.modelId"
|
|
208
|
+
:label="wfDefItem.modelName"></el-option>
|
|
209
|
+
</el-select>
|
|
210
|
+
|
|
211
|
+
</template>
|
|
212
|
+
</el-table-column>
|
|
213
|
+
<el-table-column :label="i18nt('流程节点')" width="550" prop="prop">
|
|
214
|
+
<template slot-scope="scope">
|
|
215
|
+
<el-checkbox-group v-model="scope.row.nodeIds" v-if="!!wfNodeMap[scope.row.modelId]">
|
|
216
|
+
<el-checkbox v-for="(node,index) in wfNodeMap[scope.row.modelId]" :key="index"
|
|
217
|
+
:label="node.nodeId">{{ node.nodeName }}
|
|
218
|
+
</el-checkbox>
|
|
219
|
+
</el-checkbox-group>
|
|
220
|
+
</template>
|
|
221
|
+
</el-table-column>-->
|
|
222
|
+
<el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
|
|
223
|
+
<template #header>
|
|
224
|
+
<span>{{ i18nt('designer.setting.actionColumn') }}</span>
|
|
225
|
+
<el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
|
|
226
|
+
icon="el-icon-plus" @click="addItem"></el-button>
|
|
227
|
+
</template>
|
|
228
|
+
<template slot-scope="scope">
|
|
229
|
+
<el-button
|
|
230
|
+
:title="i18nt('designer.setting.deleteTableColumn')"
|
|
231
|
+
size="mini"
|
|
232
|
+
type=""
|
|
233
|
+
circle=""
|
|
234
|
+
icon="el-icon-minus"
|
|
235
|
+
@click="tableData.splice(scope.$index,1)"
|
|
236
|
+
></el-button>
|
|
237
|
+
</template>
|
|
238
|
+
</el-table-column>
|
|
239
|
+
|
|
240
|
+
</el-table>
|
|
241
|
+
</div>
|
|
242
|
+
<div class="dialog-footer" slot="footer">
|
|
243
|
+
<el-button @click="dialogVisible = false" class="button-sty" icon="el-icon-close">
|
|
244
|
+
{{ i18nt('designer.hint.cancel') }}
|
|
245
|
+
</el-button>
|
|
246
|
+
<el-button type="primary" @click="colSubmit" class="button-sty" icon="el-icon-check">
|
|
247
|
+
{{ i18nt('designer.hint.confirm') }}
|
|
248
|
+
</el-button>
|
|
249
|
+
</div>
|
|
250
|
+
</el-dialog>
|
|
137
251
|
</div>
|
|
138
252
|
</template>
|
|
139
253
|
|
|
@@ -155,6 +269,9 @@ export default {
|
|
|
155
269
|
formScriptEnabledTypes: ['select', 'checkbox', 'radio', 'census'],
|
|
156
270
|
showDialog: false,
|
|
157
271
|
tableData: [],
|
|
272
|
+
|
|
273
|
+
dialogVisible: false,
|
|
274
|
+
wfConfigData: [],
|
|
158
275
|
}
|
|
159
276
|
},
|
|
160
277
|
methods: {
|
|
@@ -168,7 +285,30 @@ export default {
|
|
|
168
285
|
confirmDialog() {
|
|
169
286
|
this.optionModel.tagFillConfig = this.$baseLodash.cloneDeep(this.tableData);
|
|
170
287
|
this.showDialog = false;
|
|
171
|
-
}
|
|
288
|
+
},
|
|
289
|
+
|
|
290
|
+
openDialog() {
|
|
291
|
+
let reportTemplate = this.getReportTemplate();
|
|
292
|
+
let objTypeCode = reportTemplate.objTypeCode;
|
|
293
|
+
let wfConfigData = this.optionModel.wfConfigData || [];
|
|
294
|
+
this.dialogVisible = true;
|
|
295
|
+
this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
|
|
296
|
+
},
|
|
297
|
+
addItem() {
|
|
298
|
+
let newItem = {
|
|
299
|
+
type: null,
|
|
300
|
+
serveType: null,
|
|
301
|
+
serveName: null,
|
|
302
|
+
modelKey: null,
|
|
303
|
+
taskSteps: null,
|
|
304
|
+
companyCodes: null
|
|
305
|
+
}
|
|
306
|
+
this.tableData.push(newItem);
|
|
307
|
+
},
|
|
308
|
+
colSubmit() {
|
|
309
|
+
this.dialogVisible = !1;
|
|
310
|
+
this.optionModel.wfConfigData = this.tableData;
|
|
311
|
+
},
|
|
172
312
|
}
|
|
173
313
|
}
|
|
174
314
|
</script>
|