diff --git a/.collaboration b/.collaboration
index e684b0d3..687fe556 100644
--- a/.collaboration
+++ b/.collaboration
@@ -802,19 +802,7 @@
   },
   {
     "ModuleName": "PCPage/汇报详情",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:53:13.5717893+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\日报\\汇报详情.json",
-      "Pages\\汇报\\日报\\汇报详情.rd",
-      "Pages\\484d3ed119274a60bf32f15d178cf60.json",
-      "Pages\\484d3ed119274a60bf32f15d178cf60.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/汇报详情预览",
@@ -822,17 +810,7 @@
   },
   {
     "ModuleName": "PCPage/导入汇报数据",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:54:01.8757914+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\日报\\导入汇报数据.json",
-      "Pages\\汇报\\日报\\导入汇报数据.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/日报助手",
@@ -920,19 +898,7 @@
   },
   {
     "ModuleName": "PCPage/首页",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:22:41.3290957+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\首页\\首页.json",
-      "Pages\\首页\\首页.rd",
-      "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.json",
-      "Pages\\2d17eefef7c5473fbc54f0c5820a6c1.rd"
-    ]
+    "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/AI欢迎页",
@@ -976,33 +942,11 @@
   },
   {
     "ModuleName": "UserControlPage/聊天起泡",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:25:42.9945518+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\聊天起泡.json",
-      "UserControlPages\\聊天起泡.rd"
-    ]
+    "ModuleType": 31
   },
   {
     "ModuleName": "UserControlPage/聊天列表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:24:52.8534455+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\聊天列表.json",
-      "UserControlPages\\聊天列表.rd",
-      "Pages\\21293af3013f474faf264d978cf3501.json",
-      "Pages\\21293af3013f474faf264d978cf3501.rd"
-    ]
+    "ModuleType": 31
   },
   {
     "ModuleName": "ServerCommands/任务",
@@ -1146,16 +1090,7 @@
   },
   {
     "ModuleName": "ServerCommand/AI报工数据转日报",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:59:04.3798603+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\AI报工数据转日报.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "ServerCommand/AI内容转报工数据",
@@ -1551,19 +1486,7 @@
   },
   {
     "ModuleName": "CustomLibrary",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:31:46.7643343+08:00",
-    "ModuleType": 12,
-    "ToRemoveFiles": [
-      "CustomLibraries.json",
-      "UserFile\\BaseCss.css",
-      "UserFile\\CustomFormula.js",
-      "UserFile\\echart.js"
-    ]
+    "ModuleType": 12
   },
   {
     "ModuleName": "MapJsonFile",
@@ -1611,16 +1534,7 @@
   },
   {
     "ModuleName": "ServerCommand/AI对话",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-04-30T15:18:08.6779809+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\AI\\AI对话.json"
-    ]
+    "ModuleType": 15
   },
   {
     "ModuleName": "Notification/AI流消息",
diff --git a/Pages/484d3ed119274a60bf32f15d178cf60.json b/Pages/484d3ed119274a60bf32f15d178cf60.json
index 6c4e913c..28979acf 100644
--- a/Pages/484d3ed119274a60bf32f15d178cf60.json
+++ b/Pages/484d3ed119274a60bf32f15d178cf60.json
@@ -227,7 +227,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "09d6a89d-20e8-405b-af70-c3aed0b4e35b"
+                "ID": "8efb05a9-8ea5-4eac-8e3e-2fdeb61920c3"
               }
             ]
           }
@@ -762,7 +762,7 @@
                     "ShowConfirm": false
                   }
                 ],
-                "ID": "0e757d5b-6987-497f-88dc-0426d4dea122"
+                "ID": "4a038bea-a4cf-4eeb-a41e-259ac57329f6"
               }
             ]
           }
@@ -849,7 +849,7 @@
                     "MethodName": "ExecuteCommand"
                   }
                 ],
-                "ID": "ddbb3360-860d-4c61-a1bf-75cad5a1751b"
+                "ID": "dfb9a093-a3cc-4d57-b432-1cc08cef7321"
               },
               {
                 "CommandList": [
@@ -863,7 +863,7 @@
                     "MethodName": "ExecuteCommand"
                   }
                 ],
-                "ID": "bc179c99-9646-47ef-b50a-261abb860882"
+                "ID": "e2b2f578-b540-4524-a570-cdb282e8418b"
               }
             ]
           }
@@ -1114,4 +1114,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//Jm0v0OAUHm6mGCVYSVybmnkcEkDHjNT7vsEILOR1gnlaIidZoOh5mrpqU6oPmyJSMLfXdblPuciT/oZP8mTdtquIXw07dCBV+w4zBG7D1vjVUTPB4ijpD2ECi0UL5F+SUC2+WJWQfhNyWPbseO4mjY7g3/5eot3nt8wMVXIP0PKtWk8M48sK/mFGEiEF5ccCKicSXUSLdLaFltIyMAPfdJilImHLNI9djc8ujDNepzNkLROh24UthPnt4qMVbXmTMLFZpEWUa4QNCTr+Qr00fFlft3T9Fk/9mfcvv2o8lz78mdOVqZqTXrtWeixXtCgWhCSIUgb3fhGDuhIlim2CEQipaYoFGvZlBWDZevgum4ZLbDgSavYGs51Rqmol6uugCVXdGU1PFgNkZwFdR7BnPD4U7oa784xjP6Q6AiFXKFHTolX1FjmpcQKIkrmKJhIwovXp6OIPit0wmCRps5Vvh6wbRXpgBGHve44nn0AuK5eYJKOFt3vh6MVVfKiAm7LMXOS9JdX9fitcxT0Dd8kuJ+ffeplfyJk8U9MxmF6IhU3Bl/XzIlddcd+pkbXHUp+CoD+1mCtIFSGsls1yJ8Waw89iGXo8gqSLhWY1JuXWLHvhxoEeANOLrxkNWR9FYfeuVeclNLEDuzyAv4RId0GTYP/VNcLfEV8ErFau4N5KhRdCOXdRKTjP1/if+tnJI8baFOgbFCTKwauCLpZAM4QpWwq7ZUn1Q3GWA5TvIPQ9CS7qtP/N8tdwhMYWw/X2hPyPQQSpPWJDw8H8VdAoUrIY1QTyZmJOvFAK/+ww8p1K3hULH7rkiNMitMRSHvsksQ5Y82ok2xvI3IhcUjwJgFYplfKWtHP9TieiJM5cbZa+Y57R+5I1bq2JyaFL0mAWhoHO8A5W7LrDeKNV2PH2Q77Eww==|920
\ No newline at end of file
+}//f6WkF+tElvJqCqfRf7fjVhMJmOe2DJTGtNFG7adQRTVXEsnYsdq9yEhQXQddEpIyazd2A5eiPoxBY2ZaWi54kV4h0nt628TDrYrzqZRhe+nJv0j0PoRoQyjITC1CRkrWtnlZqQ6EhkTJvGsW+c4kVP9mqMUoE5KSsCK7JZCo8g3GdMNxyLvzM8Ht3ZMGtA51F8b/5DwtmwVOjxK/yx63FB8iPCpBETwvV4tsDD9Us/nE7TpqAYe6Dq1bmJar8sbf2AZ0I6K0x5ylF7bp6W/mp71FerE7gOvKNX9XwrrMZKZc1pfDJgmvSw7fwK1pKHC0eBdpot+caUZPPKlOuA7Eo7rYtQiO5x9Kul4zZEQj00oOaKOj+hIZK737pELIPa/nUEqWl8K/ePDRY+ZFUUtI1mkZMqZVlkN603eGLnQDFNw2CAswlXG3Ioqva0/dmK+UeTYl5DoigGZmxzsiBjFLpOoqBALmR7T2+i2O6cJl7Vjzo0JpadZO0iUC1kiWptMxT5DBFoyMh8F/dqA5fkZKvzgcxQCg/WRhp0YYN+K98UwDdJA8dg8uPwOjHw/gTgUxddKhkSwEcbAcqqQMMKU+mQnw2myvJPUZWt/KPYGuBmiRBwg8NY+ZGPdq0PKtLUy1t5VS3KxgmE4vXaqLNClgU6UHGO+rxFXKSYWRX24f+DYofzVtdK9qrBCokFFOO9MCGpYZqyefuNYI4ye3G8ZWCvhaTq+fysoPNjJb4f4UwaXllsVySPQ1HwsotgMj6gGjSc33GDYrcRT0JvCR5tiAyYmoRFGHwXewxCw4i7wUzgvGlu8HLwfxZiaM0etCDY2PXACBt/CGU+ecNo5/TPAFGr2Nt2yG6N7V90BMBamZdRPD/hi2korHqjLdXfG4DeCRlMHdvAOHOJt+GNWnyyICOQ==|920
\ No newline at end of file
diff --git a/Pages/汇报/日报/导入汇报数据.json b/Pages/汇报/日报/导入汇报数据.json
index eaf1c3de..78e1a5b4 100644
--- a/Pages/汇报/日报/导入汇报数据.json
+++ b/Pages/汇报/日报/导入汇报数据.json
@@ -156,11 +156,6 @@
           "DesignLengthInPixel": 32.0
         }
       },
