build

skytotwo · Mar 30, 2022 · 7ba28a9 · 7ba28a9
1 parent bec72df
commit 7ba28a9
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "DooTask",
-    "version": "0.12.36",
+    "version": "0.12.40",
     "description": "DooTask is task management system.",
     "scripts": {
         "start": "./cmd dev",

diff --git a/public/css/app.css b/public/css/app.css
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/js/build/329.js b/public/js/build/329.js
diff --git a/public/js/build/425.js b/public/js/build/425.js
diff --git a/public/js/build/304.js → public/js/build/603.js b/public/js/build/304.js → public/js/build/603.js
diff --git a/public/js/build/304.js.LICENSE.txt → public/js/build/603.js.LICENSE.txt b/public/js/build/304.js.LICENSE.txt → public/js/build/603.js.LICENSE.txt
diff --git a/public/js/build/755.js b/public/js/build/755.js
diff --git a/public/js/build/862.js b/public/js/build/862.js
diff --git a/public/js/build/911.js b/public/js/build/911.js
diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue
@@ -1328,10 +1328,19 @@ export default {
                         this.shareList.splice(index, 1)
                     }
                 }
-            }).catch(({msg}) => {
+            }).catch(({ret, msg}) => {
                 item.loading = false;
                 item.permission = item._permission;
-                $A.modalError(msg)
+                if (ret === -3001) {
+                    $A.modalConfirm({
+                        content: '此文件夹内已有共享文件夹，子文件的共享状态将被取消，是否继续？',
+                        onOk: () => {
+                            this.onShare(true)
+                        }
+                    })
+                } else {
+                    $A.modalError(msg, force === true ? 301 : 0)
+                }
             })
         },