Skip to content

foreign / customer-service

Go to a project
Commit c9fc2373 by zhousil
Options

Merge branch 'master' of http://gitlab.corp.qinqinxiaobao.com:9880/uniplat/customer-service

parents d3e1ae90 110d8a6a
Inline Side-by-side
Showing with 120 additions and 103 deletions
components/controller/index.ts
import { MessageType } from "@/customer-service/model";
import { CardMessage } from '@/customer-service/model/card';
import { CardMessage } from "@/customer-service/model/card";
import Chat from "@/customer-service/xim";
const fsImg = /(fs(.*))/;
const mapping = new Map<MessageType, string>([
[MessageType.Image, '图片'],
[MessageType.Video, '视频'],
[MessageType.Voice, '语音'],
[MessageType.File, '文件'],
[MessageType.Withdraw, '撤回了一条消息'],
[MessageType.MyPurchasePlan, '我的采购计划'],
[MessageType.MyWelfare, '我的福利'],
[MessageType.QuestionAnswer, '问答'],
[MessageType.Pay, '付款通知'],
[MessageType.PayV1, '付款通知'],
[MessageType.Refund, '退款通知'],
[MessageType.RefundV1, '退款通知'],
[MessageType.Notify, '通知'],
])
[MessageType.Image, "图片"],
[MessageType.Video, "视频"],
[MessageType.Voice, "语音"],
[MessageType.File, "文件"],
[MessageType.Withdraw, "撤回了一条消息"],
[MessageType.MyPurchasePlan, "我的采购计划"],
[MessageType.MyWelfare, "我的福利"],
[MessageType.QuestionAnswer, "问答"],
[MessageType.Pay, "付款通知"],
[MessageType.PayV1, "付款通知"],
[MessageType.Refund, "退款通知"],
[MessageType.RefundV1, "退款通知"],
[MessageType.Notify, "通知"],
]);
export function parserMessage(type: MessageType, rawMsg: string) {
try {
......@@ -35,15 +38,30 @@ export function parserMessage(type: MessageType, rawMsg: string) {
if (type === MessageType.Card) {
const p = JSON.parse(rawMsg) as CardMessage;
if (p && p.title) {
return p.title || '通知';
return p.title || "通知";
}
}
const t = mapping.get(type)
const t = mapping.get(type);
if (t) {
return `[${t}]`;
}
return `[系统自动回复]`;
} catch {
return ""
return "";
}
}
export function rebuildImage(url: string) {
if (url) {
const sdk = Chat.getSdk();
const s = sdk.mediaController.buildThumbnail;
if (fsImg.test(url)) {
const m = fsImg.exec(url);
if (m && m.length) {
return sdk.global.baseUrl + s(m[0], 300);
}
}
return url;
}
return "";
}
components/image-preview.vue
......@@ -4,20 +4,20 @@
:before-close="close"
:visible="value"
:show-close="false"
custom-class="transparent"
custom-class="transparent flex"
width="90%"
top="60px"
>
<div class="d-flex flex-column">
<div class="d-flex justify-content-center align-items-start">
<img v-if="file" :src="file.url" />
<img v-if="file" :src="file.url" :style="imgStyle" />
<i class="el-icon-close" @click="close"></i>
</div>
<div class="d-flex justify-content-center actions">
<a
class="d-flex align-items-center justify-content-center"
:href="file.url"
:download="getAttachment"
target="_blank"
>
<i class="el-icon-download"></i>
</a>
......@@ -37,6 +37,13 @@
@Prop()
private file!: { name: string; url: string };
private get imgStyle() {
return {
"max-width": `${document.body.scrollWidth * 0.8}px`,
"max-height": `${document.body.scrollHeight * 0.8}px`,
};
}
private close() {
this.$emit("update", false);
}
......@@ -70,25 +77,19 @@
}
}
.actions {
margin: 15px 0;
a {
width: 50px;
height: 50px;
padding: 10px;
background-color: #7a7b7d;
color: #fff;
border-radius: 50%;
cursor: pointer;
position: absolute;
left: 50%;
bottom: -65px;
margin-left: -50px;
i {
color: #fff;
font-size: 30px;
}
& + span {
margin-left: 15px;
}
cursor: pointer;
}
}
</style>
components/message-item/image-message.vue
......@@ -6,8 +6,8 @@
@click="open"
>
<img
v-if="messageRealUrl"
:src="messageRealUrl"
v-if="mini"
:src="mini"
:title="messageBody.msg.name"
:alt="messageBody.msg.name"
@error="onImageError"
......@@ -22,6 +22,7 @@
import BaseMessage from "./index";
import FileIcon from "./file-icon.vue";
import { UserAgentHelper } from "@/customer-service/third-party/user-agent";
import { rebuildImage } from "../controller";
@Component({ components: { FileIcon } })
export default class Index extends BaseMessage {
......@@ -31,6 +32,10 @@
window.navigator.userAgent
);
private get mini() {
return rebuildImage(this.messageRealUrl);
}
private onImageError() {
this.fileFailed2Load = true;
this.messageRealUrl = "";
......
database/index.ts
......@@ -63,17 +63,17 @@ class ChatCacheDatabaseController {
}
resolve();
};
r.onsuccess = (e) => {
r.onsuccess = e => {
this.db = (e.target as any).result;
console.log(`index database init comepleted`);
setupDb();
};
r.onupgradeneeded = (e) => {
r.onupgradeneeded = e => {
this.db = (e.target as any).result;
console.log(`upgrade database comepleted`);
setupDb();
};
r.onerror = (e) => {
r.onerror = e => {
console.log(`index database init failed, ${e}`);
this.setupError = true;
reject();
......@@ -88,7 +88,7 @@ class ChatCacheDatabaseController {
const k = this.buildChatMessageKey(chat);
const t = this.messageDatabases.get(k);
if (!t) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (this.uid && indexedDB) {
const r = indexedDB.open(k, this.msgVersion);
// eslint-disable-next-line @typescript-eslint/no-this-alias
......@@ -102,17 +102,17 @@ class ChatCacheDatabaseController {
}
setTimeout(() => resolve(), 200);
};
r.onsuccess = function (e) {
r.onsuccess = function(e) {
const db = (e.target as any).result;
that.messageDatabases.set(k, db);
setupDb();
};
r.onupgradeneeded = function (e) {
r.onupgradeneeded = function(e) {
const db = (e.target as any).result;
that.messageDatabases.set(k, db);
setupDb();
};
r.onerror = function (e) {
r.onerror = function(e) {
console.log(
`chat message index database init failed, ${e}`
);
......@@ -163,11 +163,11 @@ class ChatCacheDatabaseController {
}
public updateChat(p: ChatStore.ChatUpdateParameter) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (this.db) {
const store = this.buildStore(this.chatListKey);
const t = store.get(p.chat);
t.onsuccess = (r) => {
t.onsuccess = r => {
const chat = (r.target as any).result as Chat;
if (chat) {
chat.eid = p.eid as string;
......@@ -191,11 +191,11 @@ class ChatCacheDatabaseController {
}
public updateChat4UnreadCount(chat: number, unread: number) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (this.db) {
const store = this.buildStore(this.chatListKey);
const t = store.get(chat);
t.onsuccess = (r) => {
t.onsuccess = r => {
const chat = (r.target as any).result as Chat;
if (chat) {
chat.unread_msg_count = unread;
......@@ -214,11 +214,11 @@ class ChatCacheDatabaseController {
}
public setRead(chat: number) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (this.db) {
const store = this.buildStore(this.chatListKey);
const t = store.get(chat);
t.onsuccess = (r) => {
t.onsuccess = r => {
const chat = (r.target as any).result as Chat;
if (chat) {
chat.unread_msg_count = 0;
......@@ -253,7 +253,7 @@ class ChatCacheDatabaseController {
allRead?: boolean;
}
) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (this.db) {
const store = this.buildChatMessageStore(chat);
if (option.end && option.end > option.start) {
......@@ -267,7 +267,7 @@ class ChatCacheDatabaseController {
};
for (let i = option.start; i <= option.end; i++) {
const r = store.get(i);
r.onsuccess = (m) => {
r.onsuccess = m => {
const p = (m.target as any).result as Message;
if (p) {
if (option.allRead) {
......@@ -284,7 +284,7 @@ class ChatCacheDatabaseController {
}
} else {
const r = store.get(option.start);
r.onsuccess = (m) => {
r.onsuccess = m => {
const p = (m.target as any).result as Message;
if (p) {
if (option.allRead) {
......@@ -306,7 +306,7 @@ class ChatCacheDatabaseController {
}
public removeChatFromList(chat: number) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (this.db) {
const store = this.buildStore(this.chatListKey);
const t = store.delete(chat);
......@@ -319,27 +319,27 @@ class ChatCacheDatabaseController {
}
public getChatList() {
return new Promise<Chat[]>((resolve) => {
return new Promise<Chat[]>(resolve => {
if (!this.db) {
return resolve([]);
}
const store = this.buildStore(this.chatListKey);
const r = store.getAll();
r.onsuccess = (o) => resolve((o.target as any).result);
r.onsuccess = o => resolve((o.target as any).result);
r.onerror = () => resolve([]);
});
}
public getChatByCode(code: string) {
return new Promise<Chat | null>((resolve) => {
return new Promise<Chat | null>(resolve => {
if (!this.db) {
return resolve(null);
}
const store = this.buildStore(this.chatListKey);
const r = store.getAll();
r.onsuccess = (o) => {
r.onsuccess = o => {
const items = (o.target as any).result as Chat[];
resolve(items.find((i) => i.biz_type_code === code) as Chat);
resolve(items.find(i => i.biz_type_code === code) as Chat);
};
r.onerror = () => resolve(null);
});
......@@ -364,21 +364,21 @@ class ChatCacheDatabaseController {
}
public getChatMessages(chat: number) {
return new Promise<Message[]>((resolve) => {
return new Promise<Message[]>(resolve => {
if (!this.db) {
return resolve([]);
}
this.setupChatMessageDatabase(chat).finally(() => {
const store = this.buildChatMessageStore(chat);
const r = store.getAll();
r.onsuccess = (o) => resolve((o.target as any).result);
r.onsuccess = o => resolve((o.target as any).result);
r.onerror = () => resolve([]);
});
});
}
public appendMessages(chat: number, items: Message[]) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (!this.db || !items || !items.length) {
return resolve();
}
......@@ -413,7 +413,7 @@ class ChatCacheDatabaseController {
public mergeChatList(source1: Chat[], source2: Chat[]) {
for (const item of source2) {
const t = source1.find((i) => i.id === item.id);
const t = source1.find(i => i.id === item.id);
if (t) {
item.unread_msg_count = Math.max(
item.unread_msg_count,
......@@ -445,14 +445,14 @@ class ChatCacheDatabaseController {
msg: number,
status: MessageHandled
) {
return new Promise<void>((resolve) => {
return new Promise<void>(resolve => {
if (!this.db) {
return resolve();
}
this.setupChatMessageDatabase(chat).finally(() => {
const store = this.buildChatMessageStore(chat);
const r = store.get(msg);
r.onsuccess = (o) => {
r.onsuccess = o => {
const p = (o.target as any).result as Message;
p.handled = status;
const u = store.put(p);
......
model/im.ts
......@@ -162,12 +162,6 @@ export enum IMDomainType {
"外国人工作许可h" = "biz_wgrgzxk_h",
"成都购房社保合规咨询" = "biz_cdgfsbhgzx",
"成都落户咨询服务" = "biz_cdlhzxfw",
// 表格以外，亲亲小保项目中有使用
"企业社保薪酬咨询" = "con_qysbxcconsult",
"知识产权相关咨询" = "con_zscqxgconsult",
"公司资质咨询" = "con_gszzzx",
"保险及员工福利业务咨询" = "con_bxjygflywconsult",
"工商财税业务咨询" = "con_gscsywconsult",
}
export const imItems = [
......@@ -814,27 +808,6 @@ export const imItems = [
type: IMDomainType.成都落户咨询服务,
title: "成都落户咨询服务",
},
// 表格以外，亲亲小保项目中有使用
{
type: IMDomainType.企业社保薪酬咨询,
title: "企业社保薪酬咨询",
},
{
type: IMDomainType.知识产权相关咨询,
title: "知识产权相关咨询",
},
{
type: IMDomainType.公司资质咨询,
title: "公司资质咨询",
},
{
type: IMDomainType.保险及员工福利业务咨询,
title: "保险及员工福利业务咨询",
},
{
type: IMDomainType.工商财税业务咨询,
title: "工商财税业务咨询",
},
];
export function getOrderProductName(code: string) {
......
model/index.ts
......@@ -82,6 +82,11 @@ export interface ChatOption {
message?: ChatMessageController;
avatar?: string;
/**
* 禁用IndexDb
*/
disabledIndexDb?:boolean;
}
export interface ChatMessageController {
......
service/monitor.ts
import Axios, { AxiosResponse } from "axios";
import Axios, { AxiosResponse, AxiosAdapter } from "axios";
import { UniplatSdk } from "uniplat-sdk";
import { ImEnvironment } from "../model";
......@@ -26,6 +26,7 @@ export interface SdkMonitorOption {
userAgent?: boolean;
envir: ImEnvironment;
product: Product;
call?: (r: any) => void;
}
class WebMonitor {
......@@ -33,6 +34,7 @@ class WebMonitor {
private envir = ImEnvironment.Dev;
private product = Product.Default;
private readonly url = "https://pre-hrs-monitor.hrs100.com";
private adapter: AxiosAdapter | undefined;
public updateKey(key: string) {
this.key = key;
......@@ -42,6 +44,7 @@ class WebMonitor {
private buildHeaders() {
return {
headers: { authorization: "cdd0a34e-f537-4e5b-808e-2ba06af21845" },
adapter: this.adapter,
};
}
......@@ -85,11 +88,17 @@ class WebMonitor {
);
}
public useSdk(sdk: UniplatSdk, options: SdkMonitorOption) {
public useSdk(
sdk: UniplatSdk,
options: SdkMonitorOption,
adapter?: AxiosAdapter
) {
this.envir = options.envir;
this.product = options.product;
this.adapter = adapter;
sdk.events.addUniversalErrorResponseCallback(
(r: AxiosResponse<any>) => {
options.call && options.call(r);
if (this.enable()) {
const msg: string[] = [];
msg.push(
......@@ -111,12 +120,14 @@ class WebMonitor {
if (r.config && r.config.data) {
const form = r.config.data as FormData;
if (form.getAll) {
const p = form.getAll('parameters');
const p = form.getAll("parameters");
for (const item of p) {
msg.push(`Payload: ${item}`);
}
} else {
msg.push(`Payload: ${JSON.stringify(r.config.data)}`);
msg.push(
`Payload: ${JSON.stringify(r.config.data)}`
);
}
}
......
store/index.ts
......@@ -21,6 +21,7 @@ import { decodeJwt } from "uniplat-sdk";
import { ChatStatus, ChatStore, ChatStoreState } from "./model";
import { RootStoreState } from "@/store/model";
import { rebuildImage } from "../components/controller";
export const ns = ChatStore.ns;
......@@ -45,7 +46,7 @@ function combineMessages(
items.push(item);
}
}
return items.sort((x, y) => (x.id - y.id ? 1 : -1));
return items.sort((x, y) => x.id - y.id);
}
let removeRegisterChatEvents: (() => void)[] = [];
......@@ -71,7 +72,7 @@ async function preCacheImgs(msgs?: any[]) {
typeof Image !== "undefined"
) {
const preCache = new Image();
preCache.src = url;
preCache.src = rebuildImage(url);
preCache.onload = () => resolve();
setTimeout(resolve, 2000);
} else {
......@@ -778,9 +779,7 @@ export default {
if (!chatId) {
return;
}
const chatList = state[
ChatStore.STATE_MY_CHAT_ROOM_LIST
] as ChatType[];
const chatList = state[ChatStore.STATE_MY_CHAT_ROOM_LIST];
let wantedChatRoom = chatList.find((k) => k.chat_id === chatId);
if (!wantedChatRoom) {
......@@ -819,12 +818,12 @@ export default {
ChatStore.MUTATION_SAVE_CURRENT_CHAT_UNIPLAT_ID,
info.uniplatId
);
dispatch(ChatStore.ACTION_GET_CHAT_MEMBERS);
})
.catch(console.error);
commit(ChatStore.MUTATION_INITING_CHAT);
removeRegisterChatEvents.forEach((k) => k());
removeRegisterChatEvents = [];
await dispatch(ChatStore.ACTION_GET_CHAT_MEMBERS);
try {
await Promise.all([
dispatch(ChatStore.ACTION_REGISTER_EVENT),
......
xim/index.ts
......@@ -58,7 +58,12 @@ class Chat {
option.message && (this.messageController = option.message);
option.avatar !== undefined && (this.defaultAvatar = option.avatar);
await this.setupIndexDb(option.orgId());
if(!option.disabledIndexDb){
await this.setupIndexDb(option.orgId()).catch(err => {
// 必须catch error不然小程序不会向后运行
console.error("setupIndexDb Error")
});
}
this.token = async () => option.sdk().global.jwtToken;
tokenManager.save(this.token);
......
xim/xim.ts
......@@ -8,7 +8,7 @@ import { Message, NotifyMessage } from "./models/chat";
import chat from "./index";
import { STATUS } from "xchat-client/dist/xchat";
wampDebug(true);
wampDebug(false);
const DefaultMsgPageSize = 20;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment