{"Message":"1. 增加用户登录检测通知(暂时无法捕捉登录事件，采用刷新)；\r\n2. 增加任务评论实时通知；\r\n3. 修改新增任务的页面弹出方式；\r\n4. 修改任务提交流程及逻辑；","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/项目列表"},{"State":1,"Type":1,"Name":"PCPage/任务列表"},{"State":1,"Type":1,"Name":"PCPage/任务-侧栏"},{"State":1,"Type":1,"Name":"PCPage/任务-任务信息"},{"State":1,"Type":1,"Name":"PCPage/任务-子任务列表"},{"State":1,"Type":1,"Name":"PCPage/新增任务"},{"State":2,"Type":1,"Name":"PCPage/MD编辑器"},{"State":1,"Type":3,"Name":"MasterPCPage/FGC_母版页"},{"State":1,"Type":31,"Name":"UserControlPage/评论组件"},{"State":1,"Type":31,"Name":"UserControlPage/发表评论组件"},{"State":1,"Type":15,"Name":"ServerCommand/提交任务评论"},{"State":2,"Type":15,"Name":"ServerCommand/检查未提交汇报"},{"State":2,"Type":34,"Name":"Notification/汇报提交提醒"},{"State":3,"Type":15,"Name":"ServerCommand/用户登录检查"},{"State":3,"Type":34,"Name":"Notification/提醒通知"},{"State":3,"Type":1,"Name":"PCPage/富文本编辑器"}],"Version":"v1"}

.collaboration

@@ -518,21 +518,7 @@
   },
   {
     "ModuleName": "PCPage/项目列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:48:20.2287673+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目列表.json",
-      "Pages\\项目\\项目列表.rd",
-      "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json",
-      "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd",
-      "Pages\\b90932e038f94707b54e571ff7cd84d.json",
-      "Pages\\b90932e038f94707b54e571ff7cd84d.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目成员详情",
@@ -572,19 +558,7 @@
   },
   {
     "ModuleName": "PCPage/任务列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:52:20.9133885+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd",
-      "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.json",
-      "Pages\\a3c94948c8a24e6a9d63fc05ebfd71f.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目工时",
@@ -714,21 +688,7 @@
   },
   {
     "ModuleName": "PCPage/任务-侧栏",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:08:12.6154037+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-侧栏.json",
-      "Pages\\任务\\任务-侧栏.rd",
-      "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json",
-      "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd",
-      "Pages\\b522ad93131845cf87553eda79dfd25.json",
-      "Pages\\b522ad93131845cf87553eda79dfd25.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-基本信息",
@@ -736,17 +696,7 @@
   },
   {
     "ModuleName": "PCPage/任务-任务信息",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:00:43.2382291+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-任务信息.json",
-      "Pages\\任务\\任务-任务信息.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-关联资源",
@@ -754,19 +704,7 @@
   },
   {
     "ModuleName": "PCPage/任务-子任务列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:56:02.3530265+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\任务-子任务列表.json",
-      "Pages\\任务\\任务-子任务列表.rd",
-      "Pages\\558ca610fafc4ffd8884b819161bfd6.json",
-      "Pages\\558ca610fafc4ffd8884b819161bfd6.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/任务-工时",
@@ -786,17 +724,7 @@
   },
   {
     "ModuleName": "PCPage/新增任务",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:00:43.2381174+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\任务\\新增任务.json",
-      "Pages\\任务\\新增任务.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/新增进展",
@@ -842,20 +770,6 @@
     "ModuleName": "Pages/共用",
     "ModuleType": 6
   },
-  {
-    "ModuleName": "PCPage/MD编辑器",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:00:43.2377425+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\共用\\MD编辑器.json",
-      "Pages\\共用\\MD编辑器.rd"
-    ]
-  },
   {
     "ModuleName": "PCPage/切换任务状态",
     "ModuleType": 1
@@ -1038,17 +952,7 @@
   },
   {
     "ModuleName": "MasterPCPage/FGC_母版页",
-    "State": 1,
+    "ModuleType": 3
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:20:07.8224977+08:00",
-    "ModuleType": 3,
-    "ToRemoveFiles": [
-      "MasterPages\\FGC_母版页.json",
-      "MasterPages\\FGC_母版页.rd"
-    ]
   },
   {
     "ModuleName": "MasterPages/流程母版页面文件夹",
@@ -1064,31 +968,11 @@
   },
   {
     "ModuleName": "UserControlPage/评论组件",
-    "State": 1,
+    "ModuleType": 31
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:10:47.2924963+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\评论组件.json",
-      "UserControlPages\\评论组件.rd"
-    ]
   },
   {
     "ModuleName": "UserControlPage/发表评论组件",
-    "State": 1,
+    "ModuleType": 31
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:09:52.0653163+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\发表评论组件.json",
-      "UserControlPages\\发表评论组件.rd"
-    ]
   },
   {
     "ModuleName": "UserControlPage/收益数据横幅",
@@ -1132,16 +1016,7 @@
   },
   {
     "ModuleName": "ServerCommand/提交任务评论",
-    "State": 1,
+    "ModuleType": 15
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:01:50.8517677+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\任务\\提交任务评论.json"
-    ]
   },
   {
     "ModuleName": "ServerCommand/删除任务分组",
@@ -2003,32 +1878,6 @@
     "ModuleName": "Table/汇报状态",
     "ModuleType": 7
   },
-  {
-    "ModuleName": "ServerCommand/检查未提交汇报",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:07:14.2051159+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\检查未提交汇报.json"
-    ]
-  },
-  {
-    "ModuleName": "Notification/汇报提交提醒",
-    "State": 2,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:12:16.6758467+08:00",
-    "ModuleType": 34,
-    "ToRemoveFiles": [
-      "Notifications\\汇报提交提醒.json"
-    ]
-  },
   {
     "ModuleName": "Image/日报.svg",
     "ModuleType": 38
@@ -2157,32 +2006,14 @@
   },
   {
     "ModuleName": "ServerCommand/用户登录检查",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:20:07.8225674+08:00",
     "ModuleType": 15
   },
   {
     "ModuleName": "Notification/提醒通知",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T12:20:07.8221401+08:00",
     "ModuleType": 34
   },
   {
     "ModuleName": "PCPage/富文本编辑器",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "超哥",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-06-17T13:00:43.2377618+08:00",
     "ModuleType": 1
   }
 ]

Notifications/提醒通知.json

@@ -1,11 +1,18 @@
 {
-  "Name": "汇报提交提醒",
+  "Name": "提醒通知",
   "Params": [
     {
       "Name": "标题"
     },
     {
       "Name": "内容"
+    },
+    {
+      "Name": "类型",
+      "Remark": "分为：打开页面、执行命令..."
+    },
+    {
+      "Name": "参数对象"
     }
   ],
   "PermissionData": {

Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json

@@ -18,7 +18,8 @@
       },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 23.0
+          "DesignLengthInPixel": 23.0,
+          "IsHidden": true
         }
       }
     },
@@ -159,7 +160,7 @@
                           ]
                         }
                       ],
-                      "ID": "0d414999-c155-4be7-8d6a-278b0317f2da"
+                      "ID": "ef360bc3-6f67-45b1-9b49-ec1e06f7b9c7"
                     }
                   ]
                 }
@@ -234,7 +235,7 @@
                                   "LoadBindingDataOption": 1
                                 }
                               ],
-                              "ID": "09a48dd1-a1bb-434b-b43a-ca7bccb9a2f9"
+                              "ID": "ca6f8c46-111e-49d1-9f66-6c15026e78e2"
                             },
                             {
                               "Condition": {
@@ -264,7 +265,7 @@
                                   "Message": "复制成功"
                                 }
                               ],
-                              "ID": "dd94df67-e789-49a2-b662-8af4a0f87df5"
+                              "ID": "a677f612-f150-40d9-a466-89c3d8832b27"
                             },
                             {
                               "Condition": {
@@ -341,7 +342,7 @@
                                           "Message": "操作成功"
                                         }
                                       ],
-                                      "ID": "58f28864-2c1d-415c-90b0-d878bca8b645"
+                                      "ID": "28f69563-e8e2-4543-8df5-2339cb77152c"
                                     },
                                     {
                                       "CommandList": [
@@ -356,17 +357,17 @@
                                           "BtnText": "知道了"
                                         }
                                       ],
-                                      "ID": "7f3b18c7-f985-4508-acf3-f7a20bdd92a8"
+                                      "ID": "89278fb9-7014-4549-8e5d-068d77ae8970"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "c9d1b17e-a85b-421e-8721-d5cfe6ade893"
+                              "ID": "9e1bcf7c-cd08-43dd-8dcb-17825f9e6a5d"
                             }
                           ]
                         }
                       ],
-                      "ID": "a5c86070-88a2-4517-b8c0-89fd85de62bb"
+                      "ID": "6857f184-3354-48cc-a485-4dc49d5d3a0d"
                     }
                   ]
                 }
@@ -438,4 +439,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//SYbsBvg5NyFxiz4BLd7PYcBWETnOxlc8N1MZ2SjMDq6OjrGLiKpKFb0QUSnQl9h3J32l4FqlJ4vsF/JBTc6jHjvgE+L89Uhx8dvcHfVyQBX1br9xrjU3DD7hZtYNnZgsg74zsA7a0CkNqWGUb9cHozzNerue8/pYlAija+nDFQluByTbFyqK4xEzhTlho1zidbNn3v2LsRmYfhGeWR0/4qyQz7wxh6WE1sQqZL47K8khrwrSqx2sK8QaN8RsUoWPrZ2x+zIP/yQ2cWsliy0D307KwuplVGHR+8xxWDQrfECir3nc/+oSViPue7JdJTrP9blvmdT+cHcE34cYvauxPG+pWTxx38JKLY6khkX6vwogNMfMo34YGRtBH6LsAN6MpzpSAvP7GMES9Nq1dhgHlCTpBTFUVcX143kKwCr+25eiix3oDHzNuKj1GqxG28GA1UK2yR8dtgRiRWjw8zgyojEYmDSjiC+1E0mSlY8M20IA0A+0MYc4t79pBCt4if8ZjqMiVeoXR2S+raFSYA38PgPW7Q/slYzDUHbsmPpBjxHx22JI3yNMGpa4LZuoEaRqyfZaIjjb/e5pmKpgL7+a2cMTzOmXO3dgso8UC3RhlqyFL2Gmj6E88mZ1haklwDii0PWDqwnyHEierAtIGAIkkJeQVa8kYJWFOw1n9NEFecHoA9FIkzMt0oE6SPeyuwPMlAqwtI5qK4u5cVtq79ko5choZxR1TeSzzm5d4tGL4a9hJ0ZxNKc1vqBDPBs7m+Jd4nD035mQ38r81HA0JqThomSubJAejJoH0SjJIAU9NqIqXpQxmCxton+cyBMIZbqn6PpCdkzWDeAaFFk0Z2yrBFHie4q2Y27MIw2x4M7JGQsu6wrvfOoxIrO5AS40+rcM3hAPtH1qap4td7pLml0eQw==|920
+}//t5aMyy68GV+AL+WjCeYJOPWnrytEFaU/0bqyANQBySqyEsK9DH/Kdu3LtYnMrp57Cd5Riszk8YKusz/vZ/LHTaIFU+91m/dwHL16n+6fTLF9eBdyqsr9Br8MaN7WtLYfi1Bk7S/aYxfYWeELNDlIK2bgYaFEtFmf0VIcpvt2c1edmRLXMwSXHC9BxU0ztjtHTuU/HFO4QJYbT5IMc2VwPvWNFUW8gFZDTnyONRPBNfBNYnucjle8KoSmCse0yaGxR+qKlEBIsn5fuMtzEx9fWtiyT94LyaHTVYTl4dZAe8OOFbi839ydcSOZ0gQzM9WM3eY9p8vh3azJfrfnNBOsYMPO0HSybKxCTcIF7ioU5KCJUi1H/xX6DMVspQxWyrvM+DJ5bx/74SKwJZ0h8adENaEtGrRYv34MCqpjQbXdrC/3OX2+f9P7RygnDFMSRIHkAyffpKUtxy5WgoFB2LyFZE5ptf4g0xJKj2LDEcM9cO0/OxK8VazsCIL3AnnQ7Z+MVbl5uAtqS+MNxvZsDq+XfzPF1JT4cai90uthw0MHvIaKhN0Kkdf+qmWt0PUoPWMa2OxQIbHbjx8ty0Mu2HmMCxFrL8cMUDbvV9meZT9RXRZspy5b7VCiB97zJfDRCQYDdbaUgCwxI8UJ+CZr0ExENwKQlrdXbj+ikOVfm7FO1WEKl7F6prL7wUAaIAPyahdUoHxA82kemLfv5iuzKa/IMbhNilHE+BfDoIb5TVPX+/jF2ofPGNyCndfqC9gE7njup6areSRE48sYr2Q2iVa5L7nCh9bCcZecJL9M7hDgGioOhREZWXy8mwYjFQHC+Ty+npUe1MMdkeMMM6zY/2eiASm2ORJdXQZKgVK/0VxvIsp7aVZfo/Wgis3wd/y0CfTmH9Shn+yPrNtrfCJKl8Nzqg==|920

Pages/a3c94948c8a24e6a9d63fc05ebfd71f.json

@@ -155,7 +155,7 @@
                           ]
                         }
                       ],
-                      "ID": "457534b1-16cb-48f5-9147-710798b13929"
+                      "ID": "2a7e61d0-4deb-4f16-8795-2054f1e7eec3"
                     }
                   ]
                 }
@@ -229,7 +229,7 @@
                                   "LoadBindingDataOption": 1
                                 }
                               ],
-                              "ID": "4b93fb91-b81a-4b9d-b615-baffae6ebc2b"
+                              "ID": "ad398fac-709f-477b-9264-17caebea8bc4"
                             },
                             {
                               "Condition": {
@@ -259,7 +259,7 @@
                                   "Message": "复制成功"
                                 }
                               ],
-                              "ID": "2702288b-0b5e-4a7e-8baa-b8d2333afa44"
+                              "ID": "ccd9c335-8982-486c-a6e9-b7fddeda445e"
                             },
                             {
                               "Condition": {
@@ -336,7 +336,7 @@
                                           "Message": "操作成功"
                                         }
                                       ],
-                                      "ID": "ba2bf5d0-8835-419b-bd37-9ffcf57ede9b"
+                                      "ID": "ba697c6a-22ec-4012-a4d2-1e3998721301"
                                     },
                                     {
                                       "CommandList": [
@@ -351,17 +351,17 @@
                                           "BtnText": "知道了"
                                         }
                                       ],
-                                      "ID": "69f3d9e8-3260-4d5e-ac92-d575b1709df3"
+                                      "ID": "38529a9f-1315-447a-a087-72b112c78d3d"
                                     }
                                   ]
                                 }
                               ],
-                              "ID": "8856075b-9adf-41fa-a852-61d9916aa010"
+                              "ID": "7dca5047-8631-45cb-bb7c-12d6dad6e87e"
                             }
                           ]
                         }
                       ],
-                      "ID": "bae66faa-1b8e-4f24-bba0-08e37b5b846c"
+                      "ID": "c645ba2e-806a-466a-b231-16718ecd0ad5"
                     }
                   ]
                 }
@@ -436,4 +436,4 @@
       "Size": "24,24"
     }
   ]
-}//ILQfIT5DPfcGydsV6+KHwYjkwUwLtdtGCTKgn1Yqxin2nr4/WgkWDFDWRB61TmY3L61ozNIfugc5sroNsMoib0PB8ba2WE9GctV4wk6IoBXFUbNTl33pvoXckmMFqaNtJ23wBTGH4Ri1mzgK8jJ/1RWAWM4gfIf7UREIkW7msDtNNh4e8ONHiyoBPccdYB0RNbjXbcS1Mz9Ecex8m1su7JE1Qm/JnqUfirgYjd38QbDE6x/G/P6IQNpjezBClNsc1StCoGm7TAyXCRhsBIHZCIDY+XB710C4z5s2bUHjSVGxJX8RCTRcKiVlBn+0Mh9FPNh5z2jSGOoRqNOKhX1HEnWd7sSd0WmQV13NWd7OTPPKD4J/UA5lY6sl1mOae4vw3yADmgZLY/+VEIsE4+NWclD7Lmpm6QshsgmolhaKdCS5K0YWgMnVPTpkAzmgKhxkRjeRon4R90P4AIISE/Fn5Duxx/ZSyFwNmmT7uiRZ2V4xwaTvU5fmtvvlibHov5NbywONh1kl/O4WmP/sXoN8cgv3FxnvGfph97juPsdGxjm62N2mMY1yJJGimgKbyxwBq/NdtNQnKlxYRg+wllI/H5QYWNynOvn5tW+E5av37iUAVDeTnfncq8ISIauf/6QRRPz5VjKHXJ4jCe1LvLYWB87QcCHFzs6lypbstrEwUffTkB/U5zO6Qo7nGWTfUB6NuSl+Iur6CR5NaRC9EnAUSykybkq5mTFlpIlswLVrYJoEBXVZee1NxfJaxiW8xBZbZy6BoI2xCiZNdRNPpDsHcOI82iP/0MfcxKAm+tI6+IvmdVNCoTz7zK4yOz8wWLCOJQTkVRc77x+MZDEq8a+mkvxx9CCkwLpczZbVvC3DuTWJ98hDxddgUX8jSaq60wgNduHQ18iRAXHeUCK1JkRLHw==|920
+}//uGWy9+RCZ2xRISwsT1STdJrwGWlLqtcarGbpLF27/kovWOS6BKSD0E0aXVBmVrmKfk4C2K5F35ao40EYsAieHEhNMWzcRqJOCXCXtKVRjpKU4ZaAaSccPwkz62GZF7Jdk/GSbGD1MVB+EMHzlFiegFR+iitZ63MwJ5AWajx9r0gibIaHGocCNc2XIyql1fCE4dsmJCMTFVggWmbK43ptpzoESQq4POV6pNwuJxLmTvr3TMuvqqIrbEPNHLtarLmUN4Z47LXKMIBoLLUeDfoV95XchcMj5Y3JVTa4QgKkoZqBlHScmakQhjauWM8lvotQ/vgoUKSKO0O68DLPAhRyfo+XwJHYfDxnNRixCbp+UJMrHgILkrGbDbJ4RtOPVJlB4DJKdghlT1b34fTjR9/cimTC98X3a0OGhpl/rO4Q4YS7hcRhRe+KlYAXtQuUYzggsni+9UQk0JVG7zqlAs7hmHoXTCV910QTsoGcy4fiwOOzSurmYOabYv1ayYsXrxD7l/HIjImOsHZIc5jAqdgyBQp3cfkwUIFlFp3fR9zoqWkfXcXYMpO2tdJhx0XY0I8/qoZJochAnitkeSQMpzd75Iin7m7TI60/Ia9Q3o1KnyCty+HRRgufLCRcX0h3Y8EpRMOTXz+CvY369NvS+W4/jm0oarYibQKXatQHsrHy4gkirpltMx0wzoyLdscWMBj3sULN4M+blnASm5DP3nnkCpFI3wwPt3P/CIIik4n/ojvih+rk0/HFjcxfeRze/xTpVCMPIGNEChmZiIxGRox2S2aOjetG26TnfXFaKcIfyjI61Gp3j/9ZZBMmF49GMXKEIYT9iySqL3kO+ZCsqcB82W4iwc+0nKqSg1s7UH0po3fpfA7t/rMyhvIuBaq1BlCH7IaHt0uJ+n40VAi4LwQi6w==|920

Pages/b90932e038f94707b54e571ff7cd84d.json

@@ -265,8 +265,8 @@
           "PageName": "编辑删除页面"
         }
       ],
-      "Location": "230,156",
+      "Location": "232,159",
-      "Size": "26,23"
+      "Size": "20,20"
     }
   ]
-}//F9XELt1D4roPrpTvnS0AxGws9Zst1tjpeLLbQnGE5lzD2u6O6KcbFsNX18ZhbEK6Fdh2QeaDk9w3iKq43Z+or1igLXV9GZjurTzJ55q03EOKvkPahVyFNapQ90ljbOHDqkCWpJ6/2VJqH6fC9U0TPMWdvW6ML6Lg4pFcxkm1Zx5gmoeJ75fWX3Q6rGt8F1r9da7pTlwy9h2ImRegld8ix6nJNcUpZE2R18lY+CPL3EYjd0RwdgqiO15MINamMrSJSHdeLm9T6czCQ7b5Is28EjE+h/t7zHM11TkhSAu682MV+1Gd6wjglPUTRqArp8y6fd2rIm/e8SZH7y+QhJsqZaVq6WQD48rGCf0aWPbVU56sCJki8wXM6sAGpunSaF/QXh3P3Nbg/7caO7fCs3W6pD8E+WH/MeeUsKTqaeBY398JRdyR9qpo+S7KklinVWGtvk9zYPRSS8VO6A9qJMNsfMqAQKSAQDmd3DZQ6ZI5CRtU5o8uHJwObT2XIXyEUKhlJoWyral4U10VoGb6qb8TU/tRq7SfppU/Ypr3jPaXL0ZD4ULy0sa6EtOa0Xw0K4eXV9LKFhqW5CMLvYF2IMsyXXyTgX2Hz7ZD+wU9zTxFZbskFo1OnA4zwznke+Tx6crJsK03D2BgYRduK8cEceRdAq8fXqraTt+8CWdm/Acjup4ShF0fWMwj4Tog93pJI06ixkNTP+tOQYafCkRxRhn8woxF4io1WNmGdqFaVdm0ZKw3zy69hmG0Hgd39CluZZwkeNErMVDkw1/8QlWhu5ukSct6Y7hY33w3z0wG6OZsU2XvlIvMJraFvFfIxs7E7EI8j3DMLkD7UsD3sSDSpqnX4pAPcNOuXGEk7SYOsKREIR2Ihxwbxpq+Ya4ttkr/KGNOM6Wb+a0Uf5Z2kxgPSJTwww==|920
+}//BrTgv3u7Q3vSIcnu7oE0tGCWQxd7r8ppSh9DxUPGsQUhHR+8sjwf8lnJtbQLUYYajyh0W64ZE2sZLvHnmdvwbmE9QcLePXz/R9WlUO/6MtRPmlgEUlbObFDcIZl1xpVAgdpsRV8OuJ2Ug+77ZSvwtODM4Aj4MtgL9NJUfN9I6cCdOAtblQ+aTgS4k6tsfpyAVaq9Yp80tHlerMVzvZ/jXmuIlYoXmNdH/LlImka7jEJr9gjWbu0lzm0TyJ8AKR/Y7z8Q3SsIxWp38Edw0Ke84CC9jmYZAewnbXxjMYplzsubqqEfWpnt7+WRmiZrAWYBZvKEFCAxhegeeOz+b50mp4pcatkq3g5coW5XPN0nGXKxmVrvZdJhp8I5JfF3uQzZfseYEJewoT8NW7K4mqkOmLwAVgitqC1c2H2JhFxwzlAeanQvDd1qm5qrW61Xm6USqjqCcbi8xSXx2m76QkFwj7Z7InN3oH3ALCPYqmZwt4Habc+kmHGfcdp9PxOOvAF5HpcLKBdlIhcJUmDWR6LhjUDQrTqnMH95XELbgVIQsw0TljY37+KHaunFjHMph/MVAO2Uo8b40j1AHLFAshDJ7PtBOEwWuHVPY2igUKmxTHPJSN7m9z8ipLHOfWW0gRPC2OThVGVzBEBwJpv8iAyZHF9NSwK9hsQysHqnb80hirM364cbaYaNX0/XwNDNfDqEiETu1TLYj7YdIXFqQsiwtY3zv6X1ZsnBv6NzusWR68ns8ax+jC/vvslE14ZfFi+8P75Hec1ASJtyrLDidZHOgfcXZht0Q4zCPmADcIxEbzaToFaJ2WonGAtSvb/Wp/SI67U1mHv3J/1KxZchdwa2rGQ8iSIhMdvqR1AoEs1H0FOsr4EN3nVA+X6xFZVZjJCfuvc7GbzREcVLvkvmi7PohQ==|920

Pages/任务/任务-任务信息.json

@@ -368,7 +368,7 @@
                           "MethodName": "ReloadBindingItems"
                         }
                       ],
-                      "ID": "49067081-06a7-47e4-b71f-6bb1f6c977ab"
+                      "ID": "b7a8f337-3e83-4c45-8d39-1d4de5b755bb"
                     }
                   ]
                 }
@@ -458,7 +458,7 @@
                                   ]
                                 }
                               ],
-                              "ID": "58fcd20b-2839-48a8-a997-0ffd88f66526"
+                              "ID": "a9abeeca-033f-4d3f-98b3-3fb9bfb46c52"
                             },
                             {
                               "CommandList": [
@@ -475,12 +475,12 @@
                                   ]
                                 }
                               ],
-                              "ID": "96f7418a-3ba8-4852-8471-bad0e9d3cd15"
+                              "ID": "68b86071-c943-4f37-91e9-c15f272b8d5d"
                             }
                           ]
                         }
                       ],
-                      "ID": "ebbe9c87-953e-4c49-bbf9-a503a9537f57"
+                      "ID": "7c692a82-b121-4b0d-ae49-b609eb6c7f1e"
                     }
                   ]
                 }
@@ -490,7 +490,7 @@
                 "编辑内容": "编辑内容"
               }
             },
-            "PageName": "MD编辑器",
+            "PageName": "富文本编辑器",
             "PassValues": [
               {
                 "Source": {
@@ -498,7 +498,7 @@
                   "SerializeProperty": "='任务-任务信息'!C7"
                 },
                 "TargetCell": {
-                  "SerializeProperty": "=MD编辑器!编辑器"
+                  "SerializeProperty": "=富文本编辑器!编辑器"
                 }
               }
             ]
@@ -550,7 +550,7 @@
                       ]
                     }
                   ],
-                  "ID": "b2ec47f3-2334-4867-b25e-f6f33abfe114"
+                  "ID": "299fa236-b3ee-4c0d-b65d-05358f8a4555"
                 },
                 {
                   "CommandList": [
@@ -567,7 +567,7 @@
                       ]
                     }
                   ],
-                  "ID": "e250e99c-ff69-4958-ba8e-14f69fc2c9f9"
+                  "ID": "73a4d5f3-426e-4b34-82d8-a52c544d2823"
                 }
               ]
             }
@@ -655,7 +655,7 @@
                                   ]
                                 }
                               ],
-                              "ID": "25088740-a4bb-47fd-be9e-471bd83f0b5e"
+                              "ID": "6fb57b96-f888-4e2b-a3bb-0e2d96944519"
                             },
                             {
                               "CommandList": [
@@ -672,12 +672,12 @@
                                   ]
                                 }
                               ],
-                              "ID": "39893087-c3db-42f1-99f3-088b7c36ad6a"
+                              "ID": "ec6149ef-9678-4ef9-b5ac-a604ee019034"
                             }
                           ]
                         }
                       ],
-                      "ID": "a46d0ae7-b63a-4bd1-9756-a53b6c756495"
+                      "ID": "0573eef9-3d00-45dc-8912-f40af1865224"
                     }
                   ]
                 }
@@ -687,7 +687,7 @@
                 "编辑内容": "编辑内容"
               }
             },
-            "PageName": "MD编辑器",
+            "PageName": "富文本编辑器",
             "PassValues": [
               {
                 "Source": {
@@ -695,7 +695,7 @@
                   "SerializeProperty": "='任务-任务信息'!C11"
                 },
                 "TargetCell": {
-                  "SerializeProperty": "=MD编辑器!编辑器"
+                  "SerializeProperty": "=富文本编辑器!编辑器"
                 }
               }
             ]
@@ -747,7 +747,7 @@
                       ]
                     }
                   ],
-                  "ID": "bcee987a-3bca-4a69-b717-64f0a15aed3b"
+                  "ID": "bd7c6655-c0e9-4665-9adf-b2e72220e77d"
                 },
                 {
                   "CommandList": [
@@ -764,7 +764,7 @@
                       ]
                     }
                   ],
-                  "ID": "056edeb2-ba91-4e85-a495-918c0230d118"
+                  "ID": "a1a5ded8-cec8-475b-ab4c-914b85ce59d2"
                 }
               ]
             }
@@ -1028,7 +1028,7 @@
                 ]
               }
             ],
-            "ID": "c4be8d2f-785e-49c1-9f3b-e6025834753d"
+            "ID": "0ba621e4-6b68-4565-ac65-ac372b9206c4"
           },
           {
             "CommandList": [
@@ -1045,7 +1045,7 @@
                 ]
               }
             ],
-            "ID": "e279d6df-ef56-4ec2-b7ae-d9f29d49a763"
+            "ID": "6b8bed81-d6c3-4158-9501-8d3ab020f8d6"
           }
         ]
       },
@@ -1079,7 +1079,7 @@
                 ]
               }
             ],
-            "ID": "44bc16ad-d422-4d94-a99c-61a1c139a098"
+            "ID": "49dc5090-017f-473c-bec4-9a340d6b7cc1"
           },
           {
             "CommandList": [
@@ -1096,7 +1096,7 @@
                 ]
               }
             ],
-            "ID": "1d08d188-ba6e-424e-9b95-85e353eaa0c4"
+            "ID": "25bb4224-7723-4f32-bebd-bdcc371756da"
           }
         ]
       }
@@ -1158,4 +1158,4 @@
       "Formula": "'任务-任务信息'!$S$14"
     }
   ]
-}//5J2Ja2VFqlE7HFw62QBv+N3hjRaiEzSD/AvOl7prG5X1Rih7pjENx0KgYrDBJ8+xrLPh9sa9F7g5rFVJNQvZmNzwzBhOezdbESlaBGg+dzUYcWatkXbHV1/KiVDyeTf44oH0KjEAkp6hMpHZ0MvM0JVHN9j62CjQ16OX/hagj1JVvhVE4/uHBV9K24pQRWUFfeMj5T+1/4EoZoEdPPPmA08YC6eEZNoV+U25VQrJFAPsjSy1gtdlqLUM+zvRaeCqLo9ZwXHNL9MfTBCkVB2YVhtvTA7xrX3bXevW3kuLjy0ykVQEB6hjELu4w/reqd7hwDgTM+iLK3QfWy3iSt+7fO8TfYPbAectwfOFXYgwUdVih8eTNvbCa8lwwN7iSfTJ2UQ7FyIXm6pi99yIknWmn2FHNUI3TzWeXMPH3mvYc4DUF5jlBexTU4pwHmH1p0+nrXSrEDVt5zKd1naUky9Oi1obRZzujXJ+DYgfxUamSpJphNcewIZjIM1+/FKiKQ3KkfIEYvpezXXELIp6UpiHEKNAeSk7JnjRdCe0YsM6h5mZSoAySnbgNSfsAjc3ug/XnzZ8vc3GgbO21bh3WgiqkePAYeN0ELYgp6iessO8yHUjBwmBeyZ3iQhgEJvh1GwyP5uDhN1iRL7pFHi0HMijU/PGEwS6WttmleIQkHu9REv2LVgsirNsW7ytqBbGUNpLV2MABiFxSo12FIQW3nblGBX+Z96ht9Fqgu6CUx7MnOVq38vQdsJQihab/dMq4G7jJ/c7rwdgD3i5lKMP9qFgdrbvO2aDH6Xgs9fDxI0g5CWPmWfx3fiJcrnO8efDE00LNJQX/LpKDkVTAuR4yIefVLNSGaJkDnkYr1z4LgLboHWBG56C8qsALqZuyWWl4i81fOTw24HBgZbk3FIp9wUwVg==|920
+}//TmAPvffRq/erHwhXFCwVqA4EaIuEIYPVnGolMMThJJCnS7F2tVNB7edbHwZgb53MWFdz170ms+nGOdlevPPrdWZKwW57Ei4k6QqrsTKlowQlq9VXOsfDg7AvkF7kz0b3U049JAakL7J5MLhnUNGUVNET8Lt1JBIsGxm/V0NzmSag+Si4mfVtU72BbcYvuYsvRT/kmmxSadF0nvOsXk5766cAdo1KMG3Jp0B5Mp0RcCXgH0ERtAFbwHiIOkDJDB+vFNn518wdbZcatnoMfFGhSXVNBHO8aG02WQ4EC8AygHS2wMqz6iilxaxLhDy/f91lrOVTHeDABTPy5A4CEyiVIoBsVSF5cfkOvx32Ri/lci/iFmsVb6g+XdmSwOhjYPMJYTAp18nbAmmYDWl5FOvbOSvMUK4Fvzi0yVr94ORVy2wgJqz1Y2Y59LEEb2QW4opcobe42JyMT2rHJ2gY0M+g2XhcGy9dOlyL0qXbZpJDTVihQl2UHhswdMacneOdhiN/1Nu+Zl1XGuG1cBPHj9MjWDHIqKYTA61gDfNNQX2Y2hBUmgVWDpg63A2f3miED6Y+3mvF0G3WLhx1ASOweGxprQo5FxSvr0PxUFlt2A8gcG9hTPMjZCiS8qDhACYPrVruTmQu40LApeaAgmh8q3Z6RmaaLt9FsSPP47NqRyFS8gUiZfHNrEETnJdaObJaAoC4c7dF9SGf44xAvYy7m5vfetLYrthPQD07ZhrsmNcOOXCYa2u9uGveQmNRTDPukF44CSxDC8mv3W2+BEETrW14Pin1D+06WmeQehD24EXgEL72nHUVKLBdQ2LYYL8jSzCEvfrCjOK6Sc7HbyGbMvhYWY2rJn5a0DaStbv2lhYKat0Wh8BH5DefJGrk0Te9OoyAyN6sy1+fwLNcsHCYGRep3A==|920

Pages/任务/任务-侧栏.json

@@ -283,7 +283,7 @@
                     "ID": "ead92b1c9df1498883eaa4adeefb5174"
                   }
                 ],
-                "ID": "e44d8cd8-6285-4834-83d1-a22f351df720"
+                "ID": "0af62c36-87a4-4078-8c4a-5544dbc055d9"
               },
               {
                 "Condition": {
@@ -315,7 +315,7 @@
                     "ID": "3b696050194144c7a51203d042e4e1cf"
                   }
                 ],
-                "ID": "89f5b4b1-ba65-43a5-a367-f45e5b4e21cd"
+                "ID": "bef3de95-2613-41f6-8c59-21ff33361801"
               },
               {
                 "CommandList": [
@@ -325,7 +325,7 @@
                     "ID": "ebac52583bc449c5a4388b99e7f43d75"
                   }
                 ],
-                "ID": "d688228b-b6ca-4c1d-b952-6e60f4436568"
+                "ID": "283f9ba5-3dbd-4232-8e26-f772c7a972c7"
               }
             ]
           }
@@ -614,7 +614,7 @@
                           }
                         }
                       ],
-                      "ID": "9f1bdd48-b5d2-4edc-81c1-272a412faf66"
+                      "ID": "fffa30e3-4215-4e1a-b0f0-b9afc7c29094"
                     },
                     {
                       "CommandList": [
@@ -627,7 +627,7 @@
                           }
                         }
                       ],
-                      "ID": "e92436f4-f4e4-4e33-a2d4-ba15270dbb0b"
+                      "ID": "d7c8cdd9-b7c7-4bf9-97d0-ffd9b6d6bf45"
                     }
                   ]
                 }
@@ -636,7 +636,8 @@
                 "内容": "内容",
                 "附件": "附件",
                 "回复ID": "回复ID",
-                "回复姓名": "回复姓名"
+                "回复姓名": "回复姓名",
+                "回复对象": "回复对象"
               }
             }
           }
@@ -754,4 +755,4 @@
       "Formula": "'任务-侧栏'!$B$9"
     }
   ]
