build

package.json

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

public/js/hash

@@ -1 +1 @@
-e7b16fe432c16325
+390985da59c473a9

public/js/language.all.js

@@ -669,10 +669,9 @@
         {"CN": "输入群名称（选填）","EN": "Enter the group name (selected)","TC": "輸入群名稱（選填）","KM": "បញ្ចូលឈ្មោះក្រុម (បានជ្រើសរើស)","TH": "ป้อนชื่อกลุ่ม (เลือก)","KO": "그룹 이름을 입력하십시오 (selectd)","JA": "グループ名（選択）を入力します"},
         {"CN": "创建","EN": "Create","TC": "創建","KM": "បង្កើត","TH": "สร้าง","KO": "만들다","JA": "作成"},
         {"CN": "最近聊天","EN": "Chat recently","TC": "最近聊天","KM": "ជជែកថ្មីៗ","TH": "แชทเมื่อเร็ว ๆ นี้","KO": "최근에 채팅","JA": "最近チャットします"},
-        {"CN": "选择转发对话","EN": "Choose forwarding dialogue","TC": "選擇轉發對話","KM": "ជ្រើសរើសការសន្ទនាបញ្ចូន","TH": "เลือกการโต้ตอบการสนทนา","KO": "전달 대화를 선택하십시오","JA": "転送ダイアログを選択します"},
-        {"CN": "团队成员","EN": "Team member","TC": "團隊成員","KM": "សមាជិក​ក្រុម","TH": "สมาชิกในทีม","KO": "팀 구성원","JA": "チームメンバー"},
         {"CN": "或","EN": "Or","TC": "或","KM": "រឺ","TH": "หรือ","KO": "주문","JA": "また"},
-        {"CN": "选择转发成员","EN": "Choose forwarding members","TC": "選擇轉發成員","KM": "ជ្រើសរើសសមាជិកបញ្ជូនបន្ត","TH": "เลือกสมาชิกที่ส่งต่อ","KO": "전달 멤버를 선택하십시오","JA": "転送メンバーを選択します"},
+        {"CN": "选择转发最近聊天","EN": "Choose to forward the recent chat","TC": "選擇轉發最近聊天","KM": "ជ្រើសរើសបញ្ជូនការជជែកថ្មីៗ","TH": "เลือกที่จะส่งต่อการแชทล่าสุด","KO": "최근 채팅을 전달하도록 선택하십시오","JA": "最近のチャットを転送することを選択します"},
+        {"CN": "选择转发指定成员","EN": "Choose to forward the designated member","TC": "選擇轉髮指定成員","KM": "ជ្រើសរើសបញ្ជូនសមាជិកដែលបានកំណត់","TH": "เลือกที่จะส่งต่อสมาชิกที่กำหนด","KO": "지정된 멤버를 전달하도록 선택하십시오","JA": "指定されたメンバーを転送することを選択します"},
         {"CN": "设置待办","EN": "Set up","TC": "設置待辦","KM": "រៀបចំ","TH": "ติดตั้ง","KO": "설정","JA": "設定"},
         {"CN": "当前会话","EN": "Current session","TC": "當前會話","KM": "សម័យបច្ចុប្បន្ន","TH": "เซสชันปัจจุบัน","KO": "현재 세션","JA": "現在のセッション"},
         {"CN": "所有成员","EN": "All members","TC": "所有成員","KM": "សមាជិកទាំងអស់","TH": "สมาชิกทุกคน","KO": "전원","JA": "全員"},

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

@@ -278,10 +278,11 @@
                 <FormItem prop="dialogids" :label="$L('最近聊天')">
                     <Select
                         v-model="forwardData.dialogids"
-                        :placeholder="$L('选择转发对话')"
+                        :placeholder="$L('选择转发最近聊天')"
                         :multiple-max="20"
                         multiple
                         filterable
+                        class="dialog-wrapper-dialogids"
                         transfer-class-name="dialog-wrapper-forward">
                         <div slot="drop-prepend" class="forward-drop-prepend">{{$L('最多只能选择20个')}}</div>
                         <Option
@@ -305,8 +306,8 @@
                         </Option>
                     </Select>
                 </FormItem>
-                <FormItem prop="userids" :label="$L('团队成员')">
-                    <UserInput v-model="forwardData.userids" :multiple-max="20" :placeholder="`(${$L('或')}) ${$L('选择转发成员')}`"/>
+                <FormItem prop="userids" :label="$L('指定成员')">
+                    <UserInput v-model="forwardData.userids" :multiple-max="20" :placeholder="`(${$L('或')}) ${$L('选择转发指定成员')}`"/>
                 </FormItem>
             </Form>
             <div slot="footer" class="adaption">
