Merge branch 'master' of github.com:kuaifan/dootask-pro

docker-compose.yml

@@ -102,7 +102,7 @@ services:
 
   fileview:
     container_name: "dootask-fileview-${APP_ID}"
-    image: "kuaifan/fileview:4.1.0-SNAPSHOT-RC11"
+    image: "kuaifan/fileview:4.1.0-SNAPSHOT-RC13"
     environment:
       TZ: "Asia/Shanghai"
       KK_CONTEXT_PATH: "/fileview"

package.json

@@ -1,6 +1,6 @@
 {
     "name": "DooTask",
-    "version": "0.16.88",
+    "version": "0.16.99",
     "description": "DooTask is task management system.",
     "scripts": {
         "start": "./cmd dev",

public/js/hash

@@ -1 +1 @@
-c41197fd6554d6d9
+47e394382b435763

resources/assets/js/functions/eeui.js

@@ -21,6 +21,11 @@
             requireModuleJs("eeui").toast(object);
         },
 
+        eeuiAppRewriteUrl(val) {
+            if (!$A.isEEUiApp) return;
+            return requireModuleJs("eeui").rewriteUrl(val);
+        },
+
         eeuiAppOpenPage(object, callback) {
             if (!$A.isEEUiApp) return;
             if (typeof callback !== "function") callback = _ => {};

resources/assets/js/pages/manage/components/DialogView.vue

@@ -431,7 +431,7 @@ export default {
                     url: 'web.js',
                     params: {
                         titleFixed: true,
-                        url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                        url: $A.eeuiAppRewriteUrl(`../public/index.html#${uri}`)
                     },
                 });
             } else {

resources/assets/js/pages/manage/components/FileHistory.vue

@@ -205,7 +205,7 @@ export default {
                             url: 'web.js',
                             params: {
                                 titleFixed: true,
-                                url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                                url: $A.eeuiAppRewriteUrl(`../public/index.html#${uri}`)
                             },
                         });
                     } else {

resources/assets/js/pages/manage/components/TaskDetail.vue

@@ -1308,7 +1308,7 @@ export default {
                     url: 'web.js',
                     params: {
                         titleFixed: true,
-                        url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                        url: $A.eeuiAppRewriteUrl(`../public/index.html#${uri}`)
                     },
                 });
             } else {

resources/assets/js/pages/manage/file.vue

@@ -1030,7 +1030,7 @@ export default {
                     url: 'web.js',
                     params: {
                         titleFixed: true,
-                        url: $A.apiUrl(`../token?token=${this.userToken}&from=${encodeURIComponent($A.apiUrl(`..${uri}`))}`)
+                        url: $A.eeuiAppRewriteUrl(`../public/index.html#${uri}`)
                     },
                 });
             } else {

resources/mobile

@@ -1 +1 @@
-Subproject commit 9b8e410f6e25213ee871479374432c69648613d8
+Subproject commit 7af75419e19bc0f96923896326ffa05f9deff282