浏览代码

Merge branch 'master' of http://192.168.1.41:3000/maixinrong/Calculation

laiguoran 5 年之前
父节点
当前提交
6673f43281
共有 3 个文件被更改,包括 5 次插入9 次删除
  1. 0 6
      app/public/css/main.css
  2. 1 1
      app/public/js/ledger.js
  3. 4 2
      app/public/js/revise.js

+ 0 - 6
app/public/css/main.css

@@ -945,12 +945,6 @@ legend {
 .custom-control-label::after{
   top:.1rem;
 }
-.dropdown-menu .custom-control-label::before{
-  top:.5rem;
-}
-.dropdown-menu .custom-control-label::after{
-  top:.5rem;
-}
 .form-control-sm{
   height:calc(1.4125rem + 2px);
 }

+ 1 - 1
app/public/js/ledger.js

@@ -1194,7 +1194,7 @@ $(document).ready(function() {
                 copyBlockList.push(sheet.zh_tree.getDefaultData(posterity));
             }
             for (const cbl of copyBlockList) {
-                for (b of cbl) {
+                for (const b of cbl) {
                     const posRange = pos.getLedgerPos(b.id);
                     if (posRange && posRange.length > 0) b.pos = posRange;
                 }

+ 4 - 2
app/public/js/revise.js

@@ -1032,8 +1032,10 @@ $(document).ready(() => {
                 copyBlockList.push(sheet.zh_tree.getDefaultData(posterity));
             }
             for (const cbl of copyBlockList) {
-                const posRange = pos.getLedgerPos(cbl.id);
-                if (posRange && posRange.length > 0) cbl.pos = posRange;
+                for (const b of cbl) {
+                    const posRange = pos.getLedgerPos(b.id);
+                    if (posRange && posRange.length > 0) b.pos = posRange;
+                }
             }
             setLocalCache(copyBlockTag, JSON.stringify({ block: copyBlockList }));
         },