@@ -1072,7 +1073,7 @@ export default {
                     loop_num++
                     setTimeout(_ => {
                         this.onPositionId(position_id, msg_id, loop_num).then(resolve).catch(reject)
-                    }, Math.min(600, 100 * loop_num))
+                    }, Math.min(800, 200 * loop_num))
                     return;
                 }
                 if (loop_num > 0) {
@@ -1080,9 +1081,12 @@ export default {
                 }
                 //
                 const index = this.allMsgs.findIndex(item => item.id === position_id)
-                if (index > -1) {
-                    this.onToIndex(index)
-                    resolve()
+                const gtpos = this.prevId > 0 ? 0 : -1  // 如果还有更多消息时定位的消息必须不是第一条是为了避免定位后又有新加载
+                if (index > gtpos) {
+                    setTimeout(_ => {
+                        this.onToIndex(index)
+                        resolve()
+                    }, 200)
                 } else {
                     if (msg_id > 0) {
                         this.$store.dispatch("setLoad", {

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

@@ -1368,6 +1368,11 @@
     overflow: hidden !important;
 }
 
+.dialog-wrapper-dialogids {
+    .ivu-select-arrow {
+        display: none !important;
+    }
+}
 
 .dialog-wrapper-forward {
     .forward-option {

resources/assets/sass/taskfont.scss

@@ -1,8 +1,8 @@
 @font-face {
     font-family: 'taskfont';  /* Project id 2583385 */
-    src: url('../css/fonts/taskfont.woff2') format('woff2'),
-    url('../css/fonts/taskfont.woff') format('woff'),
-    url('../css/fonts/taskfont.ttf') format('truetype');
+    src: url('../css/fonts/taskfont/iconfont.woff2') format('woff2'),
+    url('../css/fonts/taskfont/iconfont.woff') format('woff'),
+    url('../css/fonts/taskfont/iconfont.ttf') format('truetype');
 }
 
 .taskfont {

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

@@ -669,10 +669,9 @@
         {"CN": "输入群名称（选填）","EN": "Enter the group name (selected)","TC": "輸入群名稱（選填）","KM": "បញ្ចូលឈ្មោះក្រុម (បានជ្រើសរើស)","TH": "ป้อนชื่อกลุ่ม (เลือก)","KO": "그룹 이름을 입력하십시오 (selectd)","JA": "グループ名（選択）を入力します"},
         {"CN": "创建","EN": "Create","TC": "創建","KM": "បង្កើត","TH": "สร้าง","KO": "만들다","JA": "作成"},
         {"CN": "最近聊天","EN": "Chat recently","TC": "最近聊天","KM": "ជជែកថ្មីៗ","TH": "แชทเมื่อเร็ว ๆ นี้","KO": "최근에 채팅","JA": "最近チャットします"},
-        {"CN": "选择转发对话","EN": "Choose forwarding dialogue","TC": "選擇轉發對話","KM": "ជ្រើសរើសការសន្ទនាបញ្ចូន","TH": "เลือกการโต้ตอบการสนทนา","KO": "전달 대화를 선택하십시오","JA": "転送ダイアログを選択します"},
-        {"CN": "团队成员","EN": "Team member","TC": "團隊成員","KM": "សមាជិក​ក្រុម","TH": "สมาชิกในทีม","KO": "팀 구성원","JA": "チームメンバー"},
         {"CN": "或","EN": "Or","TC": "或","KM": "រឺ","TH": "หรือ","KO": "주문","JA": "また"},
-        {"CN": "选择转发成员","EN": "Choose forwarding members","TC": "選擇轉發成員","KM": "ជ្រើសរើសសមាជិកបញ្ជូនបន្ត","TH": "เลือกสมาชิกที่ส่งต่อ","KO": "전달 멤버를 선택하십시오","JA": "転送メンバーを選択します"},
+        {"CN": "选择转发最近聊天","EN": "Choose to forward the recent chat","TC": "選擇轉發最近聊天","KM": "ជ្រើសរើសបញ្ជូនការជជែកថ្មីៗ","TH": "เลือกที่จะส่งต่อการแชทล่าสุด","KO": "최근 채팅을 전달하도록 선택하십시오","JA": "最近のチャットを転送することを選択します"},
+        {"CN": "选择转发指定成员","EN": "Choose to forward the designated member","TC": "選擇轉髮指定成員","KM": "ជ្រើសរើសបញ្ជូនសមាជិកដែលបានកំណត់","TH": "เลือกที่จะส่งต่อสมาชิกที่กำหนด","KO": "지정된 멤버를 전달하도록 선택하십시오","JA": "指定されたメンバーを転送することを選択します"},
         {"CN": "设置待办","EN": "Set up","TC": "設置待辦","KM": "រៀបចំ","TH": "ติดตั้ง","KO": "설정","JA": "設定"},
         {"CN": "当前会话","EN": "Current session","TC": "當前會話","KM": "សម័យបច្ចុប្បន្ន","TH": "เซสชันปัจจุบัน","KO": "현재 세션","JA": "現在のセッション"},
         {"CN": "所有成员","EN": "All members","TC": "所有成員","KM": "សមាជិកទាំងអស់","TH": "สมาชิกทุกคน","KO": "전원","JA": "全員"},

resources/mobile

@@ -1 +1 @@
-Subproject commit f3d8d18e1e9c372a74462db4486b20f69142a30f
+Subproject commit 2550e0f4d2d0781bc77f74122c9b7119ef8471fd