-}//i8Q5oA3+n94yoh9lIZhRrum2ofgpmbn7pay49UilbCV5U7+BMLS8t+i/nsx/zbf5dA55cppda8+500KyPV4psbBNJwYlmEoioSNArV1BDqpzl/MVN2g8m7bkw4STL2MKH5mLhUVArIJ41afjs8Y5UOZuavqdUM55TvaztaQTtJCJX+ZVsyLDDXTLL9bcd1/WqRoxoivWHjmZ6J0TM7J2Zn0H5lqbqK8NDsV/a+D9v1L9NUaet/zlDGJc4WzyG9tzePSPThzMNYDBD9C6HwSoIKvh82WT0mef6SVvpGAZbvVX8T/a1D6aNVibnvFLq2RAmL/KcSkmMrRXFE3c2H6VKRTJAF3tCqq5ERowoZ1Ec8LUBc8aFbRU4XGiDNDkVgrnFtjT01wEr9Ky4JHoYvIi6aXzucN2ks52z1qXI1nAi8JVG4r+8TdoDcjwjCdkRYdf82zDoq3Ecqldes8Tb3Lz/rehPN5ikPrHVnxz3SMG9ZnR6mwFDomCA7d5vUa0eUz8+prwMw4VP7uqBxINKSqWv9+GVrd0aXYchAl5tQW7cCD6/JjqapME1Bf5ahN4lvUPurkLIDVCQp0TJVKu+Kbi3awO38w+mbnTrMzAgtZw9Fjx06V43ynJ761BlOi66y13+VLro2UEesQu/dOd2WDTGdpRiq6VkCRQI5GPnGrQD2WElObf6MVnfy+vWIHkLWoDFL/ghafSv89y4jsRvdfmpj+XJH8dxPURaPTkQUpQXU4uYai7Eb1/QsRh27wDv1/yeQa+/NP4UfIL4KZELbTraOXKBouj+8rcxL3OHaOxZzMCS1ZYs1o7nvYtxoIxBixDNMQKpe+DWhC06PoaM2wERQ49ygXraqYA580E025CGGxmXfc4ALwpt0obB0lnmZ9hZ+zJJSh5UBJUqLGzX88NSg==|920
+}//GgOirfLlpBlnA1QO9qcEDwKsFF9wPFU1tDMovunT8qQMFJRiO5GTwDPycW5lkuD7mup0EX5gfkEzf88zFozTCyVwG4gDVxCEylXdRjXxGYiaBA0gTHThATam/UN2oLU5A6ae0Qsc+eNsqu9hMhi6sinYlOpLGicoAnF6OySlRWnHw4/wgu8UaJSz3Tp2i+feSkfxLHMmBG+stlYmICHhNae4HkQRtnIbE8yfPUc2LdQy4zBBhWaXx+iQoAVGFAsTQs7Dq0VPEB51aILO/pbBqXuQw5h6/1Sbt5iLm7RnNg8YkqxSv9Ws8wsL9aAqhT5NhfdtH5Hkusm6b1V/mgtA5n9bOQHTE65Z0oBJPTkrW0QcvdOn1SLLzKtxl/rZ61Xi9tmoA2WjNeWndSJFFwUm1DKk4Oh5A3hP9vFLr+qy74ZeQ2R81U1XhC211ig+kdCmEqZtCqPumgsYfm5IEgIz+RKN0OFRPM44TdprmUyNMImqiOZjnTn7Yb/Pe2nAfqjQxtqVakmPxaDW6M8BI7CSCQ62lkW06KbGEWDbrKrj7MhkZ8s36UifgxY0QBkaxAJACFeMI7LeUFaz5j/kBUfd3vHbIihvsODry9J1Avyz7mhS3qnpB6OqbrnRRt3UiBShMv9mhmluymE0vXcxWpzIQcUCDc1MwJE3Z9yNWX3FwmHHOQ0cqUDzgzr7hUvtSQxaWqV6pvC8VqIdqZvhfLxIPZwihPltwizBCeZUfwJLofdkan67KGsgFcl+6NJbLr/F3DqSyt/161KwC+q3HFLEC/FrcNKjbhenmI1euw7cXMkSBPLKGeEF4u4knh/Icj95f22UFrs5/s/iMIy/2o6Sy+obXOY/88C14pBP87t6tLKF9jayfV1ctW3HBLU5rcumajMBFykoE5BKrNqZ9WLWYA==|920

Pages/任务/新增任务.rd

@@ -1,16 +1,16 @@
 {
   "PageType": 0,
-  "ColumnCount": 30,
+  "ColumnCount": 16,
-  "RowCount": 23,
+  "RowCount": 32,
   "Formulas": {
     "3,13": "项目是否开启反馈收集",
-    "9,1": "J23&\",\"&M23",
+    "9,1": "H32&\",\"&K32",
     "1,1": "IFERROR(\"所属任务：\"&ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")"
   },
   "CustomNames": [
     {
       "Name": "父任务ID",
-      "Formula": "新增任务!$B$23"
+      "Formula": "新增任务!$B$32"
     },
     {
       "Name": "项目ID",
@@ -18,11 +18,11 @@
     },
     {
       "Name": "项目是否开启反馈收集",
-      "Formula": "新增任务!$E$23"
+      "Formula": "新增任务!$E$32"
     },
     {
       "Name": "任务ID",
-      "Formula": "新增任务!$P$23"
+      "Formula": "新增任务!$N$32"
     }
   ]
 }

Pages/共用/富文本编辑器.json

@@ -3,7 +3,7 @@
     "RowColumnAttachedInfos": {
       "0": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 31.0
+          "DesignLengthInPixel": 24.0
         }
       },
       "1": {
@@ -13,7 +13,7 @@
       },
       "2": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 24.0
         }
       },
       "3": {
@@ -28,7 +28,7 @@
       }
     },
     "Count": 5,
-    "DefaultSize": 32.0
+    "DefaultSize": 24.0
   },
   "Cols": {
     "RowColumnAttachedInfos": {
@@ -202,7 +202,7 @@
                 "Name": "编辑内容",
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=MD编辑器!编辑器"
+                  "SerializeProperty": "=富文本编辑器!编辑器"
                 }
               }
             ]
@@ -321,7 +321,7 @@
   "CustomNames": [
     {
       "Name": "编辑器",
-      "Formula": "MD编辑器!$B$4"
+      "Formula": "富文本编辑器!$B$4"
     }
   ]
-}//BQeffkiOuOBM0/VkbbeiQbSMYuGK045SsasgMQm2j0/bZOucnaJ2uWtbOeoyMydWTRe4ILygWjaktPgaBvLcOJW/qeID7vbpm53Ss1FWVVfDXkAFHVaXj2+dWa23UvPCGCsTKIJf+ZJs8i1F2bppYifxR+HN27oheTkFnsnT5tbvZwxQ9fqxZCqzEPfSQtk8Lt7UDDX1M3XOUmSm84v8p0oxe+XyaDJaPTuhenrWly1cXWpIE2qRnE5WFD8yZdJVOBj5/lqJ27zJhFA/qZTHRgtyJsa9cbIRi9Eb8cUaj+MxaItEEPmbyL7GNfvgl1Z2tqFLngmKkqrmessB0b3FRv0EcvYWvRNUURUSPP/aBptPpKJZBDv1C9tCl7fiakXlVZEqLO9JsLA9t8WJzAOC0/w5Qy8EyliB1Awxu/lzn3sevTjkgabygaXv+QobFgZ8FhxJq11bognBFCNHkZlcR+mNgD97zYDcHRvqyg9+6jJkwun4nMUb+TAFHfRVgpy1x8O6OESgAVDpM4kln9fgAuuQyqUd8VZ4b0+w4eCBHP9twEooVlDbqV2jMEj6ndRqLMxm0GQghxlWNX6kEoG8e8HiDr94ThFnFXdjDyVWw7vqixj85NjTMNnYDlG8maiK1Ja7Q3Kl/4b/1F+/opf685lg9AqvdQ3+hxrv/HxvJqPPd0LdrhCterx7vSYuAjfoU1bSeWAUIj2Ge+JG0Og6TB5j9e/uwpifudq0ePcJq/siEhULZb3cg5tyFbWXahTLyCWvHUQtGphfoFXN2709Q9FW8opnrdwGa9OVHVJSn8dB8o9U73IYlSWPnnZ3ghrYEMnmhdvTXGx1vII/qFh0xwzsuI3Kz0nqGDiSxXRTulV12hffrupTXPY63Xs78KiWUCEYHCsFXhQjYtG0yCOroA==|920
+}//nfUC7yynQuFF2yf56WPwA8VZ38N/dpdWgkm+iUQiTCmgwTvaucUGlfiGLuxQ2YqzzfdKjCeHGZ8fz6jUIlLbbE7AJlGXKI1G8oRsJfeuq3iGl6PG8T/V3C7+ndQzuVMizOjYX2DK19eHVPBvBdDChT4ya97ahRco5LjOtj4W3SBnMINvSrZosvIoXhpd/k6FmCeGkNizHoUUGU2XRTbV6q/7De10aeMbDTVIvlmnD6SHS8qIL8dsof2F7Rgq50R+fvsNngRdtDdz9psXFscvqsGkxn6qjymr2qhO9XWIU6nl70ksSmf/r+maLYmNE79TeFP/ctnBnGuvMzf94sDdCmnyxuzGCf6Ccp4bu9cTfMkDSLF1AKpNIR2I07PD9KBzxRUK2fTwTeGDHL0iwB53NnL8mwDGnSI6nY6BuYkD54TGY/kSAwYK/DnY7+SAvVjykpbGdDy6vgat9lyeXvJ73ogFxRhiCp2dmASjdJMWNcKUMBYFIyXT7HSKXZQeljBuV9InoPjE6d3XGWIz9GSSvXbuboJXV5kkBpNb6W8BUArPDrt6ilpyyqUg7EW2mi5NrCvPp+GvgkhgsIzf9Ay8/puoJbocLISvsDFr6Rt6tM7QFv7JPdWtuOPOX92yA585xGNHnGtmPhmx8L7cWNI8OYqbS1CupiJxCTcFARZkAsiV+tO7LX4jx6wK0FkGz0P4WT4hA236MHKVHk7hfUc2WupkqszMivWW+dXGcuR2swJIWIVl99Waud+Wcu6Gws7EyWD/KvQo8b3mU7Dib/zApANHRJrgZOEtD7yOkgCOjuSHVE2Cfr1dR+GChhH95E6g8zr83P+pC2O78cGhrKJfpzw+4E6NNL21PID64cudqqWsLrbh5QaiTRuhN+28nwXfpttt2Takm1cxeiA7YWob2g==|920

Pages/共用/富文本编辑器.rd

@@ -5,7 +5,7 @@
   "CustomNames": [
     {
       "Name": "编辑器",
-      "Formula": "MD编辑器!$B$4"
+      "Formula": "富文本编辑器!$B$4"
     }
   ]
 }

Pages/项目/项目列表.json

@@ -68,7 +68,23 @@
       },
       "13": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 418.0,
+          "DesignLengthInPixel": 235.0,
+          "Mode": 1
+        }
+      },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 30.0
+        }
+      },
+      "16": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 12.0,
           "Mode": 2,
           "MinLength": {
             "Unit": 1
@@ -78,7 +94,7 @@
           }
         }
       },
-      "14": {
+      "18": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
@@ -92,9 +108,9 @@
       5,
       6,
       7,
-      14
+      18
     ],
-    "Count": 15,
+    "Count": 19,
     "DefaultSize": 24.0
   },
   "Cols": {
@@ -336,7 +352,8 @@
     "7,1": "查询",
     "7,4": "重置",
     "10,1": "项目分组",
-    "10,10": "项目列表"
+    "10,10": "项目列表",
+    "15,1": "添加分组"
   },
   "Formulas": {
     "10,10": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\""
@@ -482,12 +499,12 @@
                                       ]
                                     }
                                   ],
-                                  "ID": "ce37c046-d681-424f-8bbd-395de9173500"
+                                  "ID": "25f8250d-84bf-4f8a-ab57-dd0ca1e088db"
                                 }
                               ]
                             }
                           ],
-                          "ID": "d4a6fdf4-7cea-48bb-be3a-373424c6e9c9"
+                          "ID": "4a8743cd-50db-48a2-b23f-f728e9a4c6b5"
                         }
                       ]
                     }
@@ -835,22 +852,6 @@
         "TemplateKey": "_RS_Information3"
       }
     },
-    "10,5": {
-      "CellType": {
-        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-            "PageName": "项目分组详情",
-            "LoadBindingDataOption": 2
-          }
-        ],
-        "ToolTip": "添加分组",
-        "Size": 14,
-        "ImagePath": "增加.svg",
-        "UseCellForeColor": true
-      }
-    },
     "10,7": {
       "CellType": {
         "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
@@ -874,6 +875,34 @@
         "UseCellForeColor": true
       }
     },
