build

app/Http/Controllers/Api/UsersController.php

@@ -1067,7 +1067,7 @@ class UsersController extends AbstractController
     }
 
     /**
-     * @api {get} api/users/delete/account          20. 删除账户
+     * @api {get} api/users/delete/account          20. 删除帐号
      *
      * @apiDescription  需要token身份
      * @apiVersion 1.0.0

package.json

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

public/js/build/908.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkDooTask=self.webpackChunkDooTask||[]).push([[908],{1908:(t,e,n)=>{n.r(e),n.d(e,{default:()=>p});var a=n(20629),i=n(80641),s=n(9669),o=n.n(s);function r(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 c(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?r(Object(n),!0).forEach((function(e){u(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function u(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}const l={data:function(){return{version:window.systemInfo.version}},mounted:function(){},computed:c(c({},(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:"密码设置"},{path:"email",name:"修改邮箱"}];return["127.0.0.1:2222","dootask.com","www.dootask.com","t.hitosea.com"].includes($A.getDomain($A.apiUrl("../")))&&this.$isEEUiApp&&t.push.apply(t,[{path:"privacy",name:"隐私政策",divided:!0},{path:"delete",name:"删除帐号"}]),this.userIsAdmin?t.push.apply(t,[{path:"system",name:"系统设置",divided:!0},{path:"clearCache",name:"清除缓存"},{path:"logout",name:"退出登录"}]):t.push.apply(t,[{path:"clearCache",name:"清除缓存",divided:!0},{path:"logout",name:"退出登录"}]),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":this.openPrivacy();break;case"index":this.goForward({name:"manage-setting"});break;default:this.goForward({name:"manage-setting-"+t})}},openPrivacy:function(){var t=$A.apiUrl("../privacy.html");this.$isEEUiApp?$A.eeuiAppOpenPage({pageType:"app",pageTitle:" ",url:"web.js",params:{url:t,browser:!0,showProgress:!0}}):window.open(t)},classNameRoute:function(t,e){return{active:this.windowLarge&&this.routeName==="manage-setting-".concat(t),divided:!!e}},onVersion:function(){var t=this;this.$Electron&&o().get($A.apiUrl("system/version")).then((function(e){var n=e.status,a=e.data;if(200===n){var i="".concat(t.$L("服务器"),": ").concat($A.getDomain($A.apiUrl("../")));i+="<br/>".concat(t.$L("服务器版本"),": v").concat(a.version),i+="<br/>".concat(t.$L("客户端版本"),": v").concat(t.version),$A.modalInfo({content:i})}})).catch((function(t){}))}}};const p=(0,n(51900).Z)(l,(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",on:{click:t.onVersion}},[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/957.js

@@ -1 +0,0 @@
-"use strict";(self.webpackChunkDooTask=self.webpackChunkDooTask||[]).push([[957],{1957:(t,e,n)=>{n.r(e),n.d(e,{default:()=>d});var a=n(20629),i=n(80641),s=n(9669),o=n.n(s);function r(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 c(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?r(Object(n),!0).forEach((function(e){u(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}function u(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}const l={data:function(){return{version:window.systemInfo.version}},mounted:function(){},computed:c(c({},(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:"密码设置"},{path:"email",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:"退出登录"},{path:"delete",name:"删除账户",divided:!0}]):t.push.apply(t,[{path:"logout",name:"退出登录",divided:!0},{path:"delete",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":this.openPrivacy();break;case"index":this.goForward({name:"manage-setting"});break;default:this.goForward({name:"manage-setting-"+t})}},openPrivacy:function(){var t=$A.apiUrl("../privacy.html");this.$isEEUiApp?$A.eeuiAppOpenPage({pageType:"app",pageTitle:" ",url:"web.js",params:{url:t,browser:!0,showProgress:!0}}):window.open(t)},classNameRoute:function(t,e){return{active:this.windowLarge&&this.routeName==="manage-setting-".concat(t),divided:!!e}},onVersion:function(){var t=this;this.$Electron&&o().get($A.apiUrl("system/version")).then((function(e){var n=e.status,a=e.data;if(200===n){var i="".concat(t.$L("服务器"),": ").concat($A.getDomain($A.apiUrl("../")));i+="<br/>".concat(t.$L("服务器版本"),": v").concat(a.version),i+="<br/>".concat(t.$L("客户端版本"),": v").concat(t.version),$A.modalInfo({content:i})}})).catch((function(t){}))}}};const d=(0,n(51900).Z)(l,(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",on:{click:t.onVersion}},[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 @@
-63afb22d97ff5312
+a856b8ad0ec51482

resources/assets/js/components/RightBottom.vue

@@ -112,9 +112,9 @@ export default {
         showPrivacy() {
             return [
                 '127.0.0.1:2222',
-                't.hitosea.com',
                 'dootask.com',
-                'www.dootask.com'
+                'www.dootask.com',
+                't.hitosea.com',
             ].includes($A.getDomain($A.apiUrl('../'))) && this.$isEEUiApp && ['login'].includes(this.$route.name)
         }
     },

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

@@ -922,7 +922,7 @@ export default {
             } else {
                 // 发送
                 const tempId = $A.randNum(1000000000, 9999999999)
-                const typeLoad = $A.stringLength(msgText) > 2000
+                const typeLoad = $A.stringLength(msgText.replace(/<img[^>]*?>/g, '')) > 2000
                 const tempMsg = {
                     id: tempId,
                     dialog_id: this.dialogData.id,

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

@@ -31,7 +31,7 @@
             <div class="small-text">
                 <div>{{ $L('删除前，请确认以下事项：') }}</div>
                 <div>{{ $L('1、您将无法查看该账号内的任何信息，包括账号信息、文件记录、聊天记录、项目信息、团队成员信息等。') }}</div>
-                <div>{{ $L('2、若你是团队的所有者，请在删除您的账户前转移所有权。例如该账户所创建的项目（可将项目移交他人或删除项目）以及文件夹。') }}</div>
+                <div>{{ $L('2、若你是团队的所有者，请在删除您的帐号前转移所有权。例如该帐号所创建的项目（可将项目移交他人或删除项目）以及文件夹。') }}</div>
                 <div>{{ $L('3、您将退出所有群聊，无法查到过往消息和人员。') }}</div>
                 <div>{{ $L('4、请保证账号未被暂停使用。') }}</div>
             </div>

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

@@ -75,27 +75,29 @@ export default {
                 {path: 'password', name: '密码设置'},
                 {path: 'email', name: '修改邮箱'},
             ]
+
             if ([
                 '127.0.0.1:2222',
-                't.hitosea.com',
                 'dootask.com',
-                'www.dootask.com'
+                'www.dootask.com',
+                't.hitosea.com',
             ].includes($A.getDomain($A.apiUrl('../'))) && this.$isEEUiApp) {
-                menu.push({path: 'privacy', name: '隐私政策'})
-            }
-            if (this.windowSmall) {
-                menu.push({path: 'clearCache', name: '清除缓存'})
+                menu.push(...[
+                    {path: 'privacy', name: '隐私政策', divided: true},
+                    {path: 'delete', name: '删除帐号'},
+                ])
             }
+
             if (this.userIsAdmin) {
                 menu.push(...[
                     {path: 'system', name: '系统设置', divided: true},
+                    {path: 'clearCache', name: '清除缓存'},
                     {path: 'logout', name: '退出登录'},
-                    {path: 'delete', name: '删除账户', divided: true},
                 ])
             } else {
                 menu.push(...[
-                    {path: 'logout', name: '退出登录', divided: true},
-                    {path: 'delete', name: '删除账户', divided: true},
+                    {path: 'clearCache', name: '清除缓存', divided: true},
+                    {path: 'logout', name: '退出登录'},
                 ])
             }
             return menu;

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

@@ -45,9 +45,9 @@ export default {
     mounted() {
         if ([
             '127.0.0.1:2222',
-            't.hitosea.com',
             'dootask.com',
-            'www.dootask.com'
+            'www.dootask.com',
+            't.hitosea.com',
         ].includes($A.getDomain($A.apiUrl('../')))) {
             this.appPush = true;
         }

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

@@ -951,10 +951,10 @@
                                         color: $primary-title-color;
 
                                         &.me {
-                                            font-size: 14px;
-                                            font-weight: normal;
-                                            padding: 3px 0;
-                                            background-color: transparent;
+                                            font-size: inherit;
+                                            font-weight: inherit;
+                                            padding: inherit;
+                                            background-color: inherit;
                                         }
                                     }
                                 }

resources/mobile

@@ -1 +1 @@
-Subproject commit c0dc440b2fb4e1b4db520ad37c81c169d491535c
+Subproject commit dfa5386fdf5ccbb54152511995b319081e5ad8dd