|
|
@@ -29,14 +29,7 @@ let visualJumbo = {
|
|
|
let border = new GC.Spread.Sheets.LineBorder;
|
|
|
border.color = "Black";
|
|
|
border.style = GC.Spread.Sheets.LineStyle.thin;
|
|
|
- sheet.suspendPaint();
|
|
|
- sheet.setRowCount(0);
|
|
|
- sheet.setColumnCount(0);
|
|
|
- //1. put the pos into array
|
|
|
- let xPos = [0], yPos = [0];
|
|
|
let pageH, pageW;
|
|
|
- let bandMappingObj = {};
|
|
|
- me.bandMappingObj = bandMappingObj;
|
|
|
let pIdx = JV.PAGES_SIZE_STR.indexOf(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_PAGE_INFO][JV.PROP_PAGE_SIZE]);
|
|
|
pageW = Math.round(JV.PAGES_SIZE[pIdx][0] * 96 - (parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_LEFT]) + parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_RIGHT])) /2.54*96 );
|
|
|
pageH = Math.round(JV.PAGES_SIZE[pIdx][1] * 96 - (parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_TOP]) + parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_BOTTOM])) /2.54*96 );
|
|
|
@@ -45,46 +38,66 @@ let visualJumbo = {
|
|
|
pageW = Math.round(JV.PAGES_SIZE[pIdx][1] * 96 - (parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_LEFT]) + parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_RIGHT])) /2.54*96 );
|
|
|
pageH = Math.round(JV.PAGES_SIZE[pIdx][0] * 96 - (parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_TOP]) + parseFloat(rptTpl[JV.NODE_MAIN_INFO][JV.NODE_MARGINS][JV.PROP_BOTTOM])) /2.54*96 );
|
|
|
}
|
|
|
- xPos.push(pageW);
|
|
|
- // pageH = Math.round(pageH / 2);
|
|
|
- yPos.push(pageH);
|
|
|
- visualCommonOprObj.addBandPos(rptTpl, pageW, pageH, xPos, yPos, bandMappingObj);
|
|
|
- visualCommonOprObj.addTplTxtFldPos(rptTpl, dataInfoMapTreeOprObj.treeObj, xPos, yPos, bandMappingObj);
|
|
|
- //2. 设置spreadjs
|
|
|
- xPos.sort(function(x1, x2){ return (x1 - x2); });
|
|
|
- yPos.sort(function(y1, y2){ return (y1 - y2); });
|
|
|
- sheet.setRowCount(yPos.length - 1);
|
|
|
- sheet.setColumnCount(xPos.length - 1);
|
|
|
- for (let idx = 1; idx < xPos.length; idx++) {
|
|
|
- sheet.setColumnWidth(idx - 1, xPos[idx] - xPos[idx - 1]);
|
|
|
- }
|
|
|
- for (let idx = 1; idx < yPos.length; idx++) {
|
|
|
- sheet.setRowHeight(idx - 1, yPos[idx] - yPos[idx - 1]);
|
|
|
- sheet.getRange(idx - 1, -1, 1, -1).backColor(undefined);
|
|
|
+ sheet.suspendPaint();
|
|
|
+ sheet.setRowCount(0);
|
|
|
+ sheet.setColumnCount(0);
|
|
|
+ if (rptTpl[JV.NODE_FLOW_INFO] || rptTpl[JV.NODE_BILL_INFO]) {
|
|
|
+ //流水式/账单式
|
|
|
+ me.setupFlowBillTpl(rptTpl, sheet, border, pageW, pageH);
|
|
|
+ } else if (rptTpl[JV.NODE_CROSS_INFO]) {
|
|
|
+ //交叉式
|
|
|
+ //目前暂缓
|
|
|
+ me.setupCrossTpl(rptTpl, sheet, border, pageW, pageH);
|
|
|
}
|
|
|
- visualCommonOprObj.brushSheet(bandMappingObj, sheet, xPos, yPos);
|
|
|
- visualCommonOprObj.setupTplTxtFld(rptTpl, dataInfoMapTreeOprObj.treeObj, sheet, xPos, yPos, bandMappingObj)
|
|
|
- for (let idx = 1; idx < yPos.length; idx++) {
|
|
|
- let bkc = sheet.getCell(idx - 1, 0).backColor();
|
|
|
- if (bkc === 'White') {
|
|
|
- sheet.setRowHeight(idx - 1, 30);
|
|
|
- }
|
|
|
+ sheet.clearSelection();
|
|
|
+ sheet.resumePaint();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ setupFlowBillTpl: function (rptTpl, sheet, border, pageW, pageH) {
|
|
|
+ let me = this;
|
|
|
+ //1. put the pos into array
|
|
|
+ let xPos = [0], yPos = [0];
|
|
|
+ xPos.push(pageW);
|
|
|
+ yPos.push(pageH);
|
|
|
+ let bandMappingObj = {};
|
|
|
+ me.bandMappingObj = bandMappingObj;
|
|
|
+ visualCommonOprObj.addBandPos(rptTpl, pageW, pageH, xPos, yPos, bandMappingObj);
|
|
|
+ visualCommonOprObj.addTplTxtFldPos(rptTpl, dataInfoMapTreeOprObj.treeObj, xPos, yPos, bandMappingObj);
|
|
|
+ //2. 设置spreadjs
|
|
|
+ xPos.sort(function(x1, x2){ return (x1 - x2); });
|
|
|
+ yPos.sort(function(y1, y2){ return (y1 - y2); });
|
|
|
+ sheet.setRowCount(yPos.length - 1);
|
|
|
+ sheet.setColumnCount(xPos.length - 1);
|
|
|
+ for (let idx = 1; idx < xPos.length; idx++) {
|
|
|
+ sheet.setColumnWidth(idx - 1, xPos[idx] - xPos[idx - 1]);
|
|
|
+ }
|
|
|
+ for (let idx = 1; idx < yPos.length; idx++) {
|
|
|
+ sheet.setRowHeight(idx - 1, yPos[idx] - yPos[idx - 1]);
|
|
|
+ sheet.getRange(idx - 1, -1, 1, -1).backColor(undefined);
|
|
|
+ }
|
|
|
+ visualCommonOprObj.brushSheet(bandMappingObj, sheet, xPos, yPos);
|
|
|
+ visualCommonOprObj.setupTplTxtFld(rptTpl, dataInfoMapTreeOprObj.treeObj, sheet, xPos, yPos, bandMappingObj)
|
|
|
+ for (let idx = 1; idx < yPos.length; idx++) {
|
|
|
+ let bkc = sheet.getCell(idx - 1, 0).backColor();
|
|
|
+ if (bkc === 'White') {
|
|
|
+ sheet.setRowHeight(idx - 1, 30);
|
|
|
}
|
|
|
- for (let iRow = 0; iRow < sheet.getRowCount(); iRow++) {
|
|
|
- for (let iCol = 0; iCol < sheet.getColumnCount(); iCol++) {
|
|
|
- let cell = sheet.getCell(iRow, iCol);
|
|
|
- if (cell.backColor() === 'LightGray' || cell.backColor() === 'LightCyan') {
|
|
|
- visualCommonOprObj.setupBorder(sheet.getCell(iRow, iCol), border);
|
|
|
- } else if (cell.backColor() === 'White') {
|
|
|
- sheet.addSpan(iRow, 0, 1, sheet.getColumnCount());
|
|
|
- break;
|
|
|
- }
|
|
|
+ }
|
|
|
+ for (let iRow = 0; iRow < sheet.getRowCount(); iRow++) {
|
|
|
+ for (let iCol = 0; iCol < sheet.getColumnCount(); iCol++) {
|
|
|
+ let cell = sheet.getCell(iRow, iCol);
|
|
|
+ if (cell.backColor() === 'LightGray' || cell.backColor() === 'LightCyan') {
|
|
|
+ visualCommonOprObj.setupBorder(sheet.getCell(iRow, iCol), border);
|
|
|
+ } else if (cell.backColor() === 'White') {
|
|
|
+ sheet.addSpan(iRow, 0, 1, sheet.getColumnCount());
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
- sheet.clearSelection();
|
|
|
- sheet.resumePaint();
|
|
|
}
|
|
|
},
|
|
|
+ setupCrossTpl: function (rptTpl, sheet, border) {
|
|
|
+
|
|
|
+ },
|
|
|
onCellEnter: function (sender, args) {
|
|
|
let me = visualJumbo,
|
|
|
sheet = me.tplWorkBook.getActiveSheet();
|
|
|
@@ -148,11 +161,18 @@ let visualJumbo = {
|
|
|
$(`#vis_wrap`)[0].className = "btn btn-sm btn-outline-secondary";
|
|
|
}
|
|
|
let border = cell.borderLeft();
|
|
|
+ let bottomBorder = cell.borderBottom();
|
|
|
if (border && border.style === GC.Spread.Sheets.LineStyle.thin) {
|
|
|
$(`#vis_outter_border`)[0].className = "btn btn-sm btn-outline-secondary active";
|
|
|
+ $(`#vis_bottom_border`)[0].className = "btn btn-sm btn-outline-secondary";
|
|
|
+ $(`#vis_no_border`)[0].className = "btn btn-sm btn-outline-secondary";
|
|
|
+ } else if (bottomBorder && bottomBorder.style === GC.Spread.Sheets.LineStyle.thin){
|
|
|
+ $(`#vis_outter_border`)[0].className = "btn btn-sm btn-outline-secondary";
|
|
|
+ $(`#vis_bottom_border`)[0].className = "btn btn-sm btn-outline-secondary active";
|
|
|
$(`#vis_no_border`)[0].className = "btn btn-sm btn-outline-secondary";
|
|
|
} else {
|
|
|
$(`#vis_outter_border`)[0].className = "btn btn-sm btn-outline-secondary";
|
|
|
+ $(`#vis_bottom_border`)[0].className = "btn btn-sm btn-outline-secondary";
|
|
|
$(`#vis_no_border`)[0].className = "btn btn-sm btn-outline-secondary active";
|
|
|
}
|
|
|
//4. txt/field
|
|
|
@@ -160,6 +180,8 @@ let visualJumbo = {
|
|
|
if (cell.cellType() && cell.cellType().typeName === '7') {
|
|
|
$(`#visRdIsField`)[0].checked = true;
|
|
|
$(`#lblIsAutoHeightVis`)[0].style.display = "";
|
|
|
+ me.private_enable_pre_suff(cell);
|
|
|
+ me.private_set_field_to_pre_suf(cell);
|
|
|
if (!stringUtil.isEmptyString(val) && val.indexOf(`{`) === 0) {
|
|
|
$(`#eleIsAutoHeightVis`)[0].checked = true;
|
|
|
} else {
|
|
|
@@ -168,9 +190,12 @@ let visualJumbo = {
|
|
|
} else if (stringUtil.isEmptyString(val) && (!border || border.style === GC.Spread.Sheets.LineStyle.empty)) {
|
|
|
$(`#visRdIsBlank`)[0].checked = true;
|
|
|
$(`#lblIsAutoHeightVis`)[0].style.display = "none";
|
|
|
+ me.private_disable_pre_suff();
|
|
|
+
|
|
|
} else {
|
|
|
$(`#visRdIsText`)[0].checked = true;
|
|
|
$(`#lblIsAutoHeightVis`)[0].style.display = "none";
|
|
|
+ me.private_disable_pre_suff();
|
|
|
}
|
|
|
} else {
|
|
|
$("#visElementFonts")[0].disabled = "disabled" ;
|
|
|
@@ -178,6 +203,46 @@ let visualJumbo = {
|
|
|
$("#visRdIsField")[0].disabled = "disabled" ;
|
|
|
$("#eleIsAutoHeightVis")[0].disabled = "disabled" ;
|
|
|
$("#id_vis_setup_lbl")[0].innerHTML = '...';
|
|
|
+ me.private_disable_pre_suff();
|
|
|
+ }
|
|
|
+ },
|
|
|
+ private_disable_pre_suff: function () {
|
|
|
+ let ele1 = $(`#elePrefix_Vis`)[0];
|
|
|
+ let ele2 = $(`#eleFormat_Vis`)[0];
|
|
|
+ let ele3 = $(`#eleDftValue_Vis`)[0];
|
|
|
+ let ele4 =$(`#eleSuffix_Vis`)[0];
|
|
|
+ ele1.disabled = "disabled" ;
|
|
|
+ ele2.disabled = "disabled" ;
|
|
|
+ ele3.disabled = "disabled" ;
|
|
|
+ ele4.disabled = "disabled" ;
|
|
|
+ ele1.value = ``;
|
|
|
+ ele2.value = ``;
|
|
|
+ ele3.value = ``;
|
|
|
+ ele4.value = ``;
|
|
|
+ },
|
|
|
+ private_enable_pre_suff: function (cell) {
|
|
|
+ $(`#elePrefix_Vis`)[0].removeAttribute("disabled");
|
|
|
+ $(`#eleFormat_Vis`)[0].removeAttribute("disabled");
|
|
|
+ $(`#eleDftValue_Vis`)[0].removeAttribute("disabled");
|
|
|
+ $(`#eleSuffix_Vis`)[0].removeAttribute("disabled");
|
|
|
+ },
|
|
|
+ private_set_field_to_pre_suf: function (cell) {
|
|
|
+ let me = visualJumbo;
|
|
|
+ let ele1 = $(`#elePrefix_Vis`)[0];
|
|
|
+ let ele2 = $(`#eleFormat_Vis`)[0];
|
|
|
+ let ele3 = $(`#eleDftValue_Vis`)[0];
|
|
|
+ let ele4 =$(`#eleSuffix_Vis`)[0];
|
|
|
+ let fps = me.bandMappingObj.fieldPreSufAttr[cell.row + "_" + cell.col + "_fieldPreSuf"];
|
|
|
+ if (fps) {
|
|
|
+ ele1.value = (stringUtil.isEmptyString(fps[JV.PROP_PREFIX]))?``:fps[JV.PROP_PREFIX];
|
|
|
+ ele2.value = (stringUtil.isEmptyString(fps[JV.PROP_FORMAT]))?``:fps[JV.PROP_FORMAT];
|
|
|
+ ele3.value = (stringUtil.isEmptyString(fps[JV.PROP_DFT_VALUE]))?``:fps[JV.PROP_DFT_VALUE];
|
|
|
+ ele4.value = (stringUtil.isEmptyString(fps[JV.PROP_SUFFIX]))?``:fps[JV.PROP_SUFFIX];
|
|
|
+ } else {
|
|
|
+ ele1.value = ``;
|
|
|
+ ele2.value = ``;
|
|
|
+ ele3.value = ``;
|
|
|
+ ele4.value = ``;
|
|
|
}
|
|
|
},
|
|
|
restoreTpl: function () {
|
|
|
@@ -516,13 +581,21 @@ let visualJumbo = {
|
|
|
sheet.suspendPaint();
|
|
|
let border = new GC.Spread.Sheets.LineBorder;
|
|
|
border.color = "Black";
|
|
|
- if ($(`#vis_outter_border`)[0].className === `btn btn-sm btn-outline-secondary active`) {
|
|
|
- border.style = GC.Spread.Sheets.LineStyle.thin;
|
|
|
- } else {
|
|
|
+ if ($(`#vis_no_border`)[0].className === `btn btn-sm btn-outline-secondary active`) {
|
|
|
border.style = GC.Spread.Sheets.LineStyle.empty;
|
|
|
+ } else {
|
|
|
+ border.style = GC.Spread.Sheets.LineStyle.thin;
|
|
|
}
|
|
|
let cellRange = new GC.Spread.Sheets.CellRange(sheet, selectedRanges[0].row, selectedRanges[0].col, selectedRanges[0].rowCount, selectedRanges[0].colCount);
|
|
|
- cellRange.setBorder(border, {all: true});
|
|
|
+ if ($(`#vis_bottom_border`)[0].className === `btn btn-sm btn-outline-secondary active`) {
|
|
|
+ let bottomBorder = new GC.Spread.Sheets.LineBorder;
|
|
|
+ bottomBorder.color = "Black";
|
|
|
+ bottomBorder.style = GC.Spread.Sheets.LineStyle.empty;
|
|
|
+ cellRange.setBorder(bottomBorder, {all: true});
|
|
|
+ cellRange.setBorder(border, {bottom: true});
|
|
|
+ } else {
|
|
|
+ cellRange.setBorder(border, {all: true});
|
|
|
+ }
|
|
|
sheet.resumePaint();
|
|
|
}
|
|
|
},
|
|
|
@@ -663,7 +736,7 @@ let visualJumbo = {
|
|
|
let me = this;
|
|
|
if (dom.className === "btn btn-sm btn-outline-secondary") {
|
|
|
dom.className = "btn btn-sm btn-outline-secondary active"
|
|
|
- let hKeys = [`vis_outter_border`, `vis_no_border`];
|
|
|
+ let hKeys = [`vis_outter_border`, `vis_no_border`, `vis_bottom_border`];
|
|
|
let domIdx = hKeys.indexOf(dom.id);
|
|
|
if (domIdx >= 0) {
|
|
|
for (let idx = 0; idx < hKeys.length; idx++) {
|
|
|
@@ -697,6 +770,19 @@ let visualJumbo = {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ changePreSuf: function (typeStr, dom) {
|
|
|
+ let me = visualJumbo, sheet = me.tplWorkBook.getActiveSheet();
|
|
|
+ let selectedRanges = sheet.getSelections();
|
|
|
+ if (selectedRanges.length > 0) {
|
|
|
+ let cell = sheet.getCell(selectedRanges[0].row, selectedRanges[0].col);
|
|
|
+ let fps = me.bandMappingObj.fieldPreSufAttr[cell.row + "_" + cell.col + "_fieldPreSuf"];
|
|
|
+ if (!fps) {
|
|
|
+ fps = visualCommonOprObj.createDftFieldPreSuf();
|
|
|
+ me.bandMappingObj.fieldPreSufAttr[cell.row + "_" + cell.col + "_fieldPreSuf"] = fps;
|
|
|
+ }
|
|
|
+ fps[typeStr] = dom.value;
|
|
|
+ }
|
|
|
+ },
|
|
|
applyBack: function () {
|
|
|
let me = visualJumbo, sheet = me.tplWorkBook.getActiveSheet();
|
|
|
let rptTpl = (zTreeOprObj.currentNode)?zTreeOprObj.currentNode.rptTpl:null;
|
|
|
@@ -899,6 +985,23 @@ let visualJumbo = {
|
|
|
//4. 左右位置%
|
|
|
me.setupHeightWidth(rst, field, startRow, colWidthArr, rowHeightArr);
|
|
|
|
|
|
+ //5. 其他(前后缀、Format、默认值)
|
|
|
+ let preSufCfg = me.bandMappingObj.fieldPreSufAttr[field.row + "_" + field.col + "_fieldPreSuf"];
|
|
|
+ if (preSufCfg) {
|
|
|
+ if (preSufCfg[JV.PROP_PREFIX]) {
|
|
|
+ rst[JV.PROP_PREFIX] = preSufCfg[JV.PROP_PREFIX];
|
|
|
+ }
|
|
|
+ if (preSufCfg[JV.PROP_SUFFIX]) {
|
|
|
+ rst[JV.PROP_SUFFIX] = preSufCfg[JV.PROP_SUFFIX];
|
|
|
+ }
|
|
|
+ if (preSufCfg[JV.PROP_FORMAT]) {
|
|
|
+ rst[JV.PROP_FORMAT] = preSufCfg[JV.PROP_FORMAT];
|
|
|
+ }
|
|
|
+ if (preSufCfg[JV.PROP_DFT_VALUE]) {
|
|
|
+ rst[JV.PROP_DFT_VALUE] = preSufCfg[JV.PROP_DFT_VALUE];
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return rst;
|
|
|
},
|
|
|
private_clear_flow_txt_fld_nodes: function () {
|
|
|
@@ -925,17 +1028,66 @@ let visualJumbo = {
|
|
|
},
|
|
|
applyBack_Bill: function (rptTpl, sheet, xPos, yPos) {
|
|
|
let me = this;
|
|
|
- let pageWith = xPos[xPos.length - 1];
|
|
|
+ // let pageWith = xPos[xPos.length - 1];
|
|
|
//先清除所有相关text/field节点，然后再重新生成
|
|
|
me.private_clear_bill_txt_fld_nodes();
|
|
|
//1. 锚定content
|
|
|
- let cotentBand = visualCommonOprObj.getBandEx(rptTpl[JV.NODE_FLOW_INFO][JV.NODE_FLOW_CONTENT][JV.PROP_BAND_NAME], rptTpl);
|
|
|
+ let cotentBand = visualCommonOprObj.getBandEx(rptTpl[JV.NODE_BILL_INFO][JV.NODE_BILL_CONTENT][JV.PROP_BAND_NAME], rptTpl);
|
|
|
+ let textFldArr = [], colWidthArr = [], rowHeightArr = [];
|
|
|
+ let startRow = me.collectSheetTxtFldByArea(sheet, me.bandMappingObj[cotentBand[JV.PROP_NAME]][JV.PROP_COLOR] , textFldArr, colWidthArr, rowHeightArr);
|
|
|
+ let contentNodes = [];
|
|
|
+ for (let field of textFldArr) {
|
|
|
+ let node = me.private_create_field_param_node(sheet, field, startRow, colWidthArr, rowHeightArr, rptTpl);
|
|
|
+ contentNodes.push(node);
|
|
|
+ }
|
|
|
//2. 其他就归类到离散去了
|
|
|
+ let discreteNodesArr = [];
|
|
|
+ if (me.bandMappingObj && me.bandMappingObj.items && me.bandMappingObj.items.length > 0) {
|
|
|
+ for (let sBandMap of me.bandMappingObj.items) {
|
|
|
+ let sArr = {Name: "子项", BandName: sBandMap[JV.PROP_BAND_NAME], items: [[],[]], isParent: true};
|
|
|
+ let sBand = visualCommonOprObj.getBandEx(sBandMap[JV.PROP_BAND_NAME], rptTpl);
|
|
|
+ if (sBand) {
|
|
|
+ me.private_build_txt_fld_nodes(sBand, sheet, rptTpl, sArr.items);
|
|
|
+ }
|
|
|
+ if (sArr.items[0].length > 0 || sArr.items[1].length > 0) {
|
|
|
+ discreteNodesArr.push(sArr);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //3. 最后生成节点
|
|
|
+ me.private_create_tpl_bill_nodes(contentNodes, discreteNodesArr);
|
|
|
+ displayMessage("应用提交成功！", "green", 5000, "id_vis_setup_lbl");
|
|
|
},
|
|
|
private_clear_bill_txt_fld_nodes: function () {
|
|
|
let nodes = dataInfoMapTreeOprObj.treeObj.getNodes();
|
|
|
for (let node of nodes) {
|
|
|
dataInfoMapTreeOprObj.treeObj.removeChildNodes(node);
|
|
|
+ //bill类型可以直接remove child nodes
|
|
|
+ }
|
|
|
+ },
|
|
|
+ private_create_tpl_bill_nodes: function (contentNodes, discreteNodesArr) {
|
|
|
+ let nodes = dataInfoMapTreeOprObj.treeObj.getNodes();
|
|
|
+ for (let node of nodes) {
|
|
|
+ if (node[JV.PROP_NAME].indexOf('数据') >= 0) {
|
|
|
+ //数据
|
|
|
+ dataInfoMapTreeOprObj.treeObj.addNodes(node, -1, contentNodes, true);
|
|
|
+ } else if (node[JV.PROP_NAME].indexOf('离散') >= 0) {
|
|
|
+ //离散信息
|
|
|
+ if (discreteNodesArr) {
|
|
|
+ for (let dNode of discreteNodesArr) {
|
|
|
+ let discreteNode = {"Name": "子项", "BandName": dNode[JV.PROP_BAND_NAME], "items": [{"Name": "离散字段集", "items": [], "isParent": true},{"Name": "离散文本集", "items": [], "isParent": true}], "isParent": true};
|
|
|
+ if (dNode.items[0].length > 0) {
|
|
|
+ // dataInfoMapTreeOprObj.treeObj.addNodes(node.items[0], -1, segSummaryNodes[0], true);
|
|
|
+ discreteNode.items[0].items = dNode.items[0];
|
|
|
+ }
|
|
|
+ if (dNode.items[1].length > 0) {
|
|
|
+ // dataInfoMapTreeOprObj.treeObj.addNodes(node.items[1], -1, segSummaryNodes[1], true);
|
|
|
+ discreteNode.items[1].items = dNode.items[1];
|
|
|
+ }
|
|
|
+ dataInfoMapTreeOprObj.treeObj.addNodes(node, -1, discreteNode, true);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
},
|
|
|
applyBack_Cross: function (rptTpl, sheet, xPos, yPos) {
|
|
|
@@ -1034,6 +1186,12 @@ let visualJumbo = {
|
|
|
isField = true;
|
|
|
} else {
|
|
|
isBlank = stringUtil.isEmptyString(textValue);
|
|
|
+ if (isBlank) {
|
|
|
+ let border = cell.borderBottom();
|
|
|
+ if (border && border.style === GC.Spread.Sheets.LineStyle.thin) {
|
|
|
+ isBlank = false;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
if (!isBlank) {
|
|
|
textArr.push({"row": row, "col": col, "rowCount": rowCount, "colCount": colCount, "text": textValue, "isField": isField});
|
|
|
@@ -1070,9 +1228,6 @@ let visualJumbo = {
|
|
|
dest[JV.PROP_AREA][JV.PROP_TOP] = 0;
|
|
|
}
|
|
|
},
|
|
|
- createDiscreteFieldNode: function (field, colWidthArr, rowHeightArr) {
|
|
|
- //
|
|
|
- },
|
|
|
private_getFontByCellProperties: function (cell) {
|
|
|
let me = this, rst = 'Content';
|
|
|
if (me.bandMappingObj.fontAttr[cell.row + "_" + cell.col + "_font"]) {
|
|
|
@@ -1085,6 +1240,11 @@ let visualJumbo = {
|
|
|
let border = cell.borderLeft();
|
|
|
if (border && border.style === GC.Spread.Sheets.LineStyle.thin) {
|
|
|
rst = 'Default_Normal'
|
|
|
+ } else {
|
|
|
+ border = cell.borderBottom();
|
|
|
+ if (border && border.style === GC.Spread.Sheets.LineStyle.thin) {
|
|
|
+ rst = 'Label_Underline'
|
|
|
+ }
|
|
|
}
|
|
|
return rst;
|
|
|
},
|