-      "21": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
-        }
-      },
       "22": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
@@ -205,18 +200,28 @@
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0
         }
+      },
+      "31": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
       }
     },
-    "Count": 31,
+    "InLogicalVisibleIndexes": [
+      21
+    ],
+    "Count": 32,
     "DefaultSize": 32.0
   },
   "Values": {
     "1,1": "筛选日期",
-    "1,27": "批量导入",
+    "1,28": "批量导入",
     "3,5": "汇报日期",
     "3,11": "汇报内容",
-    "3,21": "工时",
-    "3,25": "关联任务"
+    "3,21": "类型",
+    "3,22": "工时",
+    "3,26": "关联任务",
+    "4,21": "日报"
   },
   "AttachInfos": {
     "1,3": {
@@ -271,7 +276,7 @@
         "DefautWeekFormat": "yyyy 第 WW 周"
       }
     },
-    "1,27": {
+    "1,28": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
         "CommandList": [
@@ -324,22 +329,26 @@
                       {
                         "SourceCell": "关联任务",
                         "TargetCell": "关联任务"
+                      },
+                      {
+                        "SourceCell": "类型",
+                        "TargetCell": "汇报类型"
                       }
                     ],
                     "Source": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=导入汇报数据!C5"
+                      "SerializeProperty": "=导入汇报数据!B6"
                     },
                     "Target": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=汇报详情!B8"
+                      "SerializeProperty": "=汇报详情!日报列表"
                     }
                   },
                   {
                     "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon"
                   }
                 ],
-                "ID": "f1a40694-e119-4bfa-a244-f6f0745c067e"
+                "ID": "19b6eb0e-805b-4be8-a5d6-eff630f4d4f0"
               },
               {
                 "CommandList": [
@@ -349,7 +358,7 @@
                     "Message": "请至少选择一行进行导入"
                   }
                 ],
-                "ID": "38ab6642-e273-4d30-a0f2-68eaae04f103"
+                "ID": "300fd4d7-2561-4ddb-b0ff-87620e8b7e88"
               }
             ]
           }
@@ -372,7 +381,7 @@
         "RowIndex": 3,
         "ColumnIndex": 1,
         "RowCount": 3,
-        "ColumnCount": 29,
+        "ColumnCount": 30,
         "SqlCondition": {
           "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
           "SubConditions": [
@@ -460,6 +469,9 @@
       }
     },
     "4,21": {
+      "NameUsedInJavaScript": "类型"
+    },
+    "4,22": {
       "NameUsedInJavaScript": "工时",
       "BindingInfo": {
         "TableName": "成员计划内容合并视图",
@@ -467,12 +479,12 @@
         "GUID": "4bb8e717-58f7-4c8f-aa4c-b7ad5909e920"
       }
     },
-    "4,25": {
+    "4,26": {
       "NameUsedInJavaScript": "关联任务",
       "BindingInfo": {
         "TableName": "成员计划内容合并视图",
         "ColumnName": "任务ID",
-        "GUID": "6bdd8c9a-bce3-4ab9-848a-ca595ff8c6a7"
+        "GUID": "d9fb50c6-4609-4796-b08e-2586eea25652"
       },
       "CellType": {
         "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
@@ -594,24 +606,25 @@
     },
     "CellStyles": {
       "1,3": 0,
-      "1,24": 0,
+      "1,25": 0,
       "3,1": 1,
       "3,2": 1,
       "3,5": 2,
       "3,11": 0,
-      "3,21": 2,
-      "3,22": 0,
+      "3,21": 0,
+      "3,22": 2,
       "3,23": 0,
       "3,24": 0,
-      "3,25": 2,
+      "3,25": 0,
+      "3,26": 2,
       "4,2": 1,
       "4,5": 3,
       "4,11": 4,
-      "4,21": 5,
-      "4,22": 0,
+      "4,22": 5,
       "4,23": 0,
       "4,24": 0,
-      "4,25": 2,
+      "4,25": 0,
+      "4,26": 2,
       "9,1": 6,
       "9,2": 6,
       "9,3": 6,
@@ -625,23 +638,23 @@
     }
   },
   "Spans": [
-    "7,1,1,29",
-    "1,27,1,3",
+    "7,1,1,30",
+    "1,28,1,3",
     "1,1,1,2",
-    "5,1,1,29",
+    "5,1,1,30",
     "9,1,1,3",
     "9,4,1,3",
     "1,3,1,16",
     "4,2,1,3",
     "4,5,1,6",
-    "4,25,1,5",
-    "4,21,1,4",
+    "4,26,1,5",
+    "4,22,1,4",
     "4,11,1,10",
     "3,2,1,3",
     "3,5,1,6",
     "3,11,1,10",
-    "3,21,1,4",
-    "3,25,1,5"
+    "3,22,1,4",
+    "3,26,1,5"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -673,4 +686,4 @@
       "Formula": "导入汇报数据!$D$2"
     }
   ]
