ソースを参照

Merge branch 'develop' of http://192.168.0.253:3000/bozzysadmb/ISCS-Client-V1.0 into develop

pm 4 ヶ月 前
コミット
11290b948c

+ 0 - 15
src/Dashboard.tsx

@@ -1027,21 +1027,6 @@ export default function Dashboard() {
                 <span className="text-sm text-gray-700">{i18n.language === 'zh' ? 'EN' : '中文'}</span>
               </button>
               
-              {/* 消息通知 */}
-              <div className="relative group">
-                <button 
-                  className="relative p-2.5 hover:bg-gray-100 rounded-xl transition-colors"
-                  title="消息通知"
-                >
-                  <Bell className="w-5 h-5 text-gray-600" />
-                  <span className="absolute top-1.5 right-1.5 w-2 h-2 bg-red-500 rounded-full"></span>
-                </button>
-                {/* Tooltip */}
-                <div className="absolute right-0 top-full mt-2 px-3 py-1.5 bg-gray-900 text-white text-xs rounded-lg opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap z-50">
-                  {/* 消息通知 */}
-                </div>
-              </div>
-
               {/* 通知管理 - 点击后进入页面,二级菜单在 tab 标签中显示 */}
               {notificationMenu && (
                 <div className="relative group">

+ 1 - 1
src/components/notification/EmailNotifyForm.tsx

@@ -134,7 +134,7 @@ const EmailNotifyForm = forwardRef<EmailNotifyFormRef, EmailNotifyFormProps>(({
       onOk={submitForm}
       confirmLoading={formLoading}
       width={800}
-      destroyOnClose
+      destroyOnHidden
     >
       <Form
         form={form}

+ 3 - 0
src/components/notification/EmailNotifyManagement.tsx

@@ -129,6 +129,7 @@ export default function EmailNotifyManagement() {
   const columns: ColumnsType<MailNotifyConfigVO> = [
     {
       title: '序号',
+      key: 'index',
       width: 80,
       align: 'center',
       render: (_: any, __: MailNotifyConfigVO, index: number) => {
@@ -143,6 +144,7 @@ export default function EmailNotifyManagement() {
     },
     {
       title: '是否激活',
+      key: 'status',
       dataIndex: 'status',
       width: 120,
       align: 'center',
@@ -174,6 +176,7 @@ export default function EmailNotifyManagement() {
     },
     {
       title: '操作',
+      key: 'action',
       width: 150,
       align: 'center',
       fixed: 'right',