+    "10,42": {
+      "CellType": {
+        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.SortCommand, ServerDesignerCommon",
+            "ListViewName": "图文列表表格1",
+            "OrderByCondition": {
+              "OrderByColumns": [
+                {
+                  "ColumnBindingInfo": {
+                    "TableName": "项目表",
+                    "ColumnName": "FGC_CreateDate",
+                    "GUID": "4e6dcb84-a79e-4a81-9d60-6332f42bb486"
+                  }
+                }
+              ]
+            },
+            "ID": "7c489da223594869843882d0bd7cc08f"
+          }
+        ],
+        "ToolTip": "日期排序",
+        "Size": 18,
+        "ImagePath": "Application/093_sort_toggle_2.svg",
+        "BuiltIn": true,
+        "UseCellForeColor": true
+      }
+    },
     "12,1": {
       "CellType": {
         "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
@@ -1009,7 +1038,7 @@
                       ]
                     }
                   ],
-                  "ID": "1e4af744-5d8e-4179-bbd3-1029169031b5"
+                  "ID": "1f9cb21e-bc7a-4f62-b00f-3b528efcc86d"
                 },
                 {
                   "CommandList": [
@@ -1022,7 +1051,7 @@
                       "LoadBindingDataOption": 2
                     }
                   ],
-                  "ID": "8d01eead-f414-4f5d-83be-f1deb856f893"
+                  "ID": "2a050ef2-6767-44c5-b0b6-50b52f5cfd75"
                 }
               ]
             }
@@ -1217,7 +1246,27 @@
         "TemplateKey": "BlackWhite"
       }
     },
-    "14,10": {
+    "15,1": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+            "PageName": "项目分组详情",
+            "LoadBindingDataOption": 2
+          }
+        ],
+        "Text": "添加分组",
+        "TemplateKey": "Gost",
+        "Icon": {
+          "Name": "增加.svg",
+          "Color": "Accent 1",
+          "UseCellTypeForeColor": true
+        },
+        "IconSize": 14.0
+      }
+    },
+    "18,10": {
       "CellType": {
         "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
         "Caption": "显示搜索栏",
@@ -1319,6 +1368,18 @@
         "HorizontalAlignment": 7,
         "BorderLeft": null,
         "BorderRight": 0
+      },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "HorizontalAlignment": 7
+      },
+      {
+        "HorizontalAlignment": 7,
+        "BorderRight": 0
+      },
+      {
+        "HorizontalAlignment": 7
       }
     ],
     "Types": {
@@ -1500,7 +1561,6 @@
       "7,37": 4,
       "7,38": 4,
       "7,39": 4,
-      "7,40": 4,
       "7,41": 1,
       "7,42": 1,
       "8,1": 5,
@@ -1552,27 +1612,53 @@
       "10,7": 11,
       "10,8": 9,
       "10,10": 12,
+      "10,42": 11,
       "11,8": 13,
       "12,1": 14,
       "12,8": 15,
       "12,10": 16,
       "13,8": 17,
-      "14,10": 1,
+      "14,1": 14,
-      "14,11": 1,
+      "14,2": 14,
-      "14,12": 1,
+      "14,3": 14,
-      "14,13": 1
+      "14,4": 14,
+      "14,5": 14,
+      "14,6": 14,
+      "14,7": 14,
+      "14,8": 15,
+      "15,1": 18,
+      "15,8": 15,
+      "16,1": 14,
+      "16,2": 14,
+      "16,3": 14,
+      "16,4": 14,
+      "16,5": 14,
+      "16,6": 14,
+      "16,7": 14,
+      "16,8": 19,
+      "17,1": 14,
+      "17,2": 14,
+      "17,3": 14,
+      "17,4": 14,
+      "17,5": 14,
+      "17,6": 14,
+      "17,7": 14,
+      "17,8": 20,
+      "18,10": 1,
+      "18,11": 1,
+      "18,12": 1,
+      "18,13": 1
     },
     "SheetStyle": {
       "FontFamily": 1
     }
   },
   "Spans": [
-    "14,1,1,7",
+    "18,1,1,7",
-    "12,1,2,7",
     "1,31,1,12",
     "5,1,1,2",
     "3,1,1,2",
-    "14,10,1,4",
+    "18,10,1,4",
     "3,4,1,8",
     "3,13,1,2",
     "3,15,1,6",
@@ -1584,7 +1670,10 @@
     "7,4,1,4",
     "10,1,1,4",
     "5,4,1,37",
-    "12,10,2,33"
+    "13,8,4,1",
+    "12,1,2,7",
+    "15,1,1,7",
+    "12,10,6,33"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -1630,11 +1719,11 @@
   "CustomNames": [
     {
       "Name": "显示搜索栏",
-      "Formula": "项目列表!$K$15"
+      "Formula": "项目列表!$K$19"
     },
     {
       "Name": "选中分组",
-      "Formula": "项目列表!$B$15"
+      "Formula": "项目列表!$B$19"
     }
   ]
-}//MeqKO73Blg+sNNcuHaXiT9Vo+I7dmICZkHAgYq5Ezun13ETqwdvoxKIk04wsS8EiIzBm4pTnDr1fhr7d62gq9g+3xqmD70F7yOxjZKWfgmfaKwguGBei5Ng9XERhA6o0Igp4sBLC/jVQ711rIvOoZs5NReIvyN+f8sMsqJtY3HjJHEI3P2Rh5aqQ33nfPVkd5jUw/38teRr5d1TcZFVzD08jo7ON1LirmSB38rkQgeV9nhDjdyNdossWAdIRZ+Um+Kz3N7nhC6N56WIpuBUxFrg/fpMEzST4+Zr/QREEjQxAOeXAWEgFsJnTjhMNTvesm7ecmuc3vOB2cU+XwqjV4OSeF4G+TjTZg93kFolDsxgQVt+qa2PRYWOBbAVczEBZyEwZPIIf9nrp2A9fS/e6uzMn+Gq9zzJ0oQgYE5O8cbS06DV3gcfmGWMXM1q1CXB5DVgAeZuIlmqs6SmfHhklRUTHb8dLxB5z5nV7/I7TfoROX6B9bjS7pnZ1q4SFjb9aGRI5MVPqH474s3WS7os1jeU+XLXr2nePZT21WjNLe47W7/kVWMV5PEx38uNgZSPopbweUNKog/BEj7tiKe6Jy5ul04vuJVJn5OGJMl/UgNBfdz4OOdIajekIZ3F0ZugYxZ3+Ao2ORTT8gXifMJD6Q8ve4gf0ScG9wYikO6KSzfFDfPVHAJMhLkfXhfLPHYwqOE2UEds2oB9Log0CnL+Y0XQfWzxFeX+Rg6JfemeluH+VcYyIC/OPmnHxo01Fe9ubCj2UBLmGbI8AvYE9bfo5VpKXf/fLa1x4FABe6ueYOiCa8J7v2d7Cz91dse5u3BLTGS9hlUNLFYgXgWuSoeawr7lwAR3toeMGzVyf3hu4VKLMfQxfxmnkZbAwa7FOJQKirgn14HQS8pn56rR3FZOtaw==|920
+}//j2I+tqhi+pAPGReMMK5XZmMBJKc/Aa6hO+pTAFI1mFuezFkN/Li6GQvRJ71xgPcmM3CAkKc7GUZYZprPUtm0xkknxujmsUOgP+pTEWD4zVZVbYeNXQM7QOLvKQETxztnPGzWwPb+aTb80d+MuEw5jDbK/a/zRFuRml2PCGx0du+Gd7zZVZYemGZtT++2fzfNl5T20+Blp69TN3USsOdFFw3LN1lWg6K0076OVHOIyol6CeQTI5ULvgBX/2UbaDsCy5o8gEiSnxI9iguX4VpnN6IlF5k7KCwTWU3LlHrL5DlZbZ2kciQOxBFMnm3Uv5M/nr1wBz3ZeEmkzLFKAZkLV+f8IXe+GzXA4HjzKNpy2tLovnQ5Rsw7FOjyEDNiHInW3zsVFRUYuwzznGXGkeW7a2P3nVX9krYNsQ6RqkbWKfOkxMFoqu+NlXRtv7mzkK2Q6gMNm92xL0I8aEJ46dGyxSObaLSwuggWpXLVuWjoCt4dFJNFkSk3yy3mbrfi0TDASbWLoqIvyDlVTGVSrsEbY4n/XJF3Mm8pw0gBV7svOsr7tw+bOaV/Eg6XmSXLmIF2vH5vjlH71FVOMoSSVqlPNidlVisbwPug9rH2cC/Getb52fs10h3Njt6fgzs+kIRFUPxjHkeGRwyjglO3O7vIZTsafR4k9ZCNZVTeVhw3sGuWLR3Siutltr8dVa2H8dCpgjYhD/7Ly+XAf26HQOLK1IRxAYFZjs4IbiRSmot1vgXa3XGSuR9ZjLPwFjukPZwlnXKUZpWX/EX7sao9mfeIJf+xXs1XwXJD7EgLAfis5vi9lQlJ1ZfuNE2x2f1gbprT7ly3ZEAyqz2Awg+gXzVi4jLdZE0w8QY619rKbbKgCVNGL1o789Uf1pzm+TTmuX2WYBZ5n1Pgh/weSVMZIHTdXQ==|920

Pages/项目/项目列表.rd

@@ -1,18 +1,18 @@
 {
   "PageType": 0,
   "ColumnCount": 44,
-  "RowCount": 15,
+  "RowCount": 19,
   "Formulas": {
     "10,10": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\""
   },
   "CustomNames": [
     {
       "Name": "显示搜索栏",
-      "Formula": "项目列表!$K$15"
+      "Formula": "项目列表!$K$19"
     },
     {
       "Name": "选中分组",
-      "Formula": "项目列表!$B$15"
+      "Formula": "项目列表!$B$19"
     }
   ]
 }

Pages/项目/项目首页/项目首页-容器页面/任务列表.json

@@ -465,7 +465,7 @@
                     "LoadBindingDataOption": 1
                   }
                 ],
-                "ID": "082f1ee9-0a8d-4329-9234-c1b4ef838e29"
+                "ID": "ccae49cb-715e-4269-a416-330fc0315a16"
               },
               {
                 "Condition": {
@@ -499,12 +499,15 @@
                     ]
                   }
                 ],
-                "ID": "a5ab82f0-8cc1-498e-920e-93f3eaa13843"
+                "ID": "8544ef9b-5217-4834-807a-c66e3dff7b31"
               },
               {
                 "CommandList": [
                   {
                     "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                    "PopupDisplayMode": 3,
+                    "DrawerDirection": 3,
+                    "ShowDrawerHeader": true,
                     "ClosePopupCallbackCommand": {
                       "Commands": [
                         {
@@ -549,7 +552,7 @@
                                   ]
                                 }
                               ],
-                              "ID": "e4cfe992-75f1-4e59-a472-0a86b688c1ea"
+                              "ID": "8cdf9069-c566-486c-b702-15f374e25e45"
                             }
                           ]
                         }
@@ -573,7 +576,7 @@
                     ]
                   }
                 ],
-                "ID": "2df17b4d-dc95-4c98-ac8a-f3c9337a0bd9"
+                "ID": "b28a82ed-9981-499b-a735-4da2b334a8f4"
               }
             ]
           }
@@ -1041,7 +1044,7 @@
                             "LoadBindingDataOption": 1
                           }
                         ],
-                        "ID": "c2a9545e-0d4f-463a-a501-f9f0125fe783"
+                        "ID": "73a5490d-3d6b-4d01-8841-ac8b7a0caffa"
                       },
                       {
                         "CommandList": [
@@ -1080,12 +1083,12 @@
                                     "LoadBindingDataOption": 1
                                   }
                                 ],
-                                "ID": "35a40881-1f1d-4341-98f1-32fb033bc582"
+                                "ID": "9cd8367e-62b7-4488-ae6c-8d51cc971408"
                               }
                             ]
                           }
                         ],
-                        "ID": "ecb7c9d3-cd75-4ccc-8a9a-411b683407ba"
+                        "ID": "16b29fc8-e21c-486a-9b5d-a62bc642cb35"
                       }
                     ]
                   }
@@ -1126,7 +1129,7 @@
           }
         ],
         "Text": "添加分组",