-}//1kwYlTLS8u04zEueqyLPhtHG1zjUCU+N3TanpE7FiHyiyFwWghZgvUe5aIgruObmIQdx5pVqSqa+wYT2JPARePouKwSHzM5dffrsFs/uMEObaUfdGiXAdtFmhbhEu5ywegs1aUwx0EPBmsR9K6Xtm3MZO5KVk7nhXDk88rVQwuxyLRoE9GofjAvTlQ6cSyojVLsk4ERauYPSCOVskWvYcBdzC/ZiIunEe/MGA/ADO33ygPxp/HzHtF6XZSDI90+E0JWazmqCj0+77VvFRPF/87MC8h9i7rW+joNAkXOhG8teA00uJ4g9qg/ZiuvEOUdibAx2Gv8O0uZB367H3ZNgBKuOXiM6SvbEA37auCX9JIpiNgp3WZcG9auhmrvp+07m05WVzfF+DL0fnktGSvoBIb4ngcqtu0vQkcuM46xw7MUUEvN2CCJzJ3dK6vFwdRDTT+UwysMZuEaO+JEnyGPi/OQwYRv4IJfOA87ph6YTOVmJiiZdgFgE6SZGTq9zqK3oMF2WByTgvLuFED5picNyNX2uvtYg+YlgXXXONPjSrln4wqqjRe5NA98LoUlIvxXqGoUW8AF3yM7nbkC7M+25KZlU/HKN0Fa4gyYK6yfXzt9M8EiWcx1GB2uuQlSh8clarQz/9F8lmGuZm6RFB717h6Q12/vV3yMMqy9y5eQZYliriM1hiJo24G8RuhEO2yxZ0nGlJOJNAgF+l5JPw3tpmyoYTc7XmADxaut+rmwR7gNqFh2fiubBPkBQXbMcTg3kuQsA3wpWy0QrIc007E4QS8+QwlWDxuwoQxrrzxz8d3GopOpC4UoTfhluyvdz/HAbLEcLHnx2DEiSS+PoPCGf1s6+lZ3QjrLIRH9aWcB90FxcBTjCwTKdW7Fe3mIrXHa66iD5x2HSHlsPNxYiqPuncA==|920
\ No newline at end of file
+}//b/i2HihyWeXDZXLerUSMGGzRg3o7IR5tl0fh8gi66N3ehrBooLAmjemR0FKN/Z3s6cUMXjPnBaQ1Mh2mGR9eMONIwKCEAukWV7hl2DBCjISSe8HuCuebjoHWhlZn9G+OMyHsrjO+/hJLaWehwnKLZG9qh3HdFhZkUfJsbPVKzJNdEFoHYSz1fSROYhK19ZO3vJIHNHMbt/xogZcZ3UL5Burt6P7hM6x8OYne4znFE19wV587AyqddD7EcPVPVrn8kgzzLeZG8XstYGBkSJQL7H6cdh48VF701r/Rjib9iR7NvSopwQq/mcLulWSrnuu0p2pWsu9gp3eRnpPXznuYQnGgHUzulAh/bzuwxkCyFBjQkMFJrY6BdXTbD0Xqx7J9n9zk/WmIo32VlvgnJC5Zrss7auX1nm6XPwsBiZMcPg2C/4QQGEiKqkjHOT3NikUAG7O1ctnqbtsnsQhUdCOqRfz5vWWoseHCLRQzs3/ws3WcKrQ6uTcI/OfN/wzs77H/RhAjfppk3c1ejcx4i55JkOh45eQ8bZjiBAo0mK8w+I/m9i62+PkK19VwgQ4do7zfWtIH2FYoBbiWN9G/tyAw75IiMM4booc0VBFjwppQsJ+cU2M0fp84NaeQhLLt4lUpkWBA6iebMsWeFHXEa5BfdXnKPmenCvYuD+DxW2ayoos5d5hxJy+7T9AitOQaiFVnXnus9F7jca1WgUu/dAukvV4xErGOCfFb9v+7ZZR9MRWXhRRH1RTbZXUhQra8nAPJBGjyESG19WvnikS8o4SpV2fgFigS+V16WQ7yG0EwhQQN8fespUs/ASUFhk2wC9coX1FwwEZAu+C8hPbi1L5lL0By3MOLOh0QhuAfJYixdfvNkBkzH9cuiy17Xfj/ATkYe45vQuNF319S9UtL9/fhnQ==|920
\ No newline at end of file
diff --git a/Pages/汇报/日报/导入汇报数据.rd b/Pages/汇报/日报/导入汇报数据.rd
index 3ca4eca1..a74b0a3b 100644
--- a/Pages/汇报/日报/导入汇报数据.rd
+++ b/Pages/汇报/日报/导入汇报数据.rd
@@ -1,6 +1,6 @@
 {
   "PageType": 0,
-  "ColumnCount": 31,
+  "ColumnCount": 32,
   "RowCount": 10,
   "CustomNames": [
     {
diff --git a/Pages/汇报/日报/汇报详情.json b/Pages/汇报/日报/汇报详情.json
index 969e8d50..3e385062 100644
--- a/Pages/汇报/日报/汇报详情.json
+++ b/Pages/汇报/日报/汇报详情.json
@@ -535,7 +535,7 @@
                             }
                           }
                         ],
-                        "ID": "422ddb1f-ba05-4ecc-a6e3-790f249f3877"
+                        "ID": "57449ba1-df17-433e-8439-0c2abd9e4f8a"
                       },
                       {
                         "CommandList": [
@@ -550,7 +550,7 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "6d02acac-8518-471e-a881-81c4ab65646d"
+                        "ID": "ca300f1f-0fb6-4980-83f7-56cfaff14672"
                       }
                     ]
                   },
@@ -564,7 +564,7 @@
                     "Title": "生成中"
                   }
                 ],
-                "ID": "243faff8-bd2e-497f-b4dd-977c193f9c8c"
+                "ID": "496de6a0-6495-42a1-afd0-a45324b77655"
               },
               {
                 "CommandList": [
@@ -574,7 +574,7 @@
                     "Message": "请在下方编写你的工作内容，让AI帮你完成左边的日报！"
                   }
                 ],
-                "ID": "91ef29eb-39ee-4143-b8e5-377287bbe85f"
+                "ID": "968dfb58-8938-423b-87a4-8db0f4e2803e"
               }
             ]
           }
@@ -682,7 +682,7 @@
                       {
                         "ResultPropertyName": "生成文本",
                         "ResultTo": {
-                          "SerializeProperty": "data"
+                          "SerializeProperty": "回复内容"
                         }
                       }
                     ],
