Merge pull request #1344 from WeBankPartners/dev

Dev

Author: zgyzgyhero

cmdb-server/api/v1/ci/ci_data.go

@@ -265,7 +265,7 @@ func SimpleCiDataImport(c *gin.Context) {
 			}
 			if attrObj, ok := attrIndexMap[k]; ok {
 				if attrObj.InputType == "ref" {
-					if tmpGuidList, tmpErr := db.GetGuidByKeyName(attrObj.RefCiType, []string{v}); tmpErr != nil {
+					if tmpGuidList, tmpErr := db.GetGuidByKeyNameOrGuid(attrObj.RefCiType, []string{v}); tmpErr != nil {
 						err = tmpErr
 						break
 					} else {
@@ -277,7 +277,7 @@ func SimpleCiDataImport(c *gin.Context) {
 						}
 					}
 				} else if attrObj.InputType == "multiRef" {
-					if tmpGuidList, tmpErr := db.GetGuidByKeyName(attrObj.RefCiType, strings.Split(v, ",")); tmpErr != nil {
+					if tmpGuidList, tmpErr := db.GetGuidByKeyNameOrGuid(attrObj.RefCiType, strings.Split(v, ",")); tmpErr != nil {
 						err = tmpErr
 						break
 					} else {

cmdb-server/services/db/ci_data.go

@@ -2184,15 +2184,22 @@ func getMultiStringInputTypeValue(inputType, value string) []string {
 	return result
 }
 
-func GetGuidByKeyName(ciType string, keyNameList []string) (guidList []string, err error) {
+func GetGuidByKeyNameOrGuid(ciType string, keyNameList []string) (guidList []string, err error) {
 	if len(keyNameList) == 0 {
 		return
 	}
 	dataRows, queryErr := x.QueryString(fmt.Sprintf("select guid,key_name from `%s` where key_name in ('%s')", ciType, strings.Join(keyNameList, "','")))
 	if queryErr != nil {
-		err = fmt.Errorf("query %s table fail,%s ", ciType, queryErr.Error())
+		err = fmt.Errorf("query %s table with key_name fail,%s ", ciType, queryErr.Error())
 		return
 	}
+	if len(dataRows) == 0 {
+		dataRows, queryErr = x.QueryString(fmt.Sprintf("select guid,key_name from `%s` where guid in ('%s')", ciType, strings.Join(keyNameList, "','")))
+		if queryErr != nil {
+			err = fmt.Errorf("query %s table with guid fail,%s ", ciType, queryErr.Error())
+			return
+		}
+	}
 	for _, v := range dataRows {
 		guidList = append(guidList, v["guid"])
 	}

cmdb-server/services/db/ci_data_rule.go

@@ -51,10 +51,10 @@ func buildAutofillValue(columnMap map[string]string, rule, attrInputType string)
 			err = fmt.Errorf("buildCalcFillValue fail,%s ", calcErr.Error())
 			return
 		}
-		if calcResult < 0 {
-			err = fmt.Errorf("buildCalcFillValue fail,value:%3.f < 0", calcResult)
-			return
-		}
+		// if calcResult < 0 {
+		// 	err = fmt.Errorf("buildCalcFillValue fail,value:%3.f < 0", calcResult)
+		// 	return
+		// }
 		newValueList = append(newValueList, transFloatValueToString(fmt.Sprintf("%.3f", calcResult)))
 		log.Debug(nil, log.LOGGER_APP, "-----end buildAutofillValue with calcFillFlag", zap.Strings("result", newValueList))
 		return

cmdb-ui/src/pages/designing/ci-data.vue

@@ -854,7 +854,7 @@ export default {
       this.$refs[this.tableRef][0].resetModalLoading()
       if (statusCode === 'OK') {
         this.$Notice.success({
-          title: this.$t('add_data_success'),
+          title: this.$t('db_operation_successful'),
           desc: message
         })
         this.queryCiData()