|
@@ -205,7 +205,7 @@ class ImportBaseTree {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- static _assignRelaField(temp, node) {
|
|
|
+ _assignRelaField(temp, node) {
|
|
|
_.assignInWith(temp, node,
|
|
|
(objValue, srcValue, key) => { return ['name', 'unit'].indexOf(key) > -1 ? objValue : srcValue; });
|
|
|
}
|
|
@@ -471,13 +471,13 @@ class AnalysisExcelTree {
|
|
|
};
|
|
|
}
|
|
|
|
|
|
- static _isMatch11(tempData) {
|
|
|
+ _isMatch11(tempData) {
|
|
|
return _.find(tempData, x => {
|
|
|
return x.code.indexOf('-') > 0;
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- static _isMatch18(tempData) {
|
|
|
+ _isMatch18(tempData) {
|
|
|
return _.every(tempData, x => {
|
|
|
return !x.code || !!x.code.match(mainReg);
|
|
|
});
|