@@ -738,13 +738,13 @@
                                 },
                                 "Value": {
                                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                  "SerializeProperty": "=汇报详情!data"
+                                  "SerializeProperty": "=汇报详情!回复内容"
                                 }
                               }
                             ]
                           }
                         ],
-                        "ID": "ae95776a-6907-4abc-8e3b-97427e5727d5"
+                        "ID": "7c772a80-0fe6-468a-a9e1-20ff5df5fdc2"
                       },
                       {
                         "CommandList": [
@@ -759,12 +759,12 @@
                             "BtnText": "知道了"
                           }
                         ],
-                        "ID": "27f5f654-3a70-4e47-bf55-f7c70ce789cc"
+                        "ID": "5fa9f7f4-949b-49c7-9ada-d6379d7d941f"
                       }
                     ]
                   }
                 ],
-                "ID": "d1af4934-4c8b-4af3-80eb-cd1b719acd50"
+                "ID": "a85f9fac-e3b6-4456-a0ae-2cf7907c6e3a"
               },
               {
                 "CommandList": [
@@ -774,7 +774,7 @@
                     "Message": "请选择汇报日期"
                   }
                 ],
-                "ID": "366d114f-a575-4609-a6e9-b56df5de0632"
+                "ID": "80a9e3f2-b4a9-420f-a19a-7a295a7dd0d7"
               }
             ]
           }
@@ -1141,7 +1141,7 @@
                     "ReloadData": true
                   }
                 ],
-                "ID": "abca4a05-5a8f-4ffc-bb46-5430f348b701"
+                "ID": "d03b5910-058b-4a32-9f7c-fb91c37e62e1"
               },
               {
                 "CommandList": [
@@ -1156,7 +1156,7 @@
                     "BtnText": "知道了"
                   }
                 ],
-                "ID": "458dac6c-0e08-495b-8463-7b426ce19a9d"
+                "ID": "0deed8e5-0cd0-44a1-abc8-02b1ecb9ef2f"
               }
             ]
           }
@@ -1553,6 +1553,10 @@
     {
       "Name": "增加一行按钮",
       "Formula": "汇报详情!$H$13"
+    },
+    {
+      "Name": "日报列表",
+      "Formula": "汇报详情!$B$8"
     }
   ]
-}//S+AEdbNQNEbSDwmMse0J3W1E98stqDVKtiX8bKi0/CzbZoCfonu0d7Qdf6ZvIprD2ClC/TxAM2Zj5hSDQkcPVcG+Ku3MY2/HpVQlj3LvnNMWyD8s2Td77BL/cQPN2WsevKc2Q81YbAUe1S98lDEkz6nkID83vpR7GUSDJz9ZNQsLp3kQLr3X0Tj23EcFyOeQBbPdolgshU3swfUi+7/1WBmB/8vg9PD6mZ31PfjfXqT9gUcHWcrHn+xyT8a74CfY7Bei48ahCmVqPQk4JcaJPXffNwZLoOcuevGmArq2niWfswp7SZtbIa/mVaX1+9quY4+3tRDiY5eswLkEKHeR+/v60GkCwZ01TVb2SalDvzV72UfW3F2JZ0btNKr5mpdS5zmKpSKXl9wiTdFEVlJbTapjguCy92AcqQ9SQ7L2L6FEUy3II1iHnEqm3rBVODeSS8pvLFbdue9tCBFJFOo4r28LlxiNePStChR3BYhqLTmEj9XMpifSyU5i+zgt0nXMqQ5z/oaNWqghsVWVuZZ7Y2e4/+vpi3euNhLvz7gUEB99Hj+owW7YWoT/8dXk/lU+HNaWdxlWaJXtL8mvNW1yX74UcYajRgz0Lonux8H/iDBFw0wGnODSBjDcPr9K1dz/KtEZvvfh9/vW4hj7Gi6IheqDJYswRe6OGo1JO1Z1vaRepoBZYGmJa9MpoRdGUaPSJ6ZQaSv9n/YNgDKaSeQshW5e+Ji/agyDRBp+vwpGts4dLvMaRHaWT60bwl7vdeDqAO3SKYQki6aQ0kTRMhgL4xWkP812GFdds0mOWNqR1H9bKT71ERIRxmwCcGRvchQkACkOnPleasP5vMb7RwUsmvEAf7KLWzwgSG5gDzqbpUZqcPtI2I3r732tHcippPRpshFLwksKuzjU0wuaiNtt5Q==|920
\ No newline at end of file
+}//5IV/D/qar7DOw0GoWHDsqrqF7rLyN4tQeLjxtEhMzxcvxR6vg9Es53zXGP2ykY2Y/x+KFAATzeSC6rF59vRZe9qN+au6a4YvhPDmyqLSjegKeK8XpXA2Zzt6CISj66777M8O8vL8G9VQYxX/3RZHRYpCJL2fv5rf4/XP8E3UpMaoqpbGWPQeFxkH9CyRKawi71SCn9YsrTa7A5i0F8Dzc5Ul1YQJdmUiXftTtCINjA+K39qUGULawBkVmvopfdxN8U4MR6dzqJJNqUGs9qEW5z/D21dcA5S1OgSeWYu1AKi44DikJWy3sKehbnG1RnxyLCzp9Mmw1cZ35PPZ1/j0cX5Ktxz4e1s2mUk/7dqKRETFznjsE4dUQxRqU15T4Hv2u/gKwobEYZrOxmFoFX0BcqdTa4hCmlWtVG2atQlrgVbu5rJirm9YUYZqi8nzfSB2mOqLILPpbrIPak4VAtW5S8GaRbcb4lcvJrWqAaLEz71WkW6Xd67FCTnQrnT1J6d6o5orja+1VXjmlysvIBeEU2JOACLiXlROPkbePQpsjetmExRCWLM9DigyLbyUt13WrvowBQaIJN/4zvV4/z2f4hYZHBXrroS00unR+qGn3RoiGfqScsRTTyv7ZwHzcx2n9vKbhf+53D/hQBX65DxBqwWyaIudftQjLWBnuSfuyXJqS7jYKV8viaIAL6DLT3xepamCPNBPJnOC7IChwy73rXIxqUr81HfGqrNCGYMqINRsZcFCNWomnnCyVL44lTuqh7N28tm0gaLJoGU6bw4M+wMujjez7ClcjsEptjljFSvX9lpoJ4lg1zxKuxt+E1l+15pYA8EyO2HHTzMkqWLrkMXK/LTFsICJzTszydbaKWwjYxf7LqDbDC1ax+sht9c0QyEywgh4iUV7pxFmJzU97A==|920
\ No newline at end of file
diff --git a/Pages/汇报/日报/汇报详情.rd b/Pages/汇报/日报/汇报详情.rd
index 0b0904e2..04767334 100644
--- a/Pages/汇报/日报/汇报详情.rd
+++ b/Pages/汇报/日报/汇报详情.rd
@@ -29,6 +29,10 @@
     {
       "Name": "增加一行按钮",
       "Formula": "汇报详情!$H$13"
+    },
+    {
+      "Name": "日报列表",
+      "Formula": "汇报详情!$B$8"
     }
   ]
 }