-        "TemplateKey": "_RS_Information3",
+        "TemplateKey": "Gost",
         "Icon": {
           "Name": "增加.svg",
           "Color": "Accent 1",
@@ -1413,4 +1416,4 @@
       "Formula": "任务列表!$B$4"
     }
   ]
-}//kwLCNG5vArySKv6yjru7o7mr1rEqPm9qI5WZjV4VEH1DjnVWhxbrdbTNA3PJ2kyVVTW4CK2lM1a/WLP08XhlkmTCOB56r3ASLyj7yFPedWdifKY75l+pz5Y1ycQ36xNKjYn1X/0T2p+0ACTZ5dUP9/Sswd3mqzhiiZuYWSCZvjSI2N+ECP5OIrw1TSgdwcG+lp9XFjmKMJTid8HkPYnUY/WrnGREOEpdspB5YTyUU8wD/fDpYOpbF0rBIh8J9/eA+iYqLn23h+kt7HuUZQDiJIt8dwF197VhF4HM/aTe+4d4UqSGguEoau6uVmrQo9h8ZuLUbzurW9+fF+aYFAP6r8EFBen4TO86X2z9fF3SwOg6Wov4fR0IhPAFLMiQGHRYzmTaV/qi9nFOwsRAG1IFnQnubC+jfjbr3/fjNloew8fYYH4nQKjw50INIO9e9x8A7TCPBye1g1nZbhJlkubY+X9M4JqOk4a3AXJTxo8YxWeg94moJY0KmLccZxyGY0ruiHFeWs4RUiyqLzvaBLfzeSWHnAegLbI+sug1/vyTi3tb1kwV3Sn6Wmfws7XjIDsz9vsI+sDCkLHXIpGLuHqmxivFwmS3ghfMiQ9m38KqhsnBs6yJb8i8Z05utpz9DAPO+px85TNojNxJ2DN3lk/1OHCvNhTcfAsF4/7hCUYrNAaMlGgvaXM5d+YwtUJuKJXWbnLZ0YLzo+Qw0tPOE70TR/2LWC++9iU1tfcBb8NgT9gkR1HZImfSK/zeueObomy1ChjN1ZW8sQSQLlJ1nM6Z062cNYFBpGjqpKqD9NfToSLkCbXzgzs96AwoSUZNturGaPcSks48qa+iPI2oiLIUR2VHFHTpXB9p1qsm1OFJEZkHoiSUqN9T0FnVDZJSpTVGsbN/gkPEYgjEj8PCSaGDJA==|920
+}///xlfFCTz7JdeiSgpGLxi9wkUzqTyqGI1bMbR6O8WiGaJsjju9Tad1yLC4ZCueWxYCpmiuij32A0zjU5XYW1cOtNW//izpIwrLUDdZrKmkhWTahWjrh24Jzr7jPCmxo0D8bJKmK5xctOERive7UyE6C34LthbRePErLl+030VDKRPt78R7/C4oZmQhb/f0ukRr9Fb+S2alv539soqZ0e1l6a/1xh+Jm1dWDmYNHUKHF/72F5L/tQbkbvh/hVyduUG8TGrNfuQ+ZC1pfNmCi+3ZFKn47aMwzxBaG+G8REpPRbK6oMynV7HC5ZTMTKREW+R3tQV6eIhu85X0xE9xkiknTbsABGfD9TiQMZbUFhdZTg+1UxaJolW+IsrXK04SjqRIHoHNsxqQw8IoFXW1KrltmkkfBhbwXMUTNQcIy5Yt6tgcQ1/+Rc8EOGeaowtbChOVCZTVTt0twm0lTROnXfnfp2Dn4PeIudMZWMrSnuH29tqJ15NM+w+NuycUjRsPgn5sb4nAj/2MkWTg6z+TaEPADjPkcbpBIIjZjt9Md9DK80aEuo4mD6H5+up4/rlIH/e0GW/m2a6TwKC6zuyVYOsQvcBAbMkbvfyRdqSe77fxQx1WJZG2uPPCegWK1nVPKqjF5R6bEDfc5T5U4QOaV1bpeRSq2FE1QIei1ZHd/B4mliRGFs3HXR37ylHHpVfaGv+nfcQ7wyS75DUtqD0nufzyAe4K0LzW9eGsrN9pRCmTa0uY6BeKf2U11Ocm6lsWas0W4eS0t2Ef6kxnpLakoNMfq6ESCpWEBwU1lzdEQ7R3D+i+xK+1gS5qzR83ZOay2pL0ICqkItendSxqQIbo/nojm9/QssdLzT4H4E8fdplSMS+smMpf1T/nfkSzWUG3CUF2FclV/6tHi0P7vkcSRtHxA==|920

ServerCommands/任务/提交任务评论.json

@@ -55,6 +55,73 @@
     }
   ],
   "Commands": [
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "发表人信息",
+      "TableValue": {
+        "TableName": "用户信息视图",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "b32e8e31-2e03-44b3-8774-6b48b363c130",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "全名",
+              "GUID": "e0d1b828-840b-4876-8765-b4e94c91f82d"
+            },
+            "ColumnName": "全名"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "用户信息视图",
+            "ColumnName": "用户名",
+            "GUID": "9cdfbd06-f04e-4883-b43f-f245aca5b52e"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=发表人"
+          }
+        },
+        "NullFormulaValueQueryPolicy": 0,
+        "TopCount": "1"
+      },
+      "ID": "3e629553f95c4cca9c28f8574fb4883c"
+    },
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "任务信息",
+      "TableValue": {
+        "TableName": "任务表",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "7fba4eb2-1603-4e5d-a86b-b9e48bbe4a00",
+            "BindingInfo": {
+              "TableName": "任务表",
+              "ColumnName": "任务名称",
+              "GUID": "6b4d94f3-2223-4836-9533-00d0686bf68e"
+            },
+            "ColumnName": "任务名称"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "任务表",
+            "ColumnName": "ID",
+            "GUID": "672bb236-ef0f-46e3-90c4-cc106feb4379"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=任务ID"
+          }
+        },
+        "TopCount": "1"
+      },
+      "ID": "477f7bb227874bcea369ae287b4909a5"
+    },
     {
       "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
       "TableName": "任务评论表",
@@ -65,7 +132,7 @@
           "BindingInfo": {
             "TableName": "任务评论表",
             "ColumnName": "任务ID",
-            "GUID": "fcbe911d-0b52-40b4-b60c-a05d5abbbb9f"
+            "GUID": "7fe5c008-2952-4a8a-ad28-9182dc388da4"
           },
           "Value": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -76,7 +143,7 @@
           "BindingInfo": {
             "TableName": "任务评论表",
             "ColumnName": "发表人",
-            "GUID": "082d77b2-e31a-411e-8610-5e4929cc38ed"
+            "GUID": "013ce705-82f8-4000-b154-60abf77c84a0"
           },
           "Value": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -87,7 +154,7 @@
           "BindingInfo": {
             "TableName": "任务评论表",
             "ColumnName": "内容",
-            "GUID": "e0138448-55f2-44bc-95b2-7a05e18ea5f1"
+            "GUID": "3a06cf5b-d665-4759-bb73-dc20023407cc"
           },
           "Value": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -98,7 +165,7 @@
           "BindingInfo": {
             "TableName": "任务评论表",
             "ColumnName": "附件",
-            "GUID": "9b6baaf9-2f8b-4f7d-8d77-773b5bf47a43"
+            "GUID": "225e9ca7-2a1d-4272-be0d-ae76e566390f"
           },
           "Value": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -109,7 +176,7 @@
           "BindingInfo": {
             "TableName": "任务评论表",
             "ColumnName": "回复对象",
-            "GUID": "61d03e06-92a2-40d3-a1a7-6e6bb6f65d13"
+            "GUID": "faef5eca-95c8-4b52-8241-98d0951d62f1"
           },
           "Value": {
             "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
@@ -118,6 +185,114 @@
         }
       ]
     },
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "回复对象",
+      "TableValue": {
+        "TableName": "任务评论表",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "62500f48-3da9-4099-919d-98a0c1ff56e7",
+            "BindingInfo": {
+              "TableName": "任务评论表",
+              "ColumnName": "发表人",
+              "GUID": "dc5f9817-6402-4843-b779-6c8ab086ab00"
+            },
+            "ColumnName": "发表人"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "任务评论表",
+            "ColumnName": "ID",
+            "GUID": "97811137-4042-45b2-86a8-3f8ba217d8a2"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=回复ID"
+          }
+        },
+        "NullFormulaValueQueryPolicy": 0,
+        "TopCount": "1"
+      },
+      "ID": "b256511e072646d79533f5200d7060bf"
+    },
+    {
+      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+      "ConditionAndCommandPairList": [
+        {
+          "Condition": {
+            "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+            "param": {
+              "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+              "ParamObject": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=回复对象"
+              }
+            },
+            "value": "%Null%",
+            "compareType": 1
+          },
+          "CommandList": [
+            {
+              "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
+              "OperationParamaterPairs": [
+                {
+                  "Name": "命令名称",
+                  "Value": "打开任务详情"
+                },
+                {
+                  "Name": "任务ID",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=任务ID"
+                  }
+                }
+              ],
+              "OutParamaterName": "参数对象"
+            },
+            {
+              "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon",
+              "NotificationName": "提醒通知",
+              "SendType": 1,
+              "UserNames": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=回复对象.发表人"
+              },
+              "Params": [
+                {
+                  "Name": "标题",
+                  "Value": "有新的任务评论"
+                },
+                {
+                  "Name": "内容",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=发表人信息.全名&\"在任务【\"&任务信息.任务名称&\"】中提到了你，赶紧来看看吧~\""
+                  }
+                },
+                {
+                  "Name": "类型",
+                  "Value": "执行命令",
+                  "Remark": "分为：打开页面、执行命令..."
+                },
+                {
+                  "Name": "参数对象",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=参数对象"
+                  }
+                }
+              ],
+              "ID": "5a7833802f0846f496a8718ab25bc639"
+            }
+          ],
+          "ID": "fefeccfc-8977-49a5-ae92-aec49d0710d3"
+        }
+      ]
+    },
     {
       "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
       "ErrorCode": "0",

ServerCommands/汇报/检查未提交汇报.json

@@ -1,182 +0,0 @@
-{
-  "Name": "检查未提交汇报",
-  "Enabled": true,
-  "Triggers": [
-    {
-      "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
-      "Permission": {
-        "PermissionData": {
-          "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
-          "permissionResource": {
-            "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
-          },
-          "permissionBindings": [
-            {
-              "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
-              "roleNames": [
-                "FGC_LoginUser"
-              ]
-            }
-          ]
-        }
-      },
-      "Parameters": [
-        {
-          "Name": "用户名",
-          "DataValidationInfo": {
-            "IgnoreBlank": false
-          }
-        }
-      ]
-    }
-  ],
-  "Commands": [
-    {
-      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-      "ParameterName": "汇报数量",
-      "TableValue": {
-        "TableName": "汇报记录表",
-        "TableValueType": 3,
-        "SqlCondition": {
-          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
-          "SubConditions": [
-            {
-              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-              "ColumnBindingInfo": {
-                "TableName": "汇报记录表",
-                "ColumnName": "汇报人",
-                "GUID": "ca3d940a-80e2-4bef-bc57-81a892e404f2"
-              },
-              "Value": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=用户名"
-              }
-            },
-            {
-              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-              "ColumnBindingInfo": {
-                "TableName": "汇报记录表",
-                "ColumnName": "状态",
-                "GUID": "003daade-1d10-428e-97c7-871c4a5463ab"
-              },
-              "Value": "0"
-            }
-          ]
-        },
-        "NullFormulaValueQueryPolicy": 0
-      },
-      "ID": "d90d23e183f241a48bc0e424d9f4fbd9"
-    },
-    {
-      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
-      "ConditionAndCommandPairList": [
-        {
-          "Condition": {
-            "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
-            "param": {
-              "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
-              "ParamObject": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=汇报数量"
-              }
-            },
-            "value": "0",
-            "compareType": 2
-          },
-          "CommandList": [
-            {
-              "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
-              "ParameterName": "汇报模板",
-              "TableValue": {
-                "TableName": "汇报模板",
-                "TableValueType": 1,
-                "BindingInfos": [
-                  {
-                    "GUID": "9ddb957d-47ed-4323-9ccb-28e0aca8104d",
-                    "BindingInfo": {
-                      "TableName": "汇报模板",
-                      "ColumnName": "模板内容",
-                      "GUID": "92c1dd1b-a89b-477b-bff6-045c5f40654b"
-                    },
-                    "ColumnName": "模板内容"
-                  }
-                ],
-                "SqlCondition": {
-                  "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
-                  "ColumnBindingInfo": {
-                    "TableName": "汇报模板",
-                    "ColumnName": "ID",
-                    "GUID": "ebddb57d-c0c8-4377-bfdd-70f4a77d6bda"
-                  },
-                  "Value": "4"
-                },
-                "NullFormulaValueQueryPolicy": 0,
-                "TopCount": "1"
-              },
-              "ID": "0c415a6101b74f079857656997280c17",
-              "Disabled": true
-            },
-            {
-              "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
-              "OperationParamaterPairs": [
-                {
-                  "Name": "汇报列表",
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=汇报数量"
-                  }
-                }
-              ],
-              "OutParamaterName": "数据源",
-              "Disabled": true
-            },
-            {
-              "$type": "MustachePlugin.Render, MustachePlugin",
-              "DataSrouce": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=汇报模板.模板内容"
-              },
-              "UseCustomsDataHash": true,
-              "CustomsDataHash": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=数据源"
-              },
-              "SetMaxRecursionDepth": 512,
-              "ResultTo": "输出结果",
-              "Disabled": true
-            },
-            {
-              "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon",
-              "NotificationName": "汇报提交提醒",
-              "SendType": 1,
-              "UserNames": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=用户名"
-              },
-              "Params": [
-                {
-                  "Name": "标题",
-                  "Value": "汇报提醒"
-                },
-                {
-                  "Name": "内容",
-                  "Value": {
-                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                    "SerializeProperty": "=\"你有\"&汇报数量&\"份汇报等待提交，赶紧来看看吧~\""
-                  }
-                }
-              ],
-              "ID": "1063eb84a28b4d2b93edbced4f6a07f8"
-            }
-          ],
-          "ID": "8a1bb6b7-fc52-48a2-b181-34c2ab99a6c0"
-        }
-      ]
-    },
-    {
-      "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
-      "ErrorCode": "0",
-      "Message": "完成"
-    }
-  ]
-}

