月报补上团队统计视图,镜像已有的日报团队视图(第9章遗留缺口)
MonthlyReportList 原来只有"我的月报"一种形态,没有 team/managed 入口——日报有的 "团队统计"(应提交/已提交/未提交计数)月报完全没有,路由/组件都不支持。核对 im_be 源码确认后端本身是对称的:TenantMonthlyReportList 的 scope=managed 分支 跟日报字面上是同一段 canUseManagedReports(visibility) 权限校验(真实请求验证: 无权限账号收到 403 PERMISSION_DENIED,不是之前日报那种曾经误报全公司数据的 旧版本行为——那个越权问题后端已经修过了),GET /reports/monthly/statistics 的响应字段(expected_count/submitted_count/missing_count)也和日报完全一致。 唯一确认过的不对称点:月报没有对应的"提醒未提交成员"接口(daily有 POST /reports/daily/reminders,翻遍 im_http.go 月报没有任何同类路由)——团队视图 因此没有画这个按钮,画一个点了必然404的按钮不算镜像,是给用户挖坑。 路由从单一的 monthly-report-list 拆成 monthly-report-mine/monthly-report-team (对齐 daily-report-mine/daily-report-team 的命名),两处 tinode-web.jsx 的硬编码 白名单、APP_ROUTES、详情/编辑页的返回目标都已同步更新。 联调中发现并顺手修正一个刚写的真bug:team 分支的空列表判断沿用了旧的无条件 "暂无月报"文案,没有区分"真的没数据"和"403加载失败"——用真实账号触发403验证时 第一次跑出来就是这个问题,同一轮改完立刻测出来并修正(跟本次会话更早修的 DailyReportList 同款问题是同一个模式,这次是抄自己代码时漏抄了一半)。 真实验证:我的月报视图不受影响;团队统计视图真实触发403(该账号只是普通员工), 正确显示"月报列表加载失败"而不是误导性的"暂无月报";点击"我的月报"correctly 跳回单人视图。 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
d01547d3de
commit
abef778c7f
@@ -136,7 +136,7 @@ const SIDE_PANEL_VIEWS = ['acc_general','archive','blocked','contacts','cred','c
|
||||
'workbench','organization-directory','meeting-organizer','meeting-attendee',
|
||||
'meeting-create','meeting-detail',
|
||||
'daily-report-editor','daily-report-mine','daily-report-team','daily-report-detail',
|
||||
'monthly-report-editor','monthly-report-list','monthly-report-detail',
|
||||
'monthly-report-editor','monthly-report-mine','monthly-report-team','monthly-report-detail',
|
||||
'executive-mailbox','executive-mailbox-notice',
|
||||
'personal-center','personal-profile','profile-nickname','profile-birth-date',
|
||||
'profile-signature','profile-gender','profile-region','personal-qrcode','android-settings',
|
||||
@@ -2543,7 +2543,7 @@ class TinodeWeb extends React.Component {
|
||||
'call-minimized'].includes(activeProductView);
|
||||
const workplaceCollaborationActive = ['workbench', 'organization-directory', 'meeting-organizer',
|
||||
'meeting-attendee', 'meeting-create', 'meeting-detail', 'daily-report-editor', 'daily-report-mine', 'daily-report-team',
|
||||
'daily-report-detail', 'monthly-report-editor', 'monthly-report-list',
|
||||
'daily-report-detail', 'monthly-report-editor', 'monthly-report-mine', 'monthly-report-team',
|
||||
'monthly-report-detail', 'executive-mailbox', 'executive-mailbox-notice'].includes(activeProductView);
|
||||
const personalSettingsActive = ['personal-center', 'personal-profile', 'profile-nickname',
|
||||
'profile-birth-date', 'profile-signature', 'profile-gender', 'profile-region', 'personal-qrcode', 'android-settings',
|
||||
|
||||
@@ -25,7 +25,7 @@ const navigate = (view, params) => {
|
||||
export const WORKPLACE_COLLABORATION_VIEWS = [
|
||||
'workbench', 'organization-directory', 'meeting-organizer', 'meeting-attendee', 'meeting-create', 'meeting-detail',
|
||||
'daily-report-editor', 'daily-report-mine', 'daily-report-team', 'daily-report-detail',
|
||||
'monthly-report-editor', 'monthly-report-list', 'monthly-report-detail',
|
||||
'monthly-report-editor', 'monthly-report-mine', 'monthly-report-team', 'monthly-report-detail',
|
||||
'executive-mailbox', 'executive-mailbox-notice'
|
||||
];
|
||||
|
||||
@@ -108,7 +108,7 @@ function useUserNames(ids, myUserId) {
|
||||
// "not yet available" toast rather than guessing a feature with zero design reference.
|
||||
const APP_TONES = {organization: 'red', attendance: 'orange', meetings: 'blue', daily_reports: 'orange', monthly_reports: 'violet', executive_mailbox: 'green'};
|
||||
const APP_ICONS = {organization: 'account_tree', attendance: 'schedule', meetings: 'notifications_active', daily_reports: 'task_alt', monthly_reports: 'event_note', executive_mailbox: 'mail_outline'};
|
||||
const APP_ROUTES = {organization: 'organization-directory', meetings: 'meeting-attendee', daily_reports: 'daily-report-mine', monthly_reports: 'monthly-report-list', executive_mailbox: 'executive-mailbox'};
|
||||
const APP_ROUTES = {organization: 'organization-directory', meetings: 'meeting-attendee', daily_reports: 'daily-report-mine', monthly_reports: 'monthly-report-mine', executive_mailbox: 'executive-mailbox'};
|
||||
|
||||
function Workbench({onToast}) {
|
||||
// `me` and `modules` decide whether this screen renders its real content or a blank/loading
|
||||
@@ -851,7 +851,7 @@ function MonthlyReportEditor({onToast}) {
|
||||
.finally(() => setSubmitting(false));
|
||||
};
|
||||
|
||||
return <div className="workplace-page report-editor-page"><Header title="月报" back="monthly-report-list" />
|
||||
return <div className="workplace-page report-editor-page"><Header title="月报" back="monthly-report-mine" />
|
||||
<main>
|
||||
<section className="daily-report-block-header"><strong>月报汇总</strong></section>
|
||||
<label className="report-field"><span><b>*</b>本月工作总结</span>
|
||||
@@ -864,37 +864,65 @@ function MonthlyReportEditor({onToast}) {
|
||||
</div>;
|
||||
}
|
||||
|
||||
function MonthlyReportList({onToast}) {
|
||||
// Not routed through the shared useCachedData hook (unlike this file's other list/detail pages) --
|
||||
// that hook's own fetch failure is silently swallowed (see use-cached-data.js's catch) with no way
|
||||
// for a caller to observe it, only a second `loading` return value nothing here destructures. A
|
||||
// plain local fetch lets this page track its own error state instead.
|
||||
const [reports, setReports] = React.useState(() => readCachedData('monthly-reports:mine') || null);
|
||||
// 团队统计视图镜像 DailyReportList 的同款设计(这个页面原来只有"我的月报"一种,没有任何管理员/
|
||||
// 团队入口,日报有的东西月报完全没有)。核对 im_be 源码确认后端接口本身是对称的:
|
||||
// TenantMonthlyReportList 的 scope=managed 分支跟日报那边字面上是同一段
|
||||
// canUseManagedReports(visibility) 权限校验代码,GET /reports/monthly/statistics 的响应字段
|
||||
// (expected_count/submitted_count/missing_count)也跟日报统计完全一致——真实请求过一次确认
|
||||
// 无权限账号会收到 403 PERMISSION_DENIED 而不是被拒之前那种误报全公司数据。
|
||||
// 唯一确认过不对称的一点:月报没有"提醒未提交成员"这个后端能力(日报有
|
||||
// POST /reports/daily/reminders,月报连对应路由都不存在),所以团队视图不画这个按钮——
|
||||
// 画一个点了必炸404的按钮不算"镜像",是给用户挖坑。
|
||||
function MonthlyReportList({team, myUserId, onToast}) {
|
||||
const cacheKey = 'monthly-reports:' + (team ? 'managed' : 'mine');
|
||||
const statsCacheKey = 'monthly-stats:' + toMonthInputValue(new Date());
|
||||
const [reports, setReports] = React.useState(() => readCachedData(cacheKey) || null);
|
||||
const [loadError, setLoadError] = React.useState(false);
|
||||
const [query, setQuery] = React.useState('');
|
||||
const [stats, setStats] = React.useState(() => (team && readCachedData(statsCacheKey)) || null);
|
||||
const ids = (reports || []).map(r => r.author_id);
|
||||
const names = useUserNames(ids, myUserId);
|
||||
|
||||
React.useEffect(() => {
|
||||
getMonthlyReports({scope: 'mine'}).then(d => {
|
||||
const load = () => {
|
||||
setLoadError(false);
|
||||
getMonthlyReports({scope: team ? 'managed' : 'mine'}).then(d => {
|
||||
const list = d.reports || d.items || [];
|
||||
writeCachedData('monthly-reports:mine', list);
|
||||
writeCachedData(cacheKey, list);
|
||||
setReports(list);
|
||||
}).catch(err => { onToast(err.message || '月报列表加载失败'); setLoadError(true); });
|
||||
}, []);
|
||||
}).catch(err => { onToast(err.message || '月报列表加载失败'); setLoadError(true); setReports(prev => prev || []); });
|
||||
if (team) getMonthlyStatistics(toMonthInputValue(new Date())).then(s => { writeCachedData(statsCacheKey, s); setStats(s); }).catch(() => {});
|
||||
};
|
||||
React.useEffect(load, [team]);
|
||||
|
||||
const filtered = (reports || []).filter(r => (r.month || '').includes(query) || (r.work_summary_short || '').includes(query));
|
||||
const filtered = (reports || []).filter(r => {
|
||||
const hay = team ? `${names[r.author_id] || ''}${r.work_summary_short || ''}` : r.month;
|
||||
return (hay || '').includes(query);
|
||||
});
|
||||
|
||||
return <div className="workplace-page report-list-page">
|
||||
<Header title="月报" action="add" actionLabel="填写月报" onAction={() => navigate('monthly-report-editor')} />
|
||||
<Header title="月报" action="add" actionLabel="填写月报" onAction={() => navigate('monthly-report-editor')} back={team ? 'monthly-report-mine' : 'workbench'} />
|
||||
<main>
|
||||
{team && stats ? <section className="report-statistics">
|
||||
<header><span><small>{formatMonthLabel(toMonthInputValue(new Date()))}</small><strong>全公司</strong></span>
|
||||
<button type="button" onClick={() => navigate('monthly-report-mine')}>我的月报</button></header>
|
||||
<div><span><b>{stats.expected_count || 0}</b><small>应提交</small></span>
|
||||
<span><b>{stats.submitted_count || 0}</b><small>已提交</small></span>
|
||||
<span><b>{(stats.expected_count || 0) - (stats.submitted_count || 0)}</b><small>未提交</small></span></div>
|
||||
</section> : null}
|
||||
<label className="workplace-search"><Icon>search</Icon>
|
||||
<input value={query} onChange={e => setQuery(e.target.value)} placeholder="搜索月份或内容" /></label>
|
||||
<input value={query} onChange={e => setQuery(e.target.value)} placeholder={team ? '搜索姓名或内容' : '搜索月份或内容'} /></label>
|
||||
{!team ? <nav className="report-role-switch">
|
||||
<button type="button" className="active">我的月报</button>
|
||||
<button type="button" onClick={() => navigate('monthly-report-team')}>团队统计</button>
|
||||
</nav> : null}
|
||||
<section className="report-cards">
|
||||
{reports == null ? <p className="organization-loading">{loadError ? '月报列表加载失败' : '加载中…'}</p> :
|
||||
filtered.length === 0 ? <p className="organization-loading">暂无月报</p> :
|
||||
{reports == null ? <p className="organization-loading">加载中…</p> :
|
||||
filtered.length === 0 ? <p className="organization-loading">{loadError ? '月报列表加载失败' : '暂无月报'}</p> :
|
||||
filtered.map(r => <button type="button" key={r.report_id}
|
||||
onClick={() => navigate((r.action || (r.status === 'submitted' ? 'view' : 'edit')) === 'view' ? 'monthly-report-detail' : 'monthly-report-editor', {report_id: r.report_id})}>
|
||||
<span className="report-month"><Icon>calendar_month</Icon></span>
|
||||
<span><strong>{formatMonthLabel(r.month)}</strong><small>工作总结与下月计划</small></span>
|
||||
<span><strong>{team ? (names[r.author_id] || r.author_id) : formatMonthLabel(r.month)}</strong>
|
||||
<small>{team ? formatMonthLabel(r.month) : '工作总结与下月计划'}</small></span>
|
||||
<em className={r.status}>{STATUS_LABEL[r.status] || r.status}</em>
|
||||
<Icon>chevron_right</Icon>
|
||||
</button>)}
|
||||
@@ -915,7 +943,7 @@ function MonthlyReportDetail({hashParams, myUserId, onToast}) {
|
||||
setReport(readCachedData('monthly-report:' + reportId) || null);
|
||||
getMonthlyReport(reportId).then(r => { writeCachedData('monthly-report:' + reportId, r); setReport(r); }).catch(err => { onToast(err.message || '月报加载失败'); setLoadError(true); });
|
||||
}, [reportId]);
|
||||
if (!report) return <div className="workplace-page"><Header title="查看详情" back="monthly-report-list" /><main><p className="organization-loading">{loadError ? '月报加载失败' : '加载中…'}</p></main></div>;
|
||||
if (!report) return <div className="workplace-page"><Header title="查看详情" back="monthly-report-mine" /><main><p className="organization-loading">{loadError ? '月报加载失败' : '加载中…'}</p></main></div>;
|
||||
|
||||
// reopenMonthlyReport is self-service only (server keys the UPDATE off the caller's own uid --
|
||||
// see the comment on the im-api.js export), so this button only ever makes sense for the report's
|
||||
@@ -929,7 +957,7 @@ function MonthlyReportDetail({hashParams, myUserId, onToast}) {
|
||||
.finally(() => setReopening(false));
|
||||
};
|
||||
|
||||
return <div className="workplace-page"><Header title="查看详情" back="monthly-report-list" />
|
||||
return <div className="workplace-page"><Header title="查看详情" back="monthly-report-mine" />
|
||||
<main className="report-detail">
|
||||
<section className="report-author"><span><strong>{names[report.author_id] || '…'}</strong><small className="role-badge">员工</small></span>
|
||||
<em className={report.status}>{STATUS_LABEL[report.status] || report.status}</em></section>
|
||||
@@ -1053,7 +1081,7 @@ export default function WorkplaceCollaborationView({view, hashParams, myUserId,
|
||||
else if (view === 'daily-report-editor') content = <DailyReportEditor onToast={setToast} />;
|
||||
else if (view === 'monthly-report-editor') content = <MonthlyReportEditor onToast={setToast} />;
|
||||
else if (view === 'daily-report-mine' || view === 'daily-report-team') content = <DailyReportList team={view === 'daily-report-team'} myUserId={myUserId} onToast={setToast} />;
|
||||
else if (view === 'monthly-report-list') content = <MonthlyReportList onToast={setToast} />;
|
||||
else if (view === 'monthly-report-mine' || view === 'monthly-report-team') content = <MonthlyReportList team={view === 'monthly-report-team'} myUserId={myUserId} onToast={setToast} />;
|
||||
else if (view === 'daily-report-detail') content = <DailyReportDetail hashParams={hashParams} myUserId={myUserId} onToast={setToast} />;
|
||||
else if (view === 'monthly-report-detail') content = <MonthlyReportDetail hashParams={hashParams} myUserId={myUserId} onToast={setToast} />;
|
||||
else content = <ExecutiveMailbox tinode={tinode} noticeOnly={view === 'executive-mailbox-notice'} onToast={setToast} />;
|
||||
|
||||
+88
-22
@@ -17439,7 +17439,7 @@ const messages = (0,react_intl__WEBPACK_IMPORTED_MODULE_1__.defineMessages)({
|
||||
description: 'Placeholder for the country selector'
|
||||
}
|
||||
});
|
||||
const SIDE_PANEL_VIEWS = ['acc_general', 'archive', 'blocked', 'contacts', 'cred', 'crop', 'edit', 'general', 'newtpk', 'notif', 'register', 'reset', 'security', 'settings', 'support', 'wallpapers', 'tenant', 'login', 'enterprise-register', 'enterprise-feedback', 'identity-check', 'realname', 'realname-verified', 'realname-reminder', 'independent-password', 'messages-home', 'messages-offline', 'messages-menu', 'message-actions', 'system-messages', 'chat-inbound-request', 'chat-inbound-message', 'chat-outbound-request', 'chat-status', 'chat-friend', 'chat-media', 'chat-blocked', 'chat-deleted', 'chat-standard', 'chat-attachments', 'chat-mixed', 'chat-contact-card', 'compose-keyboard', 'mentions-select', 'mentions-complete', 'mentions-message', 'emoji-panel', 'emoji-message', 'voice-ready', 'voice-hold', 'voice-recording', 'media-uploading', 'media-gallery', 'media-retry', 'upload-file', 'file-message', 'message-multiselect', 'favorite-success', 'forward-select', 'forward-multiple', 'forward-individual', 'forward-bundle', 'address-book', 'friend-requests', 'add-friend', 'my-friend-qr', 'friend-qr', 'friend-search-result', 'friend-verification', 'friend-profile', 'group-member-profile', 'friend-settings', 'friend-settings-blocked', 'friend-delete-confirm', 'block-list', 'block-confirm', 'clear-chat-confirm', 'group-list', 'group-empty', 'group-invite', 'group-events', 'group-join-requests', 'group-new-request', 'group-announcement', 'group-summary', 'group-announcement-detail', 'group-settings', 'group-profile', 'group-avatar', 'group-nickname', 'group-description', 'group-my-nickname', 'group-role-message', 'group-qr', 'group-governance', 'group-admins', 'group-admin-add', 'group-admin-success', 'group-admin-partial', 'group-admin-removed', 'group-mute-add', 'group-muted', 'group-owner-select', 'group-owner-confirm', 'group-files', 'group-file-upload', 'favorites', 'favorites-mixed', 'favorites-files', 'favorites-text', 'favorites-voice', 'favorites-links', 'favorites-select', 'favorite-share', 'file-download', 'file-downloading', 'file-downloaded', 'history-search', 'history-files', 'history-links', 'history-images', 'history-videos', 'call-history', 'call-incoming', 'audio-call-ringing', 'audio-call-active', 'audio-call-muted', 'audio-call-speaker', 'video-call-ringing', 'video-call-camera-off', 'video-call-active', 'video-call-peer-camera-off', 'call-minimized', 'workbench', 'organization-directory', 'meeting-organizer', 'meeting-attendee', 'meeting-create', 'meeting-detail', 'daily-report-editor', 'daily-report-mine', 'daily-report-team', 'daily-report-detail', 'monthly-report-editor', 'monthly-report-list', 'monthly-report-detail', 'executive-mailbox', 'executive-mailbox-notice', 'personal-center', 'personal-profile', 'profile-nickname', 'profile-birth-date', 'profile-signature', 'profile-gender', 'profile-region', 'personal-qrcode', 'android-settings', 'cache-clear-confirm', 'clear-history-confirm', 'change-password', 'delete-account-confirm', 'app-version', 'privacy-settings', 'friend-discovery-settings', 'youth-mode-off', 'youth-mode-on', 'youth-mode-verify', 'notification-permission', 'permission-settings-reminder', 'camera-permission-info', 'microphone-permission-info', 'fraud-risk-warning', 'fraud-risk-confirmation', 'abuse-report-reasons', 'abuse-report-details', 'user-feedback', ''];
|
||||
const SIDE_PANEL_VIEWS = ['acc_general', 'archive', 'blocked', 'contacts', 'cred', 'crop', 'edit', 'general', 'newtpk', 'notif', 'register', 'reset', 'security', 'settings', 'support', 'wallpapers', 'tenant', 'login', 'enterprise-register', 'enterprise-feedback', 'identity-check', 'realname', 'realname-verified', 'realname-reminder', 'independent-password', 'messages-home', 'messages-offline', 'messages-menu', 'message-actions', 'system-messages', 'chat-inbound-request', 'chat-inbound-message', 'chat-outbound-request', 'chat-status', 'chat-friend', 'chat-media', 'chat-blocked', 'chat-deleted', 'chat-standard', 'chat-attachments', 'chat-mixed', 'chat-contact-card', 'compose-keyboard', 'mentions-select', 'mentions-complete', 'mentions-message', 'emoji-panel', 'emoji-message', 'voice-ready', 'voice-hold', 'voice-recording', 'media-uploading', 'media-gallery', 'media-retry', 'upload-file', 'file-message', 'message-multiselect', 'favorite-success', 'forward-select', 'forward-multiple', 'forward-individual', 'forward-bundle', 'address-book', 'friend-requests', 'add-friend', 'my-friend-qr', 'friend-qr', 'friend-search-result', 'friend-verification', 'friend-profile', 'group-member-profile', 'friend-settings', 'friend-settings-blocked', 'friend-delete-confirm', 'block-list', 'block-confirm', 'clear-chat-confirm', 'group-list', 'group-empty', 'group-invite', 'group-events', 'group-join-requests', 'group-new-request', 'group-announcement', 'group-summary', 'group-announcement-detail', 'group-settings', 'group-profile', 'group-avatar', 'group-nickname', 'group-description', 'group-my-nickname', 'group-role-message', 'group-qr', 'group-governance', 'group-admins', 'group-admin-add', 'group-admin-success', 'group-admin-partial', 'group-admin-removed', 'group-mute-add', 'group-muted', 'group-owner-select', 'group-owner-confirm', 'group-files', 'group-file-upload', 'favorites', 'favorites-mixed', 'favorites-files', 'favorites-text', 'favorites-voice', 'favorites-links', 'favorites-select', 'favorite-share', 'file-download', 'file-downloading', 'file-downloaded', 'history-search', 'history-files', 'history-links', 'history-images', 'history-videos', 'call-history', 'call-incoming', 'audio-call-ringing', 'audio-call-active', 'audio-call-muted', 'audio-call-speaker', 'video-call-ringing', 'video-call-camera-off', 'video-call-active', 'video-call-peer-camera-off', 'call-minimized', 'workbench', 'organization-directory', 'meeting-organizer', 'meeting-attendee', 'meeting-create', 'meeting-detail', 'daily-report-editor', 'daily-report-mine', 'daily-report-team', 'daily-report-detail', 'monthly-report-editor', 'monthly-report-mine', 'monthly-report-team', 'monthly-report-detail', 'executive-mailbox', 'executive-mailbox-notice', 'personal-center', 'personal-profile', 'profile-nickname', 'profile-birth-date', 'profile-signature', 'profile-gender', 'profile-region', 'personal-qrcode', 'android-settings', 'cache-clear-confirm', 'clear-history-confirm', 'change-password', 'delete-account-confirm', 'app-version', 'privacy-settings', 'friend-discovery-settings', 'youth-mode-off', 'youth-mode-on', 'youth-mode-verify', 'notification-permission', 'permission-settings-reminder', 'camera-permission-info', 'microphone-permission-info', 'fraud-risk-warning', 'fraud-risk-confirmation', 'abuse-report-reasons', 'abuse-report-details', 'user-feedback', ''];
|
||||
const AUTH_FLOW_VIEWS = ['tenant', 'login', 'register', 'reset', 'cred', 'enterprise-register', 'enterprise-feedback'];
|
||||
const LOGIN_ERROR_TEXT_CN = {
|
||||
'authentication failed': '账号或密码错误',
|
||||
@@ -19491,7 +19491,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
||||
const chapterSixActive = ['group-list', 'group-empty', 'group-invite', 'group-events', 'group-join-requests', 'group-new-request', 'group-announcement', 'group-summary', 'group-announcement-detail', 'group-settings', 'group-profile', 'group-avatar', 'group-nickname', 'group-description', 'group-my-nickname', 'group-role-message', 'group-qr', 'group-governance', 'group-admins', 'group-admin-add', 'group-admin-success', 'group-admin-partial', 'group-admin-removed', 'group-mute-add', 'group-muted', 'group-owner-select', 'group-owner-confirm', 'group-files', 'group-file-upload'].includes(activeProductView);
|
||||
const chapterSevenActive = ['favorites', 'favorites-mixed', 'favorites-files', 'favorites-text', 'favorites-voice', 'favorites-links', 'favorites-select', 'favorite-share', 'file-download', 'file-downloading', 'file-downloaded', 'history-search', 'history-files', 'history-links', 'history-images', 'history-videos'].includes(activeProductView);
|
||||
const callExperienceActive = ['call-history', 'call-incoming', 'audio-call-ringing', 'audio-call-active', 'audio-call-muted', 'audio-call-speaker', 'video-call-ringing', 'video-call-camera-off', 'video-call-active', 'video-call-peer-camera-off', 'call-minimized'].includes(activeProductView);
|
||||
const workplaceCollaborationActive = ['workbench', 'organization-directory', 'meeting-organizer', 'meeting-attendee', 'meeting-create', 'meeting-detail', 'daily-report-editor', 'daily-report-mine', 'daily-report-team', 'daily-report-detail', 'monthly-report-editor', 'monthly-report-list', 'monthly-report-detail', 'executive-mailbox', 'executive-mailbox-notice'].includes(activeProductView);
|
||||
const workplaceCollaborationActive = ['workbench', 'organization-directory', 'meeting-organizer', 'meeting-attendee', 'meeting-create', 'meeting-detail', 'daily-report-editor', 'daily-report-mine', 'daily-report-team', 'daily-report-detail', 'monthly-report-editor', 'monthly-report-mine', 'monthly-report-team', 'monthly-report-detail', 'executive-mailbox', 'executive-mailbox-notice'].includes(activeProductView);
|
||||
const personalSettingsActive = ['personal-center', 'personal-profile', 'profile-nickname', 'profile-birth-date', 'profile-signature', 'profile-gender', 'profile-region', 'personal-qrcode', 'android-settings', 'cache-clear-confirm', 'clear-history-confirm', 'change-password', 'delete-account-confirm', 'app-version', 'privacy-settings', 'friend-discovery-settings', 'youth-mode-off', 'youth-mode-on', 'youth-mode-verify', 'notification-permission', 'permission-settings-reminder', 'camera-permission-info', 'microphone-permission-info'].includes(activeProductView);
|
||||
const securitySupportActive = ['fraud-risk-warning', 'fraud-risk-confirmation', 'abuse-report-reasons', 'abuse-report-details', 'user-feedback'].includes(activeProductView);
|
||||
return (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_23__.jsxDEV)("div", {
|
||||
@@ -20020,7 +20020,7 @@ const navigate = (view, params) => {
|
||||
});
|
||||
_lib_navigation_js__WEBPACK_IMPORTED_MODULE_2__["default"].navigateTo(hash);
|
||||
};
|
||||
const WORKPLACE_COLLABORATION_VIEWS = ['workbench', 'organization-directory', 'meeting-organizer', 'meeting-attendee', 'meeting-create', 'meeting-detail', 'daily-report-editor', 'daily-report-mine', 'daily-report-team', 'daily-report-detail', 'monthly-report-editor', 'monthly-report-list', 'monthly-report-detail', 'executive-mailbox', 'executive-mailbox-notice'];
|
||||
const WORKPLACE_COLLABORATION_VIEWS = ['workbench', 'organization-directory', 'meeting-organizer', 'meeting-attendee', 'meeting-create', 'meeting-detail', 'daily-report-editor', 'daily-report-mine', 'daily-report-team', 'daily-report-detail', 'monthly-report-editor', 'monthly-report-mine', 'monthly-report-team', 'monthly-report-detail', 'executive-mailbox', 'executive-mailbox-notice'];
|
||||
function Icon({
|
||||
children
|
||||
}) {
|
||||
@@ -20148,7 +20148,7 @@ const APP_ROUTES = {
|
||||
organization: 'organization-directory',
|
||||
meetings: 'meeting-attendee',
|
||||
daily_reports: 'daily-report-mine',
|
||||
monthly_reports: 'monthly-report-list',
|
||||
monthly_reports: 'monthly-report-mine',
|
||||
executive_mailbox: 'executive-mailbox'
|
||||
};
|
||||
function Workbench({
|
||||
@@ -21485,7 +21485,7 @@ function MonthlyReportEditor({
|
||||
className: "workplace-page report-editor-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "月报",
|
||||
back: "monthly-report-list"
|
||||
back: "monthly-report-mine"
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("section", {
|
||||
className: "daily-report-block-header",
|
||||
@@ -21536,49 +21536,113 @@ function MonthlyReportEditor({
|
||||
}, void 0, true);
|
||||
}
|
||||
function MonthlyReportList({
|
||||
team,
|
||||
myUserId,
|
||||
onToast
|
||||
}) {
|
||||
const [reports, setReports] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(() => (0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.readCachedData)('monthly-reports:mine') || null);
|
||||
const cacheKey = 'monthly-reports:' + (team ? 'managed' : 'mine');
|
||||
const statsCacheKey = 'monthly-stats:' + toMonthInputValue(new Date());
|
||||
const [reports, setReports] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(() => (0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.readCachedData)(cacheKey) || null);
|
||||
const [loadError, setLoadError] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(false);
|
||||
const [query, setQuery] = react__WEBPACK_IMPORTED_MODULE_0___default().useState('');
|
||||
react__WEBPACK_IMPORTED_MODULE_0___default().useEffect(() => {
|
||||
const [stats, setStats] = react__WEBPACK_IMPORTED_MODULE_0___default().useState(() => team && (0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.readCachedData)(statsCacheKey) || null);
|
||||
const ids = (reports || []).map(r => r.author_id);
|
||||
const names = useUserNames(ids, myUserId);
|
||||
const load = () => {
|
||||
setLoadError(false);
|
||||
(0,_lib_im_api_js__WEBPACK_IMPORTED_MODULE_3__.getMonthlyReports)({
|
||||
scope: 'mine'
|
||||
scope: team ? 'managed' : 'mine'
|
||||
}).then(d => {
|
||||
const list = d.reports || d.items || [];
|
||||
(0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.writeCachedData)('monthly-reports:mine', list);
|
||||
(0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.writeCachedData)(cacheKey, list);
|
||||
setReports(list);
|
||||
}).catch(err => {
|
||||
onToast(err.message || '月报列表加载失败');
|
||||
setLoadError(true);
|
||||
setReports(prev => prev || []);
|
||||
});
|
||||
}, []);
|
||||
const filtered = (reports || []).filter(r => (r.month || '').includes(query) || (r.work_summary_short || '').includes(query));
|
||||
if (team) (0,_lib_im_api_js__WEBPACK_IMPORTED_MODULE_3__.getMonthlyStatistics)(toMonthInputValue(new Date())).then(s => {
|
||||
(0,_lib_use_cached_data_js__WEBPACK_IMPORTED_MODULE_4__.writeCachedData)(statsCacheKey, s);
|
||||
setStats(s);
|
||||
}).catch(() => {});
|
||||
};
|
||||
react__WEBPACK_IMPORTED_MODULE_0___default().useEffect(load, [team]);
|
||||
const filtered = (reports || []).filter(r => {
|
||||
const hay = team ? `${names[r.author_id] || ''}${r.work_summary_short || ''}` : r.month;
|
||||
return (hay || '').includes(query);
|
||||
});
|
||||
return (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("div", {
|
||||
className: "workplace-page report-list-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "月报",
|
||||
action: "add",
|
||||
actionLabel: "填写月报",
|
||||
onAction: () => navigate('monthly-report-editor')
|
||||
onAction: () => navigate('monthly-report-editor'),
|
||||
back: team ? 'monthly-report-mine' : 'workbench'
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("label", {
|
||||
children: [team && stats ? (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("section", {
|
||||
className: "report-statistics",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("header", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("span", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("small", {
|
||||
children: formatMonthLabel(toMonthInputValue(new Date()))
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("strong", {
|
||||
children: "全公司"
|
||||
}, void 0, false)]
|
||||
}, void 0, true), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("button", {
|
||||
type: "button",
|
||||
onClick: () => navigate('monthly-report-mine'),
|
||||
children: "我的月报"
|
||||
}, void 0, false)]
|
||||
}, void 0, true), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("div", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("span", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("b", {
|
||||
children: stats.expected_count || 0
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("small", {
|
||||
children: "应提交"
|
||||
}, void 0, false)]
|
||||
}, void 0, true), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("span", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("b", {
|
||||
children: stats.submitted_count || 0
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("small", {
|
||||
children: "已提交"
|
||||
}, void 0, false)]
|
||||
}, void 0, true), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("span", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("b", {
|
||||
children: (stats.expected_count || 0) - (stats.submitted_count || 0)
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("small", {
|
||||
children: "未提交"
|
||||
}, void 0, false)]
|
||||
}, void 0, true)]
|
||||
}, void 0, true)]
|
||||
}, void 0, true) : null, (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("label", {
|
||||
className: "workplace-search",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Icon, {
|
||||
children: "search"
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("input", {
|
||||
value: query,
|
||||
onChange: e => setQuery(e.target.value),
|
||||
placeholder: "搜索月份或内容"
|
||||
placeholder: team ? '搜索姓名或内容' : '搜索月份或内容'
|
||||
}, void 0, false)]
|
||||
}, void 0, true), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("section", {
|
||||
}, void 0, true), !team ? (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("nav", {
|
||||
className: "report-role-switch",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("button", {
|
||||
type: "button",
|
||||
className: "active",
|
||||
children: "我的月报"
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("button", {
|
||||
type: "button",
|
||||
onClick: () => navigate('monthly-report-team'),
|
||||
children: "团队统计"
|
||||
}, void 0, false)]
|
||||
}, void 0, true) : null, (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("section", {
|
||||
className: "report-cards",
|
||||
children: reports == null ? (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("p", {
|
||||
className: "organization-loading",
|
||||
children: loadError ? '月报列表加载失败' : '加载中…'
|
||||
children: "加载中…"
|
||||
}, void 0, false) : filtered.length === 0 ? (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("p", {
|
||||
className: "organization-loading",
|
||||
children: "暂无月报"
|
||||
children: loadError ? '月报列表加载失败' : '暂无月报'
|
||||
}, void 0, false) : filtered.map(r => (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("button", {
|
||||
type: "button",
|
||||
onClick: () => navigate((r.action || (r.status === 'submitted' ? 'view' : 'edit')) === 'view' ? 'monthly-report-detail' : 'monthly-report-editor', {
|
||||
@@ -21591,9 +21655,9 @@ function MonthlyReportList({
|
||||
}, void 0, false)
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("span", {
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("strong", {
|
||||
children: formatMonthLabel(r.month)
|
||||
children: team ? names[r.author_id] || r.author_id : formatMonthLabel(r.month)
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("small", {
|
||||
children: "工作总结与下月计划"
|
||||
children: team ? formatMonthLabel(r.month) : '工作总结与下月计划'
|
||||
}, void 0, false)]
|
||||
}, void 0, true), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("em", {
|
||||
className: r.status,
|
||||
@@ -21631,7 +21695,7 @@ function MonthlyReportDetail({
|
||||
className: "workplace-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "查看详情",
|
||||
back: "monthly-report-list"
|
||||
back: "monthly-report-mine"
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
children: (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("p", {
|
||||
className: "organization-loading",
|
||||
@@ -21651,7 +21715,7 @@ function MonthlyReportDetail({
|
||||
className: "workplace-page",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(Header, {
|
||||
title: "查看详情",
|
||||
back: "monthly-report-list"
|
||||
back: "monthly-report-mine"
|
||||
}, void 0, false), (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("main", {
|
||||
className: "report-detail",
|
||||
children: [(0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)("section", {
|
||||
@@ -21917,7 +21981,9 @@ function WorkplaceCollaborationView({
|
||||
team: view === 'daily-report-team',
|
||||
myUserId: myUserId,
|
||||
onToast: setToast
|
||||
}, void 0, false);else if (view === 'monthly-report-list') content = (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(MonthlyReportList, {
|
||||
}, void 0, false);else if (view === 'monthly-report-mine' || view === 'monthly-report-team') content = (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(MonthlyReportList, {
|
||||
team: view === 'monthly-report-team',
|
||||
myUserId: myUserId,
|
||||
onToast: setToast
|
||||
}, void 0, false);else if (view === 'daily-report-detail') content = (0,react_jsx_dev_runtime__WEBPACK_IMPORTED_MODULE_5__.jsxDEV)(DailyReportDetail, {
|
||||
hashParams: hashParams,
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user