Merge pull request #105 from lihsai0/bump-to-v1.0.17

Bump to v1.0.17
qiniu · Mar 24, 2022 · 8cf3748 · 8cf3748
2 parents 9ecc94c + a9519db
commit 8cf3748
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kodo-browser",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "license": "Apache-2.0",
   "author": {
     "name": "Rong Zhou",

diff --git a/src/renderer/main/files/modals/preview/restore-checker.html b/src/renderer/main/files/modals/preview/restore-checker.html
@@ -22,7 +22,7 @@
         <span ng-if="storageClassName==='deeparchive'">
             {{'restore.checker.hint.deepArchive.unfreezing' | translate}}
         </span>
-    </div>ert
+    </div>
     <div ng-if="info.type==3" class="text-center bg-primary pd-4">
         <!-- 归档/深度归档文件已恢复 -->
         <span ng-if="storageClassName==='archive'">

diff --git a/src/renderer/main/files/modals/rename-modal.html b/src/renderer/main/files/modals/rename-modal.html
@@ -23,12 +23,12 @@ <h4 class="modal-title text-info">
     <div class="form-group" ng-class="{'has-error': form1.name.$dirty && !form1.name.$valid,
   'has-success': form1.name.$dirty && form1.name.$valid}">
 
-      <label class="col-sm-3 control-label" for="name">
+      <label class="col-sm-3 control-label" for="rename-input">
         <!-- 重命名: -->
         {{'rename.to'|translate}}:
       </label>
       <div class="col-sm-8">
-        <input type="text" ng-model="item.name" id="name1" autocomplete="off" autofocus name="name" required="required"
+        <input type="text" ng-model="item.name" id="rename-input" autocomplete="off" autofocus name="name" required="required"
           class="input-md form-control" ng-pattern="reg.folderName" />
       </div>
 

diff --git a/src/renderer/main/files/modals/rename-modal.js b/src/renderer/main/files/modals/rename-modal.js
@@ -43,7 +43,7 @@ webModule
         cancel: cancel,
         onSubmit: onSubmit,
         reg: {
-          folderName: /^[^\/]+$/
+          folderName: /^[^\/]((?!\/\/).)*[^\/]$/
         },
         isLoading: false,
         error_message: null