\ No newline at end of file
diff --git a/Pages/首页/首页.json b/Pages/首页/首页.json
index 12c2fb0d..71eec0f2 100644
--- a/Pages/首页/首页.json
+++ b/Pages/首页/首页.json
@@ -344,7 +344,7 @@
                       ]
                     }
                   ],
-                  "ID": "297eae8f-5e51-4c59-8a48-82772bee9ce4"
+                  "ID": "5041f45c-c3a1-4818-b459-4b11567e6cda"
                 },
                 {
                   "CommandList": [
@@ -364,7 +364,7 @@
                       ]
                     }
                   ],
-                  "ID": "3e3420a1-8d7b-46e2-a864-0c9dac0bee98"
+                  "ID": "2e7e378d-19ba-4020-b1f6-e9fb9944d566"
                 }
               ]
             }
@@ -529,43 +529,6 @@
                   },
                   "Title": "加载中"
                 },
-                {
-                  "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-                  "ConditionAndCommandPairList": [
-                    {
-                      "Condition": {
-                        "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                        "param": {
-                          "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                          "cellLocations": [
-                            {
-                              "SerializeProperty": "=首页!当前主题"
-                            }
-                          ]
-                        },
-                        "value": "%Null%"
-                      },
-                      "CommandList": [
-                        {
-                          "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
-                          "PropertyItemsList": [
-                            {
-                              "TargetCells": {
-                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                "SerializeProperty": "=首页!当前主题"
-                              },
-                              "Value": {
-                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                "SerializeProperty": "=首页!M20"
-                              }
-                            }
-                          ]
-                        }
-                      ],
-                      "ID": "31257ad1-3225-4c1a-b20e-eeceaba583b9"
-                    }
-                  ]
-                },
                 {
                   "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
                   "ConditionAndCommandPairList": [
@@ -584,6 +547,34 @@
                         "compareType": 1
                       },
                       "CommandList": [
+                        {
+                          "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                          "TableName": "对话主题",
+                          "UpdateType": "add",
+                          "ShowConfirm": false,
+                          "CheckDataValidation": false,
+                          "UpdateBindingValues": [
+                            {
+                              "BindingInfo": {
+                                "TableName": "对话主题",
+                                "ColumnName": "用户",
+                                "GUID": "9f981c2d-e297-489e-9213-ece58012be56"
+                              },
+                              "Value": "%CurrentUser%"
+                            },
+                            {
+                              "BindingInfo": {
+                                "TableName": "对话主题",
+                                "ColumnName": "主题",
+                                "GUID": "e7c2f116-0d08-4178-a8e8-cc5306838c5b"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=IF(首页!内容=\"\",\"新创建的主题\",LEFT(首页!内容,12))"
+                              }
+                            }
+                          ]
+                        },
                         {
                           "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
                           "PropertyItemsList": [
@@ -593,6 +584,16 @@
                                 "SerializeProperty": "=首页!E2"
                               },
                               "Value": "对话页面"
+                            },
+                            {
+                              "TargetCells": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=首页!当前主题"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=首页!M20"
+                              }
                             }
                           ]
                         },
@@ -613,7 +614,27 @@
                           "Millisecond": "1000"
                         }
                       ],
-                      "ID": "8a2c66f8-57a4-417b-9c87-8de9cae5274c"
+                      "ID": "4d2bd355-5ec4-4016-aa66-3358869e7093"
+                    },
+                    {
+                      "CommandList": [
+                        {
+                          "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                          "PropertyItemsList": [
+                            {
+                              "TargetCells": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=首页!当前主题"
+                              },
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=首页!M20"
+                              }
+                            }
+                          ]
+                        }
+                      ],
+                      "ID": "d3b2dff5-7adb-473c-bbbe-bb18ea06d742"
                     }
                   ]
                 },
@@ -693,22 +714,7 @@
                         {
                           "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
                           "TableName": "对话主题",
-                          "ShowConfirm": false
-                        },
-                        {
-                          "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
-                          "ServerCommandName": "AI对话",
-                          "Parameters": [
-                            {
-                              "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
-                              "ParamName": "主题ID",
-                              "Value": {
-                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                                "SerializeProperty": "=首页!当前主题"
-                              }
-                            }
-                          ],
-                          "RequestAsync": true,
+                          "ShowConfirm": false,
                           "CheckDataValidation": false
                         },
                         {
@@ -756,9 +762,25 @@
                               "Returns": []
                             }
                           }
+                        },
+                        {
+                          "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+                          "ServerCommandName": "AI对话",
+                          "Parameters": [
+                            {
+                              "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+                              "ParamName": "主题ID",
+                              "Value": {
+                                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                                "SerializeProperty": "=首页!当前主题"
+                              }
+                            }
+                          ],
+                          "RequestAsync": true,
+                          "CheckDataValidation": false
                         }
                       ],
-                      "ID": "b8b4752f-7056-4765-8f68-8b888a749c22"
+                      "ID": "9c5dd9bc-bc61-4e2e-9ef6-c44233909433"
                     }
                   ]
                 },
@@ -948,4 +970,4 @@
       "Formula": "首页!$B$2"
     }
   ]
