|
@@ -1140,6 +1140,7 @@ JpcFlowTabSrv.prototype.createNew = function() {
|
|
|
for (const rCell of reservedCells) {
|
|
|
// 要拆分下数据
|
|
|
_splitValues(rCell);
|
|
|
+ setupControl(rCell, controls, true);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -1640,7 +1641,7 @@ function prepareAutoHeightCells(prepareObj, cellItem, cellIdx, cellsArr) {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-function setupControl(mergeCell, controls) {
|
|
|
+function setupControl(mergeCell, controls, isCombine = false) {
|
|
|
let orgCtrl = null;
|
|
|
if (typeof mergeCell[JV.PROP_CONTROL] === 'string') {
|
|
|
orgCtrl = controls[mergeCell[JV.PROP_CONTROL]];
|
|
@@ -1664,9 +1665,12 @@ function setupControl(mergeCell, controls) {
|
|
|
if (mergeCell[JV.PROP_IS_AUTO_HEIGHT]) {
|
|
|
mergeCell[JV.PROP_CONTROL][JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL_EXCEL]] = 'justify';
|
|
|
// mergeCell[JV.PROP_CONTROL]['Vertical'] = 'center';
|
|
|
+ } else if (isCombine && orgCtrl.CloseOutput === 'T') {
|
|
|
+ mergeCell[JV.PROP_CONTROL][JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_WRAP]] = 'T';
|
|
|
+ mergeCell[JV.PROP_CONTROL][JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL_EXCEL]] = 'justify';
|
|
|
} else {
|
|
|
mergeCell[JV.PROP_CONTROL][JV.CONTROL_PROPS[JV.CONTROL_PROP_IDX_VERTICAL_EXCEL]] = 'center';
|
|
|
- // mergeCell[JV.PROP_CONTROL]['Vertical'] = 'top';
|
|
|
+ // mergeCell[JV.PR OP_CONTROL]['Vertical'] = 'top';
|
|
|
}
|
|
|
return orgCtrl;
|
|
|
}
|