{"Message":"1","MessageType":2,"Modules":[{"State":1,"Type":1,"Name":"PCPage/汇报列表"},{"State":1,"Type":31,"Name":"UserControlPage/汇报卡片"},{"State":1,"Type":15,"Name":"ServerCommand/根据汇报模板生成内容"},{"State":3,"Type":31,"Name":"UserControlPage/用户信息"}],"Version":"v1"}

2024-08-27 18:00:20 +08:00
parent 29c000f253
commit b45fb99e9a
9 changed files with 342 additions and 392 deletions
--- a/.collaboration
+++ b/.collaboration
@@ -886,19 +886,7 @@
  },
  {
    "ModuleName": "PCPage/汇报列表",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-27T17:49:55.504411+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\汇报\\个人日报\\汇报列表.json",
-      "Pages\\汇报\\个人日报\\汇报列表.rd",
-      "Pages\\3609617039444daea57da1978344c4f.json",
-      "Pages\\3609617039444daea57da1978344c4f.rd"
-    ]
+    "ModuleType": 1
  },
  {
    "ModuleName": "PCPage/汇报详情",
@@ -1274,17 +1262,7 @@
  },
  {
    "ModuleName": "UserControlPage/汇报卡片",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-27T17:46:28.3951265+08:00",
-    "ModuleType": 31,
-    "ToRemoveFiles": [
-      "UserControlPages\\汇报卡片.json",
-      "UserControlPages\\汇报卡片.rd"
-    ]
+    "ModuleType": 31
  },
  {
    "ModuleName": "UserControlPage/聊天列表",
@@ -1472,16 +1450,7 @@
  },
  {
    "ModuleName": "ServerCommand/根据汇报模板生成内容",
-    "State": 1,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-27T18:00:14.2418273+08:00",
-    "ModuleType": 15,
-    "ToRemoveFiles": [
-      "ServerCommands\\汇报\\根据汇报模板生成内容.json"
-    ]
+    "ModuleType": 15
  },
  {
    "ModuleName": "ServerCommand/批量生成日报",
@@ -2297,12 +2266,6 @@
  },
  {
    "ModuleName": "UserControlPage/用户信息",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "cuckooent",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-08-27T17:54:45.3399994+08:00",
    "ModuleType": 31
  }
 ]
--- a/Pages/3609617039444daea57da1978344c4f.json
+++ b/Pages/3609617039444daea57da1978344c4f.json
@@ -8,7 +8,7 @@
      },
      "1": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 53.0,
+          "DesignLengthInPixel": 352.0,
          "Mode": 1
        }
      },
@@ -46,28 +46,83 @@
      },
      "1": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 1
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 27.0,
+          "Mode": 1
        }
      },
      "13": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 526.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
-        }
-      },
-      "14": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 16.0
        }
      }
    },
