1. 删除已删除节点的书签，界面刷新异常

2. sjs，书签显示调整
3. 报表，stage-zone模式，计算问题
4. 数据检查，等待时间调整

app/public/js/ledger.js

@@ -1013,10 +1013,14 @@ $(document).ready(function() {
     //         },
     //     },
     // ];
+    ledgerSpreadSetting.headColWidth = [50];
     ledgerSpreadSetting.rowHeader = [
         {
             rowHeaderType: 'tag',
             setting: {
+                indent: 14,
+                tagSize: 0.8,
+                tagFont: '8px 微软雅黑',
                 getColor: function (index, data) {
                     if (!data) return;
                     return billsTag.getBillsTagsColor(data.id);

app/public/js/shares/cs_tools.js

@@ -788,8 +788,10 @@ const showSelectTab = function(select, spread, afterShow) {
             if (data.del) {
                 const delTag = billsTags.find(x => {return x.id === data.del});
                 billsTags.splice(billsTags.indexOf(delTag), 1);
-                const bi = billsIndexes[delTag.node.id];
-                bi.splice(bi.indexOf(delTag), 1);
+                if (delTag.node) {
+                    const bi = billsIndexes[delTag.node.id];
+                    bi.splice(bi.indexOf(delTag), 1);
+                }
                 refresh.del = delTag;
             }
             if (data.update) {

app/public/js/spreadjs_rela/spreadjs_zh.js

@@ -2251,17 +2251,19 @@ const SpreadJsObj = {
 
     RowHeader: {
         getTagRowHeader: function (setting) {
-            const indent = 16, maxHintWidth = 200, borderIndent = 10;
+            const indent = setting.indent || 18, maxHintWidth = 200, borderIndent = 10;
+            const height = setting.tagSize ? 11 * setting.tagSize : 11, width = setting.tagSize ? 10 * setting.tagSize : 10;
+            const tagFont = setting.tagFont || '9px 微软雅黑';
             const drawTag = function (canvas, x, y, fillColor) {
                 canvas.save();
                 // 设置偏移量
                 canvas.translate(0.5, 0.5);
                 canvas.beginPath();
                 canvas.moveTo(x, y);
-                canvas.lineTo(x, y+5);
-                canvas.lineTo(x+6, y+11);
-                canvas.lineTo(x+11, y+6);
-                canvas.lineTo(x+5, y);
+                canvas.lineTo(x, y+height/11*5);
+                canvas.lineTo(x+width/10*5.5, y+height);
+                canvas.lineTo(x+width, y+height-width/10*4.5);
+                canvas.lineTo(x+width/11*5, y);
                 canvas.lineTo(x, y);
                 canvas.stroke();
                 canvas.fillStyle = fillColor instanceof Array ? fillColor[0] : fillColor;
@@ -2275,8 +2277,8 @@ const SpreadJsObj = {
 
                 if (fillColor instanceof Array && fillColor.length > 1) {
                     canvas.fillStyle = '#444444';
-                    canvas.font="9px 微软雅黑";
-                    canvas.fillText(fillColor.length, x+13, y+14);
+                    canvas.font = tagFont;
+                    canvas.fillText(fillColor.length, x+width/11*13, y+height/11*14);
                 }
 
                 canvas.restore();
@@ -2293,9 +2295,8 @@ const SpreadJsObj = {
                 spreadNS.CellTypes.Text.prototype.paint.apply(this, [canvas, value, x, y, w - indent, h, style, options]);
                 const node = SpreadJsObj.getRowObject(options.sheet, options.row);
                 const color = this.getTagColor(options.row, node);
-                const centerX = x + w - indent + 4, centerY = y + h/2;
-                color && drawTag(canvas, centerX - 6, centerY - 6, color);
-
+                const centerX = x + w - indent + height/2, centerY = y + h/2;
+                color && drawTag(canvas, centerX - height/2, centerY - width/2, color);
             };
             /**
              * 获取点击信息

app/public/js/stage.js

@@ -605,10 +605,14 @@ $(document).ready(() => {
     sjsSettingObj.setPropValue(ledgerSpreadSetting, ['gxby'], 'getValue', getGxbyText);
     sjsSettingObj.setPropValue(ledgerSpreadSetting, ['dagl'], 'getValue', getDaglText);
     if (thousandth) sjsSettingObj.setTpThousandthFormat(ledgerSpreadSetting);
+    ledgerSpreadSetting.headColWidth = [50];
     ledgerSpreadSetting.rowHeader = [
         {
             rowHeaderType: 'tag',
             setting: {
+                indent: 14,
+                tagSize: 0.8,
+                tagFont: '8px 微软雅黑',
                 getColor: function (index, data) {
                     if (!data) return;
                     return billsTag.getBillsTagsColor(data.id);

app/service/rpt_gather_memory.js

@@ -382,7 +382,7 @@ module.exports = app => {
             billsTree.loadDatas(billsData);
             billsTree.calculateAll();
             this.resultTree.loadGatherTree(billsTree, function (gatherNode, sourceNode) {
-                gatherUtils.gatherZone(gatherNode, sourceNode, completeData.prefix, helper);
+                gatherUtils.gatherZone(tender, gatherNode, sourceNode, completeData.prefix, helper);
             });
         }
 

app/view/shares/check_modal2.ejs

@@ -109,7 +109,7 @@
         if (!setting.prefix) setting.prefix = 'check2-';
         if (setting.randomWait) {
             for (const c of setting.checks) {
-                c.wait = _.random(1, 5) + setting.extra;
+                c.wait = _.random(2, 4) + setting.extra;
             }
         }