1

app/public/js/revise.js

@@ -40,7 +40,7 @@ $(document).ready(() => {
     const posSpread = SpreadJsObj.createNewSpread($('#pos-spread')[0]);
     const posSheet = posSpread.getActiveSheet();
     sjsSettingObj.setGridSelectStyle(posSpreadSetting);
-    if (thousandth) sjsSettingObj.setTpThousandthFormat(SpreadSetting);
+    if (thousandth) sjsSettingObj.setTpThousandthFormat(posSpreadSetting);
     SpreadJsObj.initSheet(posSheet, posSpreadSetting);
 
     const posSearch = $.posSearch({selector: '#pos-search', searchSpread: posSpread});

app/public/js/stage_im.js

@@ -460,10 +460,11 @@ const stageIm = (function () {
                 if (p.children && p.children.length > 0) continue;
                 if (checkUsed(p)) return [p, getFirstUsedPos(p)]
             }
+            return [null, null];
         } else if (checkUsed(node)) {
             return [node, getFirstUsedPos(node)];
         } else {
-            return [null, null]
+            return [null, null];
         }
     }
 
@@ -942,7 +943,7 @@ const stageIm = (function () {
     }
     function getRelaXmj(node) {
         if (checkUsed(node)) {
-            if (stage.im_gather) {
+            if (stage.im_gather && (stage.im_type !== imType.bw.value && stage.im_type !== imType.bb.value)) {
                 const checkedParent = getParentCheckNode(node);
                 return checkedParent ? checkedParent : gsTree.getLeafXmjParent(node);
             } else {