-    "Count": 15,
+    "Count": 14,
    "DefaultSize": 32.0
  },
  "AttachInfos": {
@@ -166,7 +221,7 @@
            "Name": "汇报对象",
            "Value": {
              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-              "SerializeProperty": "='3609617039444daea57da1978344c4f'!J4&'3609617039444daea57da1978344c4f'!D5"
+              "SerializeProperty": "='3609617039444daea57da1978344c4f'!I4&'3609617039444daea57da1978344c4f'!D5"
            }
          },
          {
@@ -187,7 +242,7 @@
            "Name": "用户名",
            "Value": {
              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-              "SerializeProperty": "='3609617039444daea57da1978344c4f'!L4"
+              "SerializeProperty": "='3609617039444daea57da1978344c4f'!K4"
            }
          },
          {
@@ -201,7 +256,7 @@
            "Name": "状态",
            "Value": {
              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-              "SerializeProperty": "='3609617039444daea57da1978344c4f'!N4"
+              "SerializeProperty": "='3609617039444daea57da1978344c4f'!M4"
            }
          },
          {
@@ -234,13 +289,13 @@
    "3,7": {
      "TemplateCellSource": "内容"
    },
-    "3,9": {
+    "3,8": {
      "TemplateCellSource": "汇报对象"
    },
-    "3,11": {
+    "3,10": {
      "TemplateCellSource": "汇报人"
    },
-    "3,13": {
+    "3,12": {
      "TemplateCellSource": "状态文本"
    },
    "4,1": {
@@ -267,10 +322,10 @@
    "3,1,1,2",
    "3,3,1,2",
    "3,5,1,2",
-    "3,7,1,2",
-    "3,11,1,2",
-    "1,1,1,13",
-    "3,9,1,2",
+    "3,7,1,1",
+    "3,10,1,2",
+    "1,1,1,12",
+    "3,8,1,2",
    "4,1,1,2",
    "4,3,1,2",
    "4,5,1,2"
@@ -283,4 +338,4 @@
    "PaperSize": {},
    "Margin": {}
  }
-}//Q3STBhSb011n+WHXqPSsJCcYmmzhZZe6dtyk433yR1CpClG8KziqHst1tTCfkPAXfZ7XaNzaUoKABZrUYzsh6LH98L7XkbmHjHZH0pCGUtjSW+g9LIW+fQTgcpVDRAohdqz1ZzyKG7puUibwk0I4tSUBZlBGL7xeMtIIGK1gWt5N+oVTHdLTuyysGhnwHGi20ySfM7oQMrLq0ZROWYThcgjt2DtIQKHExBXhI3IrKw33YIHZ17oqV4Qp5O7gIYjEvpjR5ayxSH7bf46n0943hzPbR9IV4pmaqVcl3WhJsSQ7C6ooSLxyu7kxDL1LjzClG+OYJ4NBBZ/smOy7HC2QoaW1nY8tffTIoVRPC1DRYb1OikHyQGS4qoHkBKHemyvUTKqN3EA10jqpZsquzx8fEOotF2UrBFXk5npTldNyDY4uCOLpityqLrQBlqkk+JTfA4lYYIgvCzh/WNT3V4eftQU1Jd0lITXP2U7s8xfB+OlcVghSbtWuMkDFaY3A5FhHXFaO2snXUI8y78ZJeoMVkrbARnFCIshbIxfBRkth9oCkPEq7K4o9nfpgh22gidI59QmqmUfLl8aqJ1ngLUs5XXoiylcy4YsvM7njPiHeJnPdvWhwAUBKaZSiV5m+Ae7h4caguKr+8HkDdoEsRWt9v0jICMZ+p0AB5eAmFm0/3tANsywt++g38BGyl6F+GEt6uRMyQKiBgy0pYUZ9F0ndG75aF39OSlTpYpAC2r/kH+Cn/oYYB3LDB+83RAcEy4yEHurbWh9oGemA7vwMnogciTN9JSzbG6DmuIprsHO/9vpYEa0cjJx08LlVQsDgi+lByP2SCP0a11FZblohDKepYmebTE7cKnqMCzz3x60EMwfqKCX+S1Yfbi06OCreHwiCaaTx1Bx+nplNDsisy85q/g==|920
+}//jSQQIwk5Voxyukb6Lsh9skucr1H0KT9aqUFOwQV5V4GWS+UtsUkyfc2t9IMYyDOcyqLKQtdIqSAtWKlMYXkjvE2R52X0Xp9eE5ItKswkbrVEuCP2mxGnuHyXfroWKmwiypY6AsrkbWBWzRbxWL8ntKiiBnjn4TV1IsooUrLD/tReVMq4tFrmKmVTqnFBCkHmZIcu9LdstlAwLqHLcmAVUE2Hfc2uv9yj35g5I3lAHEfFMDxkWSt8Ty/FuqothxlnxPUH19vvs2LEMhG93A2Rvfvg/4S4BJg+i+4qfVqm0hVr5T9TOo/P5SSVW78Gr85AxsY732yJrLZFYXA/mBmizaXL0tMSCnxhwklypjrg4AXZiUXBtQau1jiregSuzpm1SMvEQKzapu+jVW4xSoXg56VqeooEeV5XXGu434F/2nAykJwrRSxhmkuuDrwjZuDueaXqQt0Am1D56R1sedaV8Haiio3bTiLT+xvwiUdBfdVZkVaJ8OV2xoO5djek07f4BRWZvNh3xzIpre6VaSMbk1z5n9trGO6ot9/0t5dlKutFRLVNOG91HVPvPDWHtIGhcr+ccecGD3HhLvz4FGR8FLvGzcGs/1NvmENTD+LNfB5U4iJMKcCwaeg/rI86mXtgSs77bcytbZj+53XrvQGWLLvHH1/AcNNVT0+h/fLBxiHrC/vuTnyFI9p0IEabwbS2HrHww1hkdExmILcCVdMuUX3yvhKPVScfp453T1MklKpWCmCCeOxEM8PAa9kMrnOq4v6Sbtj+NSpGDCf+TtW/5kTNKj7wDhuKHSzL1neXKhniEu/dV0JSVtUjyRjAS+Sfex+1Hl9excZ2Zg9q0zwEKx+gG4ek/f6mT0V9ssqwtq/129/MTI05ARXs1LvBGrx64HFOI5zd0NkqTnUSjnAzZg==|920
--- a/Pages/3609617039444daea57da1978344c4f.rd
+++ b/Pages/3609617039444daea57da1978344c4f.rd
@@ -1,5 +1,5 @@
 {
  "PageType": 2,
-  "ColumnCount": 15,
+  "ColumnCount": 14,
  "RowCount": 5
 }
--- a/Pages/汇报/个人日报/汇报列表.json
+++ b/Pages/汇报/个人日报/汇报列表.json
@@ -462,13 +462,15 @@
        "DataSourceListviewName": "图文列表表格1",
        "IsLoadOnDemand": true,
        "LoadOnDemandCount": 31,
+        "DisplayMode": 2,
        "NoItemSetting": {
          "ImageForNoItem": {
            "Name": "暂无内容 (1).png"
          },
          "NoItemImageSize": 150.0,
          "TextForNoItem": "暂无内容"
-        }
+        },
+        "TemplateKey": "_RS_Clickable"
      }
    }
  },
