Merge commit 'c6b9dfff220858e5faee143f76ec1bc9a57ef4d5' into pro

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to this project will be documented in this file.
 
-## [0.29.61]
+## [0.29.64]
 
 ### Bug Fixes
 

app/Http/Controllers/Api/DialogController.php

@@ -405,6 +405,8 @@ class DialogController extends AbstractController
         if ($msg_type) {
             if ($msg_type === 'tag') {
                 $builder->where('tag', '>', 0);
+            } elseif ($msg_type === 'todo') {
+                $builder->where('todo', '>', 0);
             } elseif ($msg_type === 'link') {
                 $builder->whereLink(1);
             } elseif (in_array($msg_type, ['text', 'image', 'file', 'record', 'meeting'])) {

app/Http/Controllers/Api/ProjectController.php

@@ -979,10 +979,14 @@ class ProjectController extends AbstractController
         $builder->leftJoin('project_users', function ($query) {
             $query->on('project_tasks.project_id', '=', 'project_users.project_id')->where('project_users.owner', 1);
         });
+        $builder->leftJoin('project_task_users as project_p_task_users', function ($query) {
+            $query->on('project_p_task_users.task_pid', '=', 'project_tasks.parent_id');
+        });
         $builder->where(function ($query) use ($userid) {
             $query->where("project_tasks.is_all_visible", 1);
             $query->orWhere("project_users.userid", $userid);
             $query->orWhere("project_task_users.userid", $userid);
+            $query->orWhere("project_p_task_users.userid", $userid);
         });
         // 优化子查询汇总 
         $builder->leftJoinSub(function ($query) {
@@ -1778,7 +1782,7 @@ class ProjectController extends AbstractController
             'column_id' => $task->column_id,
             'times' => [$task->start_at, $task->end_at],
             'owner' => [User::userid()],
-            'is_all_visible' => 2,
+            'is_all_visible' => $task->is_all_visible,
         ]);
         $data = ProjectTask::oneTask($task->id);
         $pushUserIds = ProjectTaskUser::whereTaskId($task->id)->pluck('userid')->toArray();

app/Models/ProjectTask.php

@@ -371,8 +371,8 @@ class ProjectTask extends AbstractModel
         $p_color    = $data['p_color'];
         $top        = intval($data['top']);
         $userid     = User::userid();
-        $is_all_visible = $data['visibility_appoint'];
-        $visibility_userids = $data['visibility_appointor'];
+        $is_all_visible = isset($data['visibility_appoint']) ? $data['visibility_appoint'] : $data['is_all_visible'];
+        $visibility_userids = $data['visibility_appointor'] ?: [];
         //
         if (ProjectTask::whereProjectId($project_id)
                 ->whereNull('project_tasks.complete_at')
@@ -401,7 +401,7 @@ class ProjectTask extends AbstractModel
             'p_level' => $p_level,
             'p_name' => $p_name,
             'p_color' => $p_color,
-            'is_all_visible' => $is_all_visible
+            'is_all_visible' => $is_all_visible ?: 1
         ]);
         if ($content) {
             $task->desc = Base::getHtml($content, 100);
@@ -725,6 +725,7 @@ class ProjectTask extends AbstractModel
             if (Arr::exists($data, 'is_all_visible') || Arr::exists($data, 'visibility_appointor')) {
                 if (Arr::exists($data, 'is_all_visible')) {
                     ProjectTask::whereId($data['task_id'])->update(['is_all_visible' => $data["is_all_visible"]]);
+                    ProjectTask::whereParentId($data['task_id'])->update(['is_all_visible' => $data["is_all_visible"]]);
                 }
                 ProjectTaskUser::whereTaskId($data['task_id'])->whereOwner(2)->delete();
                 if (Arr::exists($data, 'visibility_appointor')) {

app/Models/WebSocketDialog.php

@@ -193,6 +193,7 @@ class WebSocketDialog extends AbstractModel
             $this->has_image = $msgBuilder->clone()->whereMtype('image')->exists();
             $this->has_file = $msgBuilder->clone()->whereMtype('file')->exists();
             $this->has_link = $msgBuilder->clone()->whereLink(1)->exists();
+            $this->has_todo = $msgBuilder->clone()->where('todo', '>', 0)->exists();
         }
         return $this;
     }

electron/package.json

@@ -67,6 +67,7 @@
         },
         "files": [
             "public/**/*",
+            "electron-menu.js",
             "electron-preload.js",
             "electron.js",
             "utils.js"

language/original-web.txt

@@ -1335,3 +1335,5 @@ AI机器人
 复制图片地址
 图片保存失败
 图片无法保存
+
+事项

language/translate.json

@@ -17686,5 +17686,16 @@
         "de": "Die tastatureinstellung",
         "fr": "Réglage du clavier",
         "id": "Pengaturan papan ketik"
+    },
+    {
+        "key": "事项",
+        "zh": "",
+        "zh-CHT": "事項",
+        "en": "Todo",
+        "ko": "사항",
+        "ja": "事項です",
+        "de": "Todo",
+        "fr": "Todo",
+        "id": "Todo"
     }
-]
+]

package.json

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

public/images/dialog/todo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1691334156944" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20927" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M351.1 644.3m-40.2 0a40.2 40.2 0 1 0 80.4 0 40.2 40.2 0 1 0-80.4 0Z" p-id="20928" fill="#9D95E5"></path><path d="M489 764.8C489 638.1 592.1 535 718.9 535c69 0 130.2 31.2 172.4 79.4V178.7c0-50.6-41.4-91.9-91.9-91.9H224.7c-50.6 0-91.9 41.4-91.9 91.9v666.5c0 50.8 41.2 91.9 91.9 91.9h343.7C520.2 895 489 833.8 489 764.8z m69-471h183.9c15.8 0 28.7 12.9 28.7 28.7s-12.9 28.7-28.7 28.7H558c-15.8 0-28.7-12.9-28.7-28.7s12.8-28.7 28.7-28.7zM351.1 742c-53.9 0-97.7-43.8-97.7-97.7 0-53.9 43.8-97.7 97.7-97.7s97.7 43.8 97.7 97.7c0 53.9-43.8 97.7-97.7 97.7z m112.3-445.1L348.5 411.8c-5.6 5.6-13 8.4-20.3 8.4s-14.7-2.8-20.3-8.4l-46-46c-11.2-11.2-11.2-29.4 0-40.6 11.2-11.2 29.4-11.2 40.7 0l25.6 25.6 94.6-94.6c11.2-11.2 29.4-11.2 40.7 0 11.1 11.3 11.1 29.5-0.1 40.7z" p-id="20929" fill="#9D95E5"></path><path d="M718.9 592.4c-95.2 0-172.4 77.2-172.4 172.4s77.2 172.4 172.4 172.4S891.3 860 891.3 764.8c-0.1-95.2-77.2-172.4-172.4-172.4z m76.2 248.7c-5.6 5.6-12.9 8.4-20.3 8.4s-14.7-2.8-20.3-8.4l-55.9-55.9c-0.4-0.4-0.6-1-1-1.5-2.1-2.4-4-4.9-5.2-7.8-1.4-3.4-2.1-6.9-2.1-10.5 0-0.2-0.1-0.3-0.1-0.5V681c0-15.8 12.9-28.7 28.7-28.7 15.8 0 28.7 12.9 28.7 28.7v72l47.5 47.5c11.2 11.2 11.2 29.3 0 40.6z" p-id="20930" fill="#9D95E5"></path></svg>

public/js/emoticon.all.js