-}//IhHrQgs2q9NJGBcKrZYhj1I+zO0ZS2svdcNmI+kow3c+0NN+hpF0RKnF3eo40v+y+LlmI8Fcoqu9PeoQtSP2ZhjGogARfXcYG3bJQXpnLFMGPlwaN79FuunUunrVJ+nGQYJS575cdEZI998RRdjeFQhbohqO4ScsBJpob88nKs5Gc16xujdwhizGbw++13DpUbIjjzIswJ7Kz/mEfnBCd5DJyGuYCyZzAI3Sw9740EihO+8Q34Jz+qr80nJdfnudAogk2hz9FObxuJh/h6nVPhms2yaveSxa/Q5/1n8wokmU5ZhFyelKc3zZHcGIDyiCnSVaoVheGW5h0uwOY/aoA2DNqSiLZayaAI6u29UWMm4FS1CJC79Kc7UgYpOaCr60XmMbFeaUabCZDoSTyO1Y/O+jhB1OIjC09HY/WPuw20vMqlgmAOGrOdr9w17Tm9kTDFx4PQIDyj1JAxYdzmXvZexrpjRiu4Atubzwiva3DrIEdRzakfhSFyyVOgnHg8rnmj8EpBsLNxs4L5x50y3aNq4NZwFaPdtjy4QRKZTylvXQONkOIlVJj6F+y03J/7hunb96iv1jfjafYwrsr3SCECHIT+5xmshVQpDmTOvJq7C72EpTMSe/4l6t1Nabmbietyawb+EjHsPwyJ1Q2j+UpHRm1phOzpr+SOv9U46QgfEREnETGCLxxyVrDNbH01B2rOEIXnoFEXKkoMijRKiRwtrH06SjSrv8Z1kSpesQDgoqhrdJm4Mn/M78uJThoAAf/q9hiW9x4kvIW81j+wPA6Zf53bVnXBabhEMosLlcNgy5pW25+lYBtIe/X6qh9jKWfmbIPHZ28BmnNrbH2kAmdPTfZhSzwmtowB5UDCuApnFwesTIgMKuwzfNhl2xin9D4B++mmAEAvGXrspp3sCBGw==|920
\ No newline at end of file
+}//8CWGIbnvSFZEXqWJGw75eQmZVcrvZAILeIS2AfGI8F8FMg/tKczYcu0MAbNA/gVcEC/h7AMTW8x88/m/8e/zratkVrJi1vR7hIyLXWAmWjbRRKyvUvhbXdGA13kIVHNOButKbpCOKuSfaw6/mMlC19rsgdMTKlEYeVVKyvuHn4m+syKERjEuwETN2ZcFdvx3gLxR54d+x69jj0dXPfkjEcBm9LMPg2eK3KFQTSexH8rgv3WSvhOS8F3Nkj6gbmuu3umbhDSVeQGxEzzuQhExATQIYNgA8IQx+8X5KXc2sGw9ZigUK0xlv2g6CfSHwN61++bYTKGPt+BI4oTmTtV0uhUVTu5UsvtNTpaiLvN63dSs+mFHLbu0cQQoki6yPfa8Ubdi5h8sZz8TCGoflBbWbFyqPsd4HcTHIjZ6u9OKooCsnAOYAGYaiwjbJR14OEWY+iGZKS3Wr1RjpL5o5gwN9NsF8EFuQUEbEl+Od+rf2ruJDIZYwHn/xWrrlCoB8NmZxBWUOWKKXOWY1oHhmO8jWKLCJol6LZyDrbnEsrncykRfl0FoyRxNRvArMItKFKJnvJ9ttMlZN6AR3va/ECLABgqy6MH1q6+i1to0eZtNyKJyYChMaI6/ZOnKSaOVBseS4dbbm4AsvNnDPcJLSDbnk6QWTH5CX9jYjZYKOZEFnYBGZwjW3DmpGBq56jSiux1wBCoZJNW100HfeYu74zj/72VEPqZOUjALviNWxdQSTTkiLSNwDfoYumiWhShxykLASQ7xAODIsaj9nTBl33gw29Dk8BLEUAX4aepKcwaDsdq122PiKtQC0l6NqRIulQ6Ix+52X6A+wmmHlFdrZnPbjj0jUa+f36EBswbjt5ZhYD3IDPhSCAxBQF1INjdKMK2jDkd2GNoG23wgspJ9sVvtng==|920
\ No newline at end of file
diff --git a/ServerCommands/AI/AI对话.json b/ServerCommands/AI/AI对话.json
index e2267157..d236ba3c 100644
--- a/ServerCommands/AI/AI对话.json
+++ b/ServerCommands/AI/AI对话.json
@@ -119,7 +119,7 @@
               "ParamNameToSaveNewRowValue": "主题信息"
             }
           ],
-          "ID": "b6caa162-8b3b-49bc-a40a-b047750a5c2e"
+          "ID": "66d7f2f4-0e2e-44c9-a46c-c097992c6f1b"
         }
       ]
     },
@@ -230,6 +230,7 @@
               "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY",
               "URL": "https://openai.api2d.net",
               "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh",
+              "ORGANIZATION": "",
               "IsDataSource": "json",
               "MessageJSON": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -342,7 +343,7 @@
                       ]
                     }
                   ],
-                  "ID": "27c93fbc-33bb-40ea-9f2d-dbd260839673"
+                  "ID": "b1044b48-b07e-4928-9336-dddae2a15a77"
                 }
               ]
             },
@@ -352,7 +353,7 @@
               "Message": "回答完毕"
             }
           ],
-          "ID": "72b71a55-4c52-4bc6-bce8-cfedcf9d5d60"
+          "ID": "e49cb0ba-058a-4665-ac8f-e2eb32dd63ee"
         },
         {
           "CommandList": [
@@ -362,7 +363,7 @@
               "Message": "请输入消息"
             }
           ],
-          "ID": "5488984c-21bd-408f-9016-fff233aad4c8"
+          "ID": "44e554ab-28b6-4c3f-8dea-6ef3a4820c6c"
         }
       ]
     }
diff --git a/ServerCommands/汇报/AI报工数据转日报.json b/ServerCommands/汇报/AI报工数据转日报.json
index aed5fa54..331a4db6 100644
--- a/ServerCommands/汇报/AI报工数据转日报.json
+++ b/ServerCommands/汇报/AI报工数据转日报.json
@@ -163,7 +163,6 @@
                     "$type": "OPENAIFORGUNCY.Completions, OPENAIFORGUNCY",
                     "URL": "https://openai.api2d.net",
                     "APIKEY": "fk211858-C6yKrsealBkvHao04yT9Ypg6GR0NVPyh",
-                    "ORGANIZATION": "",
                     "IsDataSource": "json",
                     "MessageJSON": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -182,20 +181,28 @@
                     },
                     "Tools": [],
                     "ResultTo": "result",
-                    "CommandList": [
+                    "CommandList": []
+                  },
+                  {
+                    "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+                    "ParameterName": "回复内容",
+                    "ParameterValue": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=result.content"
+                    },
+                    "ID": "4b21c6860da34da3bfcc81eda17c4c76"
+                  },
+                  {
+                    "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+                    "ErrorCode": "0",
+                    "Message": "生成完成",
+                    "CustomReturns": [
                       {
-                        "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
-                        "ErrorCode": "0",
-                        "Message": "生成完成",
-                        "CustomReturns": [
-                          {
-                            "ReturnPropertyName": "生成文本",
-                            "Value": {
-                              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                              "SerializeProperty": "=result.content"
-                            }
-                          }
-                        ]
+                        "ReturnPropertyName": "生成文本",
+                        "Value": {
+                          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                          "SerializeProperty": "=result.content"
+                        }
                       }
                     ]
                   }
@@ -223,7 +230,7 @@
               }
             }
           ],
-          "ID": "d0ca4227-5cc6-4b28-81d6-9469a9048713"
+          "ID": "edfc7598-9d72-4f95-a38e-cfdfa56e419b"
         },
         {
           "CommandList": [
@@ -238,7 +245,7 @@
               ]
             }
           ],
-          "ID": "fb2e6099-af16-4ac5-a4fa-b0fef1ad319e"
+          "ID": "a2c2a2f4-3b4f-474d-8910-c2a7cd722c2c"
         }
       ]
     }