@@ -532,4 +534,4 @@
      "Formula": "汇报列表!$A$2"
    }
  ]
-}//O507/flFdrGp/ul7g39e0JYDrE9+7qtjYf2jaIl5ioes5h3zt/hDLd87tIiixPfgpYpdhTgaef2klYVywTDCNcAwGbxYvmY1EzQTxdlZ8xiq/GOn6HDN3541onVOe4+kYDSmY/IzEcH8a6aXWrAzHl5lvpvoUrLf9JB96f1Z8rH373qDDh9pWxaFceV1p7k9/sk0sxfy6EUxRjoCM/FxYhiB1pRyCUATADHrIKlQRv7KDWIUG+R2uwWc5M+gmz+5kprUAYiiwqTNH4E/5NWgTcBH4MeWZ4X3Bzx6hVGBPqZZZa/gMamkQzqB7Tq06B/Rdh26P8NTgA4y2FTrSuWf4KwzlN1UznK633PzGtRXVnWPduNPwS0wKI0cU+ytTIyJPG8blOl2DrBXfXCHCPbJv3z7BsUGK9pbV9FZnBdVh5ULQiKf8aLG5USblqNGqyV7oZ7O25yvkzkr6GBnnlo7XHafv0dlaA2zVXt0Wxyr6SldBz0R0PNkj3K3433qk0YifGEt9D5Se6bJWqCpHRhKAToihNH6B55ywxO+gd3Fbd2lpp/Rmlic9Q1c0H+ZyUxpGa7T/dKxoOBIn/IktfSGwCvbiI5E/f6ZOJnA7a1NsDdZYD+KSTByYHe4DT/8qPp/pQCtdxVbdlKKpNkScr67D4ez7vKIuaeIQR+0y/HmfkW9eOx6lJ3+PG2eClpF8BahPBeR/zgVaOu7stglxE/UPyFGzda4LaCoLjJpjMBKG2+0XODz4w1jN9/DExD6hKPfTuPLafv55G7Y4deUV37wbxzK5pvH8iBylJ39a3TAIcuToNIcrmZ91r9oOKZRtSBa93+yugNWx4U/HvxliVxUk0Jd7pQ1wMxaNsxUdE/iS+3u0IH/M8kBnCY6gz5yeZr10af6w1WqRS7sVKl6mq+FDA==|920
+}//Wz/M00vsqFLCm1B9MVj/QT0JWUiVITY+h0nOOi807oueD0m0a8iSQujz/YmIqs4EE/b/4I+L9b635UXWWKnYezvgPSzItSLu3keBPux0CW6OGmA2bDP+HsLfl0fMXBb5759C05VRTG/KaMAWGDmlshSbqzyX5uLA/o3MFNxnyWgNPuYplhEEJujD93ZKTto5y/JQhvOdFEh3qJ1ec/kylI/cvgm1WlX0Mz2G5rvivZYMkH8xjmgnhGKs+5yrAjl3WWesLORfjCEtk89BWKrG/KcBXmW+kbs1rp5uYy7lCzFZC/75+pkXvpF1zSxfvjkJMHBi+GZ5qaMtKtfMuwmI9PmajRzfRCy4a5BtbkgzbcL2mPMTPj73pwf1gYOhlp4PWXG58atnmUCyWuR/4wcClW5zSfk1qyS4/TKJoZIfhkZhe5XWVZ5GIKinHcr+s1j8M8dewtq/Vjyr3JPfAxiB2yotHx/2orAGW3NK5OwUijx0qM2cOAlyfiZvxcHgHYyXxIUIkjX5Z/ZXgIBJmKQOeUY7d3e2Xmxx5mzjgCEi0TQrg/cYxuDq8Q0qnIXVThyuyc3Y6GI3XZvlWgTn7mEp4vCTBucEAkOXc7eaCluMgzifes9LQl98IAspLHVADXn1lVaJnm7Fz6fnarO2bMMo9WfCCkeTYXB319t2qquPwagHhwPDfrp99hjyb/aPn2fQdn0kYgqN/pVeh6hR7RN4Osj+2OSo7750Kl9h5lxuGMGcnd8ScZ9T0CKEoUN/7Eh7GN8csZkd2CYH4kojccS81sOHQ73mz0lEOyeW1xsK4yAPxJJgqq6J2mOI17qmNZeI9rwTywaDIwMZIy4XWEsCxWspc9xazk4wcA7yoaM7GG3WAUC/k8zahCL9crsuvxh4h3YAyMK28Fld3E0+ECj+gg==|920
--- a/ServerCommands/汇报/根据汇报模板生成内容.json
+++ b/ServerCommands/汇报/根据汇报模板生成内容.json
@@ -14,7 +14,7 @@
            {
              "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core",
              "roleNames": [
-                "FGC_LoginUser"
+                "FGC_Anonymous"
              ]
            }
          ]
