From 124a162f280e38a5fc1310427bec89d6847b3fa5 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 6 Sep 2021 10:35:20 +0800
Subject: [PATCH 1/3] fix issue 355

---
 templates/repo/modelarts/new.tmpl | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/templates/repo/modelarts/new.tmpl b/templates/repo/modelarts/new.tmpl
index 5664de181..3cebd4e09 100755
--- a/templates/repo/modelarts/new.tmpl
+++ b/templates/repo/modelarts/new.tmpl
@@ -114,13 +114,14 @@
 
                     <div class="inline field">
                         <label>数据集</label>
-                        <input type="text" list="cloudbrain_dataset" placeholder="选择数据集" name="attachment" autofocus maxlength="36">
+                        <input type="text" list="cloudbrain_dataset" placeholder="选择数据集" name="" id="answerInput" autofocus maxlength="36">
                         <datalist id="cloudbrain_dataset" class="ui search" style='width:385px' name="attachment">
                             {{range .attachments}}
-                                <option name="attachment" value="{{.UUID}}">{{.Attachment.Name}}</option>
+                                <option name="attachment" data-value="{{.UUID}}">{{.Attachment.Name}}</option>
 
                             {{end}}
                         </datalist>
+                        <input type="hidden" name="attachment" id="answerInput-hidden">
                     </div>
 
                     <div class="inline required field">
@@ -187,4 +188,23 @@
             }
         })
     })
+    document.querySelector('input[list]').addEventListener('input',function(e){
+        var input = e.target,
+        list = input.getAttribute('list'),
+        options = document.querySelectorAll('#'+list+' option'),
+        hiddenInput = document.getElementById(input.getAttribute('id')+'-hidden'),
+        inputValue = input.value;
+        hiddenInput.value = inputValue;
+        for (let i=0;i<options.length;i++){
+            var option = options[i]
+            if(option.innerText===inputValue){
+                
+                hiddenInput.value = option.getAttribute('data-value');
+                break
+            
+            }
+        }
+
+
+    })
 </script>
\ No newline at end of file

From 3a0975b80e0030b019c9b0b3bf2e37b303de783e Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 6 Sep 2021 10:54:47 +0800
Subject: [PATCH 2/3] fix issue #274

---
 options/locale/locale_zh-CN.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
index 89db6536c..4a3e910f9 100755
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
@@ -335,7 +335,7 @@ SSPIDefaultLanguage=默认语言
 
 require_error=不能为空。
 alpha_dash_error=应该只包含字母数字、破折号 ('-') 和下划线 ('_') 字符。
-alpha_dash_dot_error=' 应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。
+alpha_dash_dot_error=应该只包含字母数字, 破折号 ('-'), 下划线 ('_') 和点 ('. ') 。
 git_ref_name_error=` 必须是格式良好的 git 引用名称。`
 size_error=长度必须为 %s。
 min_size_error=长度最小为 %s 个字符。

From 7397696b773efd3e8e59b7b8f44f0bcbb60d4e06 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 8 Sep 2021 11:38:07 +0800
Subject: [PATCH 3/3] fix conflicts

---
 templates/repo/modelarts/new.tmpl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/templates/repo/modelarts/new.tmpl b/templates/repo/modelarts/new.tmpl
index f9ea86428..6020d45e6 100755
--- a/templates/repo/modelarts/new.tmpl
+++ b/templates/repo/modelarts/new.tmpl
@@ -117,12 +117,7 @@
                         <input type="text" list="cloudbrain_dataset" placeholder="选择数据集" name="" id="answerInput" autofocus maxlength="36">
                         <datalist id="cloudbrain_dataset" class="ui search" style='width:385px' name="attachment">
                             {{range .attachments}}
-<<<<<<< HEAD
-                                <option name="attachment" data-value="{{.UUID}}">{{.Attachment.Name}}</option>
-
-=======
                                 <option name="attachment" value="{{.UUID}}">{{.Attachment.Name}}</option>
->>>>>>> 14902388b9cc70d0ee65d1f67f1e6cd9d26053cb
                             {{end}}
                         </datalist>
                         <input type="hidden" name="attachment" id="answerInput-hidden">