pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

重新构建dev产物（清理调试残留日志+本轮3处修复的编译产物）

Browse Source
This commit is contained in:
Your Name
2026-09-06 15:04:00 +08:00
parent 4715ea4497
commit cd092108c2
6 changed files with 118 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
umd/src_views_messages-view_jsx.dev.js
+30 -5
View File
@@ -619,13 +619,13 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
return nextState;
}
subscribe(topic) {
if (topic.isSubscribed() || !this.props.ready) {
if (!this.props.ready) {
return;
}
const newTopic = this.props.newTopicParams && this.props.newTopicParams._topicName == this.props.topic;
let getQuery = topic.startMetaQuery().withLaterDesc().withLaterSub().withAux();
if (this.state.isReader || newTopic) {
getQuery = getQuery.withLaterData(_config_js__WEBPACK_IMPORTED_MODULE_15__.MESSAGES_PAGE);
getQuery = getQuery.withData(undefined, undefined, _config_js__WEBPACK_IMPORTED_MODULE_15__.MESSAGES_PAGE);
if (this.state.isReader) {
getQuery = getQuery.withLaterDel();
}
@@ -634,7 +634,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
});
}
const setQuery = newTopic ? this.props.newTopicParams : undefined;
topic.subscribe(getQuery.build(), setQuery).then(ctrl => {
const doSubscribe = () => topic.subscribe(getQuery.build(), setQuery).then(ctrl => {
if (ctrl.code == 303) {
_lib_navigation_js__WEBPACK_IMPORTED_MODULE_20__["default"].navigateTo(_lib_navigation_js__WEBPACK_IMPORTED_MODULE_20__["default"].setUrlTopic('', ctrl.params.topic));
return;
@@ -673,6 +673,11 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
blankState.title = this.props.intl.formatMessage(messages.not_found);
this.setState(blankState);
});
if (topic.isSubscribed()) {
topic.leave(false).catch(_ => {}).then(doSubscribe);
return;
}
doSubscribe();
}
leave(oldTopicName) {
if (!oldTopicName || !this.props.tinode.isTopicCached(oldTopicName)) {
@@ -1317,7 +1322,6 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
if (!msg && this.props.forwardMessage) {
msg = this.props.forwardMessage.msg;
head = this.props.forwardMessage.head;
this.handleCancelReply();
} else if (this.state.reply) {
if (this.state.reply.editing) {
if (msg == this.state.contentToEdit) {
@@ -1337,7 +1341,6 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
}
msg = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.append(tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.sanitizeEntities(this.state.reply.content), msg);
}
this.handleCancelReply();
} else if (typeof msg == 'string' && this.mentionedUsers && this.mentionedUsers.length) {
const parsed = tinode_sdk__WEBPACK_IMPORTED_MODULE_2__.Drafty.parse(msg);
this.applyMentionResolution(parsed);
@@ -1360,6 +1363,7 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
const topicForDraft = this.state.topic;
const draftVersionAtSend = this.state.draftVersion || 0;
const doSend = () => {
this.handleCancelReply();
const result = this.props.sendMessage(msg, uploadCompletionPromise, uploader, head);
if (originalText != null && result && typeof result.then == 'function' && topicForDraft) {
result.then(() => this.clearDraft(topicForDraft, draftVersionAtSend));
@@ -2033,11 +2037,26 @@ class MessagesView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Compone
if (!replyToSeq || isNaN(replyToSeq)) {
replyToSeq = null;
}
const systemActions = msg.content && typeof msg.content == 'object' && Array.isArray(msg.content.actions) ? msg.content.actions : null;
const isActionableSystemMessage = systemActions && systemActions.some(a => a && a.type == 'group_invitation_accept');
const isPlainSystemMessage = msg.head && (msg.head['x-im-type'] == 'system_notice' || msg.head['x-im-type'] == 'system_action') && !isActionableSystemMessage && msg.content && typeof msg.content == 'object' && typeof msg.content.text == 'string';
if (msg.hi) {
messageNodes.push((0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_22__.jsxDEV)(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
deleted: true,
deletedText: this.props.intl.formatMessage(messages.message_deleted)
}, msg.seq, false));
} else if (isPlainSystemMessage) {
const thisDate = new Date(msg.ts);
if (!prevDate || prevDate.toDateString() != thisDate.toDateString()) {
messageNodes.push((0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_22__.jsxDEV)(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
date: (0,_lib_strformat_js__WEBPACK_IMPORTED_MODULE_21__.relativeDateFormat)(msg.ts),
locale: this.props.intl.locale
}, 'date-' + msg.seq, false));
prevDate = thisDate;
}
messageNodes.push((0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_22__.jsxDEV)(_widgets_meta_message_jsx__WEBPACK_IMPORTED_MODULE_11__["default"], {
systemText: msg.content.text
}, msg.seq, false));
} else {
const thisDate = new Date(msg.ts);
if (!prevDate || prevDate.toDateString() != thisDate.toDateString()) {
@@ -3266,6 +3285,12 @@ class MetaMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComp
children: this.props.deletedText || '消息已删除'
}, void 0, false);
bubbleClass += ' deleted';
} else if (this.props.systemText) {
content = (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxDEV)("span", {
className: "gray",
children: this.props.systemText
}, void 0, false);
bubbleClass += ' system';
}
if (!content) {
return (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_1__.jsxDEV)(react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_1__.Fragment, {