build

public/js/build/512.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkDooTask=self.webpackChunkDooTask||[]).push([[512],{81030:(t,e,n)=>{n.r(e),n.d(e,{default:()=>u});var a=n(20629),i=n(80641);function s(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,a)}return n}function o(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?s(Object(n),!0).forEach((function(e){r(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):s(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function r(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}const c={data:function(){return{version:window.systemInfo.version}},mounted:function(){},computed:o(o({},(0,a.rn)(["userInfo","userIsAdmin","clientNewVersion"])),{},{routeName:function(){return this.$route.name},show768Menu:function(){return"manage-setting"===this.routeName},menu:function(){var t=[{path:"personal",name:"个人设置"},{path:"language",name:"语言设置"},{path:"password",name:"密码设置"}];return["127.0.0.1:2222","t.hitosea.com","dootask.com","www.dootask.com"].includes($A.getDomain($A.apiUrl("../")))&&this.$isEEUiApp&&t.push({path:"privacy",name:"隐私政策"}),this.windowSmall&&t.push({path:"clearCache",name:"清除缓存"}),this.userIsAdmin?t.push.apply(t,[{path:"system",name:"系统设置",divided:!0},{path:"logout",name:"退出登录"}]):t.push.apply(t,[{path:"logout",name:"退出登录",divided:!0}]),t},titleNameRoute:function(){var t=this.routeName,e=this.menu,n="";return e.some((function(e){if(t==="manage-setting-".concat(e.path))return n=e.name,!0})),n||"设置"}}),watch:{routeName:{handler:function(t){"manage-setting"===t&&this.windowLarge&&this.goForward({name:"manage-setting-personal"},!0)},immediate:!0}},methods:{toggleRoute:function(t){var e=this;switch(t){case"clearCache":this.$store.dispatch("handleClearCache",null).then((function(){$A.setStorage("clearCache",$A.randomString(6)),$A.reloadUrl()})).catch((function(){$A.reloadUrl()}));break;case"logout":$A.modalConfirm({title:"退出登录",content:"你确定要登出系统？",onOk:function(){e.$store.dispatch("logout",!1)}});break;case"version":i.Store.set("updateNotification",null);break;case"privacy":window.open($A.apiUrl("../privacy.html"));break;case"index":this.goForward({name:"manage-setting"});break;default:this.goForward({name:"manage-setting-"+t})}},classNameRoute:function(t,e){return{active:this.windowLarge&&this.routeName==="manage-setting-".concat(t),divided:!!e}}}};const u=(0,n(51900).Z)(c,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"page-setting"},[n("PageTitle",{attrs:{title:t.$L(t.titleNameRoute)}}),t._v(" "),n("div",{staticClass:"setting-head"},[n("div",{staticClass:"setting-titbox"},[n("div",{staticClass:"setting-title"},[n("h1",[t._v(t._s(t.$L("设置")))]),t._v(" "),t.show768Menu?t._e():n("div",{staticClass:"setting-more",on:{click:function(e){return t.toggleRoute("index")}}},[n("Icon",{attrs:{type:"md-close"}})],1)])])]),t._v(" "),n("div",{staticClass:"setting-box"},[n("div",{staticClass:"setting-menu",class:{"show768-menu":t.show768Menu}},[n("ul",[t._l(t.menu,(function(e,a){return n("li",{key:a,class:t.classNameRoute(e.path,e.divided),on:{click:function(n){return t.toggleRoute(e.path)}}},[t._v(t._s(t.$L(e.name)))])})),t._v(" "),t.clientNewVersion?n("li",{class:t.classNameRoute("version",!0),on:{click:function(e){return t.toggleRoute("version")}}},[n("AutoTip",{attrs:{disabled:""}},[t._v(t._s(t.$L("版本"))+": "+t._s(t.version))]),t._v(" "),n("Badge",{attrs:{text:t.clientNewVersion}})],1):n("li",{staticClass:"version divided"},[n("AutoTip",[t._v(t._s(t.$L("版本"))+": "+t._s(t.version))])],1)],2)]),t._v(" "),n("div",{staticClass:"setting-content"},[n("div",{staticClass:"setting-content-title"},[t._v(t._s(t.$L(t.titleNameRoute)))]),t._v(" "),n("div",{staticClass:"setting-content-view"},[n("router-view",{staticClass:"setting-router-view"})],1)])])],1)}),[],!1,null,null,null).exports}}]);

public/js/build/9.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunkDooTask=self.webpackChunkDooTask||[]).push([[9],{95009:(t,e,n)=>{n.r(e),n.d(e,{default:()=>u});var s=n(20629),a=n(80641);function i(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var s=Object.getOwnPropertySymbols(t);e&&(s=s.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,s)}return n}function o(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?i(Object(n),!0).forEach((function(e){r(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):i(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function r(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}const c={data:function(){return{version:window.systemInfo.version}},mounted:function(){},computed:o(o({},(0,s.rn)(["userInfo","userIsAdmin","clientNewVersion"])),{},{routeName:function(){return this.$route.name},show768Menu:function(){return"manage-setting"===this.routeName},menu:function(){var t=[{path:"personal",name:"个人设置"},{path:"language",name:"语言设置"},{path:"password",name:"密码设置"}];return this.windowSmall&&t.push({path:"clearCache",name:"清除缓存"}),this.userIsAdmin?t.push.apply(t,[{path:"system",name:"系统设置",divided:!0},{path:"logout",name:"退出登录"}]):t.push.apply(t,[{path:"logout",name:"退出登录",divided:!0}]),t},titleNameRoute:function(){var t=this.routeName,e=this.menu,n="";return e.some((function(e){if(t==="manage-setting-".concat(e.path))return n=e.name,!0})),n||"设置"}}),watch:{routeName:{handler:function(t){"manage-setting"===t&&this.windowLarge&&this.goForward({name:"manage-setting-personal"},!0)},immediate:!0}},methods:{toggleRoute:function(t){var e=this;switch(t){case"clearCache":this.$store.dispatch("handleClearCache",null).then((function(){$A.setStorage("clearCache",$A.randomString(6)),$A.reloadUrl()})).catch((function(){$A.reloadUrl()}));break;case"logout":$A.modalConfirm({title:"退出登录",content:"你确定要登出系统？",onOk:function(){e.$store.dispatch("logout",!1)}});break;case"version":a.Store.set("updateNotification",null);break;case"index":this.goForward({name:"manage-setting"});break;default:this.goForward({name:"manage-setting-"+t})}},classNameRoute:function(t,e){return{active:this.windowLarge&&this.routeName==="manage-setting-".concat(t),divided:!!e}}}};const u=(0,n(51900).Z)(c,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"page-setting"},[n("PageTitle",{attrs:{title:t.$L(t.titleNameRoute)}}),t._v(" "),n("div",{staticClass:"setting-head"},[n("div",{staticClass:"setting-titbox"},[n("div",{staticClass:"setting-title"},[n("h1",[t._v(t._s(t.$L("设置")))]),t._v(" "),t.show768Menu?t._e():n("div",{staticClass:"setting-more",on:{click:function(e){return t.toggleRoute("index")}}},[n("Icon",{attrs:{type:"md-close"}})],1)])])]),t._v(" "),n("div",{staticClass:"setting-box"},[n("div",{staticClass:"setting-menu",class:{"show768-menu":t.show768Menu}},[n("ul",[t._l(t.menu,(function(e,s){return n("li",{key:s,class:t.classNameRoute(e.path,e.divided),on:{click:function(n){return t.toggleRoute(e.path)}}},[t._v(t._s(t.$L(e.name)))])})),t._v(" "),t.clientNewVersion?n("li",{class:t.classNameRoute("version",!0),on:{click:function(e){return t.toggleRoute("version")}}},[n("AutoTip",{attrs:{disabled:""}},[t._v(t._s(t.$L("版本"))+": "+t._s(t.version))]),t._v(" "),n("Badge",{attrs:{text:t.clientNewVersion}})],1):n("li",{staticClass:"version divided"},[n("AutoTip",[t._v(t._s(t.$L("版本"))+": "+t._s(t.version))])],1)],2)]),t._v(" "),n("div",{staticClass:"setting-content"},[n("div",{staticClass:"setting-content-title"},[t._v(t._s(t.$L(t.titleNameRoute)))]),t._v(" "),n("div",{staticClass:"setting-content-view"},[n("router-view",{staticClass:"setting-router-view"})],1)])])],1)}),[],!1,null,null,null).exports}}]);

public/js/hash

@@ -1 +1 @@
-98bec2a7b1410657
+c1bf6674aee83a3a

resources/assets/js/components/DrawerOverlay/index.vue

@@ -8,7 +8,7 @@
         :transition-names="[$A.isAndroid() ? '' : `drawer-slide-${placement}`, '']"
         :beforeClose="beforeClose"
         fullscreen
-        :class-name="`common-drawer-overlay ${placement}`">
+        :class-name="modalClass">
         <DrawerOverlayView
             :placement="placement"
             :size="size"