ServerCommands/系统/用户登录检查.json

@@ -0,0 +1,497 @@
+{
+  "Name": "用户登录检查",
+  "Enabled": true,
+  "Triggers": [
+    {
+      "$type": "Forguncy.SaveLoad.PostRequestTriggerSaveData, ServerDesignerCommon",
+      "Permission": {
+        "PermissionData": {
+          "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionData, Forguncy.RbacPermission.Core",
+          "permissionResource": {
+            "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionResource, Forguncy.RbacPermission.Core"
+          },
+          "permissionBindings": [
+            {
+              "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
+              "roleNames": [
+                "FGC_LoginUser"
+              ]
+            }
+          ]
+        }
+      },
+      "Parameters": [
+        {
+          "Name": "用户名",
+          "DataValidationInfo": {
+            "IgnoreBlank": false
+          }
+        }
+      ]
+    }
+  ],
+  "Commands": [
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "汇报数量",
+      "TableValue": {
+        "TableName": "汇报记录表",
+        "TableValueType": 3,
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+          "SubConditions": [
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "ColumnBindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "汇报人",
+                "GUID": "ca3d940a-80e2-4bef-bc57-81a892e404f2"
+              },
+              "Value": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=用户名"
+              }
+            },
+            {
+              "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+              "ColumnBindingInfo": {
+                "TableName": "汇报记录表",
+                "ColumnName": "状态",
+                "GUID": "003daade-1d10-428e-97c7-871c4a5463ab"
+              },
+              "Value": "0"
+            }
+          ]
+        },
+        "NullFormulaValueQueryPolicy": 0
+      },
+      "ID": "e51f2af226874311858df813915873df"
+    },
+    {
+      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+      "ConditionAndCommandPairList": [
+        {
+          "Condition": {
+            "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+            "param": {
+              "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+              "ParamObject": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=汇报数量"
+              }
+            },
+            "value": "0",
+            "compareType": 2
+          },
+          "CommandList": [
+            {
+              "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
+              "OperationParamaterPairs": [
+                {
+                  "Name": "页面名称",
+                  "Value": "汇报管理"
+                },
+                {
+                  "Name": "打开方式",
+                  "Value": "跳转页面"
+                },
+                {
+                  "Name": "打开样式"
+                },
+                {
+                  "Name": "主题",
+                  "Value": "警告"
+                },
+                {
+                  "Name": "传值"
+                },
+                {
+                  "Name": "目标单元格"
+                }
+              ],
+              "OutParamaterName": "参数对象"
+            },
+            {
+              "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon",
+              "NotificationName": "提醒通知",
+              "SendType": 1,
+              "UserNames": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=用户名"
+              },
+              "Params": [
+                {
+                  "Name": "标题",
+                  "Value": "汇报提醒"
+                },
+                {
+                  "Name": "内容",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=\"你有\"&汇报数量&\"份汇报等待提交，赶紧来看看吧~\""
+                  }
+                },
+                {
+                  "Name": "类型",
+                  "Value": "打开页面",
+                  "Remark": "分为：打开页面、执行命令..."
+                },
+                {
+                  "Name": "参数对象",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=参数对象"
+                  }
+                }
+              ],
+              "ID": "3c94e6961f59412397003157b58e4f97"
+            }
+          ],
+          "ID": "21912be4-62a0-46b8-b84c-448434da87a7"
+        }
+      ]
+    },
+    {
+      "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon",
+      "ParameterName": "用户信息",
+      "TableValue": {
+        "TableName": "用户信息视图",
+        "TableValueType": 1,
+        "BindingInfos": [
+          {
+            "GUID": "b62e82d7-6e36-4f1f-b432-6229cc0dd370",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "用户名",
+              "GUID": "432b3d3a-5938-4a3a-a50c-27e088ce33cc"
+            },
+            "ColumnName": "用户名"
+          },
+          {
+            "GUID": "546b9c4a-898b-4d42-a3de-2390d9cc709c",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "全名",
+              "GUID": "6b30f1ec-11c7-47d6-9815-46317a76a284"
+            },
+            "ColumnName": "全名"
+          },
+          {
+            "GUID": "1970969e-41d5-4e6d-8fc5-be3536db0da1",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "邮件",
+              "GUID": "5ca729fc-02ec-4bed-830a-465c5a4af83a"
+            },
+            "ColumnName": "邮件"
+          },
+          {
+            "GUID": "12f304de-ba1a-4b5e-ae2c-2088a96bb5ba",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "有效",
+              "GUID": "ee5fc1c8-a0ba-4765-83da-778797ab323f"
+            },
+            "ColumnName": "有效"
+          },
+          {
+            "GUID": "9a863166-aecf-4aaf-abfa-ebd2c219284a",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "角色",
+              "GUID": "48d1d8a7-5a49-410f-8198-71b914e3c16e"
+            },
+            "ColumnName": "角色"
+          },
+          {
+            "GUID": "2479ac84-3d5b-4b7b-b34d-233311150fcf",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "组织上级",
+              "GUID": "b479463d-c2b9-4575-a8a9-af1111f5d1ae"
+            },
+            "ColumnName": "组织上级"
+          },
+          {
+            "GUID": "62ace2dc-744f-4cdd-9c46-3a1dc26809eb",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "负荷",
+              "GUID": "f183fbe8-9e59-419e-b0c7-ad10341ac0df"
+            },
+            "ColumnName": "负荷"
+          },
+          {
+            "GUID": "0cd1711a-6105-4d2e-b5de-c1331925c1dc",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "默认时薪",
+              "GUID": "4ead7539-801e-40f1-b997-82caf45e48d8"
+            },
+            "ColumnName": "默认时薪"
+          },
+          {
+            "GUID": "1c58aea8-eca2-4332-acd8-0a71b2c4a277",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "GIT用户名",
+              "GUID": "846d92a2-0642-466e-9fc4-4a14b30be554"
+            },
+            "ColumnName": "GIT用户名"
+          },
+          {
+            "GUID": "e1f01f85-08fa-443f-801c-a487f4505b27",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "GIT密码",
+              "GUID": "13386273-6b17-47e2-a0d2-8b04d4279fca"
+            },
+            "ColumnName": "GIT密码"
+          },
+          {
+            "GUID": "3f0b4db0-0a1c-4162-bf89-a0024be49b45",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "公司",
+              "GUID": "8dcb7cbc-a359-4d95-809c-afa8e40d059c"
+            },
+            "ColumnName": "公司"
+          },
+          {
+            "GUID": "05958b31-0811-4760-b23e-586cfb3aeead",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "部门",
+              "GUID": "2c78952b-14a9-4d8c-8ce2-354e04d4e2df"
+            },
+            "ColumnName": "部门"
+          },
+          {
+            "GUID": "0bf9fd6d-d02f-44b2-8e61-897ac0b5bd56",
+            "BindingInfo": {
+              "TableName": "用户信息视图",
+              "ColumnName": "小组",
+              "GUID": "b09cb700-6bc3-4aa1-8c16-0dafe304372c"
+            },
+            "ColumnName": "小组"
+          }
+        ],
+        "SqlCondition": {
+          "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+          "ColumnBindingInfo": {
+            "TableName": "用户信息视图",
+            "ColumnName": "用户名",
+            "GUID": "bbebf11d-ff33-4450-a28e-7a50bbdc6d56"
+          },
+          "Value": {
+            "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+            "SerializeProperty": "=用户名"
+          }
+        },
+        "NullFormulaValueQueryPolicy": 0,
+        "TopCount": "1"
+      },
+      "ID": "c291000f9a804009b354317a2ea87ab3"
+    },
+    {
+      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+      "ConditionAndCommandPairList": [
+        {
+          "Condition": {
+            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+            "SubConditions": [
+              {
+                "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                "param": {
+                  "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                  "ParamObject": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=用户信息.GIT用户名"
+                  }
+                },
+                "value": "%Null%"
+              },
+              {
+                "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                "param": {
+                  "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                  "ParamObject": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=用户信息.GIT密码"
+                  }
+                },
+                "value": "%Null%"
+              }
+            ],
+            "RelationType": 1
+          },
+          "CommandList": [
+            {
+              "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
+              "OperationParamaterPairs": [
+                {
+                  "Name": "页面名称",
+                  "Value": "完善Gitee资料"
+                },
+                {
+                  "Name": "打开方式",
+                  "Value": "弹出窗口"
+                },
+                {
+                  "Name": "打开样式",
+                  "Value": "对话框"
+                },
+                {
+                  "Name": "主题",
+                  "Value": "警告"
+                },
+                {
+                  "Name": "传值"
+                },
+                {
+                  "Name": "目标单元格"
+                }
+              ],
+              "OutParamaterName": "参数对象"
+            },
+            {
+              "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon",
+              "NotificationName": "提醒通知",
+              "SendType": 1,
+              "UserNames": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=用户名"
+              },
+              "Params": [
+                {
+                  "Name": "标题",
+                  "Value": "请完善资料"
+                },
+                {
+                  "Name": "内容",
+                  "Value": "您的Gitee信息还未绑定，赶紧填写享受更多自动化功能吧~"
+                },
+                {
+                  "Name": "类型",
+                  "Value": "打开页面",
+                  "Remark": "分为：打开页面、执行命令..."
+                },
+                {
+                  "Name": "参数对象",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=参数对象"
+                  }
+                }
+              ],
+              "ID": "5102488aabcf46ea8105f53b85315577"
+            }
+          ],
+          "ID": "7b2a5d78-aaa8-4427-8f11-15a415027bde"
+        }
+      ]
+    },
+    {
+      "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+      "ConditionAndCommandPairList": [
+        {
+          "Condition": {
+            "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+            "SubConditions": [
+              {
+                "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                "param": {
+                  "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                  "ParamObject": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=用户信息.负荷"
+                  }
+                },
+                "value": "%Null%"
+              },
+              {
+                "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                "param": {
+                  "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon",
+                  "ParamObject": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=用户信息.默认时薪"
+                  }
+                },
+                "value": "%Null%"
+              }
+            ],
+            "RelationType": 1
+          },
+          "CommandList": [
+            {
+              "$type": "CollectionOperationKit.ServerSideObjectOp, CollectionOperationKit",
+              "OperationParamaterPairs": [
+                {
+                  "Name": "页面名称",
+                  "Value": "个人中心"
+                },
+                {
+                  "Name": "打开方式",
+                  "Value": "跳转页面"
+                },
+                {
+                  "Name": "打开样式"
+                },
+                {
+                  "Name": "主题",
+                  "Value": "警告"
+                },
+                {
+                  "Name": "传值"
+                },
+                {
+                  "Name": "目标单元格"
+                }
+              ],
+              "OutParamaterName": "参数对象"
+            },
+            {
+              "$type": "Forguncy.Model.NotificationMessageCommand, ServerDesignerCommon",
+              "NotificationName": "提醒通知",
+              "SendType": 1,
+              "UserNames": {
+                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                "SerializeProperty": "=用户名"
+              },
+              "Params": [
+                {
+                  "Name": "标题",
+                  "Value": "请完善资料"
+                },
+                {
+                  "Name": "内容",
+                  "Value": "您的时薪、负荷等信息还未定义，可能会影响报工哦，赶紧来定义吧~"
+                },
+                {
+                  "Name": "类型",
+                  "Value": "打开页面",
+                  "Remark": "分为：打开页面、执行命令..."
+                },
+                {
+                  "Name": "参数对象",
+                  "Value": {
+                    "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                    "SerializeProperty": "=参数对象"
+                  }
+                }
+              ],
+              "ID": "b10acf98d0c64d9b9ddd5048246d88d2"
+            }
+          ],
+          "ID": "86141a76-de99-431b-a02a-68841de0f619"
+        }
+      ]
+    },
+    {
+      "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+      "ErrorCode": "0",
+      "Message": "完成"
+    }
+  ]
+}

