Merge branch 'develop' into develop-zhouyi

develop/@gms/gms-plugin-billexpand/package.json

 {
   "name": "@gms/gms-plugin-billexpand",
-  "version": "0.0.5-SNAPSHOT",
+  "version": "0.0.6",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

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

@@ -14,8 +14,8 @@ export default {
             let tmpField = subField.FieldCode;
             let subTableObject = context.getTableType(subField.FieldTableCode)
             let oldIndex = context.getSubFocus()
-            let focusData = context.getAllSubData()[subTableObject.title][oldIndex].getData()
-            if (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value)) {
+            let focusData = oldIndex && context.getAllSubData()[subTableObject.title][oldIndex].getData()
+            if (focusData && (!_.isEqual(focusData[tmpField]._field_old_value_, focusData[tmpField].value) || !_.isEmpty(focusData[tmpField].value))) {
                 focusData[tmpField]._field_old_value_ = focusData[tmpField].value = null
                 context.refreshSubDataRow(subTableObject.title);
             }

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

@@ -25,8 +25,9 @@ export default {
             }
             if (targetObject.type === "sub") {
                 let subTableFocusOldIndex = context.getSubFocus()
-                let subTableFocusData = context.getAllSubData()[targetObject.title][subTableFocusOldIndex].getData()
+                let subTableFocusData = subTableFocusOldIndex && context.getAllSubData()[targetObject.title][subTableFocusOldIndex].getData()
                 let oldIndex = context.getSubFocus()
+                if(subTableFocusData){
                     switch (valueType) {
                         case  FormulaConstants.billFiled.BMJJFL: {
                             let comp1 = arguments[0][2].getResult().Value;
@@ -85,6 +86,7 @@ export default {
                             console.log("")
                         }
                     }
+                }
             } else {
                 console.error("SetSubFieldValue公式配置错误,暂不支持主表字段赋值")
                 return null

solution.json

@@ -101,7 +101,7 @@
 			},
 			{
 				"name": "gms-plugin-billexpand",
-				"version": "0.0.5-SNAPSHOT"
+				"version": "0.0.6"
 			},
 			{
 				"name": "gms-plugin-mainpage-reimburseBill",