@@ -523,7 +523,7 @@
                            ]
                          }
                        ],
-                        "ID": "555d555f-d0e5-407d-8edc-d52d82ff3ccb"
+                        "ID": "6e16b256-ee84-4567-92bf-7bde47abfd78"
                      },
                      {
                        "CommandList": [
@@ -544,12 +544,12 @@
                            ]
                          }
                        ],
-                        "ID": "77e0fb90-817d-4bc3-9bb2-1d2fa1bc235f"
+                        "ID": "2cd1a3fe-578d-4d22-bd14-b4d53dda3da2"
                      }
                    ]
                  }
                ],
-                "ID": "97ff90d3-0878-435f-b71c-c7d9089c9740"
+                "ID": "164701a5-a537-4a93-b532-4c01e395f8af"
              },
              {
                "CommandList": [
@@ -573,7 +573,7 @@
                    ]
                  }
                ],
-                "ID": "237b1c7d-e125-467e-904f-29ef472e0f31"
+                "ID": "46bdc211-6ea3-4f78-8a6c-392f88945b8f"
              }
            ]
          }
--- a/UserControlPages/汇报卡片.json
+++ b/UserControlPages/汇报卡片.json
@@ -8,49 +8,43 @@
      },
      "1": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0,
-          "Mode": 1
+          "DesignLengthInPixel": 26.0
        }
      },
      "2": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 18.0
+          "DesignLengthInPixel": 15.0
        }
      },
      "3": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0,
-          "IsHidden": true
+          "DesignLengthInPixel": 15.0
        }
      },
      "4": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0,
-          "IsHidden": true
+          "DesignLengthInPixel": 230.0
        }
      },
      "5": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 115.0,
-          "Mode": 1,
-          "IsHidden": true
+          "DesignLengthInPixel": 15.0
        }
      },
      "6": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0,
-          "IsHidden": true
+          "DesignLengthInPixel": 24.0
        }
      },
      "7": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0,
-          "IsHidden": true
+          "DesignLengthInPixel": 15.0
        }
      },
      "8": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 15.0
+          "DesignLengthInPixel": 24.0,
+          "IsHidden": true
        }
      },
      "9": {
@@ -62,16 +56,19 @@
      "10": {
        "GridRowColumnDefinition": {
          "DesignLengthInPixel": 24.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          },
          "IsHidden": true
        }
      }
    },
    "InLogicalVisibleIndexes": [
-      3,
-      4,
-      5,
-      6,
-      7,
+      8,
      9,
      10
    ],
@@ -82,7 +79,7 @@
    "RowColumnAttachedInfos": {
      "0": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 15.0
        }
      },
      "1": {
@@ -107,86 +104,49 @@
      },
      "5": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 32.0
        }
      },
      "6": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 32.0
        }
      },
      "7": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 32.0
        }
      },
      "8": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0,
-          "Mode": 2,
-          "MinLength": {
-            "Unit": 1
-          },
-          "MaxLength": {
-            "Value": 1.0
-          }
+          "DesignLengthInPixel": 32.0
        }
      },
      "9": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 16.0
+          "DesignLengthInPixel": 15.0
        }
      },
      "10": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 59.0,
-          "Mode": 1
+          "DesignLengthInPixel": 91.0
        }
      },
      "11": {
        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
-        }
-      },
-      "12": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 18.0
-        }
-      },
-      "13": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 59.0,
-          "Mode": 1
-        }
-      },
-      "14": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
-        }
-      },
-      "15": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
-        }
-      },
-      "16": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 15.0
        }
      }
    },
-    "Count": 17,
-    "DefaultSize": 24.0
+    "Count": 12,
+    "DefaultSize": 32.0
  },
  "Values": {
    "1,1": "标题文字",
-    "1,13": "标签",
-    "5,1": "内容"
+    "4,1": "内容"
  },
  "Formulas": {
-    "1,15": "IF(D11,C11,B11)",
-    "2,1": "SUBSTITUTE(L11,CHAR(10),\" \")",
-    "1,1": "TEXT(I11,\"yyyy年mm月dd日\")&\"：\"&G11&\"小时\""
+    "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&\"：\"&B10&\"小时\""
  },
  "AttachInfos": {
    "1,1": {
@@ -250,50 +210,7 @@
      },
      "TemplateCellSource": "汇报对象"
    },
-    "1,12": {
-      "CellType": {
-        "$type": "ElementUI.AvatarCellType, ElementUI",
-        "CommandList": [],
-        "showSystemAvatar": true
-      },
-      "TemplateCellSource": "用户名"
-    },
-    "1,13": {
-      "TemplateCellSource": "姓名"
-    },
-    "1,15": {
-      "CellType": {
-        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
-            "PropertyItemsList": [
-              {
-                "TargetCells": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=汇报卡片!D11"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=NOT(汇报卡片!D11)"
-                }
-              }
-            ]
-          }
-        ],
-        "ToolTip": {
-          "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-          "SerializeProperty": "=IF(汇报卡片!D11,\"收起\",\"展开\")"
-        },
-        "Size": 18,
-        "ImagePath": "右箭头.svg",
-        "UseCellForeColor": true
-      }
-    },
-    "2,1": {
-      "CssName": "ec-label"
-    },
-    "5,1": {
+    "4,1": {
      "CellType": {
        "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor",
        "ShowToolBars": false,
@@ -301,7 +218,7 @@
      },
      "TemplateCellSource": "内容"
    },
-    "7,1": {
+    "6,1": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -317,7 +234,7 @@
        "UseCellForeColor": true
      }
    },
-    "7,3": {
+    "6,3": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -333,7 +250,7 @@
        "UseCellForeColor": true
      }
    },