UserControlPages/发表评论组件.json

@@ -265,7 +265,7 @@
                           ]
                         }
                       ],
-                      "ID": "1b816291-417f-46a2-b2d9-92c75f4c0a80"
+                      "ID": "93bb45cc-52a4-4158-bc36-393f5b276e4e"
                     }
                   ]
                 }
@@ -361,6 +361,13 @@
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                   "SerializeProperty": "=发表评论组件!回复对象姓名"
                 }
+              },
+              {
+                "Name": "回复对象",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=发表评论组件!回复对象"
+                }
               }
             ]
           }
@@ -446,6 +453,9 @@
       },
       {
         "Name": "回复对象姓名"
+      },
+      {
+        "Name": "回复对象"
       }
     ],
     "CommandDefinitions": [
@@ -463,6 +473,9 @@
           },
           {
             "Name": "回复姓名"
+          },
+          {
+            "Name": "回复对象"
           }
         ]
       }
@@ -566,7 +579,7 @@
                   ]
                 }
               ],
-              "ID": "d1dc8e82-8da3-4c96-a498-fc65731b1b75"
+              "ID": "be9f76b8-ab72-4063-9081-4f2e38b8a91e"
             }
           ]
         }
@@ -582,4 +595,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//lBNupAwoheGLHnueI/SHrIxos/YmAZRHEQgTg0y9il6eVe1k2t4Saor63e2GKLG94Cc3kBFJhDvdtC068OA1Z/fFhRuhFsP0ayY4TFkrLiaev+V/X8aNuWVVm2cBsHHuIlhth0IpV+imtduULNKYN6U+uiPARUtdKgi7epzCyWQEP0lPDTP/VZXGh/hYEzY60AJCmGfsE9uoSfDaTixgw6fjMXg/0+teNE3X2MA123dHvhpQErx0+/kCWwvPjzR5TxkjZypkTRrzdEbCYmmDxak2NLLuUNA4lJ/Sv5L+ID6A+KEehg34SLeFFVwO+ww9IUOblMNO67EawsNijRnVkBvrE0LKKUkFaLUaJ4KPzxNYvcC4dajJ5ns0NsX1+HrtK2LABXzK4RRecW4W6QFeatLegSW/L8zYlKYcLNtlnDvqRJ1c33ARAORaMclgtz4lJZE4pWLl4QimnkUPrEvBGj3iY3AexrnKyT8liyEC1QbT4t/gIINe2LPJLQl7oV/9KRAWSB0yw0W4QdDDRfORetSZiesweFFZ3Se28hU6/7OTXLtTf0QbNmtaHyful44N2NiDdjwz6glJgFl6dzIAJHw4pYZkVzpTyK+bilyfZ4Ncw3RNrCWV9yeKSfNSaw9m0Mf07fPNg5LHHc/+to2elUDmF+lsi29ZRGfcbi+zHNP+kST3wmFW0v4iTWnYDhUVM+CRRkzAmSXIVXwTo5jsggHzFh+lOVxPzUBUbIuwgTLWpugDhOGubhNx88/CjFwMMGCsOFHTXYL3iSWXao8/wFw7sQ9jfpFNsrczGCw5Q4LFwd8Liu9v+7lwsyY1/cxXE6Q0dFzRgMQSXfdntzxn3kr/AvDQ1QUi0iEpT1Gxguv8JEHIy24xD9lyH7UPkRiyNgrGvQuvNzxIxkRfqlTL6Q==|920
+}//MpUYGNXu8dALuwB+Mm6ks46byRrsQ52/MXcoXoy1cMIY8y7Xq0UBVjcSIFfAEfzmBsJzFrU6FJJCb7Nq/NJP6m1j3TUCq0Ds6FP/qToNbhkZwk4Cv2YWXcf6CnTrY3HaSzp8ao+9KXhIA1DwhZnuVcQ58sc8hQXgARKIyd6HFAV2QDkEg1Qi52DOcP815MUI/Br9NgB1zuA+ZQRvDr8dTdag8IDqWn6JdcwCGx2dHnyqVljN0/gXU27EcpSyk0wuE3p1xlRoHRhkkXeb9LYaT4KHR6d3E2jXo8mgmiwDrP+/PdSy0mLfRP+zbaiEC6bSqHRDuOyNXv0/LIf63Gw5psB+5BQ1RnJw7YiQ657HV00FnUJquI3fNDvOI2aG8KgAr+SYgda0KuBlJna5wF+2NTLXgA+2hJ346IB5aY6HAF6nn+qzOGrQSliPwZQFeE7WuX0d2QVyN2/1Lr6r8WdISMuVPmATl5RGveRew/aXVRCAUWIpevLDwZ728UywOdwDZx1oxHc6xzIBlJr4dcNMYoYsbjAGppRt0TOs/6Mnx/SDS3V1F7MD8M/y0Z2K4gYstVEaqYy6jRjhk7wrjclttrwwCxG+txjPnBNqV4FdC01qg/ILo/vJ4IeM8YTMjyNTVZ2tXvsTAbFN+zbH7wsBySqq1QAYohO9Wkiy6Xu2MclC/pzkBfMzMTvr01bgA/evDg4DHIX6gLJg835JGRyE3uSxLpqQtW/qy7yZrQd4hD8wynhnUtHC3HLoWq1b3P3/uqG9FJqwEsB80RYWVtIGwsIDexGpNaL9nxDfKBKGW3qtA6ssHCxc/opsL1fIAktuoNDxJa1e3qkQzjw3ux5fU83SwRZrvjSSuLZcxjebNoKVNiP1brhQnc5sK9qJEa/QumwQzLd3QX9GtxCHQIux1Q==|920

UserControlPages/评论组件.json

@@ -232,6 +232,13 @@
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
                   "SerializeProperty": "=评论组件!姓名"
                 }
+              },
+              {
+                "Name": "用户名",
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=评论组件!用户名"
+                }
               }
             ]
           }
@@ -414,7 +421,7 @@
                   ]
                 }
               ],
-              "ID": "4350894f-ddfb-4af3-be33-d1997b20f6ae"
+              "ID": "7427745f-52a6-4128-a365-db874bb0a177"
             }
           ]
         }
@@ -430,4 +437,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//+FbNpyFzxTdImbDybDr4PdrKDvhoLXBwZiuUEXtr0xEMuQyzpp9VrpAOJqJEghiqcKDEgYoctCzmLPiZlZIFF84z1nVoVyVq7BcOQWF/r/VEMrr8bV4KpMwFPnOAvedYlFShmwqBzXZq0YUAmxKRXDKIesoULoOh27TQuq4x2yl3aE/WI3jdeh0NA3j59KcnjNTjnDSTafOe+lHPIgXlSm9ywLzgUGlYZ2N3EC+DfvVqGbrWC+6lGYBY/ASHd2vjSp+XWW9EfZO6p3y6SwxGFyIEc+Ih2PVvpAX4NEebxCQzAB1ZPUGfWEuSqE0l7zyJQq5XEjKDsJid3me//4EW7Ro2ozp2fff6fONdOcphzDKw0tXLh1fTTK3rTSlVsMFtmQovF5yKzvP9/FFAWN1gyiutObUatyoZD8ImN+S15KfgOfg8XBO5Iu7H3DuwGBIsxaNUKs3JbtYT6Pt3ReoKE/69KPLgHvA51jb57BO4QHpCnxCG5K5SAMBasU/3cEnG2WdaQ+2bUG3HzLppSa4g/wdS85fIiqcpmwTJTl2XPrwk8sqw1GGriY46Ew56GveRH0auT2oXfajLnTZ4sDiSAnidkCxHIkfuncPmChb3t71lqt8VGTpp66ZQsyuJUAyN1ChZ9F4o83iKPaDk9qfqZTwpxe1W1qY2K6La08l/ZuSIWNzYU/Sx2QBGzA6h0lNKTcZ7pwB2Ugc3qS3r/tOMmkPxWQ2C6ZycOrs4ArDDjJoBVL2SGjamIWks4OoFZaNLzCYgIw/Q3QhMPo7PFLTvsWF+FyHGAkUt9pjEEc/t6DC8j+hOeKJ0MO3QJSMY3cUhb0fcJ01+UiDUPSv7eqHmEVfGS2/UHeQ8PtMxuV3/v2wBGbzZ9UeckRVGqMx9H5SoYs3XyV5jN9eYtDAy0JJ9BQ==|920
+}//lwNZ2I/bU5uyG9mlWZOadvIDpik/gx8JhZS5M6ZhYvjrqHgoTg87+XWpuaNeI992ohjLznZPb1ka2+G6FOvPafzBwsJ9ZChxFVUlawBfEkgYyHiY7gLwAm6f9LUBduXsgqhzJePRyA/wJYuilhDfVN3JaI72OCCJcKYgHt+ELY1JIwLPpJmROioxgreIHLUSRiVVt8VnRfEGzQSr2Q9yP06bHJ/7oiPZjIJWulg/4mh94o/5HG7p87UMepHcNtyBugfIVpHSQC0/r6AS5Sc9m2TrkdowL1u9I+TE+3sWvc7y9Kk3+NuYqAg/GE5W+Lv784FqJlpTeqZj3Huh3TMCJtQeHdgyyIzekM7lLK4phnAaLz3Oh/qYoU1RfumLTQfKp+li0jxZLkrr9S2aEhZN1n5lMPnUvcz7AlopE9CAYsQEkWE1tuhSqykrUP3M2kKNFp140rH/mEg840KSggTULZkrmAhEZ6MNs9w0dNBIkFahSxwAsraFxzdfIEAOQe0n5VGMld6dkByaBdhE2YiBblqPFC8Qo7bBWgOyHBgItDgsj7cmd+cPnFMWwE1WQebVIK74592dbCKS3PZ3qLxta23YijfxQae5uiXFUfrsFR/v8uhLyvlJ0to3y2JCElyzhxZ6vVFtGvzOJNA2+06FCcEXjAYf6zbdvoh08+fOFz5MchqPA8xwT30NmMSrlZKjRhSMHcyUfwcXx65ikSrB64BgS9qH2q1RR83uO1vafrvYeizBfwNNk9EqYmHQxN+s6qBjlHtOO66wuI+mSxKOlAB5EzapIpCu6mNRQPa3YuZWcz9o/GiPzX6qblVNSqbs+H8HxZlZLMCvB2f7+0kfStfJhDm62//WWFToAV0N1LNd1cjfyjC3C1ldERTrPZiU2d7X/8+l482akCB/BhwiZA==|920