@liujitcn/kratos-taro-app-system 0.0.80 → 0.0.82

package/dist/build.mjs

@@ -8,7 +8,6 @@ var systemPages = {
   "pages/my/my": {
     style: {
       navigationStyle: "custom",
-      navigationBarTextStyle: "white",
       navigationBarTitleText: ""
     }
   },
@@ -22,7 +21,6 @@ var systemPages = {
   "pagesMember/profile/profile": {
     style: {
       navigationStyle: "custom",
-      navigationBarTextStyle: "white",
       navigationBarTitleText: ""
     }
   },

package/dist/module.mjs

@@ -6,7 +6,6 @@ var systemPages = {
   "pages/my/my": {
     style: {
       navigationStyle: "custom",
-      navigationBarTextStyle: "white",
       navigationBarTitleText: ""
     }
   },
@@ -20,7 +19,6 @@ var systemPages = {
   "pagesMember/profile/profile": {
     style: {
       navigationStyle: "custom",
-      navigationBarTextStyle: "white",
       navigationBarTitleText: ""
     }
   },
@@ -155,10 +153,13 @@ var zh_CN_default = {
   "system.settings.mfa_disable_success": "\u591A\u56E0\u7D20\u8BA4\u8BC1\u5DF2\u7981\u7528",
   "system.settings.mfa_copy_uri": "\u590D\u5236\u7ED1\u5B9A\u5730\u5740",
   "system.settings.mfa_copy_success": "\u590D\u5236\u6210\u529F",
-  "system.notification.title": "\u6D88\u606F\u4E2D\u5FC3",
+  "system.notification.title": "\u6D88\u606F",
   "system.notification.sender.system": "\u7CFB\u7EDF",
   "system.notification.description": "\u67E5\u770B\u7CFB\u7EDF\u901A\u77E5\u548C\u4E1A\u52A1\u6D88\u606F",
   "system.notification.empty": "\u6682\u65E0\u6D88\u606F",
+  "system.notification.empty_inbox_hint": "\u65B0\u6D88\u606F\u5C06\u5728\u6B64\u663E\u793A",
+  "system.notification.empty_unread_hint": "\u5168\u90E8\u6D88\u606F\u5747\u5DF2\u8BFB\u5B8C",
+  "system.notification.empty_archived_hint": "\u5F52\u6863\u7684\u6D88\u606F\u5C06\u5728\u6B64\u663E\u793A",
   "system.notification.action.view_all": "\u67E5\u770B\u5168\u90E8",
   "system.notification.view.inbox": "\u5168\u90E8",
   "system.notification.view.unread": "\u672A\u8BFB",
@@ -307,10 +308,13 @@ var en_US_default = {
   "system.settings.mfa_disable_success": "Multi-factor authentication disabled",
   "system.settings.mfa_copy_uri": "Copy binding address",
   "system.settings.mfa_copy_success": "Copied",
-  "system.notification.title": "Message Center",
+  "system.notification.title": "Messages",
   "system.notification.sender.system": "System",
   "system.notification.description": "View system notifications and business messages",
   "system.notification.empty": "No messages",
+  "system.notification.empty_inbox_hint": "New messages will appear here",
+  "system.notification.empty_unread_hint": "You're all caught up",
+  "system.notification.empty_archived_hint": "Archived messages will appear here",
   "system.notification.action.view_all": "View all",
   "system.notification.view.inbox": "All",
   "system.notification.view.unread": "Unread",
@@ -459,10 +463,13 @@ var ja_JP_default = {
   "system.settings.mfa_disable_success": "\u591A\u8981\u7D20\u8A8D\u8A3C\u3092\u7121\u52B9\u306B\u3057\u307E\u3057\u305F",
   "system.settings.mfa_copy_uri": "\u767B\u9332\u30A2\u30C9\u30EC\u30B9\u3092\u30B3\u30D4\u30FC",
   "system.settings.mfa_copy_success": "\u30B3\u30D4\u30FC\u3057\u307E\u3057\u305F",
-  "system.notification.title": "\u30E1\u30C3\u30BB\u30FC\u30B8\u30BB\u30F3\u30BF\u30FC",
+  "system.notification.title": "\u30E1\u30C3\u30BB\u30FC\u30B8",
   "system.notification.sender.system": "\u30B7\u30B9\u30C6\u30E0",
   "system.notification.description": "\u30B7\u30B9\u30C6\u30E0\u901A\u77E5\u3068\u696D\u52D9\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u78BA\u8A8D",
   "system.notification.empty": "\u30E1\u30C3\u30BB\u30FC\u30B8\u306F\u3042\u308A\u307E\u305B\u3093",
+  "system.notification.empty_inbox_hint": "\u65B0\u3057\u3044\u30E1\u30C3\u30BB\u30FC\u30B8\u306F\u3053\u3053\u306B\u8868\u793A\u3055\u308C\u307E\u3059",
+  "system.notification.empty_unread_hint": "\u3059\u3079\u3066\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u3092\u65E2\u8AAD\u306B\u3057\u307E\u3057\u305F",
+  "system.notification.empty_archived_hint": "\u30A2\u30FC\u30AB\u30A4\u30D6\u6E08\u307F\u306E\u30E1\u30C3\u30BB\u30FC\u30B8\u306F\u3053\u3053\u306B\u8868\u793A\u3055\u308C\u307E\u3059",
   "system.notification.action.view_all": "\u3059\u3079\u3066\u8868\u793A",
   "system.notification.view.inbox": "\u3059\u3079\u3066",
   "system.notification.view.unread": "\u672A\u8AAD",
@@ -611,10 +618,13 @@ var zh_TW_default = {
   "system.settings.mfa_disable_success": "\u591A\u56E0\u7D20\u8A8D\u8B49\u5DF2\u505C\u7528",
   "system.settings.mfa_copy_uri": "\u8907\u88FD\u7D81\u5B9A\u5730\u5740",
   "system.settings.mfa_copy_success": "\u8907\u88FD\u6210\u529F",
-  "system.notification.title": "\u6D88\u606F\u4E2D\u5FC3",
+  "system.notification.title": "\u6D88\u606F",
   "system.notification.sender.system": "\u7CFB\u7D71",
   "system.notification.description": "\u67E5\u770B\u7CFB\u7D71\u901A\u77E5\u548C\u696D\u52D9\u6D88\u606F",
   "system.notification.empty": "\u66AB\u7121\u6D88\u606F",
+  "system.notification.empty_inbox_hint": "\u65B0\u8A0A\u606F\u5C07\u5728\u6B64\u986F\u793A",
+  "system.notification.empty_unread_hint": "\u5168\u90E8\u8A0A\u606F\u5747\u5DF2\u8B80\u5B8C",
+  "system.notification.empty_archived_hint": "\u5C01\u5B58\u7684\u8A0A\u606F\u5C07\u5728\u6B64\u986F\u793A",
   "system.notification.action.view_all": "\u67E5\u770B\u5168\u90E8",
   "system.notification.view.inbox": "\u5168\u90E8",
   "system.notification.view.unread": "\u672A\u8B80",

package/package.json

@@ -7,7 +7,7 @@
     "type": "git",
     "url": "git@github.com:liujitcn/kratos-admin.git"
   },
-  "version": "0.0.80",
+  "version": "0.0.82",
   "type": "module",
   "files": [
     "dist",
@@ -38,8 +38,8 @@
     "@tarojs/components": "4.2.1",
     "@tarojs/taro": "4.2.1",
     "react": "18.3.1",
-    "@liujitcn/kratos-taro-app-core": "^0.0.80",
-    "@liujitcn/kratos-taro-app-ui": "^0.0.80"
+    "@liujitcn/kratos-taro-app-core": "^0.0.82",
+    "@liujitcn/kratos-taro-app-ui": "^0.0.82"
   },
   "scripts": {
     "build": "pnpm run build:entries && pnpm pack --pack-destination ../../../dist/npm",

package/src/locales/en-US.json

@@ -119,10 +119,13 @@
   "system.settings.mfa_disable_success": "Multi-factor authentication disabled",
   "system.settings.mfa_copy_uri": "Copy binding address",
   "system.settings.mfa_copy_success": "Copied",
-  "system.notification.title": "Message Center",
+  "system.notification.title": "Messages",
   "system.notification.sender.system": "System",
   "system.notification.description": "View system notifications and business messages",
   "system.notification.empty": "No messages",
+  "system.notification.empty_inbox_hint": "New messages will appear here",
+  "system.notification.empty_unread_hint": "You're all caught up",
+  "system.notification.empty_archived_hint": "Archived messages will appear here",
   "system.notification.action.view_all": "View all",
   "system.notification.view.inbox": "All",
   "system.notification.view.unread": "Unread",

package/src/locales/ja-JP.json

@@ -119,10 +119,13 @@
   "system.settings.mfa_disable_success": "多要素認証を無効にしました",
   "system.settings.mfa_copy_uri": "登録アドレスをコピー",
   "system.settings.mfa_copy_success": "コピーしました",
-  "system.notification.title": "メッセージセンター",
+  "system.notification.title": "メッセージ",
   "system.notification.sender.system": "システム",
   "system.notification.description": "システム通知と業務メッセージを確認",
   "system.notification.empty": "メッセージはありません",
+  "system.notification.empty_inbox_hint": "新しいメッセージはここに表示されます",
+  "system.notification.empty_unread_hint": "すべてのメッセージを既読にしました",
+  "system.notification.empty_archived_hint": "アーカイブ済みのメッセージはここに表示されます",
   "system.notification.action.view_all": "すべて表示",
   "system.notification.view.inbox": "すべて",
   "system.notification.view.unread": "未読",

package/src/locales/zh-CN.json

@@ -119,10 +119,13 @@
   "system.settings.mfa_disable_success": "多因素认证已禁用",
   "system.settings.mfa_copy_uri": "复制绑定地址",
   "system.settings.mfa_copy_success": "复制成功",
-  "system.notification.title": "消息中心",
+  "system.notification.title": "消息",
   "system.notification.sender.system": "系统",
   "system.notification.description": "查看系统通知和业务消息",
   "system.notification.empty": "暂无消息",
+  "system.notification.empty_inbox_hint": "新消息将在此显示",
+  "system.notification.empty_unread_hint": "全部消息均已读完",
+  "system.notification.empty_archived_hint": "归档的消息将在此显示",
   "system.notification.action.view_all": "查看全部",
   "system.notification.view.inbox": "全部",
   "system.notification.view.unread": "未读",

package/src/locales/zh-TW.json

@@ -119,10 +119,13 @@
   "system.settings.mfa_disable_success": "多因素認證已停用",
   "system.settings.mfa_copy_uri": "複製綁定地址",
   "system.settings.mfa_copy_success": "複製成功",
-  "system.notification.title": "消息中心",
+  "system.notification.title": "消息",
   "system.notification.sender.system": "系統",
   "system.notification.description": "查看系統通知和業務消息",
   "system.notification.empty": "暫無消息",
+  "system.notification.empty_inbox_hint": "新訊息將在此顯示",
+  "system.notification.empty_unread_hint": "全部訊息均已讀完",
+  "system.notification.empty_archived_hint": "封存的訊息將在此顯示",
   "system.notification.action.view_all": "查看全部",
   "system.notification.view.inbox": "全部",
   "system.notification.view.unread": "未讀",

package/src/pages.ts

@@ -5,7 +5,6 @@ export const systemPages: Record<string, KratosTaroPageConfig> = {
   'pages/my/my': {
     style: {
       navigationStyle: 'custom',
-      navigationBarTextStyle: 'white',
       navigationBarTitleText: '',
     },
   },
@@ -19,7 +18,6 @@ export const systemPages: Record<string, KratosTaroPageConfig> = {
   'pagesMember/profile/profile': {
     style: {
       navigationStyle: 'custom',
-      navigationBarTextStyle: 'white',
       navigationBarTitleText: '',
     },
   },

package/src/views/pages/my/my.scss

@@ -14,8 +14,8 @@ page {
 }
 
 .my-viewport--weapp .my-content {
-  /* 44PX 是系统导航栏高度，88px 按设计稿转换为 44 物理像素。 */
-  padding-top: calc(44PX + 88px);
+  /* k-top 在小程序端自带 44PX 状态栏高度的导航带，页面不再额外让出顶部空间 */
+  padding-top: 0;
 }
 
 .my-stack {

package/src/views/pages/my/my.tsx

@@ -29,7 +29,7 @@ export default function MyPage() {
   const gearIcon = `data:image/svg+xml;charset=utf-8,${encodeURIComponent(
     `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="none" stroke="${
       themeStore.theme === 'light' ? '#102232' : '#e9f4f6'
-    }" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.6 1.6 0 0 0 .3 1.8 2 2 0 1 1-2.8 2.8 1.6 1.6 0 0 0-2.7 1.1 2 2 0 1 1-4 0 1.6 1.6 0 0 0-2.6-1.1 2 2 0 1 1-2.8-2.8A1.6 1.6 0 0 0 3 13.9a2 2 0 1 1 0-4 1.6 1.6 0 0 0 1.5-2.7 2 2 0 1 1 2.8-2.8A1.6 1.6 0 0 0 10 4.6a2 2 0 1 1 4 0 1.6 1.6 0 0 0 2.7.6 2 2 0 1 1 2.8 2.8 1.6 1.6 0 0 0-.1 2.6"/></svg>`,
+    }" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="3"/><path d="M19.4 15a1.6 1.6 0 0 0 .3 1.8 2 2 0 1 1-2.8 2.8 1.6 1.6 0 0 0-2.7 1.1 2 2 0 1 1-4 0 1.6 1.6 0 0 0-2.6-1.1 2 2 0 1 1-2.8-2.8A1.6 1.6 0 0 0 3 13.9a2 2 0 1 1 0-4 1.6 1.6 0 0 0 1.5-2.7 2 2 0 1 1 2.8-2.8A1.6 1.6 0 0 0 10 4.6a2 2 0 1 1 4 0 1.6 1.6 0 0 0 2.7.6 2 2 0 1 1 2.8 2.8 1.6 1.6 0 0 0-.1 2.6a2.2 2.2 0 1 1 0 4.4Z"/></svg>`,
   )}`
   /** 个人卡账号行：登录展示账号，未登录提示去登录。 */
   const accountText =
@@ -64,8 +64,6 @@ export default function MyPage() {
             className='k-glass k-glass--lit k-pfx my-profile'
             onClick={() => navigateAppRoute('app/profile')}
           >
-            <View className='k-cnr k-cnr--tr' aria-hidden />
-            <View className='k-cnr k-cnr--bl' aria-hidden />
             <View className='my-pfx-main'>
               {isLoggedIn && profile ? (
                 <Image

package/src/views/pagesMember/message/detail.tsx

@@ -26,6 +26,7 @@ export default function MessageDetailPage() {
     if (!value.read_at) await defNotificationService.MarkNotificationRead({ ids: [id] })
   }
 
+  /** 将系统通知发送者映射到当前语言。 */
   function resolveSenderName(value?: string) {
     if (value === '系统' || value === '__I18N__:system.notification.sender.system') {
       return t('system.notification.sender.system')

package/src/views/pagesMember/message/index.tsx

@@ -2,7 +2,13 @@ import type { CSSProperties } from 'react'
 import { useDidShow } from '@tarojs/taro'
 import { Button, Text, View } from '@tarojs/components'
 import { useRef, useState } from 'react'
-import { getMpCapsuleRightGap, navigateAppView, t, useThemeStore } from '@liujitcn/kratos-taro-app-core'
+import {
+  getMpCapsuleRightGap,
+  KratosEmpty,
+  navigateAppView,
+  t,
+  useThemeStore,
+} from '@liujitcn/kratos-taro-app-core'
 import { UniIcon } from '@liujitcn/kratos-taro-app-ui'
 import { defNotificationService } from '../../../api/base/v1/notification'
 import type { Notification, NotificationCategory } from '../../../rpc/base/v1/notification'
@@ -155,6 +161,15 @@ export default function MessageInboxPage() {
     navigateAppView('MESSAGE_DETAIL', { id: String(item.id) })
   }
 
+  /** 空态提示语随当前视图切换。 */
+  function emptyHintKey() {
+    if (selectedView === NotificationView.NOTIFICATION_VIEW_UNREAD)
+      return 'system.notification.empty_unread_hint'
+    if (selectedView === NotificationView.NOTIFICATION_VIEW_ARCHIVED)
+      return 'system.notification.empty_archived_hint'
+    return 'system.notification.empty_inbox_hint'
+  }
+
   return (
     <View
       className={`message-page ${
@@ -163,7 +178,7 @@ export default function MessageInboxPage() {
     >
       <View className='k-top message-header' style={topNavStyle}>
         <View className='message-header__title'>
-          <Text className='k-top__t2'>{t('system.notification.title')}</Text>
+          <Text className='message-header__text'>{t('system.notification.title')}</Text>
           {unreadTotal > 0 && <View className='message-unread-dot' aria-hidden='true' />}
         </View>
         {selectedView !== NotificationView.NOTIFICATION_VIEW_ARCHIVED && unreadTotal > 0 && (
@@ -227,9 +242,11 @@ export default function MessageInboxPage() {
               </View>
               <View className='message-item__body'>
                 <Text className='k-msg-item__title'>{item.title}</Text>
-                <Text className='k-msg-item__meta'>{item.category_name}</Text>
+                <View className='k-msg-item__foot'>
+                  <Text className='k-msg-item__meta'>{item.category_name}</Text>
+                  <Text className='k-msg-item__time'>{item.received_at}</Text>
+                </View>
               </View>
-              <Text className='k-msg-item__time'>{item.received_at}</Text>
             </View>
             {(selectedView === NotificationView.NOTIFICATION_VIEW_ARCHIVED ||
               item.allow_archive ||
@@ -283,7 +300,13 @@ export default function MessageInboxPage() {
         </Button>
       )}
       {finished && items.length === 0 && (
-        <View className='empty'>{t('system.notification.empty')}</View>
+        <KratosEmpty
+          icon={
+            <UniIcon type='notification-filled' size={26} color='var(--kratos-color-primary)' />
+          }
+          title={t('system.notification.empty')}
+          description={t(emptyHintKey())}
+        />
       )}
     </View>
   )

package/src/views/pagesMember/message/message.scss

@@ -7,16 +7,35 @@
 }
 
 .message-header {
+  /* 标题绝对居中后头部不再依赖流内内容撑高，保证标题行与筛选行留出间距 */
+  min-height: 76px;
   padding: 20px 4px 24px;
 }
 
+/* 标题排版与 k-page-nav__title/k-top__title 同规格，绝对居中后文字与红点同行排布 */
 .message-header__title {
+  position: absolute;
+  left: 50%;
   display: flex;
   align-items: center;
   min-width: 0;
+  max-width: calc(100% - 190px);
+  overflow: hidden;
+  font-size: 16PX;
+  font-weight: 700;
+  color: var(--kratos-color-text);
+  transform: translateX(-50%);
+  white-space: nowrap;
+}
+
+.message-header__text {
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 
 .message-unread-dot {
+  flex-shrink: 0;
   width: 12px;
   height: 12px;
   margin-left: 12px;
@@ -39,10 +58,6 @@
   min-width: 0;
 }
 
-.message-item__body .k-msg-item__meta {
-  display: block;
-}
-
 .load-more {
   box-sizing: border-box;
   width: 100%;
@@ -61,13 +76,6 @@
   border: 0;
 }
 
-.empty {
-  padding: 120px 0;
-  color: var(--kratos-color-text-dim);
-  font-family: var(--kratos-font-mono);
-  text-align: center;
-}
-
 .detail-page {
   box-sizing: border-box;
   min-height: 100vh;
@@ -94,7 +102,8 @@
 
 .detail-meta {
   display: flex;
-  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
   gap: 18px;
   margin: 24px 0 36px;
   padding-bottom: 28px;
@@ -107,6 +116,10 @@
 .detail-category {
   display: inline-flex;
   align-items: center;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .detail-category__icon {

package/src/views/pagesMember/profile/profile.tsx

@@ -164,8 +164,6 @@ export default function ProfilePage() {
         </View>
 
         <View className='k-glass k-glass--lit k-pfx profile-id' onClick={() => void onAvatarChange()}>
-          <View className='k-cnr k-cnr--tl' aria-hidden />
-          <View className='k-cnr k-cnr--br' aria-hidden />
           <View className='profile-id__main'>
             <View className='k-pfx__av'>
               <Image className='profile-av-img' src={userInfo.avatar ? formatSrc(userInfo.avatar) : defaultAvatar} mode='aspectFill' />