Merge pull request #2908 from jumpserver/dev

[Update] 修复创建资产是协议bug

apps/assets/templates/assets/asset_create.html

@@ -164,9 +164,15 @@ $(document).ready(function () {
     if (protocol === "") {
         return
     }
-    if (protocolLen === 0) {
-        protocolLen = protocolsRef.length;
-    }
+    var formNameNum = [0];
+    protocolsRef.children().find("select").each(function (i, v) {
+        var fieldName = $(v).attr("name");
+        var num = fieldName.split('-')[1];
+        formNameNum.push(parseInt(num));
+    });
+
+    var protocolLenLast = Math.max(...formNameNum);
+    protocolLen = protocolLenLast + 1;
     var selectName = "form-" + protocolLen + "-name";
     var selectId = "id_" + selectName;
     var portName = "form-" + protocolLen + "-port";

apps/locale/zh/LC_MESSAGES/django.po

@@ -1216,7 +1216,7 @@ msgstr "连接"
 
 #: assets/serializers/asset.py:21
 msgid "Protocol format should {}/{}"
-msgstr ""
+msgstr "协议格式 {}/{}"
 
 #: assets/serializers/asset.py:38
 msgid "Protocol duplicate: {}"