Merge branch 'develop-yinliqian' into 'develop'

修改保存提示

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

develop/@gms/gms-plugin-billexpand/src/actions/util/errorMessageUtil.js

@@ -60,18 +60,36 @@ export default {
     },
     tempSaveAction: {
         commonMessage: "暂存失败，请联系系统管理员。",
+        customMessageList: [
+            {
+                preMessage: "More than one row with the given identifier was found",
+                convertMessage: "multiBaseDataError"
+            },
+            {
+                preMessage: "formulaError:",
+                convertMessage: "backFormulaError",
+            }
+        ],
+        getErrorBaseDataName(a) {
+            if (!a || !_.isString(a)) {
+                return "";
+            }
+            let reg = /(?<=datamodel\.).*?(?=;)/;
+            let targetString = a.match(reg);
+            return targetString ? targetString[0] : "";
+        },
         getErrorMessage(a) {
             if (!a || !_.isString(a)) {
                 return this.commonMessage;
             }
             let errorPreMessage = "";
-            for (let i = 0; i < this.saveAction.customMessageList.length; i++) {
-                if (a.indexOf(this.saveAction.customMessageList[i].preMessage) > -1) {
-                    errorPreMessage = this.saveAction.customMessageList[i].convertMessage;
+            for (let i = 0; i < this.customMessageList.length; i++) {
+                if (a.indexOf(this.customMessageList[i].preMessage) > -1) {
+                    errorPreMessage = this.customMessageList[i].convertMessage;
                     break;
                 }
             }
-            return errorPreMessage === "" ? (a?a:this.commonMessage) : errorPreMessage + this.saveAction.getErrorBaseDataName(a);
+            return errorPreMessage === "" ? (a?a:this.commonMessage) : errorPreMessage + this.getErrorBaseDataName(a);
         },
         getCommonMessage(){
             return this.commonMessage;