Merge branch 'develop-fengjiansheng' into 'develop'

fix(@gms/gms-plugin-billexpand): 短路处理以避免赋值公式无限执行

See merge request GFP/RBC/rbc-frontend!151

develop/@gms/gms-plugin-billexpand/src/formula/SetDefaultValue.js

@@ -35,9 +35,14 @@ export default {
             if (targetField instanceof BillDataNode) {
                 let tableObj = bill.getTableType(targetField.FieldTableCode);
                 if (tableObj.type == "master") {
+                    let res = propName ? result[propName] : result
                     oldVal = targetField.dynamicNodeFactory.methodJson.GetFieldData('',targetFieldLink, '')
-                    if (recoverFlag == 1 || !oldVal) {
-                        targetField.dynamicNodeFactory.methodJson.SetFieldData('', targetFieldLink, propName ? result[propName] : result, '')
+                    if (oldVal instanceof Object && res instanceof Object && "id" in oldVal && "id" in res && oldVal.id === res.id ) {
+                        // short circuit to avoid loop call
+                    }else{
+                        if (recoverFlag === 1 || !oldVal) {
+                            targetField.dynamicNodeFactory.methodJson.SetFieldData('', targetFieldLink, res, '')
+                        }
                     }
                 } else {
                     let _data = bill.getSubData(tableObj.title);
@@ -65,4 +70,4 @@ export default {
     getResultType: function () {
         return FMR.ConstDataTypes.General;
     }
-}
+}
\ No newline at end of file