cloud-web-corejs 1.0.54-dev.266 → 1.0.54-dev.268
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/content.vue +3 -3
- package/src/components/xform/form-designer/setting-panel/property-editor/container-data-table/table-column-dialog.vue +17 -2
- package/src/components/xform/form-render/container-item/data-table-mixin.js +25 -0
- package/src/views/bd/setting/form_import_log/list.vue +1 -0
- package/src/views/bd/setting/push_data/list.vue +1 -0
- package/src/views/bd/setting/push_data_h/list.vue +1 -0
- package/src/views/user/wf/wf_auto_submit_data/list.vue +2 -0
- package/src/views/user/wf/wf_manage/list.vue +1 -0
package/package.json
CHANGED
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
<div>
|
|
73
73
|
<b :class="{on:tabIndex=='1'}" @click="tabIndex='1'">{{ $t2('任务情况', 'components.wf.taskInfo') }}</b>
|
|
74
74
|
<b :class="{on:tabIndex=='2'}" @click="tabIndex='2'" v-if="toTalk">{{ $t2('流程沟通', 'components.wf.wfTalk') }}</b>
|
|
75
|
-
<b :class="{on:tabIndex=='4'}" @click="tabIndex='4'">{{ $t1('
|
|
75
|
+
<b :class="{on:tabIndex=='4'}" @click="tabIndex='4'">{{ $t1('发起人附言') }}</b>
|
|
76
76
|
<b :class="{on:tabIndex=='3'}" @click="tabIndex='3'" v-if="showAllWfOpinon">{{ $t2('全部任务情况', 'components.wf.allTaskInfo') }}</b>
|
|
77
77
|
</div>
|
|
78
78
|
</div>
|
|
@@ -318,7 +318,7 @@
|
|
|
318
318
|
</span>
|
|
319
319
|
</el-dialog>
|
|
320
320
|
|
|
321
|
-
|
|
321
|
+
<!--发起人附言-->
|
|
322
322
|
<el-dialog
|
|
323
323
|
v-if="showWfMemoDialog"
|
|
324
324
|
:visible.sync="showWfMemoDialog"
|
|
@@ -331,7 +331,7 @@
|
|
|
331
331
|
v-el-dialog-center
|
|
332
332
|
>
|
|
333
333
|
<template #title>
|
|
334
|
-
<span class="el-dialog__title">{{ $t1('
|
|
334
|
+
<span class="el-dialog__title">{{ $t1('发起人附言') }}<span
|
|
335
335
|
style="margin-left: 10px;margin-right: 10px;">—</span><b
|
|
336
336
|
class="f-red" style="font-size: 12px;">{{ $t2('节点', 'components.wf.node') }}：{{
|
|
337
337
|
wfInfo.taskName
|
|
@@ -272,7 +272,21 @@
|
|
|
272
272
|
></el-button>
|
|
273
273
|
</template>
|
|
274
274
|
</el-table-column>
|
|
275
|
-
|
|
275
|
+
<el-table-column
|
|
276
|
+
:label="i18nt('显示名称颜色')"
|
|
277
|
+
width="100"
|
|
278
|
+
prop="fixed"
|
|
279
|
+
>
|
|
280
|
+
<template #default="scope">
|
|
281
|
+
<el-select v-model="scope.row.labelColor" clearable>
|
|
282
|
+
<el-option value="#e6a23c" label="橙"></el-option>
|
|
283
|
+
<el-option value="#2a6494" label="蓝"></el-option>
|
|
284
|
+
<el-option value="#30b08f" label="绿"></el-option>
|
|
285
|
+
<el-option value="#909399" label="灰"></el-option>
|
|
286
|
+
<el-option value="#ea5353" label="红"></el-option>
|
|
287
|
+
</el-select>
|
|
288
|
+
</template>
|
|
289
|
+
</el-table-column>
|
|
276
290
|
|
|
277
291
|
<el-table-column label="操作" width="150" fixed="right">
|
|
278
292
|
<template slot="header">
|
|
@@ -967,7 +981,8 @@ export default {
|
|
|
967
981
|
exportType: null,
|
|
968
982
|
footerDataType: null,
|
|
969
983
|
footerMethodConfg: null,
|
|
970
|
-
widgetList: []
|
|
984
|
+
widgetList: [],
|
|
985
|
+
labelColor:null
|
|
971
986
|
// treeNode: false,
|
|
972
987
|
};
|
|
973
988
|
return row;
|
|
@@ -873,6 +873,30 @@ modules = {
|
|
|
873
873
|
if (this.widget.options.hideGridCheckBox) {
|
|
874
874
|
otherConfig.checkBoxRequired = false;
|
|
875
875
|
}
|
|
876
|
+
|
|
877
|
+
//标题颜色
|
|
878
|
+
let headerCellStyle = null
|
|
879
|
+
let tableColumns = this.widget.options.tableColumns;
|
|
880
|
+
let colorMap = {}
|
|
881
|
+
let flag = 0
|
|
882
|
+
tableColumns.forEach(item=>{
|
|
883
|
+
if(item.labelColor){
|
|
884
|
+
flag = 1;
|
|
885
|
+
colorMap[item.columnId] = item.labelColor
|
|
886
|
+
}
|
|
887
|
+
})
|
|
888
|
+
if(flag){
|
|
889
|
+
headerCellStyle = (rowParam)=>{
|
|
890
|
+
let columnId = rowParam.column?.params?.columnId;
|
|
891
|
+
if(columnId){
|
|
892
|
+
let color = colorMap[rowParam.column.params.columnId]
|
|
893
|
+
if(color){
|
|
894
|
+
return `color:${color};`
|
|
895
|
+
}
|
|
896
|
+
}
|
|
897
|
+
}
|
|
898
|
+
}
|
|
899
|
+
|
|
876
900
|
let tableOption = {
|
|
877
901
|
// vue: this,
|
|
878
902
|
tableRef: tableRef,
|
|
@@ -886,6 +910,7 @@ modules = {
|
|
|
886
910
|
showFooter,
|
|
887
911
|
pagerConfig,
|
|
888
912
|
treeConfig,
|
|
913
|
+
headerCellStyle,
|
|
889
914
|
...editOpts,
|
|
890
915
|
...dataTableConfig.config,
|
|
891
916
|
/*rowConfig:{
|
|
@@ -100,6 +100,7 @@
|
|
|
100
100
|
size="small"
|
|
101
101
|
clearable
|
|
102
102
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
103
|
+
default-time="23:59:59"
|
|
103
104
|
:picker-options="$baseEndPickerOptions(formData.startToExeTime)"
|
|
104
105
|
></el-date-picker>
|
|
105
106
|
</template>
|
|
@@ -211,6 +212,7 @@
|
|
|
211
212
|
size="small"
|
|
212
213
|
clearable
|
|
213
214
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
215
|
+
default-time="23:59:59"
|
|
214
216
|
:picker-options="$baseEndPickerOptions(formData2.startToExeTime)"
|
|
215
217
|
></el-date-picker>
|
|
216
218
|
</template>
|