diff --git a/.collaboration b/.collaboration index d9c99eba..0931d215 100644 --- a/.collaboration +++ b/.collaboration @@ -175,16 +175,7 @@ }, { "ModuleName": "Table/项目表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T19:21:54.2012003+08:00", - "ModuleType": 7, - "ToRemoveFiles": [ - "Tables\\项目任务\\项目表.json" - ] + "ModuleType": 7 }, { "ModuleName": "Table/项目预算变动表", @@ -208,33 +199,11 @@ }, { "ModuleName": "PCPage/任务-任务信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T19:01:10.6664682+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-任务信息.json", - "Pages\\任务\\任务-任务信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-侧栏", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:58:40.1289065+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\任务-侧栏.json", - "Pages\\任务\\任务-侧栏.rd", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.json", - "Pages\\9d9faa04d5a74f1dbf8dd3b2040b6f6.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/任务-关联资源", @@ -262,17 +231,7 @@ }, { "ModuleName": "PCPage/参与成员管理", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T20:16:00.8228877+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\参与成员管理.json", - "Pages\\任务\\参与成员管理.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/工时详情-列头", @@ -280,33 +239,11 @@ }, { "ModuleName": "PCPage/工时详情", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:56:43.7897928+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\工时详情.json", - "Pages\\任务\\工时详情.rd", - "Pages\\31a709cea02e45ad83bb92336a6d829.json", - "Pages\\31a709cea02e45ad83bb92336a6d829.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增任务", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T19:01:10.66667+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\任务\\新增任务.json", - "Pages\\任务\\新增任务.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/新增进展", @@ -318,17 +255,7 @@ }, { "ModuleName": "PCPage/MD编辑器", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T19:01:10.6662789+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\MD编辑器.json", - "Pages\\共用\\MD编辑器.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/切换任务状态", @@ -564,19 +491,7 @@ }, { "ModuleName": "PCPage/项目成员统计", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:56:31.4302913+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目成员统计.json", - "Pages\\项目首页\\项目首页子页面\\项目成员统计.rd", - "Pages\\5f448cc5e408484e9837a0183cf1365.json", - "Pages\\5f448cc5e408484e9837a0183cf1365.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目概况-关键数据", @@ -584,17 +499,7 @@ }, { "ModuleName": "PCPage/项目概况", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T21:34:41.9944903+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目首页子页面\\项目概况.json", - "Pages\\项目首页\\项目首页子页面\\项目概况.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目甘特图", @@ -614,33 +519,11 @@ }, { "ModuleName": "PCPage/项目信息", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T19:14:34.3484141+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目信息.json", - "Pages\\项目首页\\项目信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目列表", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T19:13:23.6814819+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目列表.json", - "Pages\\项目首页\\项目列表.rd", - "Pages\\b90932e038f94707b54e571ff7cd84d.json", - "Pages\\b90932e038f94707b54e571ff7cd84d.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目审批", @@ -648,17 +531,7 @@ }, { "ModuleName": "PCPage/项目标题", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T21:36:05.7749436+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目首页\\项目标题.json", - "Pages\\项目首页\\项目标题.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目首页", @@ -758,20 +631,7 @@ }, { "ModuleName": "Theme", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:59:57.6062102+08:00", - "ModuleType": 9, - "ToRemoveFiles": [ - "Theme\\CellTypeStyles", - "Theme\\ListViewStyles", - "Theme\\StyleDefaultNames", - "Theme\\ThemeConfig", - "Reports\\DefaultTheme.rdlx-theme" - ] + "ModuleType": 9 }, { "ModuleName": "image/内置图片", @@ -963,25 +823,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T22:33:57.3041792+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Microsoft SQL Server-10_0_0_0.zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\PC组件包-ElementPlus-10_0_0_0.zip", - "Plugin\\加载动画-10_0_0_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\支持预览的附件上传-10_0_0_0.zip", - "Plugin\\甘特图-10_0_0_0.zip", - "Plugin\\自定义菜单类型和树类型-10_0_0_0.zip", - "Plugin\\设置当前行命令-10_0_0_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -993,56 +835,22 @@ }, { "ModuleName": "PCPage/编辑删除页面", - "State": 1, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T19:26:49.5364587+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\编辑删除页面.json", - "Pages\\共用\\编辑删除页面.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Image/默认头像 .png", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T18:58:36.4827869+08:00", "ModuleType": 38 }, { "ModuleName": "Table/项目成员表", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T20:10:43.1309228+08:00", "ModuleType": 7 }, { "ModuleName": "ServerCommand/同步项目成员", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T21:11:55.7618511+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/项目成员", - "State": 3, - "LockedBy": { - "UserName": "SHAMUSPC\\NINGMEI", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-03-05T21:29:35.606117+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/007ea4aa4c7440478a9a092179dace8.json b/Pages/007ea4aa4c7440478a9a092179dace8.json new file mode 100644 index 00000000..50586e2f --- /dev/null +++ b/Pages/007ea4aa4c7440478a9a092179dace8.json @@ -0,0 +1,102 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 23.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 7 + ], + "Count": 8 + }, + "Cols": { + "RowColumnAttachedInfos": { + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 1 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 1 + } + } + }, + "Count": 7 + }, + "Values": { + "5,1": "姓名", + "7,1": "岗位名称" + }, + "AttachInfos": { + "1,2": { + "CellType": { + "$type": "ElementUI.AvatarCellType, ElementUI", + "CommandList": [], + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "默认头像 .png" + }, + "badge": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "='007ea4aa4c7440478a9a092179dace8'!B8" + } + }, + "TemplateCellSource": "项目成员" + }, + "5,1": { + "TemplateCellSource": "项目成员_全名" + }, + "7,1": { + "TemplateCellSource": "岗位名称" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 16.0, + "HorizontalAlignment": 0 + }, + { + "FontSize": 13.333333333333332, + "HorizontalAlignment": 0 + } + ], + "Types": { + "Strs": [ + "Center", + "Body" + ] + }, + "CellStyles": { + "5,1": 0, + "7,1": 1 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "5,1,1,5", + "1,2,3,3", + "7,1,1,5" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "项目成员" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//nRyUAlTDYqOMDM39ZB45s/9q2kYfHClHINh/9JTxjbM8c15loi7/v2Pckqlk11VcSvcwv5gQvkmBBgFjpKwUy1TvdxV2vjP0w193xvzCKtmS7reGxBlpuabt+YkvCuGJhWZsasKRqoS1xjfxl7f+03D7EtIH0LzdWQ2gjP0lJync66VtDW1BNdBlmfZ5P0hY4glCzWCqQdy/vwmpEBhpGbMj91+AkJMl1xVaCb0k/d5T9UO1P/47nBZ9MmoTqpAauo3wPoKcJXgGX+AlQh7yFgEGSdaEiBJwVv3WH7Dh+eQ9xZT6M5oMncOBD+HUogmlVCa7TXcajyxJpciBvrTQl+ytmi7Nex9+rYDsQJcAy8N3gwElx+bzkjf7YE0z6MOa2RtOEhr19WSMcj460HiuXyQsiwgACN6CaL+c+EoYBpk+PkWWBTj4TuZeM7yhjzIEbR+lwtf15RudxW6NvOerXXail+7IgvPt8iHZJgrrGeyER3idj4T/eUWfPxMmlDShTxnvuZqdGe1ErGoSnnb3zBL2hfL7Z8y0RBA/LqhpHgH7pmmPssnLp1/6qLI7bltXR5nLCiPBk+Vqsp5/5s+TvADnhJnbGcWuAE09LEWog/GxNYDHVFyRNesb68q+Z0HzeyI8VFy7OOKHqvt7LDRaCL2IhLbA/ZOgMtMi00gPi2Rq1TsNOjYq/6cCXTKG2up7UmAGyOy0jFFCzsHkJ6g2frrzeHg8SzCfsh264UH514MM1w5VUopVAAOb1qnsW3wUbXhhVn5tcfMWF5Fb/z5Ybv9hnEmcuVghnMBvyxkXUdMWsQS+dfuYA5ylB4z0A4fMOijERR10eUOoWaIBeywIjHuyA3EEIg0fjB8fKOlqNB8GVociy5rl+jkXyPTeuqAbrmZz5XlMr3sDIvagLkvE8g==|920 \ No newline at end of file diff --git a/Pages/007ea4aa4c7440478a9a092179dace8.rd b/Pages/007ea4aa4c7440478a9a092179dace8.rd new file mode 100644 index 00000000..a26cd3f2 --- /dev/null +++ b/Pages/007ea4aa4c7440478a9a092179dace8.rd @@ -0,0 +1,5 @@ +{ + "PageType": 2, + "ColumnCount": 7, + "RowCount": 8 +} \ No newline at end of file diff --git a/Pages/31a709cea02e45ad83bb92336a6d829.json b/Pages/31a709cea02e45ad83bb92336a6d829.json index f7b4f503..101645a8 100644 --- a/Pages/31a709cea02e45ad83bb92336a6d829.json +++ b/Pages/31a709cea02e45ad83bb92336a6d829.json @@ -106,9 +106,10 @@ "1,1": { "CellType": { "$type": "ElementUI.AvatarCellType, ElementUI", - "CommandList": [] + "CommandList": [], + "showSystemAvatar": true }, - "TemplateCellSource": "头像" + "TemplateCellSource": "执行人" }, "1,3": { "CellType": { @@ -223,7 +224,7 @@ } } ], - "ID": "01a288d9-ab42-4765-a2b9-2786b35d84f9" + "ID": "97ffcf71-25ed-43ac-98d8-4eacc9b71d4f" }, { "CommandList": [ @@ -238,12 +239,12 @@ "BtnText": "知道了" } ], - "ID": "e914419d-41ff-4bef-b849-8f585d7acfe3" + "ID": "2db53b47-aa70-401b-b176-4e27d66c2cab" } ] } ], - "ID": "77031d32-5a3f-42bd-92dd-63309066b939" + "ID": "dbba27fd-e3be-4f80-a092-92c01b9db35e" } ] } @@ -365,7 +366,7 @@ "value": "编辑" }, "CommandList": [], - "ID": "c12e4d57-de43-4944-af3a-3f7cb2fa0416" + "ID": "6474e55b-2f70-4062-a3b0-25a5fb1bdfc7" }, { "Condition": { @@ -419,17 +420,17 @@ } } ], - "ID": "854a82c0-16e0-4875-984e-75729447b81e" + "ID": "0220b96c-bec6-4904-9a60-c82a059b2f71" } ] } ], - "ID": "6b83f6ad-0ead-494e-ba78-8c251a407db2" + "ID": "19473a9b-35f0-47e2-8091-7f51e69fff34" } ] } ], - "ID": "7e4e1270-ac6e-49f3-9ede-e3649fa329bf" + "ID": "0de2c5f2-90c3-4ad0-b486-5efc82a68ce2" } ] } @@ -549,4 +550,4 @@ "PaperSize": {}, "Margin": {} } -}//rqSg0gF727f1YjlttLQTIyKPYcisovGaZUQlVG4XrdYCaKH4WwKUr8ecNNfwGBpoVWjghkvL5GPq7uiRMAJgmSOyUACVSi9/RGno4ezVuh4Yb1ziwO8CdHlTDC2a9glactRSTd1RPlRo1V53q9QWhviryNT+Bsc27LhXwO85l00yT1YO89bBuFV51dUlu28kuqOOs242GUksKDJydHAXe1CF0424+zj89OAXDHp1z9uRhSaRnWk+YubNOFCSMzrV+Ik6XAjS9P+vd/3LnmzrZzsYk45Lj6ccBip0WAg+aq++1Mn6RBUuOfjp3OGz6Tne6UPT6C3uR6DEDvVnQFuSh0/mkqrvk2UNb7KyBwGGSwZCG0+w09d80516J2bPembHsS5nxccRZrxk3NcrC2iZEPJkowTOMccLKgKrtGPR8+WHiiLyyqwDSfU1KOMIGou7LMObwwjrYmMexWgopdSonFLqWRfXhY0e6C51kOFA4pYFxEM2f2YehqOhKz5W2uZXQkkjXggsweeQ+wCpCUvUBS9F6tE7cqLcxKN/xRcN8BtYF36bNAypbgwEjUX63sLD+IG+aFK4dGp1OSO3iq3pPPPHl0mlrQ73vgeKC1qJGa6JoRYOMhZAAGr80n/dFBnuVJ/RDvciefhhfqE24Qi0gb3di7tFHyjK+kffvp5Pkokq40+C/QhQiPqknqTRjbe/IhVH15ep1TGxAHfm3QWTFUCfLdO71xsQY8Uqz5jqy2cxgPyzGvcg1bS8NHGTCQqwreYwLGwmNWfOkzsmPQcjjBrQrPGa5ArOhubi+zx8iPkXukpAe7cfR2hCaSd/nOAltwqNP2SMmuYZQpfPQbR1UdeoaClYdqreMRTWfE5O0hFfwjiOAxG/eyu1DQ0MT9Jd8aSNSiu2GiS7DJyq6/943w==|920 \ No newline at end of file +}//pTFRu188vbF/PSjXE9NtXZuVl5owf+yTeJoMNKakTkYgaKRMRQPPVsZuJh23GD74d7tK/mWvslOKFdlrmvVRcaqIdPr1l5hyGeO0ffD2bp5NfIsATy/mx2AVBbxc1S7TQ8zwUVQEwYBjLFNB9Iz8YhZ95zcIEVJJf50J/BdyWfFVjrbXsQOKTDuG5ZetZxuipWqjzh6zhdIIzgF5LPF5H58EzIVSTzTYgxi+vbHptjTIrrbb/AqWRJCeJ8k2Ba0t7vLazk8yLDjQpYU44+ffjvBaDc6x7ExAobCx+acPN5vKFsvrxNz0gxsir9zEQONC0yBju9odTXwJqrGbw5s3QNvEUBTFBPp0vgS3ilxujDeIHKLy37muiPPOu160EQw6JwnmnyxruSwpTG7kLnY9KJ2cbs1DMCkK0780Ynb1hJchn2kQ/Nix2u1l0vzxo0aX4gpYDqu5psGuui0bY8yxoqT5x8Kgp9DlaERzKrcpqqTz/QTLDRTLImxOzx20+R5kCmSPAPmWPsbgYvvjtt27p2uVAtqA09Ktn88jnja8+4L4i+4j59P/iM5yMXCYy4iz/6HwzeZ2DshLuZtbnwTuEc4BEREWTwWe9EgFhtmqRymOeK3Ds0ZO1IspUh1cybvHzJgO+jZSAyjRZOcN7BJkQyayp9LSOVqBdMpVxwm0AmJCI5iFIQU5t9wbVK/Hy/0qF7yujJ/ioGKXG+NajVPP7tnyCAuvFp91pldgbeDbQqC7fCd12mZtiPIrFzlq7PuP4jLhhfatuj1SGJ/wHnQ/pvhNKD23nnCKG7s6fIKHYIHkQF1OxQSof3/cyxb3BlPFOkd74N0dMoqpXbcwUfAn5nU2oDwkDFQpo1iYJc0JzxDCFmtw12NX8JR/8xPAnHjK3F9fIaZjW7LdbdhcVkYe4g==|920 \ No newline at end of file diff --git a/Pages/5f448cc5e408484e9837a0183cf1365.json b/Pages/5f448cc5e408484e9837a0183cf1365.json index 5533c72a..ee114cae 100644 --- a/Pages/5f448cc5e408484e9837a0183cf1365.json +++ b/Pages/5f448cc5e408484e9837a0183cf1365.json @@ -8,7 +8,12 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 77.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 } }, "2": { @@ -18,11 +23,16 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 25.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 } } }, - "Count": 4, + "Count": 6, "DefaultSize": 15.0 }, "Cols": { @@ -34,22 +44,22 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 24.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 20.0 + "DesignLengthInPixel": 39.0 } }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 10.0 + "DesignLengthInPixel": 39.0 } }, "4": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 79.0 + "DesignLengthInPixel": 24.0 } }, "5": { @@ -62,54 +72,68 @@ "DefaultSize": 15.0 }, "Values": { - "1,4": "执行人", - "2,4": "0/0" + "3,1": "执行人", + "4,1": "0/0" }, "AttachInfos": { - "1,1": { + "1,2": { "CellType": { "$type": "ElementUI.AvatarCellType, ElementUI", "CommandList": [], "icon": { "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", - "Name": "app-logo3.png" - } + "Name": "默认头像 .png" + }, + "badge": "初级工程师", + "showSystemAvatar": true }, - "TemplateCellSource": "头像" - }, - "1,4": { "TemplateCellSource": "执行人" }, - "2,4": { + "3,1": { + "TemplateCellSource": "执行人姓名" + }, + "4,1": { "TemplateCellSource": "工时情况" } }, "StyleDatas": { "Styles": [ { - "FontSize": 13.333333333333332 + "FontFamily": 0 }, { + "FontFamily": 0, + "FontSize": 16.0, + "HorizontalAlignment": 1 + }, + { + "FontFamily": 0, "FontSize": 12.0, - "Foreground": 0 + "Foreground": 2, + "HorizontalAlignment": 1 } ], "Types": { "Strs": [ - "Text 1 50", - "Body" + "Body", + "Center", + "Text 1 50" ] }, "CellStyles": { - "1,4": 0, - "2,4": 1 + "1,2": 0, + "1,3": 0, + "3,1": 1, + "4,1": 2 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 0 } }, "Spans": [ - "1,1,2,2" + "1,2,1,2", + "3,1,1,4", + "4,1,1,4" ], "PageInfo": { "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", @@ -119,4 +143,4 @@ "PaperSize": {}, "Margin": {} } -}//ZykyUhFcgbjXObjrQq6GfuFxcDIH3zBYrCFm8wn9v0saPCMQSk/V/vbsfzoJkMDGE1q3f/Y+jcFgLK7RWFGJM4WRq/kCR+bcMQyagI4Zb9JX2uoYlwLqJ+18YbYW+w9zNQpprGHoMe1k4GXJpUeB/kUwKeHN8itWmi1iVMFGi1WE5IWTnRBkwdGRmNcTJGd6e++gGqjArbruC2hYo2SL7huO3HVxGmPQFiFfmMK5KrRLXYlvpDiJ1HUnhce58Q9gaxd5OsTYGQMo2MGIRgNM14YoxzYK42iopSgw1lj28c18aiRGnR6Z4gO4463Fs+2wR39b03vcIxnDFvu1CMHji8iIYkss8zq3nzb0tYyoFmYg3lPczvsEcceHrgCbZrHgcnvpztEjRrmrWtZ3LC/j/NyEiRqY0P7b7hpzZQW5UlTrxXEM0GzOXU57ktYMECrxAkIN2P6pYS1z9fRy9f1biY/Gh6PY2QIbeiuZMaZlwIx72tm6LzoNrim/kCD5nqXF+HgR0MWOD6zc6yUhNHRQnT9roROhlqBpC28jF1HpadaxWIYnG1DSL/UZbC9TqHe92TjaDu5qNSR3jLxeYN+He7JeTQUGs7gwhAr36jYptl32LI0fFp8uR+5L9280GMPe2YDIu6QQz+svE3H/ScwFeZuLe6rCFu12hKnkyf+J5GS2jVRRRvd+U3l+WlbS5c8lNh6Utuk2IL8U9E7XCijKmCW8EIy1qvU8XNYQ5lC9awWA2ZivY/51bKkMas8HSpd117OF+s6HlaEfa60YBrqyoXKtMsJ8XReJlY/euxLfQVvkFcxvQMsUl43wPAdW4Y4U8J2vyrnAUIPqGMzy/wbSrg84gf1i8xPV8ca/CCaw8y07mRKMs5baVTceJSt51ULIiLsc0by7r0rSRQEIs8Dgdg==|920 \ No newline at end of file +}//HPpArMuqS53AVLQNK4SAfvaAVWP+PygKjDgnjxp6uzqz3VeXopU6gFgNEcm2afmnHAgpWQA22toRcCH7qen7aW30wLo2I2gmX9e339cyrDxROcNufmP/htxttSi4SjNw+T16bfVduOMcQtcBU2ebSGZ4qBaht05QnMn3GJ9dZ6ybHI/tVQfv7AT7REirVR49wDzkB2pCKELLZ2C1anV23EogbVAB/3WvMCoI3pXGNIRIlFejVUTpAHVR/ZyhKr8Q4sCB4MX+J4BAmxVcnmIwX87Ie9k2nD+mGKZg0dUZf9prcl5MEs1SYK45j2Tl1bTqviUpxxBWMurT+qSfAg9ifGpTFacw92DEb1CbFJTVQgyPUnE6fY+nUeHrufMxNhuGRUBnAwjL3SNtaxfmv8O4LdrvZ0CKqfnPXwyACBFZtiKa5af36eN5TPvlFC+5jChKyX/9mTX4LSZeokelIyTsiQM/LzHnWsO8z95+wtE+LW4D/+kX11B+eppnVWdduLQr7jzjX26Hxx3X8rSL6DrsIoNOhb/rzEtyv088CP3u7InSTTHAK4Yrf0hVhGsBzFy2QkU84LV6O11ay1xRyVNNZonWu53D7bRjeKERC3lnu9UmqGQlzwNhoHvdZqJ8DZzIxtATSOoTsJA41AsE86bNPOloeZbimvvrGx8JcUXs5RSQGmei7umO9tuLxwZprWGjPdd0eR6jLfi+89CDLL1qoGC5b/EqHhD8HY5h//jm/YGX3l/yFvYWKnTLzA1t6K/nkGKmFW7zloZVedCjahd26QbHKVet9KcA9qhjwnV0xspYMqrn1qUxqQ7YpcKDn821iUx2/i4P/wX/gf+fz3D1Ecg8X0NkPMY56wE4vwu3TzJfH2o0zzWzNz8BjjuvgpCkpilTj6iH5tbNLx2rd8/0wA==|920 \ No newline at end of file diff --git a/Pages/5f448cc5e408484e9837a0183cf1365.rd b/Pages/5f448cc5e408484e9837a0183cf1365.rd index ad4c0293..56ad5d86 100644 --- a/Pages/5f448cc5e408484e9837a0183cf1365.rd +++ b/Pages/5f448cc5e408484e9837a0183cf1365.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 6, - "RowCount": 4 + "RowCount": 6 } \ No newline at end of file diff --git a/Pages/6899a8cead694b3ba00307b6756dbd7.json b/Pages/6899a8cead694b3ba00307b6756dbd7.json new file mode 100644 index 00000000..3f6f07ce --- /dev/null +++ b/Pages/6899a8cead694b3ba00307b6756dbd7.json @@ -0,0 +1,160 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 26.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 10.0 + } + } + }, + "Count": 6, + "DefaultSize": 10.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 14 + }, + "Values": { + "1,1": "执行人", + "1,8": 0, + "3,1": 0, + "4,1": 0 + }, + "AttachInfos": { + "1,1": { + "TemplateCellSource": "执行人姓名" + }, + "1,8": { + "TemplateCellSource": "总工时" + }, + "3,1": { + "TemplateCellSource": "平均时薪" + }, + "4,1": { + "TemplateCellSource": "总提成" + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332 + }, + { + "FontSize": 16.0, + "Foreground": 0, + "Formatter": 1 + }, + { + "FontFamily": 2 + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 4, + "HorizontalAlignment": 5 + }, + { + "FontSize": 13.333333333333332, + "Foreground": 3, + "Formatter": 6, + "HorizontalAlignment": 5 + } + ], + "Types": { + "Strs": [ + "#FFFF0000", + "0.0\"小时\"", + "Body", + "Text 1 50", + "\"平均时薪：\"¥#,##0.00_)", + "Left", + "\"预计收益：\"¥#,##0.00_)" + ] + }, + "CellStyles": { + "1,1": 0, + "1,8": 1, + "3,0": 2, + "3,1": 3, + "3,2": 2, + "3,3": 2, + "3,4": 2, + "3,5": 2, + "3,6": 2, + "3,7": 2, + "3,8": 2, + "3,9": 2, + "3,10": 2, + "3,11": 2, + "3,12": 2, + "3,13": 2, + "4,1": 4 + }, + "SheetStyle": { + "FontFamily": 2 + } + }, + "Spans": [ + "1,1,1,7", + "1,8,1,5", + "4,1,1,9", + "3,1,1,9" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon", + "ParentPageName": "项目成员" + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + } +}//eMOh40/TLJmYGCua46SYjP2eWaxcA/GbWbGb586yVfBfOlONx9VC+2Fs0Mut8tcVqtz02VKlUxQrJBzgGFwoyIXAX3eCrzdJFGaiAospjTNUIwwUYswOL0b0C79Nm1Fi7kL0ZASJ2+2dn6K7urdQuSliwFX38w/keGb4ieqJw1Km/yUQtr4wVQ5STrfIjOlysQeO3ncYYbiE2YVTTtFRs06IGVTPKO7tMfnsupL0DV9gY8448LLyR4Kibe7c6XoQd44LM6gxzHcocl3uSvvIKV5cd0qk+HQXA/8KAGlOragBxDG3Mr1Tvf24ZWtP3rVFiEhzWvnqlp/3QPfNufFe252hJgdGS6Ohxp9jQQ8C/3svBvbUPkuCPSP2UteLkRcFjWtnbX/hQ74AWC2fR9/aWOPt8ucuRQZaBGVV96iqfpdkK2kAiUJrBAHZX3vWjfhdynFXwxA4uhmGO9mqXh/aqWU1K5u2MBML4+bfuRE4yM+oPld18BHzfHdIKd1onVgzOKjOO0DUADR4fbK0WqCeHhiyJP30wQ7mfUZVxrwOvOucQs6x/Z1k/f6IdGnvxlhcVk9GNxjs9ArLRiJNBy2E5ksOYlGCk6ZXdjDUS9eGDD4Ob0qhBwvrG7ri9HlD5yTfCqD7DOF2o2CLmcvecy9SAWHYNF/GlOaYZJdqPRXJjqK+T7D20TF/qWazIGJQEgXO2jZ/DLq1QebuIShQJ5ap4RDfKZiHH43+XCwhkWCZL1ad9QEuMsPwfLq/GHrfslqHL9GFuONGw3p8vZFdrTDb30cxWbZ1l8Xhh9EWywaQVzITx/8Yy9FtwwPxk3EJgyZ+64j9ZcovlqIyb0FMKQI1M3l8SEzX/D0PFKwM40A00NRRKzoQH6igSvoeRrIsmAohrAIQSBwz/lkVvzX2Ougqjg==|920 \ No newline at end of file diff --git a/Pages/6899a8cead694b3ba00307b6756dbd7.rd b/Pages/6899a8cead694b3ba00307b6756dbd7.rd new file mode 100644 index 00000000..c667b117 --- /dev/null +++ b/Pages/6899a8cead694b3ba00307b6756dbd7.rd @@ -0,0 +1,5 @@ +{ + "PageType": 2, + "ColumnCount": 14, + "RowCount": 6 +} \ No newline at end of file diff --git a/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json index 2e26c193..dcedab2c 100644 --- a/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json +++ b/Pages/9d9faa04d5a74f1dbf8dd3b2040b6f6.json @@ -55,6 +55,10 @@ "CellType": { "$type": "ElementUI.AvatarCellType, ElementUI", "CommandList": [], + "icon": { + "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin", + "Name": "默认头像 .png" + }, "showSystemAvatar": true }, "TemplateCellSource": "用户名" @@ -96,4 +100,4 @@ "PaperSize": {}, "Margin": {} } -}//K2stV+wQ1luCG4lCN0o/D2bZo8CuOW35fITRzFL68DlP3DYsdhVcPLS438qvC19E2kAAdb8igkez0791Yfve62IxSgWxGbBXFCzvp0WwBgURJ4iAyMGpqMxxqOJzQ3M5ZJVv3r0rQndw6qcz9omC+BK066JGFR59SPJcUJbHMmM+/cBPyBofuvIbm2Yuk0x8dS2nMxVj2TeMlVhWEbyVBHfG/F4CmPpMvSzc0QhJ66tS50kML6gCXbRIu3wnNJQUzttfhYs5ROUWdfOUgFY/zQzXnl4DFFQt/HZUr5oEzcerFOaad7kE7c9GUGLhWN193iUuB06ZE+Jrd+VnhtFtxoT/RszK/D3e2MHLGzg3V3t9bfUJ+EHKlM4N9gEz7ygBdtniP0P2oHFhPM+NBx3jH9XNtBIJIk1vS9MlO/4Skv2nWDWNpCF2mFbR5UKCtzC/DV7sc3efKTtUxjsm9YhU+0sfqHBO0xLBMlqmkZ5QcxTIRptPvv9FLL9H01fXMEJutTUy5/lmtd2ldxh52WS2NNcRb4VbPES6DSwmn9L+lCckfkmGgT90W2KooySQESv59GywMoV5dCy5t/RVaVuv+gCZmQArTCzkHPybCbG63cZP49JSmgJiPLBxmxoPbvlSAP2xjcmeUMjA86eqVn1/T90aTmAN3qduxxE2dsTeEisI5G5ekZD6W5g1TGA9uyYUakyGUyhS6M5cchp4EwV2KDDHusrjabi1V63TZrmqMrJhUhYmyDSZMjfEPO51mgS+wDzzNUsTRRvFh3/gOvGiTwzvN1g5EVrjKfmFM4E7Dp+GkjUV92C4zh3xQmICxe7VtwEurLKTO/iC6GZ5VI2TRo59JtlwLz/nYnThqxb8UUIIph6t+NEbJg8nYnAbi9J64BSqgHG93fobLQ4aC1GAxQ==|920 \ No newline at end of file +}//b2uK1UtNDc3vDSVddF2njih6YfSe2Uxwv7M3s1SgDeNRgxZxePt54AQB8mopt9IjKCbAAlY1iGYjmEyxEx6ambsotF/b9WIVSMagClGS1ykaKsn+XPj7E2DyaPyj/7HJ4EuOredcQ/tupSqjgwnsGoVdMcaclLEx7wZ9gT/T7GdTxbCsg8ZeoXIoLNx3WtlcGb/qtabZAc9KocTvng2xlKeNyjxDOXYKvOyGaEnFrnuvRgK05be1/B24mCMOC9TsKz8C6cgXS9ZRdaaxyOGNtSlL9jNjgKNgXSvBhrK0dxHRDP9vY9rUgBtV1D+TLTqqGSspCya98ZQH2b7IWQfoJTEyFGLHUd2mrcFRMeWLJRFMG25lP4E6yfaoL2oQ3hpb8CfvlIHda9sLGaw+kTEvoDvKt6nL1oKYHRhFTlsKh3f2+VQMtM+0iOk3+98cQ3lfZ7oP8mP9G9jussbphZf1Uy9xz6Fvt04IJiXx5nJ8W+m+yXK3bQ5oqsYq7S67H4WI820y3qNmKlUIdZLtUmS5iGAhEumPu6EddyW3Djqi5B3HN17XV+8ccSY0lSC12bcacUrs9WQ3lEAAOnbMy1T9XjHmLuCw1+7ZdA5iJlOPoF8c1VeMJQVkQ9+RXYcT9/qxTlUPZTrKejFhtlsL1nvQh45IGjGpnZC9XM4RhOtgBHWQFvydFLGoNDNo8+772yTMAqsb+Y9eKBKsgQkSQJMJ3OHivFYl6aA4Nz1UnB3lmdIYa2gBmsQZhEyOGym7Pn3kWLmn3xXO98xsrCSmZJU849FwDetw4LMgH7o2A1HCTr6MezNksp2pEyi0d3BavU1wibrIecrNjEi2QdHkbsQGSdSNcCidSIUE5r1kBzkT9BNdBmOqS8v/hnmIAxEe/9iBYvfVB8R0+LptZqRyb3j+Nw==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.json b/Pages/b90932e038f94707b54e571ff7cd84d.json index 78065912..a82d43b5 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.json +++ b/Pages/b90932e038f94707b54e571ff7cd84d.json @@ -20,18 +20,9 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 22.0, - "IsHidden": true - } } }, - "InLogicalVisibleIndexes": [ - 4 - ], - "Count": 5, + "Count": 4, "DefaultSize": 10.0 }, "Cols": { @@ -62,188 +53,6 @@ "2,1": { "CssName": "ec-label", "TemplateCellSource": "项目名称" - }, - "4,1": { - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "回调值", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B5" - }, - "ID": "fca787aebd60472ca78e90305b6d4689" - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!回调值" - } - ] - }, - "value": "%Null%", - "compareType": 1 - }, - "CommandList": [ - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ - { - "TargetCells": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!B5" - }, - "Value": "%Null%" - } - ] - }, - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!回调值" - } - ] - }, - "value": "编辑" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", - "ShareCommandContainerRefer": { - "ShareCommandContainerID": "26f70fca-3984-43f6-a8a2-143eb5d48c1d" - } - } - ], - "ID": "9016b27f-6105-44de-92fe-bfc24736fce9" - }, - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", - "cellLocations": [ - { - "SerializeProperty": "=b90932e038f94707b54e571ff7cd84d!回调值" - } - ] - }, - "value": "删除" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", - "SubConditions": [ - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", - "tableData": { - "TableName": "项目表", - "ColumnName": "项目经理", - "GUID": "1afadd5b-cf71-4c7c-ac28-eb41831509fd" - } - }, - "value": "%CurrentUser.UserName%" - }, - { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionCurrentUserInfoParam, ServerDesignerCommon", - "currentUserProperty": { - "UserProperty": "用户名" - } - }, - "value": "Administrator" - } - ], - "RelationType": 1 - }, - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Confirm_Command, Notiflix_Forguncy", - "Title": "提示", - "Message": "确认将此项目移到回收站吗？", - "Answer": "我已确认", - "OklButton": "确认", - "CancelButton": "取消", - "OkButtonCommand": { - "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", - "Commands": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "项目表", - "ShowConfirm": false, - "UpdateBindingValues": [ - { - "BindingInfo": { - "TableName": "项目表", - "ColumnName": "删除", - "GUID": "aace6039-c9b7-4203-b106-44d7074056ef" - }, - "Value": "1" - } - ] - } - ], - "ParamProperties": { - "context": "上下文", - "inputContent": "用户输入内容" - } - } - } - ], - "ID": "e57643cd-4cb2-4dc3-98e6-ff1f80e2a23d" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": "无删除该项目权限" - } - ], - "ID": "6ac0801e-7009-4d0c-99c9-57dc4bbdc1bf" - } - ] - } - ], - "ID": "f4514737-1cfd-41c0-98ac-2e604d064bb9" - } - ] - } - ], - "ID": "8552871b-e6dd-4150-92a6-aaed711794f9" - } - ] - } - ] - } } }, "StyleDatas": { @@ -255,29 +64,20 @@ { "FontSize": 16.0, "HorizontalAlignment": 0 - }, - { - "Background": 1, - "FontSize": 16.0, - "Formatter": 2, - "HorizontalAlignment": 0 } ], "Types": { "Strs": [ "Center", - "#FFFFFF00", - "@", "Body" ] }, "CellStyles": { "2,1": 0, - "3,1": 1, - "4,1": 2 + "3,1": 1 }, "SheetStyle": { - "FontFamily": 3 + "FontFamily": 1 } }, "Spans": [ @@ -342,23 +142,14 @@ }, "CommandList": [ { - "$type": "Forguncy.Model.ShareCommand, ServerDesignerCommon", - "ShareCommandContainerRefer": { - "ShareCommandContainerID": "26f70fca-3984-43f6-a8a2-143eb5d48c1d" - }, - "Params": [ - { - "ParamReferObject": { - "ParamID": "4eb86791-f7de-426d-a433-ddfb616e730e", - "ShareCommandContainerReferObject": { - "ShareCommandContainerID": "26f70fca-3984-43f6-a8a2-143eb5d48c1d" - } - } - } - ] + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 3, + "DrawerDirection": 3, + "ShowDrawerHeader": true, + "PageName": "项目信息" } ], - "ID": "ce0c3583-b2d3-45e6-b8f0-44b7c84f99da" + "ID": "c30f7a90-98ab-4524-b795-ea6f21888bf4" }, { "Condition": { @@ -440,7 +231,7 @@ } } ], - "ID": "80e87aba-689d-4988-b05a-d24d9dda8717" + "ID": "dea25a5c-ac65-4e02-a9cc-8c0b7d650084" }, { "CommandList": [ @@ -450,17 +241,17 @@ "Message": "无删除该项目权限" } ], - "ID": "fb1fac4b-ff4b-429e-b1e0-1dbd163c7705" + "ID": "5a3a67ab-7b07-4aa3-8048-2c7744567fdc" } ] } ], - "ID": "254a001b-9e47-4125-9ba3-ed575e15d910" + "ID": "d7f23333-8648-49db-abd5-bd0ece404f30" } ] } ], - "ID": "3b5e071f-ebd6-4289-a7d7-0de35669dd44" + "ID": "bbe8c8e0-a08f-464a-8399-cc11a3531eb0" } ] } @@ -477,4 +268,4 @@ "Size": "17,18" } ] -}//YIGE/G//NAvnXdQfvD8H7rcf6olYdu7xI6eMbv5cxvzrXc0P7Qtxv2mIVVr9yr1+WsrVYvD0dBWgQ/aHBpm2/vuXik6puvJoXOE5UvA30ksitE0MAFhaGrUMscKBl46I+8CgnhYhOueSHuF3FFcvhxSDt7l+QSOM1gZt3XnHhb5u+5CAxBwdsgbw57ggI6DzzOrn/HaIa4BG+7mEY6EpLkLwbMQANMTGNlizHkUGPZEyQ7gap8ZPhNpzlRLtd1XyuTehqGdzdJMoOVVlKMPUrpG3db/KAXthzQcmpnQC7/aZPA5l9KOE+119Iqy9EExeEQx0RPtood7NjX5ZM4gtdD0DF00DPTijE5C6VJNNcgDdizac2eUZTCJ4wdQDj1OyDdsp97eVs+ZVeaAN2rod6IlXpN7IYCHKClivWsoUzGZMf9KTtBYShcHDO8I4UG2gWEOQryxObAPp8ZTdE60h+6nv6HtH+qNvp/cjb/rLvdZWcneTyTFAERtWB6QnHs7F2w4qJhCPQ5zLgBBSdeeGk6bhwQO3C6R6mBiUrq5690X1Y1mvFXB+aN2tbQhtCHn39Ugdp7FgR7PADAmWBr76FzKFNXSebnWD4IMQIPa0eiZKz7hzGZx8fZ7OsDZJgexywQ/zs3uMJSU5MVBYSCmTSYKiqctGMLX4deIIlzpOSm+Z3hiapIwL6JAnjpVUKK5Sy2vhXmpZelxwJ+r8MPdma9M/w2zZARTut3zbIKaQHEbblOo8rdx9GFAMJ/BhdjbCKHLonUJ5WdcsAUQELt9tTE/2ndzeJB8VSahyqEZnP7saegajXwNW+rug2n/wAA4QWYQDyUG/gvJjNd0mbwIdjaxBMOUxbP4qBWNGEtckNDv38f2F57VUgogfvKj244kZFM0Ad0tK+5jAx0yKBLVoMw==|920 \ No newline at end of file +}//J5ttnm2Q2RXAxJfmA0Sc4/rriK9Pq4Os7FzmjNDkXaTAkmRubOCRd26TZr+ksEElySHXHo72ozB1CLPefjbikQdN5c473WYtliN7CRYUopKsw3WWXNa1G2RqltcbcL+r1D6J4zT+pnDNpUow2ShduAdiXdFyxegg9bO4uvwETxvHCOEb9wcYph095WhgMhIhOqfYdSa3tw4Hh/NX8PGizWQNtq5cOewpNxJUlpzy7Wbna1U1R31y3bDjsXNQYoc+KYcpsUjakFm0OackdQBe2qSYvh2IW2EJXwdMFYNxXpTqm6Zts9KZno/fRlnL3E30glNG3kmaaVJ5IIz49rIekjjQtLQhNlpkRWOzralOinXm5clv55NuYhghcpqvlTEgXKlNdPpIg0w++X9cIGBKeveFcQZSu+E/iU9bMloX9CMjuttXBwsocyoFeZzqSNZybhSNlQWC8F3l3HgnE7z6oJSXLA7I4GBhMuQ/YE+perbIr5ZESzV0LPBWFz1oriI3MZKBSmaXbEojXTZ3qSO7rjznJTYLe6qdrqhlhvWaP+A6GV8fzUxBOzP1/q2pzzrUJY2+8IF05H93bsPp36lItn7E4FH8YMa4Nme02J0oBBf6fb5hlcEGG2Kp7tF4FbJ8q4AHfI9cWKGE5KJgd4XsGohQcKaHA8S9Uxv9qXjqZaP1OCfuh86UJR/LVWCPBgWsUylLVxpg6mKGKqXxQPROGayEua7awhJ6Mh341Dxh51O4I2aAMk4kBvdYo0CjL5bjHHpO3HM3APc1+RdnfwAVjf4BU3fKmuPSelpiXQ530Cxw7Uu1XACxLcSrEBxF4t26WYcX8Z4aUN11WWHAH3IkjmikhlsI0MSgQp2lL/ZH8MFDSdhinG4SkDcB8GgSmrUjqBR2rHE2U6kjz5S0Z+nGjg==|920 \ No newline at end of file diff --git a/Pages/b90932e038f94707b54e571ff7cd84d.rd b/Pages/b90932e038f94707b54e571ff7cd84d.rd index fbd38a34..0787c20b 100644 --- a/Pages/b90932e038f94707b54e571ff7cd84d.rd +++ b/Pages/b90932e038f94707b54e571ff7cd84d.rd @@ -1,5 +1,5 @@ { "PageType": 2, "ColumnCount": 3, - "RowCount": 5 + "RowCount": 4 } \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json index 6255f3f5..b958ea3a 100644 --- a/Pages/任务/任务-任务信息.json +++ b/Pages/任务/任务-任务信息.json @@ -159,10 +159,6 @@ "7,1": "备注", "7,2": "编辑" }, - "Formulas": { - "4,2": "IF(ISBLANK(C11),\"\",C11)", - "8,2": "H11" - }, "AttachInfos": { "0,26": { "CellType": { @@ -302,12 +298,48 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 2, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false + } + ], + "ID": "df756569-45a8-4210-bb9a-409993fa7780" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "编辑内容": "编辑内容" + } + }, "PageName": "MD编辑器", "PassValues": [ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!C11" + "SerializeProperty": "='任务-任务信息'!C5" }, "TargetCell": { "SerializeProperty": "=MD编辑器!编辑器" @@ -322,9 +354,15 @@ } }, "4,2": { + "BindingInfo": { + "TableName": "任务表", + "ColumnName": "任务说明", + "GUID": "5de4a783-a19d-4843-ac90-55461bf4b5c1" + }, "CellType": { - "$type": "editormdPlugin.editormdPlugin, editormdPlugin", - "Pren": true + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", + "ShowToolBars": false, + "ReadOnly": true } }, "7,2": { @@ -333,12 +371,48 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 2, + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "任务表", + "ShowConfirm": false + } + ], + "ID": "ff4d107d-703c-4448-acef-8eb527887cca" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "编辑内容": "编辑内容" + } + }, "PageName": "MD编辑器", "PassValues": [ { "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "='任务-任务信息'!H11" + "SerializeProperty": "='任务-任务信息'!C9" }, "TargetCell": { "SerializeProperty": "=MD编辑器!编辑器" @@ -353,103 +427,15 @@ } }, "8,2": { - "CellType": { - "$type": "editormdPlugin.editormdPlugin, editormdPlugin", - "Pren": true - } - }, - "10,2": { - "BindingInfo": { - "TableName": "任务表", - "ColumnName": "任务说明", - "GUID": "fe35b0eb-a489-4b70-856a-b50c20e905f7" - }, - "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } - }, - "value": "passValue" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false - }, - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "保存成功" - } - ], - "ID": "31f8ca46-f73c-4b96-a183-9d2e0b2b10bb" - } - ] - } - ] - } - }, - "10,7": { "BindingInfo": { "TableName": "任务表", "ColumnName": "备注", - "GUID": "e0537eca-0629-4a5e-90db-fea03812aa00" + "GUID": "fecf0fd6-4b27-48f8-b24d-0d0cbeedf728" }, "CellType": { - "$type": "Forguncy.TextCellType, ServerDesignerCommon", - "SavedValidators": [ - { - "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" - } - ], - "TemplateKey": "_RS_NewLittleRoundCorner", - "CommandList": [ - { - "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", - "ConditionAndCommandPairList": [ - { - "Condition": { - "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", - "param": { - "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", - "contextProperty": { - "Display": "值变更原因" - } - }, - "value": "passValue" - }, - "CommandList": [ - { - "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", - "TableName": "任务表", - "ShowConfirm": false - }, - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "Message": "保存成功" - } - ], - "ID": "e49bd787-13e0-4c6e-b671-e0987e4e7ddf" - } - ] - } - ] + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", + "ShowToolBars": false, + "ReadOnly": true } }, "10,25": { @@ -527,9 +513,7 @@ "Underline": false }, { - "FontFamily": 1, - "FontSize": 13.333333333333332, - "Formatter": 6 + "FontSize": -1.0 }, { "Foreground": 2 @@ -542,8 +526,7 @@ "Text 1 50", "[AUTO]General", "Center", - "Left", - "@" + "Left" ] }, "CellStyles": { @@ -596,7 +579,16 @@ "10,0": 2, "10,1": 3, "10,2": 7, + "10,3": 7, + "10,4": 7, + "10,5": 7, + "10,6": 7, "10,7": 7, + "10,8": 7, + "10,9": 7, + "10,10": 7, + "10,11": 7, + "10,12": 7, "10,13": 2, "10,14": 2, "10,15": 2, @@ -622,14 +614,12 @@ "Spans": [ "3,2,1,3", "7,2,1,3", - "10,2,1,5", - "10,7,1,6", - "4,2,2,26", - "8,2,2,26", "10,25,1,3", "0,26,1,2", "1,26,1,2", - "1,2,1,8" + "1,2,1,8", + "4,2,2,26", + "8,2,2,26" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -655,4 +645,4 @@ "PaperSize": {}, "Margin": {} } -}//Tvtsw2lfSZMXF61HrsW19gzSwyBX/3dSi8NcR4a4LX0eWDLL+MywlWtpBF05mQZai5oYfiqOIGev6cwCOp5ldX6jofS9klqcDzjWuyKdgjdd77wQdqLnTKyjS5ktfF3CqNU5NuzMqewEPLl/EXLCtj6Ug2/U4sDmjnIWzdDgbNeITEeE1DkLu/qk2T7hGLmfvjPNMSaRbeWnBclRdQjE51JtqRnSn8V+NWY6qcPMn8hCmiwokNVQ9HnB23RPV+OYQCDZsNIqAXSXvvC2P5YXnD1epy/YFe+wNIqgyRu3VkTnF9QqUo2/Yah+yoXQQBCdThxAaK2x3NzrWzu5Oqz8rsCAUE5Or4v1ct+mmv0VMJktYXoIPfItlYU/PRtdTQ5EsgKi/u+Ttf0zWAk4tLhUbbxsJ0TG8ygyf2dkDHGsT9VA5jHJpGZGcty+tOqa7ornXAMEpekbvwM0mZuYlzwI7fMcBkXT5NQ6OExP75ulVY2JhT1VWOKTzRal8ccnOHAZUfgAKWAvaJ1glWsQiysqYaSqLAT6A0U8Rdq4UH4mo07tNp8X9oP/YGahe9Z3ZGn+c6JzdcI4aw34FvIUeZmjNwQyhEomSkQxwHOsSATdT9wFHCNBbx/Wx/9fQmqHml+YdCMmUcmSlvddkXkaMHPA87Z2JZ8HsQ69iV247843Z1SJBR2c8NeSi/IzhADxbJli5zsgSbVDxDXrbvb+pDFk2xa3z53ZzH5Zffew3WuSxBhd72a9kaTrXl8FPFpbKD6u0jC1PKMX5RUSTp+XW+nv/SxNIO6A+hCxKxBBJSIZJVmLiUKP/y3KHhnYROhsoBU5Gol6hPZ7M4SRd13uG+YzPHFgRRFG6veiolREUZ6ir/1jmD+IKzdsbVdJsfQ5B8ou+1l4gqqScPPGI1l6+ImnIg==|920 \ No newline at end of file +}//TFa+HqwmLNE2lkRzSuJBdUtwLAPpYuN1RurnOMOjBT08yY86k3Yfaf9w7/55cRsZmCU8VF5QA4tQ3cmBmh0E5fq0j5DadQntVYyDjHqNGhkTyQ4DxlEMMOWMbCHfG2QBTKDbkicZ2NawSrfx8PlSBIxzmH9r63y3ZrralC9gfynwzs4LT79lPE3UCF26u0IGbJDR90EeALYiCjEuPJdxsdCWtgQzNRUUWJ7/VigBbvRIsN3rkPKm3POTV010QN2uXHyhOrHJKXltX9r95IRI+a3joPPqfkmrAK/DROIKATi7lPzZR9RFrxoriRjUulkK0g59WEPo53F2vQo68+hBbwh2K9pLC04T93RcmL6gLIjtxMZIdeYafRhdXNByZxOWhNpnuvjAOXS5ckYfEDxia/KJ02p3XadtiOatgTK1YMF1Ii7lJUFM6f9hRlW+maEBFD9tw262u8HLFIcmj8RlI8fDBYEgUaSvvcSrJzmIL3lfnV0/xVSVVg6KCyXwxKlp57p+TLDclsfcGbR7tupARLzWaMxX5mIva/r46HNLKrNjUgbONDAmVZfb8EfiwddOFHMqjltygtb3MKZrHbKpT1qLMyA5pQaZJwH3YIKt2R9rIxC1uoKAzAoGfwzk2HD1x63Gnp71LT5gEJJPNwgQvBI1+IzuxWLHr3tKZQg3E1qQcT8wrGqS+Ve/W0Xlv9ha4pLddviortU4Leq3p40TjwO/yYw12HbERbfVSiSF1o2ezSeCTFZbS/v4M3sh6+8FIQddbeIxlJcS0c9zdoTspzq1EFMAzcihSkuR7sl/yiXjBrBZB66+h4DxhM1JHCyAcWJvr8+YnTqjKAaUOd05ft90wSVrz1dy4RjWH5d3aiemZIc9yNNY2HmvgMBdrpV95sXMw6aHY0ynQYSQ+o0l8Q==|920 \ No newline at end of file diff --git a/Pages/任务/任务-任务信息.rd b/Pages/任务/任务-任务信息.rd index 1072a31f..e6e82d99 100644 --- a/Pages/任务/任务-任务信息.rd +++ b/Pages/任务/任务-任务信息.rd @@ -1,9 +1,5 @@ { "PageType": 0, "ColumnCount": 28, - "RowCount": 11, - "Formulas": { - "4,2": "IF(ISBLANK(C11),\"\",C11)", - "8,2": "H11" - } + "RowCount": 11 } \ No newline at end of file diff --git a/Pages/任务/参与成员管理.json b/Pages/任务/参与成员管理.json index d658822d..6a523abc 100644 --- a/Pages/任务/参与成员管理.json +++ b/Pages/任务/参与成员管理.json @@ -149,42 +149,62 @@ "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", "ParameterName": "成员", "TableValue": { - "TableName": "用户信息视图", + "TableName": "项目成员表", "TableValueType": 1, "BindingInfos": [ { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "d6211ba2-6928-4c58-94ef-794dc7ac8216" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "415c3a61-4562-49f0-ab72-b070114fb3e0" }, - "ColumnName": "用户名" + "ColumnName": "项目成员" }, { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "默认时薪", - "GUID": "5a5eba6a-a930-476d-a586-746f653ba504" + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "5bc27408-12cf-4781-b629-1f03c950e669" }, - "ColumnName": "默认时薪" + "ColumnName": "岗位ID" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "13f292e5-2544-4803-9fa6-8d2d6430b3ea", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "默认时薪" + } + }, + "ColumnName": "岗位默认时薪" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "be365809-71b0-4c42-96f9-5a48e43f2eff" + }, + "ColumnName": "人员默认时薪" } ], "SqlCondition": { "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "95aaa323-608a-4109-b726-399032580ebc" + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "2f594d01-dffd-4dc9-99f4-fcc3d29f63f9" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", "SerializeProperty": "=参与成员管理!B2" } }, - "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "3f928864780245229740df6621f52b79" + "ID": "4550405b5d2e4868a21bae55dca59b98" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -196,7 +216,7 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=参与成员管理!成员.默认时薪" + "SerializeProperty": "=成员" } ] }, @@ -216,11 +236,18 @@ "SerializeProperty": "=参与成员管理!成员.用户名" } }, + { + "Column": "岗位ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!成员.岗位ID" + } + }, { "Column": "任务时薪", "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!成员.默认时薪" + "SerializeProperty": "=IF(参与成员管理!成员.人员默认时薪=\"\",参与成员管理!成员.岗位默认时薪,参与成员管理!成员.人员默认时薪)" } } ] @@ -238,7 +265,7 @@ ] } ], - "ID": "b7477635-5154-4872-bb8d-58a6d892f410" + "ID": "c934ad2a-5331-42e9-b9de-31fab94773c4" }, { "CommandList": [ @@ -250,7 +277,7 @@ "BtnText": "知道了" } ], - "ID": "9a103b19-dec1-41b9-8078-2f015da3a78c" + "ID": "2475db15-160c-4598-8015-b1075b00c5ae" } ] }, @@ -306,36 +333,39 @@ ], "bindingOptions": { "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", - "TableName": "用户信息视图", + "TableName": "项目成员表", "BindingInfos": [ { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "c2737a58-4d2f-4cd7-afb6-20a40bb55ea7" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "4d97fda7-da74-47da-839d-9fc789e6e43d" }, "ColumnName": "value" }, { "BindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "全名", - "GUID": "f81f0f2e-8c03-4768-b6b6-ed19d0ca0135" + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "9d9741e7-d136-4a1d-bd47-d8ca4d6b15fa", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } }, "ColumnName": "label" } ], "SqlCondition": { - "$type": "ForguncyDataAccess.TextCESqlCondition, ForguncyDataAccess", - "CompareType": 9, + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", "ColumnBindingInfo": { - "TableName": "用户信息视图", - "ColumnName": "用户名", - "GUID": "227474e3-c33b-426e-8d36-cbb9f9b07772" + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "64b845f9-1031-4683-803e-781b50274e2a" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=参与成员管理!B10" + "SerializeProperty": "=参与成员管理!项目ID" } }, "NullFormulaValueQueryPolicy": 1, @@ -380,7 +410,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "参与人", - "GUID": "00a3da47-5f44-41ea-bc29-c0aeff935fa2" + "GUID": "81dd6796-2408-403d-88f4-50555d01386c" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -407,7 +437,7 @@ "BindingInfo": { "TableName": "任务成员表", "ColumnName": "岗位ID", - "GUID": "281a95fc-48ed-4a44-9b90-095cadc63253" + "GUID": "a8ef53da-a823-49bf-997c-e8e45ad57e77" }, "CellType": { "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon", @@ -498,7 +528,7 @@ "NullFormulaValueQueryPolicy": 0, "TopCount": "1" }, - "ID": "c112760f865a44f1b4a616a26964eee9" + "ID": "4b5d495055194f0aafeb67abdb229b89" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -507,6 +537,16 @@ "Condition": { "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionContextPropertyParam, ServerDesignerCommon", + "contextProperty": { + "Display": "值变更原因" + } + }, + "value": "userInput" + }, { "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", "param": { @@ -606,12 +646,12 @@ "UpdateRowType": 3 } ], - "ID": "a8a27c0b-8852-4d00-9118-5514a0cf9ea1" + "ID": "d538bb51-1227-4fa6-96a4-80709493b4ba" } ] } ], - "ID": "9be4719b-2262-4a29-b4c3-088e42a01edd" + "ID": "526a55fc-e56f-43ec-ac95-41a5d05337cf" } ] } @@ -663,7 +703,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目ID", - "GUID": "392dbb09-595c-49ec-81f6-4df46083874c" + "GUID": "38411657-ff8c-45e1-843f-71ca54e57bf4" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -674,7 +714,7 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "项目动态", - "GUID": "9530bf77-7088-483b-b589-9596da6d5448" + "GUID": "e4eeef35-922c-47f2-a05c-ab02a81b5f17" }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", @@ -685,20 +725,43 @@ "BindingInfo": { "TableName": "项目动态", "ColumnName": "执行人", - "GUID": "949e5ad9-de64-432c-983c-c328121065d8" + "GUID": "58a6e19c-39ce-467a-a6c2-d9ab23e002a0" }, "Value": "%CurrentUser%" } ] } }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "同步项目成员", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "项目ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=参与成员管理!项目ID" + } + } + ], + "RequestAsync": true, + "CheckDataValidation": false + }, { "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", "Message": "操作完成" } ], "Text": "保存", - "TemplateKey": "_RS_Main1" + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/067_save_4.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, "9,5": { @@ -740,6 +803,9 @@ }, { "Foreground": 3 + }, + { + "FontSize": -1.0 } ], "Types": { @@ -757,7 +823,11 @@ "4,9": 0, "4,14": 1, "4,18": 2, - "7,1": 3 + "7,1": 3, + "9,14": 4, + "9,15": 4, + "9,16": 4, + "9,17": 4 }, "SheetStyle": { "FontFamily": 0, @@ -824,4 +894,4 @@ "Formula": "参与成员管理!$I$10" } ] -}//8npsW2H8REjwQCYR70bt3DHbT8A7p/8wEsTDkNuQjUfHS76az8ws/g8+PVdl9TA3m0mgxP7zokVqtczJs5biv+b9Y+CDR0C38wHAi7MYr3d1J3tBKGMYBB16XboRpR4DRNGtuzvLQ5nttX4KagPEcsJPiEEWMZ7em8ErPbmBUV41C9FiF6eZ9cEHFT4MPW2xw114fpMAH2EpAf/0y3+rD7SMLSRj8ZEZtjauc1REBL76kTsq0zlKXU0Vt19XmWxT0RH2a3edPgu3ll5fwDxakHYDbrzahGhLDjgh1n9E78Ry2KCDbt+YHWdKD0z1GlHl5wIGYmPpGbiP+0YLVM53CriSgwdExNU8C9mUdMDdYPxWhuKB7+Ih/i/qaSYq8ScRTMqy363/lGBpMvBaVZp00GGvfCiWuWlGwDcXR8GqhqRUYaB5M4/njjzaIijfH0J5zoEjpda1q8HSLBW+BS6KUfR0NqD7rQ+fwxVY6G2tDDHd9f3ID9Dk+5//zkqiPabB7h+tRb7AxM+6noVt3HE9o9tpTCguHZ/9XvGunGJc8FPjg1jwpDEkLfXfPAYSd7dtraKX7gyjs0M8gSTLgvQRJo2DifoFk1Eh+o0seQxwVUzy37l3wchvS0YIPawBePadj+yFfGOkrEvVXJjS+3uBSotiTKUxubk7AHxur8zXpcAwTcd5lYEXH6uEEejTGtMv/A0Ozb08oFKFyGPBrRxqV2xRGzxNt9+uX46ox529/aRW1EknBwSzBm5Cs9mVHuiPsKqhNWGXiWSGz/9gw5IbJKfRwzpoOAFN/oO1wQ4aG4Eahx+b9pwo7xJQ248UyzxLknEC4vwx6T2HWL4xXYv2WwE/6Gc7LzDEFNY6BgJll2yemrlrPCNh9TNCgA8Ykh42RECNEbuJ2GkifbGJb29aTA==|920 \ No newline at end of file +}//hJfROHhAgSsNFKdH/EWqeHAFKPWWYnCwdIjwDVcPjFC/Qm5ierRnMJEkuFEx+IqF2yjwtU4/P7x2rotLAl29H3aXsvm6tups4DRRYV3tG90mPH5GRC73sW4zziDQ7GjgDGpleNBuTm3/3ME5UEvtStF98qDPZ1LPcf3+rL8I6lqkDSSX5eRo/LhvRoVwoKu/rZHA3VQMmXnVbhWJygVw+CU4HhxYKtrC+W7aWfU59u0KalkI8aRrO3r7oLsTqRJmyrCNWUItZJyCc26frsjUpEEqOQpjlShI2mKUTIq8rLG2oJz15pgZzXCLND3hBBne87EogZLJW5bayiOelfYqjIR2xCQwbf1ekOv26u9lNFJF35vEgvxNldDWGX6xRAy1tc3NulrkL2PhzHfHHHS/Pmhqat1CROshinUv7q10BSZ8WaJ9AYw9iQnxLHZSWkl/8R0fjIKzIS4O3hUxShbOnhPHomu1O+M+CkxQK8QT/0IWeTQwGnln2LUBIFWjDKfH8zJ3FgPXlpL2VEh5wFgiwgEYKzs4X7AN3z1GWeJBLuIlIWBKwDtQWCzaLtrzny3G0p6kT1YruJ6y0rB3qNrxqEI5J5GeDdB7uTbIusm21poEMWSjypI6SqCYtPhRrZ7DIpqpet7i3P1MCU2t6XBbKPw71Fk+FodO+MxYnmguxo/yet9d1tY6XwZ65b8xtnGrp5i0HbgNwsRFwhXL86qlH3cmL6qqNyDfpyoD1A3zLCXSjkwGSA+RuBKMcR7LN0IjWUzZ5BnrkfM399XukRJ4QNjD/qrCRHSGDPERijJxEP9Zg5S1rzZpq2E1wSwJv7aQNn7RwCI5dw8Ywrs30/U4dB11kzHZPBkZkAJ/I0zMAREX9ob7mfj1CdETvIYfM9EGCLSC8C9gZjZ1mrp6jV6SSw==|920 \ No newline at end of file diff --git a/Pages/任务/工时详情.json b/Pages/任务/工时详情.json index ef00e502..cf1a7175 100644 --- a/Pages/任务/工时详情.json +++ b/Pages/任务/工时详情.json @@ -305,19 +305,6 @@ }, "ColumnName": "全名" }, - { - "BindingInfo": { - "TableName": "View_任务工时统计", - "ColumnName": "执行人", - "GUID": "a86d743d-e2c6-4f62-a017-79b43c8189ae", - "RelationBinding": { - "RelatedTable": "用户信息视图", - "RelatedColumn": "用户名", - "DisplayColumn": "头像" - } - }, - "ColumnName": "头像" - }, { "BindingInfo": { "TableName": "View_任务工时统计", @@ -686,4 +673,4 @@ "Formula": "工时详情!$E$13" } ] -}//lyijiWSbQRrkJaFCvbkaKt7WQdnhuWhWTILyQjl9lnBn/SU9a5WG2yEMEZzZkU/rzfF4TbbvYF+HvaLkGMBr6csSQSH0isrtNS/vgRjdrkyZ4TDuIb+fEAyfCyGbhBQAmS4AzHe6Ss+0rguBUDBkHKaX57UcjRvm00vkRnVZQU10GKXDoWywc2jMfMz7Cw9804WotlO7RnzIts2JuVs6b042BeZtSspNuRFAIP+r4wZ3CaZHoBR0qvjdRlT/wCPQxzx1d50rBXxKLKRpb3yHR2oiAq8bdJWNUHt/yS8eB8mhv8x9zfX6SAW1lfV6VfjUXTIn/4kPaWXWAlVB9VKbWOv5a9cEQUlkX044WrRy+4Hz2dccPTv6/CBxoAmVfK6Sgb5lSHIgtaGELdwDxdnVN3cy86eFpdjlteCk0dGul5GbBJrgqEqIAme99bV1MBcMUuxjgI4Fn7B2I+9JZUsIzhpiOjXd1MVRhwsy7eoffxhYhtqmn4kcahnqeQwQGhhdtZsnaXo0LbPIcZNeVpfBaEvbhmNjG7stPp2ErOb7mKN3W4Phc5RoBhOQ/X/boT0dtrnfLT7elfz1ivftNJvH1pyJDNd4Wq4iWhG/UTVTbePW/xihTGkE/TsviY7qQLXyZGJRc0L7BZuH3NkLxRnVjZrUakuyyh/KWCmobZYX1NTNhJ1YDOt6FigTD/L0OWStqcDfLWXbXJX2Rj3526/0IaxqMbqHXXHZ6IwXk0QXeaxbiHqD8Bi7SaXPVFgNK9T0tPtBdsiMeF7EWHIi3P1d/L7ahYg3YekeK9vHuUEMnIRr94LEKQgT50gEvsAAvnx6SXe1UKueQzHWxwqrytL7falp5o5hSInAKPGbT8fB1v5+wt0mVriDpsi8laZ86G4qk7/PaQlZGlamtprdHuweuw==|920 \ No newline at end of file +}//0A4t65d1c+/Htjba9YuwALruutUmVJ3wJFBmQutCvJwCjfdBdY1VruRyHvGUe5Aw5U9zZHkef7j+L59pPiG/EH1iS5FXsQPRrxlOY6/qzvybTtNQDp63R9DyeniYXgUaozDGgwyjWMItdgtfWMD73r6Vy/GfSrnxQJjGPHVz9caPlFg3lfV4sPP1uKs35iNmC5I3fnmoEc0u9sYDvCqL54Azr8CYLpwKWylkxRQJhslkvqwZdaeocsmyR01/ZTGsQ0GHMljIG/bp1yN0yi8z5MUr1ncnlQ0QydhL0I8ajoGdhjcvoMveQcWQTutu+/YAyRG9RNAV6FB3oTTLy4IwQ9ABsJXucTIF5Bb99mHNnh9frGYexxmZ+a42CsQQfxtQKP094nafXCeQTFBMR+0RaPNvxZjdm9JUpJ22Bfb0FKzzJu7cODiSSaN4D2+m2IO8E04oMc55BI59tLKsGXH/YC80ZshU1vh52TSjCQUrR0zUmiqGnY9fZ661gWENHa9s1EVqLdn1y60mhuf4DZVkcFjufjA9dUfULGc2MylZI03+Hlfm5reOHxAXMEIu/SS1VAI7C0qSNsYzPzajewqrfUfbQWr1zQx5v/JRa4K/M0UTy9MolXi4aqi8rSQM+FrPUy+kho2+K4o7ZiGoksCuegxuDpy3/xEoLupHlT2iDkvPVe9oxcTEEucQv50/oLCOhBXWiTx7Z7yJ1nMX/GLyXVVVJwvnm2P2+q6VkaGgoYjY1HmLkHOpsV4ZJLcoeQjfJo4j3dH5wWwEjbqkCBgCnOvtYoUR81eIa3XNY2RKvViO7zhoLcz4vxLBE6K5uiGTZIXsfQ9Q/ohBLgzX2Pt3niV+EH3wRMnUpI5jdyM6h7zDoD5de8NjK0TkwDKdTHGSlSFkTEFxlTcx+O3d0AhIjQ==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json index 16c8ec68..26d99d41 100644 --- a/Pages/任务/新增任务.json +++ b/Pages/任务/新增任务.json @@ -253,6 +253,7 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 2, "PageName": "MD编辑器", "PassValues": [ { @@ -306,8 +307,9 @@ }, "3,21": { "CellType": { - "$type": "editormdPlugin.editormdPlugin, editormdPlugin", - "Pren": true + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", + "ShowToolBars": false, + "ReadOnly": true } }, "5,5": { @@ -315,8 +317,8 @@ "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 3, - "PrimaryColor": "Background 2 0", - "SecondaryColor": "black", + "PrimaryColor": "Accent 1 0", + "SecondaryColor": "Background 1 0", "CellDefaultValue": 1, "IsBounding": true, "DataSource": "工时核定方式", @@ -448,6 +450,7 @@ "CommandList": [ { "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PopupDisplayMode": 2, "PageName": "MD编辑器", "PassValues": [ { @@ -630,8 +633,9 @@ }, "12,21": { "CellType": { - "$type": "editormdPlugin.editormdPlugin, editormdPlugin", - "Pren": true + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", + "ShowToolBars": false, + "ReadOnly": true } }, "15,1": { @@ -1046,7 +1050,7 @@ "ReloadData": true } ], - "ID": "3143fb64-353b-4de1-b254-dc32566b45c2" + "ID": "142d4cf6-006d-4abf-bf98-12a9d05428f0" }, { "CommandList": [ @@ -1061,7 +1065,7 @@ "BtnText": "知道了" } ], - "ID": "c4099582-880a-497a-890b-9f80a19d9c84" + "ID": "c1616364-a718-4f04-a20b-080406f812c7" } ] } @@ -1545,11 +1549,11 @@ "5,5,1,14", "1,37,1,2", "11,37,1,2", - "12,21,7,18", - "3,21,7,18", "19,19,1,2", "21,36,1,3", - "21,32,1,3" + "21,32,1,3", + "3,21,7,18", + "12,21,7,18" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1576,13 +1580,13 @@ "Margin": {} }, "CustomNames": [ - { - "Name": "项目ID", - "Formula": "新增任务!$B$13" - }, { "Name": "父任务ID", "Formula": "新增任务!$B$24" + }, + { + "Name": "项目ID", + "Formula": "新增任务!$B$13" } ] -}//6pMOFFWXNd+Di2WMnYYK2h8PmXMmdTfAPYAXQiu8QwV5k1qKPZ3d0dihkTSoHtVAO+GmrZ186+7zH00ZLkukk76Tveb6SvzYohG7YNBqFeM/5jSL1Vu/v/Eb3TIFXzO0ldyPadcBRdS+e5BWTo9wciV7oLtBz5QoUmHOUWG2knirm3rhMCQo/slLjRiLfSz/B+MN1e5Zfplr3IR9i2kfSbLOvAebgt3Z0QD5wAkG7TlbFp1zeQok30AitnrPcAuvCYrnZzZphOqv9HRUktyWgQ0aenrOj6gy8YWJTyfcqeuuFDZgoxFGZYwOv0NkSL3zN/5NAfITa5VuuM8cEW4g/E6zoCMvCdyBDfoIR/yPiC+5q5jVXGohGVdQrENG4KkhwH2yteaQcDIa2qZry3rv2xGzzGwcjcFEkDv7Df2N4y5FeK/6JY3sLn9HQwlQVP+582XpQOLCelx1eqQnsYe03+/YnPgPnC8CDpxYcXLKm/7yCK7F19YKkr2+kSxO0TINQ26sQkphJBLjCoD9dgTtbePo6EAf/ehMrGByWc6Jp6L6sGJlC3NUGQHq7Sr1WYjIsTvTlplNzhFnTugrSeL3hIlwEtdVmTOiju2CUhmmnq1oyMBQM0TSIe2shxfpjoSoJdS6xSmowaV0lvFreQNoUdpgYOHFJoBUh5+sXGTzvGREYVAKqyu/uEYvPRwLRKSxNQr/ALoqqd4sOGUoVcaGQCi5X8xMg9tTZg1kQSKTJ3iuYZAK0lwV0jxrEjOaM6N+u3CanfxP7D4RPH2QWpExegzhQ2t67GgOdLKq+JTsxdIO9YqRGbv8UfbLwMj3EYFfqTZ07aLFor8RqPe3AzdtTbdRVJ0RJb05NvJpsbnqrV8cYO1KyF08z22de9E+WvzEfDC0pYlLF9axSPTQmZAqlA==|920 \ No newline at end of file +}//mv5uDStCe0lF/IolkkIEmkjVIcAFCi6DdCIeafzYwbxVp2cDrbc4e1/HYpqNLVhJxdPaXrobndSwGO+b3XxY5+hrNvJY6TrSAZKG+aKsdMviS4tACKkf0L86ER6++l5Gq4CpD8LKbvYABRAVPZtjy8TQEiEJZiZygc12C+xsr5aF83mkaaWHkcF/EL7AAb5dFn/kJRgPgBSRDtro+8RieTtjhPDw8QycRsh2eHiPtxj7KSIrnIZzK3Jw/VTVyTG6Ks7YhOaGWsySnzGOW07KODdmfZD8Hwoc79dhGn2BRzCwyFybCbujx2hIfjGNa3PfoSnElrc6gxqm9a6sXYjmZVr7ZdoFUly563hOKqIcRTtbY+q+xmzHEpZl62Tp9cbY6xS2q1ibbyACAAkzmXeDi/wvI9dDa1h5IaHKHwJlFf9lQL3omBIh3OiV/dxCMDZrsBpdaENSIAage+UXxcQuYygVbcNXreaIQxZJ+qhqMKUrjeiUWEJeBk2IrKgVPFVRs53tFyHKxoUssCegaskrsHmCmXWV1NM8G4Gl+UecO2pPeSsnOHexAlWx9VlvvNtSvd2HUqlxwQKo/XkNvKq9p7ta3qGGDsQPuDhPtIVBT+5d4JO/1zHh/qIlLHI5ZrLDvteTuoQ3AvdCu8umocp5VHKK0lRfwvPC8cVN6GSFYvzFHi8ZYjmvjqEqIOBo7Q150fQVd6lH5nT3RSUq/gX4Sb8aIWP7wDPtxCA8CnugBMs+6S25lz7QFtpaVYrIwAJjxFx5Zfritx4Qd1w2JtjU03+SthArZvn5POqliCaKEzWPMW3kDdQpkpI0kSTIbFo5axIwWrdBlhWR6QopUTO4uZqlNWTPsot3f/4HI7hSNNv6YD3adQzpJo9GmsskbsfGuy0nQ1tWGchTRV+HUbbKMg==|920 \ No newline at end of file diff --git a/Pages/任务/新增任务.rd b/Pages/任务/新增任务.rd index bb1176a2..8f54c25a 100644 --- a/Pages/任务/新增任务.rd +++ b/Pages/任务/新增任务.rd @@ -6,13 +6,13 @@ "1,1": "IFERROR(ODATA(\"任务表?$select=任务名称&$filter=ID eq \"&IF(ISBLANK(父任务ID),\"null\",父任务ID)&\"&$top=1\"),\"请输入任务标题\")" }, "CustomNames": [ - { - "Name": "项目ID", - "Formula": "新增任务!$B$13" - }, { "Name": "父任务ID", "Formula": "新增任务!$B$24" + }, + { + "Name": "项目ID", + "Formula": "新增任务!$B$13" } ] } \ No newline at end of file diff --git a/Pages/共用/MD编辑器.json b/Pages/共用/MD编辑器.json index f23b6d9b..99b44b44 100644 --- a/Pages/共用/MD编辑器.json +++ b/Pages/共用/MD编辑器.json @@ -2,6 +2,21 @@ "Rows": { "RowColumnAttachedInfos": { "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 712.0 + } + }, + "4": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } @@ -10,112 +25,10 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } - }, - "2": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "3": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "4": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "5": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "6": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "7": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "8": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "9": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "10": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "11": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "19": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 198.0 - } - }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } - } } }, - "Count": 21, - "DefaultSize": 32.0 + "Count": 5, + "DefaultSize": 24.0 }, "Cols": { "RowColumnAttachedInfos": { @@ -179,61 +92,11 @@ "DesignLengthInPixel": 32.0 } }, - "12": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "13": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "14": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "15": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "16": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "17": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "18": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "19": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "20": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "21": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, - "22": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 - } - }, "23": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 @@ -254,51 +117,161 @@ "DesignLengthInPixel": 32.0 } }, - "27": { + "30": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, - "28": { + "31": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 398.0 + "DesignLengthInPixel": 32.0 } }, - "29": { + "32": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0, - "Mode": 2, - "MinLength": { - "Unit": 1 - }, - "MaxLength": { - "Value": 1.0 - } + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "40": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "41": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "42": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 } } }, - "Count": 30, + "Count": 43, "DefaultSize": 32.0 }, + "Values": { + "1,1": "编辑内容", + "1,34": "关闭", + "1,39": "确定" + }, "AttachInfos": { - "0,0": { + "1,34": { "CellType": { - "$type": "editormdPlugin.editormdPlugin, editormdPlugin" + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupResult": 1 + } + ], + "Text": "关闭", + "TemplateKey": "_RS_Information3" + } + }, + "1,39": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "PassValueBack": true, + "ClosePopupReturnValues": [ + { + "Name": "编辑内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=MD编辑器!编辑器" + } + } + ] + } + ], + "Text": "确定", + "TemplateKey": "_RS_Main1" + } + }, + "3,1": { + "CellType": { + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor" } } }, "StyleDatas": { + "Styles": [ + { + "FontSize": 18.666666666666664, + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1 + }, + { + "FontSize": 13.333333333333332 + } + ], "Types": { "Strs": [ + "Text 1 50", "Body" ] }, + "CellStyles": { + "1,1": 0, + "1,34": 1, + "1,35": 2, + "1,36": 2, + "1,39": 3, + "3,1": 2 + }, "SheetStyle": { - "FontFamily": 0 + "FontFamily": 1 } }, "Spans": [ - "0,0,21,30" + "1,39,1,3", + "1,34,1,3", + "3,1,1,41" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -335,7 +308,7 @@ "CustomNames": [ { "Name": "编辑器", - "Formula": "MD编辑器!$A$1" + "Formula": "MD编辑器!$B$4" } ] -}//UoFa3Mm1Z2fnGvKqFafm0EBfYsNBg5VQ7FSPKINefKOT3GGsF5C74z7k5GaLNOMkogdqOR3FgYlHre1FMRb6RU/qwfM/KewnbSo0PYPu78zJnq83+7qYd5YEmwSQ4REGy090gSvZ1+dVpJO9MF0bJH/jJT8ZXVfSosfuWPGAc6CS1PIvoIbbKFMefmVZzwAnuzm2VGkMNFS9s9QQ1/Wx2SKYGZ5tyPMbO6lbrPrUvxh92bgTquDkhJtSIMxcozakgSE1Y4Zc/lXQLZ3l55UW18/CbomjneDAH+jrz1vS0+9HBhJxygBL2jr/O01BCC6IaeAm7VC3d4BRj2es3Kk90X2bTjMrMPdXHOVFDK4sgtkG60HazHQOYEvu9PT9/bahsg211FMgOv33Y5hUJHvmCfN9uBtYkwKu9l8ctEkAuYi07ZGbo/yG6lE8SRqWfravseWbLerNTimP5xKgoa6UBVQJegtfKBWNSPQ/pEgFhi/rMw1IphHifDTwKL3aGe+Rj0vkwEc0YLY225uTxJOETyaZgL8SkTMrl/NO3w8FDiXcM4jWmVU+EIRO3xjji/61iyVeyotyc0IL7qQaokK18LXqYBDDqTf9gCxj6JmR0m8sp8EqSA+wW0wrDGcYczxwL0u2MLpeOwrm5Ag2zFhIgHUeVCOwvZDOscUkZFpegK1hFMBTcoSeRYHOAnn+bkYPgDYjemCpZrIdW7FoJbZAE/JbA5iWmg2bSJuMlouueCcItkdj3DO0w4oHe0l6+9F6QQxiYoi2h1hzXzDsXvabxHY2PPdWqNtTE8KEiQTqNGSieNsSacYlj32ifSw3F5BzNFM0FHVpTnvUcXcgUFQ/gnJpRVBKLq6gSuYc0DdJvQs5LYVoRITkXnXe9ruCRdyM62nYqtIItn/bb8TLESS02w==|920 \ No newline at end of file +}//U3UA3A0LfSQ7D3g+O2Wy0uErtpniTJF+QxLGyzCFAGiVyb+TAb5A2iXJcFpilIxyHy1exM0BcKu/iaIPIPDCdIOhVGXU3dMAyZxZa8i9FyW0m9DXlg7d3++sPDXT/UWqUE52i+en3iyKBJpvah3/miDtK4FQX49rb/RKc45kHjxxjIqKiP47KVVyYLmghwvq3/womdVtBOIy+Dmz01TnOhLXRHK6HbKorqI93I6KLyEMih1yTimbtNH4Ku+of04rJtIYlxLIjFLOy4Io3wTcWLBpaSr2HvNzlfFJrUYsfSvMbf2jep6beoTOx4QFUebu6Gsyb3J2HilwdqmrYsjbfvLfL6cyGffjq1iYxfaZnOCKYu4JFLZdD6u/0qXOVFqIbULJZl0SHuinQz9XL3WW4BTFO/lUPoApV6cIROCUWCYqTQIs0Z0NbFQ/yIMOWhsxcHCw2O5OkWvJH6sQPmHHBneml8Yfj3pn7hRciedQh0kx6Sv2KiA/8HHHvo3CMGZa8vmgHd2Rj3n5xa/xe+59wjXYLiexZVI7iSNPC0DpphZ1yGVEpaH9/3lQbjnyV9VFwYpc6mg71ek+kgROw6WPB8Nx8nEQW5HaFSEQ6OeFTPIuQ2NA3kZzkxPsyB8aOqQYGeS31Uvft1flbB3rwbGR+dzbnEs9xmu3WqeXxC6N5TNNH1z6bmv8aaj8dV2z3i7HBrCBARvWJGR9JBMvoIoCyyxdNCLeI16ULHqQP/UPeG0JiEnPPiiPF8TynXAyY/E9nMcwwXMt11s5AQkmhl5z2Yj3BmBDoP6uwOlPimLQdsNzzrWMdoZrjt6vmn37f3w2aVX92hGYT/PoBIPRGnWoRkZXYciehTvZXOFhYfT6dx5FGVcPUQfibqIv2IoQdgdfFl4N2Mku5BBS4o8u/Z73OQ==|920 \ No newline at end of file diff --git a/Pages/共用/MD编辑器.rd b/Pages/共用/MD编辑器.rd index f3e53368..777d979b 100644 --- a/Pages/共用/MD编辑器.rd +++ b/Pages/共用/MD编辑器.rd @@ -1,11 +1,11 @@ { "PageType": 0, - "ColumnCount": 30, - "RowCount": 21, + "ColumnCount": 43, + "RowCount": 5, "CustomNames": [ { "Name": "编辑器", - "Formula": "MD编辑器!$A$1" + "Formula": "MD编辑器!$B$4" } ] } \ No newline at end of file diff --git a/Pages/共用/编辑删除页面.json b/Pages/共用/编辑删除页面.json index 75c92326..2cf1da1f 100644 --- a/Pages/共用/编辑删除页面.json +++ b/Pages/共用/编辑删除页面.json @@ -3,7 +3,7 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "1": { @@ -18,23 +18,23 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } } }, "Count": 4, - "DefaultSize": 15.0 + "DefaultSize": 10.0 }, "Cols": { "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "2": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 15.0 + "DesignLengthInPixel": 10.0 } }, "1": { @@ -44,7 +44,7 @@ } }, "Count": 3, - "DefaultSize": 15.0 + "DefaultSize": 10.0 }, "Values": { "1,1": "编辑", @@ -53,7 +53,7 @@ "AttachInfos": { "1,1": { "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", @@ -69,13 +69,18 @@ } ], "Text": "编辑", - "ClickMode": 1, - "TemplateKey": "黑色" + "TemplateKey": "链接样式", + "Icon": { + "Name": "编辑.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } }, "2,1": { "CellType": { - "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ { "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", @@ -91,8 +96,13 @@ } ], "Text": "删除", - "ClickMode": 1, - "TemplateKey": "_RS_Error" + "TemplateKey": "链接样式", + "Icon": { + "Name": "回收站.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 } } }, @@ -101,19 +111,36 @@ { "FontFamily": 0, "FontSize": 13.333333333333332, + "TextIndent": 15, + "HorizontalAlignment": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "TextIndent": 15, "HorizontalAlignment": 1, "Underline": false + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 2, + "TextIndent": 15, + "HorizontalAlignment": 1 } ], "Types": { "Strs": [ "Body", - "Left" + "Left", + "Accent 5 0" ] }, "CellStyles": { "1,1": 0, - "2,1": 0 + "1,2": 1, + "2,1": 2, + "2,2": 1 }, "SheetStyle": { "FontFamily": 0 @@ -142,4 +169,4 @@ "PaperSize": {}, "Margin": {} } -}//IHgwTO9pym/H34PTu/w2x3kQumORAyFH49VKXmH+tCYZnQbLnk4VD7V7xY6N6lpegEimEsy8dHIPtAGKlPIPRorOe9/4Aqs5BWcu4UjYrQM5ChbhHJtEgGCa0OAYSlHwAtzbXpgnz59/jOf4ZBJY+Js46vr85aEsB4MBsjxE7ZXkBq0N3hVEsHQLt37DkW2CEvVCX5KCNjeiwTH/LrqBR8mH74BruFGSgYJmDEKcYg1GAt/VZK1JvQj1y1Y3qSVf9xCVlAgONh3BhHsI7B4dYcEYuCzgkyYF2LdhYW8JTeiKoDdP7lGV99P1ZXlgrX7WHI83H9Z7i5iev/RBtWuH7k/VRJOo+AT3xw6qxtaKvfndk3l8erNnxeJB55jr7Zozc6ZReNZ87K0Aj0q8i13W5DI3DQqsaR97k/xQgNQs8CoDdnNmCnI9sqRsWxn35InCCt9Be9KYuLPA3T44kR7XagK+Z5YRNaVGzjc5rglWFZ2RCH9KP6RmyrBCVFsycpy8XO7gk/MtVp+kQa6ETPoY/Vb0orPfQTzTlyXYTG8eJ/0eiv1KioCRwQw+GaiAJZUxr/d/EDptEdBMiYYFqE0LLcbzcu8IGATZaUfBE8MAc+Ghl2a3TwR2TQjh4jld/gVsbGDTrXLsuZuZqiV58O3doBATKAYivwWo2uVxmrc/BFdeWWYxC6mHrUiKKpsGggfHK/DNsB57E4xOyIz5B48NCvFc9viSqmkjlEBkzAhPl9sNERuh2gT4vAHf7NpzrsZ64iXj3YmNPZB4uqNtQA1/1ZmtNnhBl/F2qK91VL7xafV7S/AiZdQvk87HgJ8qPFVM3oc85hAASVojM14zFn6EycUJXR60Zegafuo1LHy3zHWaLzTAFpN818lnsfm7M7oSDvaCpTKfSfM7MI386vDibw==|920 \ No newline at end of file +}//k2p5P+aRRA0lN/WiKfkuU69cY8UkvR3ZxOSgGTB3BMR68LAqnKQDVBR9tmpoO6vxcZlHlR+inu2re7pK8wM1Z7i8UEhzXifgUrCu5MVG/QWXKujdAhgWwf11PS7lYaLrzhOpEsboehdlgHdAKdBL5ZrEvpwd0Hr8Nxhtj0lyVy/eHMoIeXm7cP4+R8odBIfzRx7hPWPxLkZoJ4rIgNz3yYVQNNf7ZguAuEOvdIZWMoe76y+DCExIfPhlQ6OXq2MXSmTyTLjQ+2hNWPYSp48TBqNBN8kF7aTF4u9gRuhJFsAHqBTR5RAPrhF8mqUXAjMp0Knx7gPfmyRzL2oyt75y1m0SRrIsxlset5CFEiwJHYjVzuFbDkU7KJ/auhbg7l32nBGSvCOeVA5bu2JaTs1krMA/1r6xV6D0cwZA6BK1WAyCLT9tdZpoA/0DknGWDVqS2WtSws+GOs0LzClvAkFjzoLwO5O6FSpIFpRi2Ghppd2IP3i7rk9/f13IZ0b/dZMpiWtXD2rja7dimvuOBdDjM4e8Tz75psM6NUPA3EvgBcjN3BXahU0Fp46zdjuFPIW9eZyjrH7ZbgY4XWWetV92GP6opSn5PfteIUzGx5oVwR0Kn6cCBy1Fud4ixgCZPIfSPVBp0Yg5Qn9L821wiSrvT4ZLBaLA0pQFMIWaSr8dx9UJpx8pswCKq55GeD3CETOnAcRII2oHBinBKJ6fRnsrMgkvBW2AgilT094Z9NUF1CeYay6RPOfuQOzYuhe74THkt7oRML4GADVQw/JiUNzRGmJ6fOLLUIxWCU/VqjG99DY8iET8sy/VZS9t1ktzi+ne+agxVsKJMbCwgEzthtTM2jkfsJQ+m9RySulN1vNgh7wnCCMpg4gAh1Ai/LGHo8DFnU38f9R5/iDNvqzhK3CIsg==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目信息.json b/Pages/项目首页/项目信息.json index f5b0624a..b543854e 100644 --- a/Pages/项目首页/项目信息.json +++ b/Pages/项目首页/项目信息.json @@ -144,7 +144,7 @@ }, "28": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 32.0 + "DesignLengthInPixel": 24.0 } }, "29": { @@ -153,11 +153,33 @@ } }, "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 81.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "31": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0 } }, "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "35": { "GridRowColumnDefinition": { "DesignLengthInPixel": 32.0, "IsHidden": true @@ -165,9 +187,9 @@ } }, "InLogicalVisibleIndexes": [ - 32 + 35 ], - "Count": 33, + "Count": 36, "DefaultSize": 32.0 }, "Cols": { @@ -250,8 +272,8 @@ "1,1": "项目封面", "1,6": "项目名称", "4,6": "项目简介", - "8,1": "计划时间", - "8,15": "计划工期", + "8,1": "项目日期", + "8,15": "项目周期", "11,1": "所属客户", "11,15": "所属客户部门", "14,1": "管理员", @@ -269,7 +291,8 @@ "21,1": "计划", "23,1": "项目方案", "26,1": "预算方案", - "30,18": "提交" + "29,1": "网络资源", + "33,18": "提交" }, "AttachInfos": { "2,1": { @@ -454,7 +477,7 @@ "min": 0, "max": 100, "step": 1, - "placeholder": "请选择", + "placeholder": "请选择项目周期", "controls": false, "IsDisabled": true } @@ -875,7 +898,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "8c89e59c-9d15-4302-b8f6-c297f1596ca9" + "ID": "f5ed9807-e089-4980-93da-4300af09393f" } ] } @@ -929,7 +952,7 @@ } ], "Comments": "如果流程发起后，存在当前用户正在办理的任务，那么弹出任务详情页面", - "ID": "eca99aeb-64e4-4b24-8474-c47ce26f7ffe" + "ID": "6edbff22-cab7-4a57-adc1-bb0bde9962c7" } ] } @@ -1054,6 +1077,7 @@ "ColumnName": "工时核定方式", "GUID": "0668cfa2-faca-42fd-996a-349f34bcd39a" }, + "CssName": "singlebox", "CellType": { "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", "Style": 3, @@ -1144,7 +1168,22 @@ "IsSmallButtonMode": true } }, - "30,18": { + "30,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "网络资源", + "GUID": "805a7e23-3174-443a-912a-1b1290b052b5" + }, + "CellType": { + "$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor", + "ShowToolBars": false + }, + "DataValidationInfo": { + "InputMessageTitle": "提示", + "InputMessage": "可填写网址或其他信息，一行一个" + } + }, + "33,18": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", "CommandList": [ @@ -1345,7 +1384,7 @@ "ReloadData": true } ], - "ID": "26e89ab6-24a8-4e06-bbff-6dead0e02a36" + "ID": "67d1f856-a969-49d2-aa85-29d3deed7e3f" }, { "CommandList": [ @@ -1360,12 +1399,12 @@ "BtnText": "知道了" } ], - "ID": "9b482d11-0a0d-4bb9-a317-8ce7dc03db24" + "ID": "917f1617-c025-4a83-b595-6a150d176efe" } ] } ], - "ID": "0765d12a-4453-4b9b-8c02-05ffead4cc53" + "ID": "bc2c28f9-05fd-4bec-bb93-83bf74506def" }, { "CommandList": [ @@ -1383,7 +1422,7 @@ "ReloadData": true } ], - "ID": "e2fd6570-c906-4cdf-a425-30b69cab481a" + "ID": "ed40dad9-627a-42a9-a0df-9aa05188a39d" } ] } @@ -1392,7 +1431,7 @@ "TemplateKey": "_RS_Main1" } }, - "32,1": { + "35,1": { "BindingInfo": { "TableName": "项目表", "ColumnName": "ID", @@ -1421,6 +1460,24 @@ "FontSize": 13.333333333333332, "Foreground": 3 }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 4, + "VerticalAlignment": 5, + "BorderBottom": 0, + "BorderTop": 0, + "BorderLeft": 0 + }, + { + "BorderBottom": 0, + "BorderTop": 0 + }, + { + "BorderBottom": 0, + "BorderTop": 0, + "BorderRight": 0 + }, { "BorderBottom": 0 }, @@ -1436,11 +1493,13 @@ "[AUTO]General", "Right", "Text 1 50", + "Left", + "Top", "Background 2 0" ], "Borders": [ { - "Color": 4 + "Color": 6 } ] }, @@ -1783,26 +1842,42 @@ "27,0": 0, "27,1": 0, "27,21": 0, - "28,1": 4, - "28,2": 4, - "28,3": 4, - "28,4": 4, - "28,5": 4, - "28,6": 4, - "28,7": 4, - "28,8": 4, - "28,9": 4, - "28,10": 4, - "28,11": 4, - "28,12": 4, - "28,13": 4, - "28,14": 5, - "28,15": 5, - "28,16": 5, - "28,17": 5, - "28,18": 5, - "28,19": 5, - "28,20": 5, + "28,0": 0, + "28,1": 0, + "28,2": 0, + "28,3": 0, + "28,4": 0, + "28,5": 0, + "28,6": 0, + "28,7": 0, + "28,8": 0, + "28,9": 0, + "28,10": 0, + "28,11": 0, + "28,12": 0, + "28,13": 0, + "28,14": 0, + "28,15": 0, + "28,16": 0, + "28,17": 0, + "28,18": 0, + "28,19": 0, + "28,20": 0, + "28,21": 0, + "29,0": 0, + "29,1": 1, + "29,2": 0, + "29,3": 0, + "29,4": 0, + "29,5": 0, + "29,6": 0, + "29,7": 0, + "29,8": 0, + "29,9": 0, + "29,10": 0, + "29,11": 0, + "29,12": 0, + "29,13": 0, "29,14": 0, "29,15": 0, "29,16": 0, @@ -1810,12 +1885,62 @@ "29,18": 0, "29,19": 0, "29,20": 0, - "30,18": 0, - "30,19": 0, - "30,20": 0, - "31,18": 0, - "31,19": 0, - "31,20": 0 + "29,21": 0, + "30,0": 0, + "30,1": 4, + "30,2": 5, + "30,3": 5, + "30,4": 5, + "30,5": 5, + "30,6": 5, + "30,7": 5, + "30,8": 5, + "30,9": 5, + "30,10": 5, + "30,11": 5, + "30,12": 5, + "30,13": 5, + "30,14": 5, + "30,15": 5, + "30,16": 5, + "30,17": 5, + "30,18": 5, + "30,19": 5, + "30,20": 6, + "30,21": 0, + "31,1": 7, + "31,2": 7, + "31,3": 7, + "31,4": 7, + "31,5": 7, + "31,6": 7, + "31,7": 7, + "31,8": 7, + "31,9": 7, + "31,10": 7, + "31,11": 7, + "31,12": 7, + "31,13": 7, + "31,14": 8, + "31,15": 8, + "31,16": 8, + "31,17": 8, + "31,18": 8, + "31,19": 8, + "31,20": 8, + "32,14": 0, + "32,15": 0, + "32,16": 0, + "32,17": 0, + "32,18": 0, + "32,19": 0, + "32,20": 0, + "33,18": 0, + "33,19": 0, + "33,20": 0, + "34,18": 0, + "34,19": 0, + "34,20": 0 }, "SheetStyle": { "FontFamily": 0, @@ -1829,7 +1954,7 @@ "18,15,1,6", "18,1,1,6", "18,8,1,6", - "30,18,1,3", + "33,18,1,3", "21,1,1,20", "24,1,1,20", "27,1,1,20", @@ -1840,7 +1965,8 @@ "2,6,1,15", "5,6,2,15", "2,1,4,4", - "32,1,1,3" + "35,1,1,3", + "30,1,1,20" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1903,7 +2029,7 @@ "CustomNames": [ { "Name": "项目ID", - "Formula": "项目信息!$B$33" + "Formula": "项目信息!$B$36" } ] -}//o46pAzQ1VAv1UJyBblRLFR/vV3mBoglmb98OR47mZShenkLDa4Azz6xrAw4xZvSjEeZBbz3w0sJe8RYuGxQqkATLpNMxGPClYR9gtoAY19Ebxyo4XJOq8fMZ3u1sXEEToRHN+SNv9cPWPcOrZ1kwOwg86aPGS0hI6KXi5TWGHrVS6tFBmcbMO9jObDs1zahNyDzTpR9riUgxH5l/5ksfvfnUWJWgJkyfMasfkS6RH4RmbEwAHCe68UC3TlG0YEKQRpTtijPHj3zGwOXq77DOB5KrfQntMTmowLrKAb2dZI4LOUR2GlwjXi2shUIodp/SGmwnG1cOqzJWwHDeiLTbao32mPFJhs4jy7wCJjncBxdZsKkCVTmNmmxE24Kaeb1lInrJBhoKlWLQMjK1td2ppChcKhsuMKATBRAHkMB8OkFmcyUs0rTMsZ7/3c47XimJdAtyDhop+vtyTii74BPQemdCZOcwMfXcmeq7YWgdhSBb/MIoC+H8uO1TsfFCX6uLJVNFxjzDwJPGOXYQwjVPGzLWUs7notftQmDjELeYxtgfbBZeaicfoTwJd1HZ8oo20PM2MueinO8IdABIYCoPjVJ7pntAAmCCpyIPJJ+YpYg5FQRTJ11Y/0LdQcTdsmZ980HTulNKCZI13LM/enwhUzkoLf7iSMDMmF7rSR6lUHkqak6G4LFk14Z00JFU1ZlYoGaG3nehl+SVa79a0Mmn8LuM0z2aj44THlyjgybXURQWUOCAsgGg7SCiYgggWHFWwBfbfYfrAaPrEQBOhWaq7tGFLYEEi25/P1rgXiG+3+y0GaQl+2wcb43feKTLGrGw8RyozqE1Y4pte3sGYlUtOJtVwivCXTIKcM4vXjpu1y0sTKLrV/8qPmN7MxRW0/eqvjZCV5z6BPAo7A+zzGFkAw==|920 \ No newline at end of file +}//UoQlvJtY7eZcdRBW2Qyt4b991A1ztyTeq9QgypVs5d65Qm8MxSTyvzHcfYEC0LlW1MN7MeAxBhhqd8R2uyXlHfeSb5FQkSgvkwLM8Mi1k6XVQWpwRtPKnLdo3Amx+kX+7SZWK+7SfDPdJKsE2QWOysM+wKtbRlNL/9RLUAOXBu3moKlHl8MsABmqPva4/EwK+D1y/6MqnOtkVSDG9Y1Jj5GP1fQmP4O4zvOXLqZvT9y29S51TYv9VTStgmKIIXLbGDZr/FL9VzPGb3KkksG/nrHUAAlYSV9pAOH04YlMj3vvM7v0/7Dj9zbRm+7mkTiReVkkjpJkeD3y1BXL1aYG3yLfbdKw8TvUmJcQBnSkOnr3L7l/sGCmCcdkwM1low+K0DRJQuNzZw+uvSZoeAVo8sycESQeT1zc4Vx/ett1aPjX6qCOtger3BWM8O1m1W57RRtUbo4/uxDmY3jhFqPwVZ9Nb/XvcZfgW4Ovw3VOcCXNdmFX+j7ebZuSvQXVqA32pJdNP+Xp2kMc4ktZdVkS/Le5sf+uAS2A6CmgwlFK62Xz5Fa47kvFxNQ+WNFfrGgCTlQD/gCVcmedEUIogn8lsVfLDVU/UkePDWOHkTwV2x4sDg4Wix6hwOxoOp/YK7Zz8m0CmsWe5jGSzTyoz9Fc5VwU0FiorrYKr1jmgny8YqDvaLm/ek4CB88ZW+wUMBGW16spniDgwlEraY+DiDNytHpPkY6mSFjYgoZsnu4AXUdtcqQqpVwgiHuHHuRdb72w8m8Dw4qL7rPcJfy2mMQhiPFETOvmcppQNH/JHaPKh0JnMc2rDx9MGmPjoBozHC8WAeYkFLYZqVcs/4g2pNKJAZWrX9m6kXkFYpO4XZw9EYNirhyK/fxuZkggFWZqQbC1NtJBc2Nz1eY0nOwbBbRg/g==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目信息.rd b/Pages/项目首页/项目信息.rd index 4ca916c9..0ee036c5 100644 --- a/Pages/项目首页/项目信息.rd +++ b/Pages/项目首页/项目信息.rd @@ -1,11 +1,11 @@ { "PageType": 0, "ColumnCount": 22, - "RowCount": 33, + "RowCount": 36, "CustomNames": [ { "Name": "项目ID", - "Formula": "项目信息!$B$33" + "Formula": "项目信息!$B$36" } ] } \ No newline at end of file diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json index 5bb003e3..e89325fa 100644 --- a/Pages/项目首页/项目标题.json +++ b/Pages/项目首页/项目标题.json @@ -578,7 +578,7 @@ "Name": "文档" }, { - "Value": "人员", + "Value": "项目成员", "Name": "人员" }, { @@ -775,4 +775,4 @@ "Formula": "项目标题!$O$6" } ] -}//T5FNFO9EbBAeQPnB2P7MRjYY8S+dlbodK5Mbhpj0HW2Ox6fpK83SJOWySFOOaUIGjyE3x8n5FpCbxpfcxOikgYDLSbEjHTZlEkjz4jd0ihWbNOpHuXDQ/ZGj2grNSKHjgTDEm/LSk5Q4Mv1VDuDjCw9gsH6gyJqohHDMOaIMZJ1GUyj91d3iiVbMehUAg19xIcFinGvg+o/XZUAVuCGqnfyOzsFAHzhQkJiZRAx8bZGk79zEdRBV5xAY3UJu3T8nWvT9HAk16LEdCuCjwu4HLOEJRSNbIZyc4lPseJFtdTljfRJnebV6AmrwoZaPTLkijqkNvGCxiyrgjVzo6M6XvphW3bF4hiFDcASwKiwQdp4+0vsW9eIBi2UqJRDpRwtNwPA3klF8pcby0glJsL1jWkqmFRVqIQICoTXvAFecDHGTqhdjAlTkSe6gEc56RBh998UP72TV9b/LXX3APzHIdFgcnvf17I6h8Tdf4Em32YzRugr6ifUleHjkleXfSA4hKoChuvgnAA5D1VemQZpB1jJh/05kaxjb1FD1tITmePzv1+ZXedLXSvQT/sTuvmulQa866eVsP1gdglPTYyFQL5495hs0aJHoOWSAo5cY4ZKGJ+QV8FrUpO126piCusn2/PuevGGejHmTuHhpPRz9STAr2VYMNpWgKcLC27KW6Xatdz8rtaJsQzbMzU4Mo4RFiS8P5ft28qMns6/e2C8hLgU/GeXWww/QeeI4anhWPlRgLcbi2puIAX5n4/5PEXI860wgbFOW02qTloYP3jONi/DyX6jmtMdVJFLsOk28daD74+hM4OKAgNpGHkrWpJbWjeStZBv2ZAd+ZThNOmVX3OZHe9a6O+cwqoogqxoOwDwUvt7+XakZ7yxDar2Ziarh81p8lZriMX99VyWJTGM2yA==|920 \ No newline at end of file +}//IdTEDTFa8yUELguX+Y3GEgl602drJwF6gymv1sE3ZmDhxZiDpjuuxnQV42YqdeW9zBZ/JG/jxK3hE/6uZ0V1i6TPiPshtUJvJArkScgjlsfZPn4Isao63MFwzsUXywYxDMLIi3oPfz4lNht2TGqlM8s4U/TSFW+FtEWshCncjAYjzPi3Y8icF3O838VvXXGx6awu3kbwShlvybfmcuOSy27yV69O/9biTjaz4HkBMafD5TmZ7wrl0BoEaz/rb6pxUcspCiFn+vLSH5T6gp0eJ8et0xUVXLvIpasHiL5Rup1nJ8xdfFySYbglilAtGU/5J7hdIwOzcn2U5gY5qNLJUR1z7Tt2pT065f9+PRzymHT0FiicbSKtz4I1t/Ny15A8jmql0q2A2P3WNeiox/jdA4cWXK0qeYJ///0buvOPW5s0eUXTyMD1Y0Gt9H2H0A3NXyV024Mp/KgI7vHhCb0drV2WarEb/Lq8x9xgntClgzWclg+BMd3ICK5Iy5Mv53bOS0e0Kw6VkpBY+U+XEqczHqjLyIJWrCZFnR3EbsUa6DEQGikUib4dKXWZ8rZOmoWzARl+MmxxVo64n+gDLrCt3T0epjVE36oGQgjxP7uDkb3qT9v6FrAUzio7p/3cErUvV7Rx5F02tIlZoVtp4oYEqTiRMEzKo9Q//j+sx8aCPoiLa1q103P/b5RODEfk1KwynH2C1UOCWiXkc6Iiuk0e6watf/ULJ76ZIHSvGZmqifAAMRO4LLX0Nri6EuP2c+gOy+DxBAHqcmKgsE/53tcrzHrUhHOk3SW/f0cJ/WtHDNr7DeWdNvzYAyXOEUccQvYib47YHJL7OsWCU8R7SOWv+vGNY5T5PkPsx8/a3ZrsmEKiJiauquN441F2LXulHqgXiaY4MngiOB54LhUlCS5TFQ==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员.json b/Pages/项目首页/项目首页子页面/项目成员.json new file mode 100644 index 00000000..0e138f21 --- /dev/null +++ b/Pages/项目首页/项目首页子页面/项目成员.json @@ -0,0 +1,720 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 20.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 642.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 24.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "IsHidden": true + } + } + }, + "InLogicalVisibleIndexes": [ + 5 + ], + "Count": 6, + "DefaultSize": 24.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "39": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + } + }, + "Count": 40, + "DefaultSize": 32.0 + }, + "Values": { + "1,26": "任务详细视图", + "1,35": "查询" + }, + "AttachInfos": { + "1,1": { + "CellType": { + "$type": "ElementUI.SelectCellType, ElementUI", + "CommandList": [], + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "useBinding": true, + "options": [ + { + "value": "黄金糕", + "label": "黄金糕" + }, + { + "value": "双皮奶", + "label": "双皮奶" + }, + { + "value": "蚵仔煎", + "label": "蚵仔煎" + }, + { + "value": "龙须面", + "label": "龙须面" + }, + { + "value": "北京烤鸭", + "label": "北京烤鸭" + } + ], + "bindingOptions": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "用户信息视图", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "af5f9c93-4159-42bb-89f1-4f5ba75e361b" + }, + "ColumnName": "value" + }, + { + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "全名", + "GUID": "16a5f8b7-9cc4-42cf-8e38-2056e5657781" + }, + "ColumnName": "label" + } + ], + "CustomColumns": [] + }, + "placeholder": "请选择成员", + "noDataText": "无数据", + "multiple": true, + "collapseTags": true, + "filterInServerOptions": { + "matchMethod": "contains", + "loadingText": "加载中" + }, + "noMatchText": "无匹配数据", + "clearable": true + } + }, + "1,11": { + "CssName": "singlebox", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 3, + "Items": [ + { + "Value": "", + "DisplayValue": "所有" + }, + { + "Value": "计划", + "DisplayValue": "计划工时" + }, + { + "Value": "实际", + "DisplayValue": "实际工时" + } + ] + }, + "RulesGuidList": [ + "f7355555-9eb3-43e8-8fde-5cecffe691be" + ] + }, + "1,26": { + "CssName": "singlebox", + "CellType": { + "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon", + "Style": 3, + "CellDefaultValue": "任务详细视图", + "Items": [ + { + "Value": "任务详细视图", + "DisplayValue": "任务详细视图" + }, + { + "Value": "人员统计视图", + "DisplayValue": "人员统计视图" + } + ] + } + }, + "1,35": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "Text": "查询", + "TemplateKey": "_RS_Main1", + "Icon": { + "Name": "Application/047_search_8.svg", + "BuiltIn": true, + "Color": "Background 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, + "3,1": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "6899a8cead694b3ba00307b6756dbd7", + "Command": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!B2" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!执行人" + } + } + ] + } + ], + "ParamProperties": { + "执行人": "执行人", + "总工时": "总工时", + "平均时薪": "平均时薪", + "总提成": "总提成" + } + }, + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "任务工时表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "97421878-8c3f-4e42-9ba8-7637d317a933" + }, + "ColumnName": "执行人" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "执行人", + "GUID": "ff3a5ee6-cb60-4bf0-b312-d3a72c68fb40", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "执行人姓名" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "551e6832-5c1a-4028-a9fa-5f4c72f32d44" + }, + "ColumnName": "总工时" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "平均时薪", + "GUID": "ed933549-a5c9-4e1b-be65-8bcc2b1b35da" + }, + "ColumnName": "平均时薪" + }, + { + "BindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总提成", + "GUID": "05ad4c59-a92a-4d57-8113-0488921b56a6" + }, + "ColumnName": "总提成" + } + ], + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "任务工时表", + "ColumnName": "总工时", + "GUID": "f93371a2-2e00-42a2-9cef-134287c59879" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格1", + "TemplateKey": "BlackWhite", + "DetailTableSetting": { + "$type": "Forguncy.Model.DetailListViewInfo, ServerDesignerCommon", + "ColumnOfDetailTable": "项目ID", + "MasterTable": "项目表", + "ColumnOfMasterTable": "ID", + "DataCommitType": 2 + } + } + }, + "3,11": { + "CellType": { + "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon", + "TemplatePageName": "007ea4aa4c7440478a9a092179dace8", + "DataSourceType": 1, + "DataSource": { + "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon", + "TableName": "项目成员表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "5e6ecc70-0b8c-48c2-ae52-b26c7f580397" + }, + "ColumnName": "项目成员" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "eded767c-dd09-4323-a133-72d59d357da6", + "AttachType": { + "$type": "ForguncyDataAccess.UserColumnAttachObj, ForguncyDataAccess", + "UserColumnAttachType": 1 + } + }, + "ColumnName": "项目成员_全名" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "2b7f920d-dae0-4573-8cdd-9595f6750ef5", + "RelationBinding": { + "RelatedTable": "项目岗位", + "RelatedColumn": "ID", + "DisplayColumn": "岗位名称" + } + }, + "ColumnName": "岗位名称" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "15b189a0-94c5-49c8-a051-80060a288837" + }, + "ColumnName": "默认时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "88127190-fc5f-4ae1-8278-2114953e59bb" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目ID" + } + }, + "OrderBySqlCondition": { + "OrderByColumns": [ + { + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "FGC_CreateDate", + "GUID": "0b2d493b-818f-4d46-b6b1-b93a3eb7b4d1" + }, + "Order": 1 + } + ] + }, + "IsListviewDataSource": true, + "CustomColumns": [] + }, + "DataSourceListviewName": "图文列表表格2", + "DisplayMode": 2, + "TemplateKey": "渐变卡片" + } + }, + "5,1": { + "BindingInfo": { + "TableName": "项目表", + "ColumnName": "工时核定方式", + "GUID": "d6bd5419-1ac2-4273-b273-2ad756ae5ffb" + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 13.333333333333332, + "Foreground": 0 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332 + }, + { + "FontSize": 13.333333333333332 + }, + { + "FontFamily": 1, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 2 + }, + { + "FontFamily": 1 + }, + { + "HorizontalAlignment": 3 + } + ], + "Types": { + "Strs": [ + "black", + "Body", + "Right", + "Center" + ] + }, + "CellStyles": { + "1,1": 0, + "1,11": 1, + "1,25": 2, + "1,26": 3, + "1,27": 4, + "1,28": 4, + "1,29": 4, + "1,30": 4, + "1,31": 4, + "1,32": 4, + "1,33": 4, + "1,35": 2, + "3,1": 5, + "3,11": 5, + "4,1": 5, + "4,2": 5, + "4,3": 5, + "4,4": 5, + "4,5": 5, + "4,6": 5, + "4,7": 5, + "4,8": 5, + "4,9": 5, + "5,1": 2 + }, + "SheetStyle": { + "FontFamily": 1 + } + }, + "Spans": [ + "1,1,1,9", + "3,1,1,9", + "1,11,1,8", + "1,35,1,4", + "1,26,1,8", + "5,1,1,4", + "3,11,1,28" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员!项目子页面" + }, + "Title": "加载中" + } + ], + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_LoginUser" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [], + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=IF(项目成员!$AA$2=\"任务详细视图\",0,1)" + }, + "GUID": "f7355555-9eb3-43e8-8fde-5cecffe691be", + "StyleInfo": { + "Underline": null, + "Strikethrough": null + }, + "IsInvisible": true + } + ] + } + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "项目成员!$B$6" + } + ] +}///4AEQp7JwohyriN94PsUJvKaiUz2+J0CNY4CbFBkoipsuHOCW95vcBMKSGyVqP+Ciw3VJRV3enLPe4OH9JCpgicrEVkzzF31FYJlM0hgBmzFjXqykEDDjaiSxhgR7Bv+X01UTx6zVzjSm3cvs1cwgjSN56u7UvOKo3KZz/Z/oh0OurC1rAOszpvaLaxOeWrSeWwwT+Cf4t+iEhpPPQaRaIU3NAEtlA5JiW16tKpwRBo3AcFkIgPwBPXAp+QYIa1UQd7Q26rcXYSUICUY1XFp+BL3xlLneh90d+paEIHK0vXh25NX4piZ0bNYNnnCRiEUKsap+OFdIDjlYvupClklCJSMC8fh3fjP/q0IUpJREIo85AjGKlHiCOGlrtcEPnoPoxagXTogwU58FK+2gZrsc4wPxG9Tb7GIsLHh3H4uEAkCVsk0mEtfj0OF9ocGXudaUUfjGx/IqnQ1PgJlHa30d9Be9QPmpdxbmW4xewrUrKpq5zvM5fb6OW+fvK2kWOk0H64dBIvgbuPl/ggOTMjXjhY3nlZcHt5aRpNTMRStnfQ+SSpk1ciD7NNL1E6CAcHqwpxj7GNdEeBu0CUkrk0b5xDrn+FJn4NNkBV7CidCFpe8KrQfVmdR7Owglm4Bh5x/3l3cSGpbXf700+Htb0ahvBhJ+TrNIj04DJ5yMrz9O989Cqcy7HQZxZv4Oyh5yn36EYM8h5uCHw3zkSzLg8kqmrcDQA0/NnRMfSetjzQzqlvllEAbHGZOaIHgUyW+EiS4sEmBHJ1pDxcU4UrlICfou6V5f/BHPDYnvG+e8qBG2xix3EcgDmulHyTSos1AVKqo4sNGhEctXOyrCT5Okbk0BjGs71ITVxIey2kf9p7voPrWQnZy6/napi/erBOH1j/qO7z2h0fds0vucPe7guZyjw==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员.rd b/Pages/项目首页/项目首页子页面/项目成员.rd new file mode 100644 index 00000000..35e45c39 --- /dev/null +++ b/Pages/项目首页/项目首页子页面/项目成员.rd @@ -0,0 +1,11 @@ +{ + "PageType": 0, + "ColumnCount": 40, + "RowCount": 6, + "CustomNames": [ + { + "Name": "工时核定方式", + "Formula": "项目成员!$B$6" + } + ] +} \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目成员统计.json b/Pages/项目首页/项目首页子页面/项目成员统计.json index 5512ab2d..f38ea99a 100644 --- a/Pages/项目首页/项目首页子页面/项目成员统计.json +++ b/Pages/项目首页/项目首页子页面/项目成员统计.json @@ -8,7 +8,7 @@ }, "1": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 87.0, + "DesignLengthInPixel": 198.0, "Mode": 1 } } @@ -211,12 +211,7 @@ "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "ea960229-a6c2-4278-9c58-aa3b7f5f02c5", - "RelationBinding": { - "RelatedTable": "用户信息视图", - "RelatedColumn": "用户名", - "DisplayColumn": "全名" - } + "GUID": "a14f7334-4346-4b3e-ac2a-f3ce7da6bc80" }, "ColumnName": "执行人" }, @@ -224,14 +219,14 @@ "BindingInfo": { "TableName": "View_任务工时统计", "ColumnName": "执行人", - "GUID": "ade4efc1-dd63-4ade-bdc2-70253bc35607", + "GUID": "ea960229-a6c2-4278-9c58-aa3b7f5f02c5", "RelationBinding": { "RelatedTable": "用户信息视图", "RelatedColumn": "用户名", - "DisplayColumn": "头像" + "DisplayColumn": "全名" } }, - "ColumnName": "头像" + "ColumnName": "执行人姓名" }, { "BindingInfo": { @@ -341,4 +336,4 @@ "PaperSize": {}, "Margin": {} } -}//m3GO64Vi1ojR+Y4rmsLDft/z+P55VBV0IX6wLCHEObQ5xiuBCuw6xigYdWYoa91aZLVvOywHh8jYr9BOG5ihjhqC/QMX3rw2QtJvzKA0RLtP01oaBNKPPQxzJWjTANbqNF9VrK2ai4b6dOifyzghuOwhwZe+e0gsGq1h8QfEzyOQVateEahdtl0Oz2ydwAi0lLP9WuKJ9DNlSJzECV54bcfj64FZr6Y9HQtXC1mAT/1Qjvvof0c/xI48NI7mrJLa1JMIhb+s/9JQERS32ohUZS1XnosqB3Z1q7Pm/xiFgeIZSS6jJygna57X/DWK24g06+mF+35FkLjEu0vVDkueJxvEhHsr8pMafpazB1I1ovmf6GN5FA9iQbbiqARkbFotGcTAj5w3c+zmvy0JNE8RtWQSuTngOV1P8H7ngP6B/1unDnxuRU+QBSDoOZBwrpMa3DH6LVkKq27PlctHgJottSBw5QD2/87mEKeq8q9IYR+gJ25EuOTHsPoHo2Msz5dqBu/+NQ6192YnPl5oxsN0BBdH/nF6tjVhLostYHAI4p18pkcFoAciq7HjPBk5tXYKwsFsbNaZPVg/vy5dps652BCpW+e2CX71WAY2bCl0ieCgq6u1BXA7zb0DuiWbfDzVPJAR0OJWqR4lEv8bTDA3XMEVjoWwqmMd3CeOCtHoZ8fQMLEfsnH4haBH8dxm5JTXO/2rMevH46qUAYd5ZI1B4UgTamo0Hz2hdQYVGG5Cq3VralN7DqCgwgIDnS+JnvXkUB1HRt4E4q98dgr2FpRXBsdAx9lYyqc37+Uq1GGWw8KAVXCOV5TM++xM4MJ8hQ5DNJ5stvQV0nQcUBTOh7uhVdcqIRVwiF4GCk4nrn+aiyAlDORm7f8hXtGoUP2rWkeOW+uGHB9DB74jP+VSEcqcQQ==|920 \ No newline at end of file +}//MF5iqTIyb+ULR/fHXQEGdbm0ylNoBDFaBS6oSWF5zONvuCj5uZvbLpiQnH4XqDxv8lcdxKSDzeMiH7dJOVPAbSXi9saB8rOnCRfel7f/DFiESrgnzGyLi4tAiEAmOoezuW+RpnqdKcNfX0cO7sJec1JrUWlyvAFMOG/lbHnnCrJW6IjIpKCIRzwa3So6FlgU4Jp5S3vzRIayWtokE5SKbiZp2tTZ4b41lODekhMtC25C5jToGxR5RsQFo1UZ4BYkLu1Bxib1/jIwtGedW1MuCOXCP1iTxDFHKc9SZi7kFXKo3IXmuP7efUsOIz1SEhv+6fp+Nwo+Ctp7MPe9gP9AT29kvRdjcUPPR/lx/csnLKTwq7N4n0lYq8qXiK0Xjs9ziNnwZNdNC22qhRwj67mwOPFuIzBo74HkUbItYXFVAV8Sw8/B3wtL5GRVbIMlAdh5kzOC12WxyFckSaIp9YZNugDNRf+0AcAL7Bmht++f1rGdjr1YvvZOcy/DdSfEnlu5y4OLCCHJW7gcuqPJoyVI618tn7XVVsgfTjg+aQJEnriMz7liTZiNLPzVj+pvmpzxt2i6s1teLu+LGRI/c9RRp/aaXgeNB3zE/c5Jw9eJL0ouw6ltQdRE0Kq/m0QcdbnqSnunHBYCE0IqvxxFj0jkVjgDUlPY78hmSVrnQT4MFjrVQiwvZ63pQWWzvkwH+zwmVbg6s+F+pzapx0SWnj98Kbw6VGC8G/m3OQ/vUKBue12Qt2QEjK5FL7iXeW3v3PQS1x5oWhuyUHmXC+lyG05F4Cp47Fp+M0fwKZBqMHN5/eDQFeh3B5sw/Q/SHyUaBKkQ7DEAyL7jQ7hXscStvAqfG25HaMMJ4cvnNYVmp/PPM7tNLEzwsmoDXWL70vW0QMcXulV6oDA3zwggX+DOKG/mKA==|920 \ No newline at end of file diff --git a/Pages/项目首页/项目首页子页面/项目概况.json b/Pages/项目首页/项目首页子页面/项目概况.json index 7214e78a..02352451 100644 --- a/Pages/项目首页/项目首页子页面/项目概况.json +++ b/Pages/项目首页/项目首页子页面/项目概况.json @@ -19,7 +19,7 @@ }, "3": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 117.0, + "DesignLengthInPixel": 224.0, "Mode": 1 } }, @@ -779,7 +779,7 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Name": "Chart1", - "Location": "32,573", + "Location": "32,680", "Size": "960,230" } ], @@ -801,4 +801,4 @@ "Formula": "项目概况!$AG$2" } ] -}//2/XNxl+qbLlvwEU6alMGY50ParIOauAB4s4gH9x5huEz3qAcR5gidshPkHKLiCPajaiwhkuJsWcOt5OG6CHiW3DNWudQ83tKMlB5654vNQa7WCLT19NBvR8igI2NPo2LUsaf41jEiaXdWnBbgyg0/X3LrcecmORovDyUImF5Qa+C0E8HuMyTA7f3q7Lw1c8fxhpg8Vat2bzDwo9aTUI41OTGePXACI26DYPcQyj4Wzg0js3FP6L07bOwtCy2tR7Qb2cwO7jx+qwAn3obLaN5sD5N+cq5KJA/Za5F67nqeU5EMLGeZy+vheQFQxA6neBbbKgOR0cC8juTe47oOLiXlfQM3y9WvQrZBzozdgY444qgL52Rlyg7NDJ9Egi4GpBddjVW0VVCVg1UT07YrluZrj6omA/1Jlr/+wP3yFb0ps0BWgubp/XSIwa1AYAbQjV0mGgdloKvqtCkYXwXwPRn3N+kvljJS5rPA5/o2SNGIK/pxV5lHa42a5ChZOv6SQKMZdHTbMVRZBZl7W5mey7jSo7HapZyile7EyHHDhbO/80ytKOldmd46ui3OGpkt3dqmZaH5NjbtO+ekyMWrGdq8JCNzhRlWneCQBAUqc/lF2wZ2bW3Udy9+j1OhKnV8JiJw7e3BAMv5JaROpV3MRw5TwApktJ+hmtWF4omRHV4gtnaKF1l3FNu5xzjRx1oU9oG5tWMRKJQE5jW+grRVAFGP0VQQbCkZY1EhWf6+E7DIPSKvU+mvWU/a9tjncNNs7E+PF4VrDGRR5jdxN8xdMkrx3A8hRJ2DGcDv9gtWqaVYwWQmwme5UchgnTfAAbIUg1PSHe2fHSTHhPw50EAD5oxo8sy1v4H8I31qPX+IxWjmJYBEK8nvTZxSJ3CD+Rh/MjcOImOTDrDsXpBgJua26yUMQ==|920 \ No newline at end of file +}//W4MSBUkpsYNxSG/XwsyNxf/qJG2UlOzC357gW76w0N8i0T0TfIBkaLhDxvWDzQuaUKBONkN91VmnY9uA7VWKam0TakpEoDCUiyDyX//R2m6vueWw6sHG71SmdeW5k/ls29NETiIrCAdMpxy04/ZZtLkz4l0CIzzh3HZIneaLGx5Btyk5Zv7gJwxQvb89ZFtszIEk9vLcjDzitKPrahudSjGYMoi5YHhYRxhsbluanicxhNp5XB5cSeq5bLNAPGtULHBP15ci2luvzHMkQg9QcRC2T0kTXaiAjENKO4RDA9CYjLsQjOkQdNs5YSehXzvtSHE9CCK2KeCDTrG6xf9uL3lQ4ZRlYAd0awcaU3Br41FMY+Ry90LOty6DiaOuht1I035YPZM94C33EWhulnWDCMlouBiJ0qrUWDoI8KToKLm7DqSka8d5QFjlLih/71zjMbVafAe/RDl3kmhqGVvo65ytLcZ8C4VOWi1nbvfyza6wOF+L/BwMjWNWCCohKKcxqo+bpxMnfpsUCOERZxX5cl99hxDGpme9/xrekWiscibhM8/A36UXW9UgHq997prqX+Y8LpFqMQMKlnihH5rBsgDyQeCfvKfd3tGfG6k1mWtm4C2q/xk8peYcBW8FabNZmUcCHojLWFTCW+wBc1l51KWQp9gJxoGA9Zrhim6ksRpu87RxK+XAn6fjdk97qPhc/8InRXXqSgJvjvLSey2dpopqTsF3EsvKZE6eEG5Zw2/szCVjHikB94LMtCe7qjvlWE0EnOb0lo3AdHYQjE6m8dZAEKXWRx16kBDK8mNn878gX/thhxdgtNnZhWxboTGv+r6hyixjfT2FiTiZ5ihspiFCdtf38OfB0PKZFnfVuuaius6kaAxdG/YIsMKWSM4URn6LBhQvEJmjQUubw0isOg==|920 \ No newline at end of file diff --git a/Plugin/富文本编辑器-10_0_0_0.zip b/Plugin/富文本编辑器-10_0_0_0.zip new file mode 100644 index 00000000..7268d04e Binary files /dev/null and b/Plugin/富文本编辑器-10_0_0_0.zip differ diff --git a/ServerCommands/项目/同步项目成员.json b/ServerCommands/项目/同步项目成员.json new file mode 100644 index 00000000..dcc4b578 --- /dev/null +++ b/ServerCommands/项目/同步项目成员.json @@ -0,0 +1,373 @@ +{ + "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": "项目ID", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.CatchExceptionCommand, ServerDesignerCommon", + "TryCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "成员列表", + "TableValue": { + "TableName": "任务成员表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "46de6571-6826-4235-976f-a5064c56a1d7" + }, + "ColumnName": "参与人" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "岗位ID", + "GUID": "dc37147b-37ae-447e-be34-44aa79248cd9" + }, + "ColumnName": "岗位ID" + }, + { + "BindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务时薪", + "GUID": "ffd017c3-0213-434a-850a-17e468a25351" + }, + "ColumnName": "任务时薪" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "2cc2c0aa-d496-4ba1-9489-9340529dba7f", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "项目ID" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + } + }, + "ID": "26c5cca1321e4452a0571822eda70f9d" + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=成员列表" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否存在", + "TableValue": { + "TableName": "项目成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "7d33c794-4447-4038-84d0-215ede69a00c" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "958cdb07-86e0-45cc-90f5-f10ddc68fc3f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.参与人" + } + } + ] + }, + "NullFormulaValueQueryPolicy": 0 + }, + "ID": "e1175777efe1428db7a940d44c33d8af" + }, + { + "$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" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "add", + "ShowConfirm": false, + "UpdateBindingValues": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "b5dba8cc-b6c6-4453-b2c7-5eee4a72bba9" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "cec1565c-6cf4-40f9-875d-c332832ca12d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.参与人" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "岗位ID", + "GUID": "a41ae40a-48be-4e06-808a-5d3180a9179d" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.岗位ID" + } + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "默认时薪", + "GUID": "dca7ae70-52c2-4102-aa42-c3d41fe145c6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.任务时薪" + } + } + ] + } + ], + "ID": "747cdcdd-8f33-49f2-bac1-c05fc36b2602" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "项目成员列表", + "TableValue": { + "TableName": "项目成员表", + "BindingInfos": [ + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "776b34e0-2742-40f8-b25a-7442467aad3c" + }, + "ColumnName": "ID" + }, + { + "BindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目成员", + "GUID": "54c3ab22-8dfa-4375-9161-50d4240730af" + }, + "ColumnName": "项目成员" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "项目ID", + "GUID": "a39233a0-70be-4432-9c6c-5119c5fc397e" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + } + }, + "ID": "b61a6630f13f4d60a260243f7ba8d01e" + }, + { + "$type": "Forguncy.Model.LoopCommand, ServerDesignerCommon", + "LoopInfo": { + "$type": "Forguncy.Model.CountLoopInfo, ServerDesignerCommon", + "LoopCount": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目成员列表" + }, + "LoopItemParamName": "Item" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "是否存在", + "TableValue": { + "TableName": "任务成员表", + "TableValueType": 3, + "SqlCondition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "任务ID", + "GUID": "4a90d292-0621-4ba2-b56d-ca1ceed510a8", + "RelationBinding": { + "RelatedTable": "任务表", + "RelatedColumn": "ID", + "DisplayColumn": "项目ID" + } + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "任务成员表", + "ColumnName": "参与人", + "GUID": "3bc96ff4-ca55-4f09-9c6f-ad89327ec7f6" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.项目成员" + } + } + ] + } + }, + "ID": "53692da06b9444d6a0d6f2d56dc87b5c" + }, + { + "$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" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon", + "TableName": "项目成员表", + "UpdateType": "delete", + "ShowConfirm": true, + "ConfirmText": "您确定要删除吗？", + "RowsToUpdate": 1, + "RowsToUpdateCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目成员表", + "ColumnName": "ID", + "GUID": "c68c1577-2e22-464b-b66b-fcc6b6921063" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Item.ID" + } + } + } + ], + "ID": "472d8e9e-a7a8-4def-bdbd-c74cb220ddd4" + } + ] + } + ] + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "同步完成" + } + ] + }, + "CatchCommandPart": { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionCode" + }, + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ExceptionMessage" + } + } + ] + } + } + ] +} \ No newline at end of file diff --git a/Tables/项目任务/项目成员表.json b/Tables/项目任务/项目成员表.json new file mode 100644 index 00000000..ead67de6 --- /dev/null +++ b/Tables/项目任务/项目成员表.json @@ -0,0 +1,93 @@ +{ + "Name": "项目成员表", + "Columns": [ + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "Unique": true, + "AutoIncrement": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "项目ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon", + "Required": true, + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "项目成员", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "bigint", + "MaxLength": -1, + "Name": "岗位ID", + "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DefaultValue": 0.0, + "DatabaseColumnType": "float", + "MaxLength": -1, + "Name": "默认时薪", + "ColumnType": "System.Double, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_Creator" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_CreateDate" + }, + { + "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifier" + }, + { + "$type": "Forguncy.SaveLoad.DateExtraBingingColumnSaveData, ServerDesignerCommon", + "ColumnType": "System.DateTime, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e", + "Name": "FGC_LastModifyDate" + } + ], + "ExternalDatabaseInfo": { + "DataBaseType": "6db454c0-531c-4395-9122-921a18942902", + "AllowModifySchema": true, + "ConnectionId": "业务表", + "SourceTableName": "项目成员表", + "SourceTableSchema": "dbo" + }, + "PrimaryKey": [ + "ID" + ], + "Relations": [ + { + "PrimaryTable": "项目表", + "PrimaryColumn": "ID", + "ForeignTable": "项目成员表", + "ForeignColumn": "项目ID", + "IsDetailTableRelation": true + }, + { + "PrimaryTable": "项目岗位", + "PrimaryColumn": "ID", + "ForeignTable": "项目成员表", + "ForeignColumn": "岗位ID", + "IsDetailTableRelation": true + } + ], + "Indexes": [] +} \ No newline at end of file diff --git a/Tables/项目任务/项目表.json b/Tables/项目任务/项目表.json index b0908f1e..6d836e99 100644 --- a/Tables/项目任务/项目表.json +++ b/Tables/项目任务/项目表.json @@ -178,7 +178,8 @@ "计划完成日期": 5, "计划工期": 5, "项目方案": 5, - "预算方案": 5 + "预算方案": 5, + "网络资源": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -224,7 +225,8 @@ "计划完成日期": 5, "计划工期": 5, "项目方案": 5, - "预算方案": 5 + "预算方案": 5, + "网络资源": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -270,7 +272,8 @@ "计划完成日期": 5, "计划工期": 5, "项目方案": 5, - "预算方案": 5 + "预算方案": 5, + "网络资源": 5 }, "subTableOperations": { "View_任务工时统计": 5, @@ -427,6 +430,13 @@ "Name": "预算方案", "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" }, + { + "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", + "DatabaseColumnType": "nvarchar", + "MaxLength": -1, + "Name": "网络资源", + "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e" + }, { "$type": "Forguncy.SaveLoad.BindingColumnSaveData, ServerDesignerCommon", "DefaultValue": 0, diff --git a/Theme/CellTypeStyles b/Theme/CellTypeStyles index fb1c9b97..b631d943 100644 --- a/Theme/CellTypeStyles +++ b/Theme/CellTypeStyles @@ -1 +1 @@ -{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFECF9FF","BorderRadiusString":"0px 0px 0px 0px","Bold":true},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL1":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFF3F9FC","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"FontColor":"Accent 1 0","Background":"Background 1 0"},"Transition":"0.15s"},"LEVEL2":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL3":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"渐变卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"linear-gradient(-180deg, #FFFDFBFB 0.00%, #FFEBEDEE 100.00%)","BorderString":"1px solid Background_2_0","BorderRadiusString":"10px 10px 10px 10px","BoxShadowString":"3px 3px 10px 0px #0B000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_60","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"ActiveStyle":{"MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"SelectedStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"Transition":"0.3s"}}},{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}},{"Key":"_RS_Static","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Accent_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px","MarginTop":10,"MarginBottom":10},"Transition":"0.15s"}}},{"Key":"_RS_Selectable","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"4px 4px 4px 4px","BoxShadowString":"0px 0px 5px 0px Text_1_5_38","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_89"},"FocusStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"ActiveStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"Transition":"0.15s"}}},{"Key":"样式1","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"2px 2px 2px 2px","MarginLeft":10,"MarginRight":10,"MarginTop":10},"Transition":"0.15s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}},{"Key":"_RS_Mini","Category":"_RS_RecommendStyle","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Text 1 35","BorderRadiusString":"0px 0px 0px 0px","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"HoverStyle":{"FontColor":"Accent 1 40","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"ActiveStyle":{"FontColor":"Accent 1 -25","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16}}},"Scope":1}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}},{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 40","Background":"Background 1 0","BorderString":"1px solid Text_2_40","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"FontColor":"Text 2 40","Background":"Accent 1 80","BorderString":"1px solid Text_2_40"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60"},"ActiveStyle":{"FontColor":"Background 1 0","Background":"Accent 1 40","BorderString":"1px solid Accent_1_40"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"#FFFFFF","BorderString":"1px solid Background_1_-25"},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"Background":"Accent 1 20"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_40"},"ActiveStyle":{"Background":"Accent 1 -20"},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Text 1 50","BorderString":"1px solid #AAAAAA"},"Transition":"0.15s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"黑色","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 25"},"DisableStyle":{"Opacity":0.41316738912675405}}},"StyleTemplateFashionScope":2},{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}],"Forguncy.ProcessPanelCellTypeStyleTemplateSupportAttribute":[{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Accent 1","Background":"Background 1","BorderString":"1px solid Accent_1","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"#FFFFFF","BorderString":"1px solid Background_1_-35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 -20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Background 1 -35","BorderString":"1px solid Background 1 -35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}}]} \ No newline at end of file +{"Forguncy.CustomMenu.ForguncyMenuCellTypeStyleTemplateSupportAttribute":[{"Key":"透明菜单","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"6px 6px 6px 6px"},"HoverStyle":{"Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Background 2 -75"},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"FontColor":"Background 1 -15","Background":"Text 1 0","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"SelectedStyle":{"FontColor":"Background 1 0","Background":"Text 1 15"},"Transition":"0.3s"},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"BalckWhite","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 50"},"SelectedStyle":{"FontColor":"Accent 1 0","BorderLeftString":"3px solid Accent_1_0","Bold":true},"Transition":"0.3s"},"LEVEL1":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL2":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}},"LEVEL3":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px"}}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"LEVEL0":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFECF9FF","BorderRadiusString":"0px 0px 0px 0px","Bold":true},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL1":{"NormalStyle":{"FontColor":"Text 1 35","Background":"#FFF3F9FC","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"FontColor":"Accent 1 0","Background":"Background 1 0"},"Transition":"0.15s"},"LEVEL2":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"},"LEVEL3":{"NormalStyle":{"FontColor":"Accent 1 14","Background":"Background 1","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Accent 1 90"},"FocusStyle":{"Background":"Accent 1 80"},"SelectedStyle":{"Background":"Accent 1 80"},"Transition":"0.15s"}}}],"Forguncy.RepeaterCellTypeStyleTemplateSupportAttribute":[{"Key":"渐变卡片","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"linear-gradient(-180deg, #FFFDFBFB 0.00%, #FFEBEDEE 100.00%)","BorderString":"1px solid Background_2_0","BorderRadiusString":"10px 10px 10px 10px","BoxShadowString":"3px 3px 10px 0px #0B000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"HoverStyle":{"BorderString":"1px solid Accent_1_60","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"FocusStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"ActiveStyle":{"MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"SelectedStyle":{"BorderString":"1px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":15},"Transition":"0.3s"}}},{"Key":"普通_悬浮变白_","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 1 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"竖排无样式","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"Background":"Background 2 0","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"FocusStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"ActiveStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"SelectedStyle":{"MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"Transition":"0.3s"}}},{"Key":"BlackWhite","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1 0","BorderString":"2px solid Background_2_0","BorderRadiusString":"8px 8px 8px 8px","BoxShadowString":"3px 3px 5px 0px #20000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"HoverStyle":{"BoxShadowString":"5px 7px 15px 0px #17000000","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"FocusStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"ActiveStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"SelectedStyle":{"BorderString":"2px solid Accent_1_0","MarginLeft":8,"MarginRight":8,"MarginTop":8,"MarginBottom":8},"Transition":"0.3s"}}},{"Key":"_RS_Static","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderTopString":"","BorderRightString":"","BorderBottomString":"","BorderLeftString":"3px solid Accent_1_0","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"0px 0px 0px 0px","MarginTop":10,"MarginBottom":10},"Transition":"0.15s"}}},{"Key":"_RS_Selectable","Category":"_RS_Normal","Styles":{"TEMPLATE":{"NormalStyle":{"BorderRadiusString":"4px 4px 4px 4px","BoxShadowString":"0px 0px 5px 0px Text_1_5_38","MarginLeft":5,"MarginRight":5,"MarginTop":5,"MarginBottom":5},"HoverStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_89"},"FocusStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"ActiveStyle":{"BoxShadowString":"0px 0px 7px 0px Accent_1_0_165"},"Transition":"0.15s"}}},{"Key":"样式1","Category":"_RS_Custom","Styles":{"TEMPLATE":{"NormalStyle":{"Background":"Background 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"2px 2px 2px 2px","MarginLeft":10,"MarginRight":10,"MarginTop":10},"Transition":"0.15s"}}}],"Forguncy.ImageCellTypeStyleTemplateSupportAttribute":[{"Key":"按钮图标","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Background 1 -50","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"上圆角封面","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"8px 8px 0px 0px"}}}},{"Key":"pd_10","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"0px 0px 0px 0px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":10,"PaddingBottom":10}}}},{"Key":"中圆角","Category":"_RS_Custom","Styles":{"CONTAINER":{"NormalStyle":{"BorderRadiusString":"10px 10px 10px 10px"}}}},{"Key":"_RS_Mini","Category":"_RS_RecommendStyle","Styles":{"CONTAINER":{"NormalStyle":{"FontColor":"Text 1 35","BorderRadiusString":"0px 0px 0px 0px","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"HoverStyle":{"FontColor":"Accent 1 40","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16},"ActiveStyle":{"FontColor":"Accent 1 -25","MarginLeft":16,"MarginRight":16,"MarginTop":16,"MarginBottom":16}}},"Scope":1}],"Forguncy.ButtonCellTypeStyleTemplateSupportAttribute":[{"Key":"动态背景","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"6px 6px 6px 6px"},"DisableStyle":{"Opacity":0.445079736545843}}}},{"Key":"链接样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"FontColor":"Text 1 0"},"Transition":"0.3s"}}},{"Key":"圆角浮动","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1 -50","Background":"Background 1 0","BorderString":"1px solid Background_2_0","BorderRadiusString":"20px 20px 20px 20px","BoxShadowString":"5px 5px 16px 0px #10000000"},"HoverStyle":{"FontColor":"Background 1 0","Background":"Accent 1 0"},"Transition":"0.3s"}}},{"Key":"Gost","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"8px 8px 8px 8px"},"HoverStyle":{"Background":"Background 2 0"},"DisableStyle":{"Opacity":0.44507973654584293},"Transition":"0.3s"}}},{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Accent 1 40","Background":"Background 1 0","BorderString":"1px solid Text_2_40","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"FontColor":"Text 2 40","Background":"Accent 1 80","BorderString":"1px solid Text_2_40"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60"},"ActiveStyle":{"FontColor":"Background 1 0","Background":"Accent 1 40","BorderString":"1px solid Accent_1_40"},"DisableStyle":{"FontColor":"Background 1 -25","Background":"#FFFFFF","BorderString":"1px solid Background_1_-25"},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"BUTTON":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","MarginLeft":4,"MarginRight":4,"MarginTop":4,"MarginBottom":4},"HoverStyle":{"Background":"Accent 1 20"},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_40"},"ActiveStyle":{"Background":"Accent 1 -20"},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Text 1 50","BorderString":"1px solid #AAAAAA"},"Transition":"0.15s"}}}],"Forguncy.HyperlinkCellTypeStyleTemplateSupportAttribute":[{"Key":"红色带背景","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Accent 5 0","Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"Background":"Accent 5 80 51"},"DisableStyle":{"Opacity":0.41316738912675405},"Transition":"0.3s"}},"StyleTemplateFashionScope":2},{"Key":"黑色带背景","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"FontColor":"Text 1 0","Background":"Background 1 0","BorderRadiusString":"6px 6px 6px 6px","PaddingLeft":5,"PaddingRight":5},"HoverStyle":{"Background":"Accent 1 80 51"},"DisableStyle":{"Opacity":0.41316738912675405},"Transition":"0.3s"}},"StyleTemplateFashionScope":2},{"Key":"Gost","Category":"_RS_Custom","Styles":{"LINK":{"NormalStyle":{"Background":"#00FFFFFF","BorderRadiusString":"5px 5px 5px 5px","PaddingLeft":5,"PaddingRight":5,"PaddingTop":5,"PaddingBottom":5},"HoverStyle":{"Background":"Background 2 0"},"Transition":"0.3s"}}}],"Forguncy.TextCellTypeStyleTemplateSupportAttribute":[{"Key":"Gost","Category":"_RS_Custom","Styles":{"MAIN":{"NormalStyle":{"FontColor":"Text 1 50","Background":"#00FFFFFF","BorderRadiusString":"0px 0px 0px 0px"},"HoverStyle":{"Background":"Background 2 0"},"FocusStyle":{"FontColor":"Text 1 0","Background":"Background 2 0"},"Transition":"0.3s"},"FGC_BUILDIN_ERROR":{"NormalStyle":{"BorderString":"1px solid #FFFF0000","BorderRadiusString":"5px 5px 5px 5px"}}}}],"Forguncy.ProcessPanelCellTypeStyleTemplateSupportAttribute":[{"Key":"流程样式2","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Accent 1","Background":"Background 1","BorderString":"1px solid Accent_1","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 80","BorderString":"1px solid Accent_1","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"#FFFFFF","BorderString":"1px solid Background_1_-35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}},{"Key":"流程样式","Category":"_RS_Custom","Styles":{"PROCESS_PANEL":{"NormalStyle":{"FontColor":"Background 1","Background":"Accent 1","BorderString":"","InsideHorizontalBorderString":"","InsideVerticalBorderString":"","BorderRadiusString":"4px 4px 4px 4px","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"HoverStyle":{"Background":"Accent 1 20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"FocusStyle":{"BoxShadowString":"0 0 1px 2px Accent_1_60","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"ActiveStyle":{"Background":"Accent 1 -20","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"DisableStyle":{"FontColor":"#EEEEEE","Background":"Background 1 -35","BorderString":"1px solid Background 1 -35","PaddingLeft":10,"PaddingRight":10,"PaddingTop":4,"PaddingBottom":4},"Transition":"0.15s"}}}]} \ No newline at end of file diff --git a/Theme/ListViewStyles b/Theme/ListViewStyles index f8dde4ff..675bcdd6 100644 --- a/Theme/ListViewStyles +++ b/Theme/ListViewStyles @@ -1 +1 @@ -[{"Name":"_RS_NewFashionListStyle2","Group":"_RS_RecommendStyle","ColumnHeaderBack":"Background 2 0","ColumnHeaderFore":"Text 1 50","EvenRowBack":"Background 1 0 0","EvenRowFore":"Text 1 15","OddRowBack":"Background 1 0 0","OddRowFore":"Text 1 15","SelectBack":"Background 2 0 51","ColumnHeaderHighlightBack":"Background 2 0","ColumnHeaderHighlightFore":"Text 1","ColumnHeaderHoverBack":"Background 2 0","ColumnHeaderSelectBack":"Background 2 0","ColumnHeaderSelectFore":"Text 1 15","TotalRowBack":"Background 1 0 0","TotalRowFore":"Text 1 15","SelectBorder":"Accent 2 0","DirtyCellColor":"Accent 2 40","GridLineColor":"Background 2 -10","ColumnHeaderGridLineColor":"Background 2 -10","RowHeaderGridLineColor":"Background 2 -10","ColumnFilterButtonStyle":1,"ColumnFilterIconColor":"Text 1 50","OutLineColor":"Background 2 -10","RowSelectBack":"Background 2 0 204","RowHoverBack":"Background 2 0 51"}] \ No newline at end of file +[{"Name":"_RS_NewFashionListStyle2","Group":"_RS_RecommendStyle","ColumnHeaderBack":"Background 2 0","ColumnHeaderFore":"Text 1 50","EvenRowBack":"Background 1 0 0","EvenRowFore":"Text 1 15","OddRowBack":"Background 1 0 0","OddRowFore":"Text 1 15","SelectBack":"Background 2 0 51","ColumnHeaderHighlightBack":"Background 2 0","ColumnHeaderHighlightFore":"Text 1","ColumnHeaderHoverBack":"Background 2 0","ColumnHeaderSelectBack":"Background 2 0","ColumnHeaderSelectFore":"Text 1 15","TotalRowBack":"Background 1 0 0","TotalRowFore":"Text 1 15","SelectBorder":"Accent 2 0","DirtyCellColor":"Accent 2 40","GridLineColor":"Background 2 -10","ColumnHeaderGridLineColor":"Background 2 -10","RowHeaderGridLineColor":"Background 2 -10","ColumnFilterButtonStyle":1,"ColumnFilterIconColor":"Text 1 50","OutLineColor":"Background 2 -10","RowSelectBack":"Background 1 0","RowHoverBack":"Accent 2 80 102"}] \ No newline at end of file diff --git a/image/图片/默认头像 .png b/image/图片/默认头像 .png new file mode 100644 index 00000000..01d9eea8 Binary files /dev/null and b/image/图片/默认头像 .png differ