|
@@ -529,20 +529,20 @@ const showSelectTab = function(select, spread, afterShow) {
|
|
|
};
|
|
|
const get18Bw = function(tree, data) {
|
|
|
let parent = tree.getParent(data);
|
|
|
- while (parent && parent.code.test(/^[a-zA-Z]/)) {
|
|
|
+ while (parent && (!parent.code || /^[a-zA-Z]/.test(parent.code || ''))) {
|
|
|
parent = tree.getParent(parent);
|
|
|
}
|
|
|
- return parent ? parent.code : '';
|
|
|
+ return parent ? parent.name : '';
|
|
|
};
|
|
|
const get08Bw = function(tree, data) {
|
|
|
let parent = tree.getParent(data);
|
|
|
- let lastXmjCode = '', level4XmjCode = '';
|
|
|
+ let lastXmj = '', level4Xmj = '';
|
|
|
while (parent) {
|
|
|
- if (parent.code && !lastXmjCode) lastXmjCode = parent.code;
|
|
|
- if (parent.code && parent.level === 4) level4XmjCode = parent.code;
|
|
|
+ if (parent.code && !lastXmj) lastXmj = parent.name;
|
|
|
+ if (parent.code && parent.level === 4) level4Xmj = parent.name;
|
|
|
parent = tree.getParent(parent);
|
|
|
}
|
|
|
- return level4XmjCode || lastXmjCode;
|
|
|
+ return level4Xmj || lastXmj;
|
|
|
};
|
|
|
const getBw = function (data) {
|
|
|
if (!data.b_code) return '';
|