@@ -5,40 +5,40 @@
             "path": "18",
             "icon": "icon.png",
             "list": [
-                {"name": "爱你", "key": "爱你哟 爱老虎油 爱你啦 亲亲 亲一个 啵啵", "path": "1.gif"},
-                {"name": "搬砖", "key": "工作 努力", "path": "2.gif"},
-                {"name": "不愧是精英", "key": "精英 大佬 厉害 真棒 你真棒 牛逼", "path": "3.gif"},
-                {"name": "不想理你", "key": "生气 不理 不开心", "path": "4.gif"},
-                {"name": "不想面对", "key": "瑟瑟发抖 体重", "path": "5.gif"},
-                {"name": "沉迷工作", "key": "工作 认真 做事 干活 电脑", "path": "6.gif"},
-                {"name": "打卡了么", "key": "打卡 上班 报", "path": "7.gif"},
-                {"name": "发生了啥", "key": "冒泡 浮出水面 八卦 露头", "path": "8.gif"},
-                {"name": "给你个眼神", "key": "眼神 真的 质疑 疑问 不确定", "path": "9.gif"},
-                {"name": "恭喜发财", "key": "新年好 新年 拜年", "path": "10.gif"},
-                {"name": "跪谢", "key": "谢谢 感动 跪", "path": "11.gif"},
-                {"name": "Hi", "key": "打招呼 欢迎 招呼 你好 好", "path": "12.gif"},
+                {"name": "爱你", "key": "爱你 爱你哟 爱老虎油 爱你啦 亲亲 亲一个 啵啵 比心 笔芯 爱心", "path": "1.gif"},
+                {"name": "搬砖", "key": "搬砖 工作 努力", "path": "2.gif"},
+                {"name": "不愧是精英", "key": "不愧是精英 精英 大佬 厉害 真棒 你真棒 牛逼 6 666 不愧是你 还得是你", "path": "3.gif"},
+                {"name": "不想理你", "key": "生气 不理 不开心 哼 不想理你", "path": "4.gif"},
+                {"name": "不想面对", "key": "不想面对 瑟瑟发抖 体重 担忧 不想理你 又胖了", "path": "5.gif"},
+                {"name": "沉迷工作", "key": "工作 认真 做事 干活 电脑 沉迷工作", "path": "6.gif"},
+                {"name": "打卡了么", "key": "打卡 上班 报 记得打卡", "path": "7.gif"},
+                {"name": "发生了啥", "key": "冒泡 浮出水面 发生了啥 八卦 露头 我看看 怎么个事 怎么了", "path": "8.gif"},
+                {"name": "给你个眼神", "key": "眼神 真的 质疑 疑问 不确定 给你个眼神", "path": "9.gif"},
+                {"name": "恭喜发财", "key": "恭喜发财 新年好 新年 拜年", "path": "10.gif"},
+                {"name": "跪谢", "key": "谢谢 感动 跪 多谢 THANKS THANK YOU 谢了", "path": "11.gif"},
+                {"name": "Hi", "key": "Hi 打招呼 欢迎 招呼 你好 好 哈喽 哈啰 hello 大家好", "path": "12.gif"},
                 {"name": "欢迎欢迎", "key": "欢迎 新人 兴奋 开心 庆祝 喝彩 气氛组", "path": "13.gif"},
-                {"name": "加油", "key": "喝彩 气氛组", "path": "14.gif"},
-                {"name": "静静看着你", "key": "静静 看着 不说话 沉默", "path": "15.gif"},
-                {"name": "开会啦", "key": "开会 会 通知 敲锣", "path": "16.gif"},
-                {"name": "可以吗", "key": "害羞 不好意思", "path": "17.gif"},
-                {"name": "迷之自信", "key": "自信 自我欣赏", "path": "18.gif"},
-                {"name": "明白", "key": "收到 好的 收", "path": "19.gif"},
-                {"name": "摸摸", "key": "摸头 你真乖 乖 棒", "path": "20.gif"},
-                {"name": "你真棒", "key": "大拇指 太棒了 太棒啦 棒棒棒 棒", "path": "21.gif"},
-                {"name": "佩服", "key": "五体投地 崇拜 仰慕 牛逼 厉害", "path": "22.gif"},
-                {"name": "撒花", "key": "欢迎 花 开心", "path": "23.gif"},
-                {"name": "生日快乐", "key": "吃蛋糕 蛋糕", "path": "24.gif"},
-                {"name": "收到", "key": "明白 好的 收 已阅 已读", "path": "25.gif"},
+                {"name": "加油", "key": "加油 喝彩 气氛组", "path": "14.gif"},
+                {"name": "静静看着你", "key": "静静 看着 不说话 沉默 静静看着你 无语 看你表演", "path": "15.gif"},
+                {"name": "开会啦", "key": "开会 会 通知 敲锣 开会啦 开会了", "path": "16.gif"},
+                {"name": "可以吗", "key": "可以吗 害羞 不好意思 脸红 可以 可以不", "path": "17.gif"},
+                {"name": "迷之自信", "key": "自信 迷之自信 自我欣赏 自恋 我真帅", "path": "18.gif"},
+                {"name": "明白", "key": "明白 收到 好的 收 OK", "path": "19.gif"},
+                {"name": "摸摸", "key": "摸摸 摸头 你真乖 乖 棒", "path": "20.gif"},
+                {"name": "你真棒", "key": "大拇指 你真棒 太棒了 太棒啦 棒棒棒 棒", "path": "21.gif"},
+                {"name": "佩服", "key": "佩服 五体投地 崇拜 仰慕 牛逼 厉害", "path": "22.gif"},
+                {"name": "撒花", "key": "撒花 欢迎 花 开心 耶 真好 真棒", "path": "23.gif"},
+                {"name": "生日快乐", "key": "生日快乐 吃蛋糕 蛋糕 生日", "path": "24.gif"},
+                {"name": "收到", "key": "明白 收到 好的 收 已阅 已读", "path": "25.gif"},
                 {"name": "送你花花", "key": "送花 送你花 花 兴奋 开心 庆祝 喝彩 气氛组", "path": "26.gif"},
-                {"name": "在线吃瓜", "key": "吃瓜 八卦", "path": "27.gif"},
-                {"name": "我错了", "key": "认错 错了 哭 难过", "path": "28.gif"},
-                {"name": "我太难了", "key": "太难了 难过 不开心 委屈", "path": "29.gif"},
-                {"name": "笑而不语", "key": "笑 不说话 静静 不发表", "path": "30.gif"},
-                {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助", "path": "31.gif"},
-                {"name": "幸福", "key": "满足 洗澡 泡澡", "path": "32.gif"},
-                {"name": "赞", "key": "大拇指 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒", "path": "33.gif"},
-                {"name": "走人了", "key": "下班 闪人 走人 溜人", "path": "34.gif"}
+                {"name": "在线吃瓜", "key": "吃瓜 八卦 看戏 看热闹 在线吃瓜 凑热闹 吃瓜群众 围观", "path": "27.gif"},
+                {"name": "我错了", "key": "认错 错了 哭 难过 悲伤 我错了 对不起 道歉", "path": "28.gif"},
+                {"name": "我太难了", "key": "我太难了 太难了 难过 不开心 委屈", "path": "29.gif"},
+                {"name": "笑而不语", "key": "笑 不说话 静静 不发表 沉默", "path": "30.gif"},
+                {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助 给点吧", "path": "31.gif"},
+                {"name": "幸福", "key": "幸福 满足 洗澡 泡澡 开心", "path": "32.gif"},
+                {"name": "赞", "key": "大拇指 赞 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒 6 666 牛", "path": "33.gif"},
+                {"name": "走人了", "key": "下班 闪人 走人 溜人 走了 关机", "path": "34.gif"}
             ]
         },
         {

public/language/web/zh.js

@@ -1 +1 @@
-if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]
+if(typeof window.LANGUAGE_DATA==="undefined")window.LANGUAGE_DATA={};window.LANGUAGE_DATA["zh"]=["","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","","",""]

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

@@ -786,6 +786,9 @@ export default {
             if (this.dialogData.has_tag) {
                 array.push({type: 'tag', label: '标注'})
             }
+            if (this.dialogData.has_todo) {
+                array.push({type: 'todo', label: '事项'})
+            }
             if (this.dialogData.has_image) {
                 array.push({type: 'image', label: '图片'})
             }
@@ -1416,6 +1419,10 @@ export default {
                     if (!item.tag) {
                         return false
                     }
+                } else if (this.msgType === 'todo') {
+                    if (!item.todo) {
+                        return false
+                    }
                 } else if (this.msgType === 'link') {
                     if (!item.link) {
                         return false

resources/assets/js/store/actions.js

@@ -2297,6 +2297,9 @@ export default {
                 if (data.mtype == 'tag') {
                     updateData.has_tag = true;
                 }
+                if (data.mtype == 'todo') {
+                    updateData.has_todo = true;
+                }
                 if (data.mtype == 'image') {
                     updateData.has_image = true;
                 }

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

@@ -308,6 +308,10 @@
                                 background-image: url("../images/dialog/tag.svg");
                             }
 
+                            &.todo i {
+                                background-image: url("../images/dialog/todo.svg");
+                            }
+
                             &.project i {
                                 background-image: url("../images/dialog/project.svg");
                             }

resources/assets/sass/pages/components/task-detail.scss

@@ -266,9 +266,12 @@
                             .file-name {
                                 color: $primary-text-color;
                                 padding-left: 8px;
-                                overflow: hidden;
+                                word-break: break-all;
                                 text-overflow: ellipsis;
-                                white-space: nowrap;
+                                overflow: hidden;
+                                display: -webkit-box;
+                                -webkit-line-clamp: 1;
+                                -webkit-box-orient: vertical;
                             }
                             .file-size {
                                 flex-shrink: 0;
@@ -454,10 +457,14 @@
                 .el-dropdown {
                     max-width: 100%;
                     .add-button {
+                        white-space: normal;
                         > em {
-                            overflow: hidden;
+                            word-break: break-all;
                             text-overflow: ellipsis;
-                            white-space: nowrap;
+                            overflow: hidden;
+                            display: -webkit-box;
+                            -webkit-line-clamp: 1;
+                            -webkit-box-orient: vertical;
                         }
                     }
                 }

resources/assets/statics/public/images/dialog/todo.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1691334156944" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20927" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M351.1 644.3m-40.2 0a40.2 40.2 0 1 0 80.4 0 40.2 40.2 0 1 0-80.4 0Z" p-id="20928" fill="#9D95E5"></path><path d="M489 764.8C489 638.1 592.1 535 718.9 535c69 0 130.2 31.2 172.4 79.4V178.7c0-50.6-41.4-91.9-91.9-91.9H224.7c-50.6 0-91.9 41.4-91.9 91.9v666.5c0 50.8 41.2 91.9 91.9 91.9h343.7C520.2 895 489 833.8 489 764.8z m69-471h183.9c15.8 0 28.7 12.9 28.7 28.7s-12.9 28.7-28.7 28.7H558c-15.8 0-28.7-12.9-28.7-28.7s12.8-28.7 28.7-28.7zM351.1 742c-53.9 0-97.7-43.8-97.7-97.7 0-53.9 43.8-97.7 97.7-97.7s97.7 43.8 97.7 97.7c0 53.9-43.8 97.7-97.7 97.7z m112.3-445.1L348.5 411.8c-5.6 5.6-13 8.4-20.3 8.4s-14.7-2.8-20.3-8.4l-46-46c-11.2-11.2-11.2-29.4 0-40.6 11.2-11.2 29.4-11.2 40.7 0l25.6 25.6 94.6-94.6c11.2-11.2 29.4-11.2 40.7 0 11.1 11.3 11.1 29.5-0.1 40.7z" p-id="20929" fill="#9D95E5"></path><path d="M718.9 592.4c-95.2 0-172.4 77.2-172.4 172.4s77.2 172.4 172.4 172.4S891.3 860 891.3 764.8c-0.1-95.2-77.2-172.4-172.4-172.4z m76.2 248.7c-5.6 5.6-12.9 8.4-20.3 8.4s-14.7-2.8-20.3-8.4l-55.9-55.9c-0.4-0.4-0.6-1-1-1.5-2.1-2.4-4-4.9-5.2-7.8-1.4-3.4-2.1-6.9-2.1-10.5 0-0.2-0.1-0.3-0.1-0.5V681c0-15.8 12.9-28.7 28.7-28.7 15.8 0 28.7 12.9 28.7 28.7v72l47.5 47.5c11.2 11.2 11.2 29.3 0 40.6z" p-id="20930" fill="#9D95E5"></path></svg>

resources/assets/statics/public/js/emoticon.all.js

@@ -5,40 +5,40 @@
             "path": "18",
             "icon": "icon.png",
             "list": [
-                {"name": "爱你", "key": "爱你哟 爱老虎油 爱你啦 亲亲 亲一个 啵啵", "path": "1.gif"},
-                {"name": "搬砖", "key": "工作 努力", "path": "2.gif"},
-                {"name": "不愧是精英", "key": "精英 大佬 厉害 真棒 你真棒 牛逼", "path": "3.gif"},
-                {"name": "不想理你", "key": "生气 不理 不开心", "path": "4.gif"},
-                {"name": "不想面对", "key": "瑟瑟发抖 体重", "path": "5.gif"},
-                {"name": "沉迷工作", "key": "工作 认真 做事 干活 电脑", "path": "6.gif"},
-                {"name": "打卡了么", "key": "打卡 上班 报", "path": "7.gif"},
-                {"name": "发生了啥", "key": "冒泡 浮出水面 八卦 露头", "path": "8.gif"},
-                {"name": "给你个眼神", "key": "眼神 真的 质疑 疑问 不确定", "path": "9.gif"},
-                {"name": "恭喜发财", "key": "新年好 新年 拜年", "path": "10.gif"},
-                {"name": "跪谢", "key": "谢谢 感动 跪", "path": "11.gif"},
-                {"name": "Hi", "key": "打招呼 欢迎 招呼 你好 好", "path": "12.gif"},
+                {"name": "爱你", "key": "爱你 爱你哟 爱老虎油 爱你啦 亲亲 亲一个 啵啵 比心 笔芯 爱心", "path": "1.gif"},
+                {"name": "搬砖", "key": "搬砖 工作 努力", "path": "2.gif"},
+                {"name": "不愧是精英", "key": "不愧是精英 精英 大佬 厉害 真棒 你真棒 牛逼 6 666 不愧是你 还得是你", "path": "3.gif"},
+                {"name": "不想理你", "key": "生气 不理 不开心 哼 不想理你", "path": "4.gif"},
+                {"name": "不想面对", "key": "不想面对 瑟瑟发抖 体重 担忧 不想理你 又胖了", "path": "5.gif"},
+                {"name": "沉迷工作", "key": "工作 认真 做事 干活 电脑 沉迷工作", "path": "6.gif"},
+                {"name": "打卡了么", "key": "打卡 上班 报 记得打卡", "path": "7.gif"},
+                {"name": "发生了啥", "key": "冒泡 浮出水面 发生了啥 八卦 露头 我看看 怎么个事 怎么了", "path": "8.gif"},
+                {"name": "给你个眼神", "key": "眼神 真的 质疑 疑问 不确定 给你个眼神", "path": "9.gif"},
+                {"name": "恭喜发财", "key": "恭喜发财 新年好 新年 拜年", "path": "10.gif"},
+                {"name": "跪谢", "key": "谢谢 感动 跪 多谢 THANKS THANK YOU 谢了", "path": "11.gif"},
+                {"name": "Hi", "key": "Hi 打招呼 欢迎 招呼 你好 好 哈喽 哈啰 hello 大家好", "path": "12.gif"},
                 {"name": "欢迎欢迎", "key": "欢迎 新人 兴奋 开心 庆祝 喝彩 气氛组", "path": "13.gif"},
-                {"name": "加油", "key": "喝彩 气氛组", "path": "14.gif"},
-                {"name": "静静看着你", "key": "静静 看着 不说话 沉默", "path": "15.gif"},
-                {"name": "开会啦", "key": "开会 会 通知 敲锣", "path": "16.gif"},
-                {"name": "可以吗", "key": "害羞 不好意思", "path": "17.gif"},
-                {"name": "迷之自信", "key": "自信 自我欣赏", "path": "18.gif"},
-                {"name": "明白", "key": "收到 好的 收", "path": "19.gif"},
-                {"name": "摸摸", "key": "摸头 你真乖 乖 棒", "path": "20.gif"},
-                {"name": "你真棒", "key": "大拇指 太棒了 太棒啦 棒棒棒 棒", "path": "21.gif"},
-                {"name": "佩服", "key": "五体投地 崇拜 仰慕 牛逼 厉害", "path": "22.gif"},
-                {"name": "撒花", "key": "欢迎 花 开心", "path": "23.gif"},
-                {"name": "生日快乐", "key": "吃蛋糕 蛋糕", "path": "24.gif"},
-                {"name": "收到", "key": "明白 好的 收 已阅 已读", "path": "25.gif"},
+                {"name": "加油", "key": "加油 喝彩 气氛组", "path": "14.gif"},
+                {"name": "静静看着你", "key": "静静 看着 不说话 沉默 静静看着你 无语 看你表演", "path": "15.gif"},
+                {"name": "开会啦", "key": "开会 会 通知 敲锣 开会啦 开会了", "path": "16.gif"},
+                {"name": "可以吗", "key": "可以吗 害羞 不好意思 脸红 可以 可以不", "path": "17.gif"},
+                {"name": "迷之自信", "key": "自信 迷之自信 自我欣赏 自恋 我真帅", "path": "18.gif"},
+                {"name": "明白", "key": "明白 收到 好的 收 OK", "path": "19.gif"},
+                {"name": "摸摸", "key": "摸摸 摸头 你真乖 乖 棒", "path": "20.gif"},
+                {"name": "你真棒", "key": "大拇指 你真棒 太棒了 太棒啦 棒棒棒 棒", "path": "21.gif"},
+                {"name": "佩服", "key": "佩服 五体投地 崇拜 仰慕 牛逼 厉害", "path": "22.gif"},
+                {"name": "撒花", "key": "撒花 欢迎 花 开心 耶 真好 真棒", "path": "23.gif"},
+                {"name": "生日快乐", "key": "生日快乐 吃蛋糕 蛋糕 生日", "path": "24.gif"},
+                {"name": "收到", "key": "明白 收到 好的 收 已阅 已读", "path": "25.gif"},
                 {"name": "送你花花", "key": "送花 送你花 花 兴奋 开心 庆祝 喝彩 气氛组", "path": "26.gif"},
-                {"name": "在线吃瓜", "key": "吃瓜 八卦", "path": "27.gif"},
-                {"name": "我错了", "key": "认错 错了 哭 难过", "path": "28.gif"},
-                {"name": "我太难了", "key": "太难了 难过 不开心 委屈", "path": "29.gif"},
-                {"name": "笑而不语", "key": "笑 不说话 静静 不发表", "path": "30.gif"},
-                {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助", "path": "31.gif"},
-                {"name": "幸福", "key": "满足 洗澡 泡澡", "path": "32.gif"},
-                {"name": "赞", "key": "大拇指 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒", "path": "33.gif"},
-                {"name": "走人了", "key": "下班 闪人 走人 溜人", "path": "34.gif"}
+                {"name": "在线吃瓜", "key": "吃瓜 八卦 看戏 看热闹 在线吃瓜 凑热闹 吃瓜群众 围观", "path": "27.gif"},
+                {"name": "我错了", "key": "认错 错了 哭 难过 悲伤 我错了 对不起 道歉", "path": "28.gif"},
+                {"name": "我太难了", "key": "我太难了 太难了 难过 不开心 委屈", "path": "29.gif"},
+                {"name": "笑而不语", "key": "笑 不说话 静静 不发表 沉默", "path": "30.gif"},
+                {"name": "行行好吧", "key": "行行好 乞丐 乞求 请求 求助 给点吧", "path": "31.gif"},
+                {"name": "幸福", "key": "幸福 满足 洗澡 泡澡 开心", "path": "32.gif"},
+                {"name": "赞", "key": "大拇指 赞 点赞 厉害 你真棒 太棒了 太棒啦 棒棒棒 棒 6 666 牛", "path": "33.gif"},
+                {"name": "走人了", "key": "下班 闪人 走人 溜人 走了 关机", "path": "34.gif"}
             ]
         },
         {