diff --git a/UserControlPages/聊天列表.json b/UserControlPages/聊天列表.json
index a3b0261e..b58f11c7 100644
--- a/UserControlPages/聊天列表.json
+++ b/UserControlPages/聊天列表.json
@@ -243,7 +243,7 @@
               "GUID": "eb108c13-3e0a-4085-8b0a-95160d16d7b3",
               "Formula": {
                 "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=IF(聊天列表!角色=\"user\",1,0)"
+                "SerializeProperty": "=IF(LEFT(聊天列表!角色,4)=\"user\",1,0)"
               },
               "ColumnName": "是否自己"
             }
@@ -460,10 +460,11 @@
           }
         ]
       }
-    ]
+    ],
+    "PageLoadedCommandList": []
   },
   "PrintInfo": {
     "PaperSize": {},
     "Margin": {}
   }
-}//d3gOxEBkylwfn2fiby6qX04SvHiuobRsu39zuoUpXkQYJ4BrcfMGp9K6Wtt24qKBIKorma3cXDS5qVydvB9Ka2LThz4TRAe5hF/04s8dSZ31pKY28tNf14Pw+l7TV8RsTnqa299kMZ/QePJXfxPx+cJO02PTq4hlTJf55/+oJhZTySkeLMrVj4F3B4AoltGZDGdK0/MB7E0bwRMzXI8lugJlJPm9XI4hz5LOkNTSYI31lpFkLPQkuOBX3SjUQA8f7eG12EHV8E4GWErnvG92Rx4sLI80Z/YuSCuzrJZq8VCNPZ9BbIrykxymqhrxG9+AevAH9OloujBnH5tNUfMhdYe+RiYRw30pDOa8EgsEajVpLBFRc9wPQXOGwKorZlpL4wJL0PkSdJR+6/b4oakxDyltUPwukC1TK7ZKw/QgMUEuqaiIH3VVqYQXytIkVJVyY6nAf96vbobn/kpU+P/PpMfFKBAi1YB8se51PNKJ+DnOfX/5hYNRr1mX5N1K5nHDQ5haJk0otK0k8BL2xiX/SgKj2GOSMKUrNhBMYwQblVadepy/eAZXT7Hz6QXny1Jzn1HqqLS7174gDjBE+mHiGrDfXjdEjuyTb3+yyxOC6WisAd90Szvi+6AsA2icatUu2hdOt6HxgPbgDJcAL/DA2AVF1GjuQsX5tugKWTvxC8Pe0Z1PR7LnCdrlpB5OL69D7K54ODfsYkt5KDTwGE9fhyTYPHlpi2oJTszo4kLb68MUlu8oBJ79N5ZX29836h/AU3IFdJPUugl1G6EdT1chJDJqOActOFPlShE7IU2Wi1SGawStoaxIcoeRA4WnXyKAPbmPDjXP8AOGQO8mFaMKyDpCNbtLBGaR5+PSolk1r9u4WXgf+yaHSXtUZScuE0DZWWZia/orK32orttFJQubmw==|920
\ No newline at end of file
+}//1vv8n07QuaB9VwDb97nhjnKQDvaJrF1f/mn4Lc/PF4Jk9mKKgxyDXnPIvVVQEH5O9c0rAcpeRpDFkgZ75ZQP/68dh5EzAlJKDhX2Te7e/xzYfH6lTHVZUY0aiWgL4vPlSi5AVxTWgrpM9wWv8Fhly8BOh/sj9QJKwd3gGA6lXDrrRa07vNZhhrTkDi2pvdNgMc++l69D7ndec3MWfhS0W1w5NgnKQBcuUMUQQsEB3dGOHTxNVAL1eddR9zDhaV89TNp7XoPMBHLuspiB/a3y1isT+x1wUsOQSy29/Uluk3NvVoIS56x3rH5qvBAlHiTJsNNcWJdKApOR/zeCLhePMlf1kmqGmtCJkv9aJFvGH1XPpdJR/9x1gm66/jlaJRgerqwixTTGslRgphCDHq9l8Wo2yT6TkePwp7vFay6cBHPvZrr/qZz0M0tivuyu3XkUU30d6hxnm+uQcjvho+/0Of4v62xRq3Fy+4Fs8Nave6eTLKcmICjVV3B8Onz7rNAxZQUbVe3o30uwK45NwBM5jEocvG2le8hR+HcCxg7C5AefyOFhzmAjqiD9E6jg9709kVdnr8tkG4CBZdDMcE8JIxPbxkj4BW5q06qSuPjFDePhUv5R7xz/n4hMmZ1jKkJvBsdloDGzmmpqsQJjdpsGzdTdsLZfeLCyzxv/xJNEvzmmT/CM5i+hhzY6S75POeHPOM23k5v+FY3hhdUbqKLERux+sxcm0zXpGhwYWAdaPyQoy4kHVYeEoUIFt9v+M5K9kNAPOfGyq6uxYvPEFSw2+S6CvHsPFa31SzOJmw6LG3X9RePUjMLiYd0mLZLstfNOUAPfZJe3PifM6uJ6hCUYzBZJluI4va2vHHuzemVXz4J20Ywg8Vsx51atSVAD3Qxb5CmY6ZH6yWTtHHyvjo9u1A==|920
\ No newline at end of file
diff --git a/UserControlPages/聊天起泡.json b/UserControlPages/聊天起泡.json
index 3d658e1c..a8218e74 100644
--- a/UserControlPages/聊天起泡.json
+++ b/UserControlPages/聊天起泡.json
@@ -201,7 +201,7 @@
       }
     },
     "4,3": {
-      "CssName": "",
+      "CssName": "chatEditor",
       "CellType": {
         "$type": "editormdPlugin.editormdPlugin, editormdPlugin",
         "Toolbar": true,
@@ -291,84 +291,73 @@
     ],
     "CommandDefinitions": [],
     "MethodDefinitions": [],
-    "PageLoadedCommandList": [],
-    "PropertyChangedHandlers": {
-      "Commands": [
-        {
-          "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-          "ConditionAndCommandPairList": [
-            {
-              "Condition": {
-                "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-                "SubConditions": [
+    "PageLoadedCommandList": [
+      {
+        "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+        "ConditionAndCommandPairList": [
+          {
+            "Condition": {
+              "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+              "param": {
+                "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+                "cellLocations": [
                   {
-                    "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                    "param": {
-                      "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                      "cellLocations": [
-                        {
-                          "SerializeProperty": "=属性名"
-                        }
-                      ]
-                    },
-                    "value": "我方消息"
-                  },
-                  {
-                    "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-                    "param": {
-                      "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
-                      "cellLocations": [
-                        {
-                          "SerializeProperty": "=新值"
-                        }
-                      ]
-                    },
-                    "value": {
-                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=聊天起泡!原值"
-                    },
-                    "compareType": 1
+                    "SerializeProperty": "=我方消息"
                   }
                 ]
               },
-              "CommandList": [
-                {
-                  "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
-                  "PropertyItemsList": [
-                    {
-                      "Location": {
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=聊天起泡!I:O"
-                      },
-                      "Value": {
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=聊天起泡!新值"
-                      }
+              "value": "1"
+            },
+            "CommandList": [
+              {
+                "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+                "PropertyItemsList": [
+                  {
+                    "Location": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=聊天起泡!I:O"
                     },
-                    {
-                      "Location": {
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=聊天起泡!A:G"
-                      },
-                      "Value": {
-                        "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                        "SerializeProperty": "=NOT(聊天起泡!新值)"
-                      }
-                    }
-                  ]
-                }
-              ],
-              "ID": "d5ce9355-01d3-48ab-9ca2-94f17f758137"
-            }
-          ]
-        }
-      ],
-      "ParamProperties": {
-        "propertyName": "属性名",
-        "oldValue": "原值",
-        "newValue": "新值"
+                    "Value": true
+                  },
+                  {
+                    "Location": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=聊天起泡!A:G"
+                    },
+                    "Value": false
+                  }
+                ]
+              }
+            ],
+            "ID": "3042d5c5-a79f-4454-9a3d-2da0995ac1b7"
+          },
+          {
+            "CommandList": [
+              {
+                "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+                "PropertyItemsList": [
+                  {
+                    "Location": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=聊天起泡!I:O"
+                    },
+                    "Value": false
+                  },
+                  {
+                    "Location": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=聊天起泡!A:G"
+                    },
+                    "Value": true
+                  }
+                ]
+              }
+            ],
+            "ID": "a58b516d-0f9e-422e-9353-9f0c77d08055"
+          }
+        ]
       }
