可视化优化 - 其他配置(指标前后缀、Format、默认值)

web/maintain/report/html/rpt_tpl_vis_jumbo.html

@@ -81,6 +81,24 @@
                     <label class="form-check-label" id="lblIsAutoHeightVis" style="display: none"><input type="checkbox" class="form-check-input" id="eleIsAutoHeightVis" onchange="visualJumbo.changeIsAutoHeight(this)">自动行高</label>
                 </div>
             </div>
+            <div class="row" id="element_pre_suff_vis">
+                <div class="input-group col-3">
+                    <div class="input-group-addon">前缀</div>
+                    <input class="form-control" id="elePrefix_Vis" value="" onkeyup="visualJumbo.changePreSuf(JV.PROP_PREFIX, this)" disabled>
+                </div>
+                <div class="input-group col-2">
+                    <div class="input-group-addon">格式</div>
+                    <input class="form-control" id="eleFormat_Vis" value="" onkeyup="visualJumbo.changePreSuf(JV.PROP_FORMAT, this)" disabled>
+                </div>
+                <div class="input-group col-2">
+                    <div class="input-group-addon">默认值</div>
+                    <input class="form-control" id="eleDftValue_Vis" value="" onkeyup="visualJumbo.changePreSuf(JV.PROP_DFT_VALUE, this)" disabled>
+                </div>
+                <div class="input-group col-2">
+                    <div class="input-group-addon">后缀</div>
+                    <input class="form-control" id="eleSuffix_Vis" value="" onkeyup="visualJumbo.changePreSuf(JV.PROP_SUFFIX, this)" disabled>
+                </div>
+            </div>
             <label id="id_vis_setup_lbl" style="color:green;font-weight:bold">...</label>
             <div class="row p-3" style="height: 400px" id="ele_visual_div_main3">
             </div>

web/maintain/report/js/rpt_tpl_data_map.js

@@ -745,16 +745,20 @@ let dataInfoMapTreeOprObj = {
         rst[JV.PROP_TEXTS] = [];
         for (let subNode of sumNode.items) {
             if (subNode[JV.PROP_NAME] === "统计指标集") {
-                for (let sumField of subNode.items) {
-                    let item = {};
-                    rst[JV.PROP_SUM_FIELDS].push(item);
-                    me.private_copy_field_properties(sumField, item);
+                if (subNode.items && subNode.items.length > 0) {
+                    for (let sumField of subNode.items) {
+                        let item = {};
+                        rst[JV.PROP_SUM_FIELDS].push(item);
+                        me.private_copy_field_properties(sumField, item);
+                    }
                 }
             } else if (subNode[JV.PROP_NAME] === "文本集") {
-                for (let txt of subNode.items) {
-                    let item = {};
-                    rst[JV.PROP_TEXTS].push(item);
-                    me.private_copy_text_properties(txt, item);
+                if (subNode.items && subNode.items.length > 0) {
+                    for (let txt of subNode.items) {
+                        let item = {};
+                        rst[JV.PROP_TEXTS].push(item);
+                        me.private_copy_text_properties(txt, item);
+                    }
                 }
             }
         }

web/maintain/report/js/rpt_tpl_vis_common.js

@@ -502,6 +502,7 @@ let visualCommonOprObj = {
     setupTplTxtFld: function (rptTpl, tree, sheet, xPos, yPos, bandMappingObj) {
         let me = this, nodes = tree.getNodes();
         bandMappingObj.fontAttr = {};
+        bandMappingObj.fieldPreSufAttr = {};
         if (rptTpl[JV.NODE_FLOW_INFO]) {
             //流水式
             let contentBandMap, contentRowH;
@@ -641,6 +642,12 @@ let visualCommonOprObj = {
                 let cell = sheet.getCell(idxTop, idxLeft, GC.Spread.Sheets.SheetArea.viewport);
                 if (itemNode.FieldID || itemNode.ParamID) {
                     me.changeCellType(cell, 'field', bandMap[JV.PROP_COLOR]);
+                    let fpsAttr = me.createDftFieldPreSuf();
+                    bandMappingObj.fieldPreSufAttr[idxTop + "_" + idxLeft + "_fieldPreSuf"] = fpsAttr;
+                    fpsAttr[JV.PROP_PREFIX] = itemNode[JV.PROP_PREFIX];
+                    fpsAttr[JV.PROP_SUFFIX] = itemNode[JV.PROP_SUFFIX];
+                    fpsAttr[JV.PROP_FORMAT] = itemNode[JV.PROP_FORMAT];
+                    fpsAttr[JV.PROP_DFT_VALUE] = itemNode[JV.PROP_DFT_VALUE];
                 } else {
                     me.changeCellType(cell, 'text', bandMap[JV.PROP_COLOR]);
                 }
@@ -664,6 +671,14 @@ let visualCommonOprObj = {
             }
         }
     },
+    createDftFieldPreSuf: function () {
+        let rst = {};
+        rst[JV.PROP_PREFIX] = ``;
+        rst[JV.PROP_SUFFIX] = ``;
+        rst[JV.PROP_FORMAT] = ``;
+        rst[JV.PROP_DFT_VALUE] = ``;
+        return rst;
+    },
     addDiscreteSpan: function (discreteItemNode, xPos, yPos, bandMappingObj, sheet) {
         let me = this;
         if (discreteItemNode.items) {

web/maintain/report/js/rpt_tpl_vis_jumbo.js

@@ -160,6 +160,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 +170,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 +183,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 () {
@@ -697,6 +742,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 +957,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 () {
@@ -1070,9 +1145,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"]) {