@@ -57,6 +57,9 @@ export default {
             type: Boolean,
             default: true
         },
+        className: {
+            type: String
+        },
         beforeClose: Function
     },
     data() {
@@ -72,6 +75,15 @@ export default {
             this.value !== v && this.$emit("input", v)
         }
     },
+    computed: {
+        modalClass() {
+            if (this.className) {
+                return `common-drawer-overlay ${this.className} ${this.placement}`
+            } else {
+                return `common-drawer-overlay ${this.placement}`
+            }
+        }
+    },
     methods: {
         onClose() {
             this.$refs.modal.close();

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

@@ -258,6 +258,7 @@
         <DrawerOverlay
             v-model="replyListShow"
             placement="right"
+            class-name="dialog-wrapper-reply-list"
             :size="500">
             <DialogWrapper
                 v-if="replyListShow && replyListItem"

resources/assets/js/pages/manage/setting/index.vue

@@ -147,6 +147,10 @@ export default {
                     Store.set('updateNotification', null);
                     break;
 
+                case 'privacy':
+                    window.open($A.apiUrl('../privacy.html'))
+                    break;
+
                 case 'index':
                     this.goForward({name: 'manage-setting'});
                     break;

resources/assets/js/pages/manage/setting/privacy.vue

@@ -1,22 +0,0 @@
-<template>
-    <div class="setting-item submit">
-        <IFrame class="privacy-iframe" :src="$A.apiUrl('../privacy.html')"/>
-    </div>
-</template>
-
-<style scoped>
-.privacy-iframe {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 100%;
-    height: 100%;
-    border: 0;
-}
-</style>
-<script>
-import IFrame from "../components/IFrame";
-export default {
-    components: {IFrame}
-}
-</script>

resources/assets/js/routes.js

@@ -54,11 +54,6 @@ export default [
                         path: 'system',
                         component: () => import('./pages/manage/setting/system.vue'),
                     },
-                    {
-                        name: 'manage-setting-privacy',
-                        path: 'privacy',
-                        component: () => import('./pages/manage/setting/privacy.vue'),
-                    },
                 ]
             },
             {

resources/assets/js/store/actions.js

@@ -2200,19 +2200,6 @@ export default {
             }
             dispatch("setLoad", loadKey)
             //
-            if (data.prev_id) {
-                const prevMsg = state.dialogMsgs.find(({prev_id}) => prev_id == data.prev_id)
-                if (prevMsg) {
-                    prevMsg.prev_id = 0
-                }
-            }
-            if (data.next_id) {
-                const nextMsg = state.dialogMsgs.find(({next_id}) => next_id == data.next_id)
-                if (nextMsg) {
-                    nextMsg.next_id = 0
-                }
-            }
-            //
             dispatch("call", {
                 url: 'dialog/msg/list',
                 data,
@@ -2231,6 +2218,20 @@ export default {
             }).catch(e => {
                 console.warn(e);
                 reject(e)
+            }).finally(_ => {
+                // 将原数据清除，避免死循环
+                if (data.prev_id) {
+                    const prevMsg = state.dialogMsgs.find(({prev_id}) => prev_id == data.prev_id)
+                    if (prevMsg) {
+                        prevMsg.prev_id = 0
+                    }
+                }
+                if (data.next_id) {
+                    const nextMsg = state.dialogMsgs.find(({next_id}) => next_id == data.next_id)
+                    if (nextMsg) {
+                        nextMsg.next_id = 0
+                    }
+                }
             });
         });
     },

resources/assets/sass/pages/components/dialog-wrapper.scss

@@ -15,6 +15,7 @@
 
     &.reply-list {
         border-radius: 18px 0 0 18px;
+        overflow: hidden;
 
         .dialog-nav {
             position: relative;
@@ -26,6 +27,7 @@
                 bottom: 0;
                 width: 100%;
                 height: 1px;
+                z-index: 1;
                 background-color: #f4f5f5;
             }
 
@@ -1112,6 +1114,11 @@
     }
 }
 
+.dialog-wrapper-reply-list {
+    position: absolute !important;
+    overflow: hidden !important;
+}
+
 @keyframes ani-dialog-shake {
     10%, 90% { transform: translate3d(-1px, 0, 0); }
     20%, 80% { transform: translate3d(+2px, 0, 0); }

resources/mobile

@@ -1 +1 @@
-Subproject commit 4ffdc7c01c76265599799248416319133b4130f0
+Subproject commit fe6f39173349723a04cae1966f1eb248b22a7c3d