-    "7,5": {
+    "6,5": {
      "CellType": {
        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
        "CommandList": [
@@ -353,226 +270,155 @@
        "a6a04ac2-31f5-43b9-b82b-0ff605b59deb"
      ]
    },
-    "7,13": {
+    "6,7": {
+      "CellType": {
+        "$type": "Forguncy.UserControlPageCellType, ServerDesignerCommon",
+        "UserControlPageName": "用户信息",
+        "PropertyValues": [
+          {
+            "Name": "姓名",
+            "Value": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=汇报卡片!姓名"
+            }
+          },
+          {
+            "Name": "用户名",
+            "Value": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=汇报卡片!姓名"
+            }
+          }
+        ]
+      }
+    },
+    "9,1": {
+      "TemplateCellSource": "工时"
+    },
+    "9,2": {
+      "TemplateCellSource": "日期"
+    },
+    "9,3": {
+      "TemplateCellSource": "简介"
+    },
+    "9,4": {
      "TemplateCellSource": "状态",
      "RulesGuidList": [
        "2783013b-5a41-49c7-b5ad-e6016390d1bd"
      ]
-    },
-    "10,1": {
-      "CellType": {
-        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
-        "Size": 14,
-        "ImagePath": "右箭头.svg",
-        "UseCellForeColor": true
-      }
-    },
-    "10,2": {
-      "CellType": {
-        "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
-        "Size": 14,
-        "ImagePath": "向上箭头.svg",
-        "UseCellForeColor": true
-      }
-    },
-    "10,3": {
-      "CellType": {
-        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
-        "Caption": "展开",
-        "Style": 1,
-        "CommandList": [
-          {
-            "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
-            "PropertyItemsList": [
-              {
-                "Location": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=汇报卡片!4:8"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=汇报卡片!D11"
-                }
-              },
-              {
-                "Location": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=汇报卡片!3:3"
-                },
-                "Value": {
-                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=NOT(汇报卡片!D11)"
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
-    "10,6": {
-      "TemplateCellSource": "工时"
-    },
-    "10,8": {
-      "TemplateCellSource": "日期"
-    },
-    "10,11": {
-      "TemplateCellSource": "简介"
    }
  },
  "StyleDatas": {
    "Styles": [
      {
-        "FontSize": 13.333333333333332,
-        "HorizontalAlignment": 0
-      },
-      {
+        "FontFamily": 0,
        "FontSize": 14.666666666666666,
        "FontWeight": 1
      },
      {
+        "FontFamily": 0,
        "FontSize": 13.333333333333332,
        "HorizontalAlignment": 2
      },
-      {
-        "FontSize": 13.333333333333332,
-        "Foreground": 3,
-        "TextIndent": 5,
-        "HorizontalAlignment": 4
-      },
-      {
-        "FontFamily": 5,
-        "FontSize": 12.0,
-        "Foreground": 6
-      },
-      {
-        "FontSize": 12.0,
-        "Foreground": 6
-      },
      {
        "BorderBottom": 0
      },
      {
        "FontSize": 13.333333333333332,
        "HorizontalAlignment": 4,
-        "VerticalAlignment": 8,
+        "VerticalAlignment": 5,
        "WordWrap": true
      },
      {
-        "FontFamily": 5,
+        "FontFamily": 0,
        "FontSize": 13.333333333333332,
-        "Foreground": 9
+        "Foreground": 6
      },
      {
-        "FontFamily": 5,
+        "FontFamily": 0,
        "FontSize": 13.333333333333332,
+        "Foreground": 7
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "Foreground": 8
+      },
+      {
+        "FontFamily": 0,
+        "HorizontalAlignment": 2
+      },
+      {
+        "FontFamily": 0
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 12.0,
+        "Foreground": 9,
+        "HorizontalAlignment": 2
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 12.0,
        "Foreground": 10
-      },
-      {
-        "FontFamily": 5,
-        "FontSize": 13.333333333333332,
-        "Foreground": 11
-      },
-      {
-        "FontSize": 12.0,
-        "Foreground": 3,
-        "HorizontalAlignment": 0
-      },
-      {
-        "FontFamily": 5,
-        "FontSize": 12.0,
-        "Foreground": 6,
-        "BorderBottom": 1,
-        "BorderTop": 1,
-        "BorderLeft": 1,
-        "BorderRight": 1
-      },
-      {
-        "BorderBottom": 1,
-        "BorderTop": 1,
-        "BorderLeft": 1,
-        "BorderRight": 1
-      },
-      {
-        "FontFamily": 5
      }
    ],
    "Types": {
      "Strs": [
-        "Right",
-        "Bold",
-        "Center",
-        "Text 1 0",
-        "Left",
        "Body",
-        "Text 1 50",
+        "Bold",
+        "Right",
        "Background 1 -15",
+        "Left",
        "Top",
        "black",
        "Accent 5 0",
-        "Accent 2 0"
+        "Accent 2 0",
+        "Text 1 0",
+        "Text 1 50"
      ],
      "Borders": [
        {
-          "Color": 7
-        },
-        {
-          "Color": 9
+          "Color": 3
        }
      ]
    },
    "CellStyles": {
-      "1,0": 0,
-      "1,1": 1,
-      "1,10": 0,
-      "1,12": 2,
-      "1,13": 3,
-      "1,15": 4,
-      "2,1": 5,
-      "3,1": 6,
-      "3,2": 6,
-      "3,3": 6,
-      "3,4": 6,
-      "3,5": 6,
-      "3,6": 6,
-      "3,7": 6,
-      "3,8": 6,
-      "3,9": 6,
-      "3,10": 6,
-      "3,11": 6,
-      "3,12": 6,
-      "3,13": 6,
-      "3,14": 6,
-      "3,15": 6,
-      "5,1": 7,
-      "7,1": 8,
-      "7,3": 9,
-      "7,5": 10,
-      "7,13": 11,
-      "10,1": 12,
-      "10,2": 12,
-      "10,3": 13,
-      "10,4": 13,
-      "10,5": 13,
-      "10,6": 14,
-      "10,7": 14,
-      "10,8": 14,
-      "10,9": 14,
-      "10,10": 14
+      "1,1": 0,
+      "1,10": 1,
+      "2,1": 2,
+      "2,2": 2,
+      "2,3": 2,
+      "2,4": 2,
+      "2,5": 2,
+      "2,6": 2,
+      "2,7": 2,
+      "2,8": 2,
+      "2,9": 2,
+      "2,10": 2,
+      "4,1": 3,
+      "6,1": 4,
+      "6,3": 5,
+      "6,5": 6,
+      "6,7": 7,
+      "9,1": 8,
+      "9,2": 8,
+      "9,3": 8,
+      "9,4": 9,
+      "10,1": 10,
+      "10,2": 10,
+      "10,9": 9
    },
    "SheetStyle": {
-      "FontFamily": 5
+      "FontFamily": 0
    }
  },
  "Spans": [
-    "10,3,1,3",
-    "2,1,1,8",
+    "4,1,1,10",
+    "9,1,1,1",
+    "9,2,1,1",
    "1,1,1,8",
-    "7,13,1,3",
-    "10,6,1,2",
-    "10,8,1,3",
-    "10,11,1,3",
-    "5,1,1,15",
-    "10,14,1,3"
+    "6,7,1,4"
  ],
  "PageInfo": {
    "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon",
@@ -667,40 +513,5 @@
  "PrintInfo": {
    "PaperSize": {},
    "Margin": {}
-  },
-  "BackgroundPictures": [
-    {
-      "FitToBrowserWidth": true,
-      "FitToBrowserHeight": true,
-      "Name": "ae262ab1-83b7-482a-a395-f30d215fb8eb.png",
-      "DisplayName": "背景图1",
-      "PictureCommands": [
-        {
-          "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
-          "PropertyItemsList": [
-            {
-              "TargetCells": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=汇报卡片!D11"
-              },
-              "Value": {
-                "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                "SerializeProperty": "=NOT(汇报卡片!D11)"
  }
-            }
-          ]
-        }
-      ],
-      "StyleInfo": {
-        "CornerRadius": 9.515625000000039,
-        "Fill": "Background 1 0",
-        "StrokeDashType": 8,
-        "Stroke": "Background 1 -15",
-        "StrokeThickness": 1.0
-      },
-      "IsAutomaticStroke": false,
-      "IsAutomaticFill": false,
-      "Size": "422,295"
-    }
-  ]
-}//kop3efNaEOtlWgX1GYcjP37ZNy2kKLheCJx71F7i6WCv24V1K+nNOgD0OmvIRBUw5do/tk8Eo+ayRR2A7EFway9u7pWUSY8nkXluz8krMW/TWMglPAj+b7OREdgoYIFaCgLiWvAy0lfjiUgAaNk1PfKsf6MTjQQmTGm5JYCPDkQv3shFFWANE4POyp84n92NXBHnrUQwaqv1nL4ydJah+EmR02eTGKyULpUDgtMCR+HQzpVhkJCndnVsKBXNqHPXr2Ljm55tdhsTmS1nk3SiAz2m9j3//pIlBAmF5MoNwicUoUp71YAMn8Mcq7AavFoAr+g8yw/Qmuc1WG0mvT9poucLgNduffbsiAOTPJFibXXRjLICKGjV8f/xP2jH6FVoBXH1VHAjRRr4ZDjaVKy6dLP5DFmNPx/b1TGzf569vbaGHQ039P/F2jkB0lXP/Kr+HfzpUVac1DB5l1LTvFca0FxUJSR90Chfa7JDQzHw0y6/8Yu4nnO/+m5Zxn42rklho5jHcFha3PtRWmcCaI55Q6F8DS8ki6LIqXjsHw6iV+lT/u60mTn8Wwrguc3bzjNx3VLDNwFXC4R3rA10/EHMNPuf1co8LjLzxCJIGO1a3htiTxBDffcp0YgUeD7mdPaow0UqPQH8GcdZq0/67UDQkEcu94PQDw6cs1Ra5scdkVYN5uCoMgdC70Htl4sq3/t4o6PuweNUcaDeQjXibuf4U1dpdje7OO6AzasxSSfIWQ4a0qVJFOWocPgPz7Ml+EPqXz6hC/yI4DDse7XwOFWm78J+6WIBlH1bEiJAHZh47o77WTv23Yp5+YCwVfTLjBPIOi/dZPocrndatoYMnlfiNwK9BijhgBQ3XUxdTMRArH73TQeh9vuJGovR8s2Gyzn3KMhQmB89OpytcLjocoi73g==|920
+}//JZqEnlXe2ReDjdMxnWMHQk4f9U0F49XvYmZs2HiAABx8MUoJLjJ+UcRdF/wqikqCsAq55ka4gIJcyMl1tPu1UokiDBxJzX+LJtH+0WYwLHD/bHh5GgmVt11hvoq8YbdI4+NR9665+ihhy4nFURGkZrvd7T0clkOPmghbweOMwgGpP0YT85SOHo8kmEYruA5iCJF7vjiPFa+iGX1Va1yIn3Ip2HcC2HuM6yTGlUHjF3LmEunwIGq7mL/Q3jbXIbxfkZi64h1DStWTjx7aPyUMxOS8Wp7Xsnyp+fiIV/oO1/68WxMYaCzrLhJnoFNtAtvS60oztPVycUFCIsOm68+ovSo+OkkaChU7djmaTRPlNCOn8VF3sfKAAcNtxaMeVuNv31on2jzccL8Jz0MMhNE4UcemcCe6njzm/ZxIU4FsmglXWIzHu/UyAoKyYRPr/HIYQ54MLULzHT0xnXWdCJy2PNb4x/HKYJB7ccOKnqVAcRaSMhCyty52mpsplvJmSxM+ahp62IIpCuXdNCRpORG/6UAMjkpAMX3OBZ8cUBtwDY7w4w5RdsTyeCHn0tf/og6REBn/0ygPSA9KgZIEiQZPzHOiRGEwFdptzft0ug90VO8Y7ZJRCPjVloqAdKimPkN+K/D1V4lRPePr4Tgt66u84ecceIMs2DTZ3BsH6x00h1dAjiDRdJnCQcLaZnzL7VkYm1NjRXayhVTBfjkIgx6XpLk3/w87EoknQNLyKqGXrcv20/uRIKTHFAsGisZtWOfqqasSSIfVBfP8fp9JmJxq6SlF/bB5xhC9g+FOr3JJq30TuFm5fB2qex7kZAuAwaAVo00db+I4IDdnNsKe4J+G2/+lg5E5dlJwiukobaTXfkpqb+CrryIvGSuXM5uMdj3im0C5GGnbdAgLAVod3vyS2g==|920
--- a/UserControlPages/汇报卡片.rd
+++ b/UserControlPages/汇报卡片.rd
@@ -1,10 +1,8 @@
 {
  "PageType": 3,
-  "ColumnCount": 17,
+  "ColumnCount": 12,
  "RowCount": 11,
  "Formulas": {
-    "1,15": "IF(D11,C11,B11)",
-    "2,1": "SUBSTITUTE(L11,CHAR(10),\" \")",
-    "1,1": "TEXT(I11,\"yyyy年mm月dd日\")&\"：\"&G11&\"小时\""
+    "1,1": "TEXT(C10,\"yyyy年mm月dd日\")&\"：\"&B10&\"小时\""
  }
 }
--- a/UserControlPages/用户信息.json
+++ b/UserControlPages/用户信息.json
@@ -0,0 +1,116 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      }
+    },
+    "Count": 1,
+    "DefaultSize": 24.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 60.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 75.0,
+          "Mode": 1
+        }
+      }
+    },
+    "Count": 3,
+    "DefaultSize": 60.0
+  },
+  "Values": {
+    "0,2": "标签"
+  },
+  "AttachInfos": {
+    "0,1": {
+      "CellType": {
+        "$type": "ElementUI.AvatarCellType, ElementUI",
+        "CommandList": [],
+        "icon": {
+          "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin",
+          "Name": "默认头像 .png"
+        },
+        "showSystemAvatar": true
+      },
+      "TemplateCellSource": "用户名"
+    },
+    "0,2": {
+      "TemplateCellSource": "姓名"
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "HorizontalAlignment": 1
+      },
+      {
+        "FontFamily": 0,
+        "FontSize": 13.333333333333332,
+        "TextIndent": 5,
+        "HorizontalAlignment": 2
+      },
+      {
+        "Foreground": 3
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Body",
+        "Center",
+        "Left",
+        "Text 1 35"
+      ]
+    },
+    "CellStyles": {
+      "0,1": 0,
+      "0,2": 1
+    },
+    "ColStyles": {
+      "2": 2
+    },
+    "SheetStyle": {
+      "FontFamily": 0
+    }
+  },
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.UserControlPage, ServerDesignerCommon",
+    "PropertyDefinitions": [
+      {
+        "Name": "姓名"
+      },
+      {
+        "Name": "用户名"
+      }
+    ],
+    "CommandDefinitions": [],
+    "MethodDefinitions": [],
+    "PageLoadedCommandList": []
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  }
+}//ookcplnb0g3bFrMO0CRCe7pt579EtCSMaqpCP8ifRsq8KjU/LY6nV7sq3vyABrFGIrBYOdbMIycXOHT0O4RUXoLJBFJeWTAJOMAePwBAWMjGRKzr5VJ9gEk/ynkODcgXQxgspU7mhzHMi7MolURA8ro4lrkkoC4oxQQusy6/uGGVxNTKxm73HwqbVPYhH5f83R4jJz+qrCICUa0oevHHmUmy+PstyXMDo9I1OuTcjYin7bHwsc67cYv9mbrOX/gHy1EF7u9u1Q3ldKMwgUxD8YmzzPSfcL0UUOdo9h0GSr64JShCt3N7MwEtMAuhuAS2D46Fo4pk1AWycXDbT6+V9329CD5Jj42YhJhvOPK8WQtPNj3utUR949V0r8PM2YdOZgVUL1U7Zi3AVRNAk5CiyOQc442+G+hKQvTUar/1RASuBYHmU3sQXQYKHktzviie21xoHcfzK5K36KEIGNx/S+5jZ2nGIwkRROA0xevRDwWkVz+i2WEA+U7fRQQH9DeOEokGTsbvgBYurP6SN3Nba/k9WmZRH8NSLFkdWIYRGGb+VON1nO2GvGumCbKrh4XWt2M7rZ6KueMGS1ozGi5SOG6iVDIdNFEVhLvSZ1fqB2j4cQ4fLfsDe4xfr2x2Mvgx5MPbzcHiOU+65sEuwrRBBa1R6p8ZG5F108j60qDHum8BRi9WK185C/lYvlX1Eq7meS1IwENGnDis2pA7AVXXWGuHUbvHtgFB4qneLnKtK3/uFxWULfacoINMF82qEfx2JKZycUBSQufXld/gUVgENknx7zOZPbd7DU8fb3eKETeIt7nXodCrqj68quj2Ot8nzzd4g6mX1kC8Tt9vVMwq9L88J5S8awrCkINkcY8H5jccrfLQR6tfe/Z4GxphTcct7ixFaCWfxtjx7w4YhbUpog==|920
--- a/UserControlPages/用户信息.rd
+++ b/UserControlPages/用户信息.rd
@@ -0,0 +1,5 @@
+{
+  "PageType": 3,
+  "ColumnCount": 3,
+  "RowCount": 1
+}