-    }
+    ]
   },
   "PrintInfo": {
     "PaperSize": {},
@@ -402,4 +391,4 @@
       "Size": "115,42"
     }
   ]
-}//LRFkptgI24X52the7pqkr1ZhAg6clxBc/2BzeiYX09VblETzl97Qgr1DvDfyN7NaultzHBUu7y6DAHPeNIn3rgj0aWQbN3h7+RHRbUbFkae3EAqed1lRSvHv5fmSTb9iiSfUu8Z9Wgh8vpl4tE/Rc94cOwGS9rnSH8xL+PPzCm4XqkgHXi5REHsksNsJRTfh156LzHRQYkqDn+svHxfHZKGzCJkzzDtJHuNdVJF9L1Zg0iehQFKOBATAZiZuxMQwI5qB0Q4z0TknDVVss34/70CZyUelrh6w7T27OGxqK2reP7bI4ep1B4/TPfhou2ApjP7ZZMPqtdZHNZNOQwvTHgvcpYKVz2p1plNz+PhRWdDUgAKrNmizU8bhZPcFg1P+ZskUWjhjruAucYMA6ppSbx0bkSex1x5XdEkrSnZ02UhNi3r+koG1o9c1zB2b18mcDwTr2/VPeq6KQSPfpDHTCmXG4tjNPQReHL/1nwfNq2AjMx+ixGIse4UIP7A9SOzmCxsW3SykNJvkB+Cmkrxp/7mB+sl0vPiajPjA7npC6kr+MY4OUeOxLYOH1qPAzguqpZ4s/v0DjSXylECokTJ6Vbq4/CkWuKIQQCiGP3m5houLieWSIvT6kG+CmmO8PdR7Nmbij9VW+++iTqrN42venjiJQmm+Kcp2O/n05sYPFGWMzrq2bZFGLbJzUppFfZauz+O4YI2cB0G9hoVe3i0He83t6HeiA87Ur0Gg+3u1kv27T84zsH1BjDrK77wZ17nKbtfp6Lt4w+rWcISKJoBq2k+8NzHqGGyvXnfplPEzki1vWfJUKzww9wvMmeW0xu4QwJDMiJsX3RraesPICXO/16gJPqWz8I68pS3TEfDUGhuBxZbbvJ0SE3rtuoJ+UwbMJBbR4JY+TF/dG+DgMxlKzQ==|920
\ No newline at end of file
+}//rSNk5qAYrJQOQezPA1Z6VClagcPVff+b5Q830cA4zExEFAQmz1Kp/CGTAr0ZJ5j3l1oYuJ24rUAMdsgKr54H+XcaM+9JvidcCLfvfQ6MqV7MuVZBjk0bTdotXsGnBbt/gD7au0T0zABWpZ7fNvttU2quA6ufcCfZ17O8238CaD+iBBE0a1j2wUGK7OLTLpaQaGvu+KVAwNo5+BreaGZWWx8iAhjjRhhQYzSRB2ksW2QApI6HGSPvdmuWNQuKrOUab2aq+h5w1vPb+Qqxw7Ih5ciNdTA7LUe8AUxtlzgk/cEPQrvQdw8yOo85wB1euOFus1YijbHjuS3+JzgL40L7ayNn0Hq4jclrxYtkfOVxQDPgMAu9SRImJu0953mjEsOHCjWW7rF++8p3RoEq6irSyx8x3CqJCCyMkT/hWoyVV5qqk+E+mMVQK9HOp0k+foYIvUgzY7XuEmytBLvDnc93Zeb3w0/FoYOLbFbdZZIk0MyStde6r2LqOWmVCC1Q6a+gAcJoRbF+hPCJX5n3TnkEWFF92nmbVcFxmcKyPl611m6mzx+wGR5AzYF8CEqwMsaP2822zbFOU5cvTJQoxReSrPkD2N0VDqltcsA7wE3tBJMAeygZdHy9EboYD77EGihatKOVZCC+TS0tLnO2BY2xT9ZZrOqOnSLgXNzMqjtcQsQfUvmVAfBi22Cd6QMQ+NHDF2STDc6KS1hbLmR/8sUyD3lqCYgvJJTexLpFWQMZu4HIqol1Oh2SN6BPlhQrwYxeSat2FsUxJSxo3dDSl3HflOdCsjYUCjJFL73R91IhoiQU4lVoCbWpgM2qGXNgL11NVZc8OF1J5BUC9xNLaf4666UhM1yVk2Y5u/OVytRtaWdeOFDzwc+7bXFqUfV710x3er7hus9j2qx7RRi8d8ECtw==|920
\ No newline at end of file
diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css
index 58b434a0..a93c15a6 100644
--- a/UserFile/BaseCss.css
+++ b/UserFile/BaseCss.css
@@ -138,10 +138,10 @@
 }
 
 /* 聊天气泡框 */
-.chatpop .markdown-body.editormd-html-preview{
-    white-space: normal !important;
+.chatEditor .editormd-html-preview {
     padding: 0 !important;
     background-color: transparent !important;
+    white-space: normal !important;
 }
 
 /* 定义旋转动画 */