diff --git a/.collaboration b/.collaboration
index 88f869c9..30728f65 100644
--- a/.collaboration
+++ b/.collaboration
@@ -17,29 +17,11 @@
},
{
"ModuleName": "Table/项目表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:17:39.0540605+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\项目任务\\项目表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/任务表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:18:43.674508+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\任务\\任务表.json"
- ]
+ "ModuleType": 7
},
{
"ModuleName": "Table/任务类型",
@@ -147,17 +129,7 @@
},
{
"ModuleName": "PCPage/项目列表",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:17:39.0548391+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目首页\\项目列表.json",
- "Pages\\b90932e038f94707b54e571ff7cd84d.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/项目首页",
@@ -169,16 +141,7 @@
},
{
"ModuleName": "PCPage/项目标题",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:49:18.8536851+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目首页\\项目标题.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Pages/项目首页/子页面",
@@ -194,42 +157,15 @@
},
{
"ModuleName": "PCPage/任务首页",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:12:07.20037+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务首页.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-基本信息",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:18:43.6743896+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-基本信息.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-任务信息",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:11:31.4747484+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\任务-任务信息.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/任务-侧栏",
@@ -486,34 +422,12 @@
},
{
"ModuleName": "PCPage/新增任务",
- "State": 1,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:18:43.6745033+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\任务\\新增任务.json"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "Table/项目版本",
"ModuleType": 7
},
- {
- "ModuleName": "Table/项目分组",
- "State": 2,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:18:43.6741871+08:00",
- "ModuleType": 7,
- "ToRemoveFiles": [
- "Tables\\项目任务\\项目分组.json"
- ]
- },
{
"ModuleName": "Tables/任务",
"ModuleType": 22
@@ -528,192 +442,78 @@
},
{
"ModuleName": "Image/caret-down-small.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:49:04.679938+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/增加.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:49:04.6799929+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/设置 (1).svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:49:04.6799945+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/设置.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:49:04.6799954+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/编辑.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:50:18.72463+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/更多1.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:50:18.7246316+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/产品1.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:50:18.7246325+08:00",
"ModuleType": 38
},
{
"ModuleName": "PCPage/项目菜单",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:57:31.4912399+08:00",
"ModuleType": 1
},
{
"ModuleName": "Image/回收站.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:55:22.1824571+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/提示.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:56:56.4683951+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/退出.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:57:39.0779346+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/人才.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:58:22.4175494+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/项目文件.svg",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T10:59:25.0590125+08:00",
"ModuleType": 38
},
{
"ModuleName": "PCPage/项目信息",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:17:39.0549193+08:00",
"ModuleType": 1
},
{
"ModuleName": "image/图片",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:15:10.514027+08:00",
"ModuleType": 37
},
{
"ModuleName": "Image/app-logo横幅1.png",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:15:24.1457608+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/app-logo.png",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:15:32.5890032+08:00",
"ModuleType": 38
},
{
"ModuleName": "Image/app-logo3.png",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:15:32.5890051+08:00",
"ModuleType": 38
},
{
"ModuleName": "Table/项目任务分组",
- "State": 3,
- "LockedBy": {
- "UserName": "SHAMUSPC\\NINGMEI",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-03-02T11:18:43.6741928+08:00",
"ModuleType": 7
}
]
\ No newline at end of file
diff --git a/Pages/任务/任务-任务信息.json b/Pages/任务/任务-任务信息.json
index bbdeeccf..e417cfe1 100644
--- a/Pages/任务/任务-任务信息.json
+++ b/Pages/任务/任务-任务信息.json
@@ -261,7 +261,7 @@
},
"Value": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "='任务-任务信息'!任务ID"
+ "SerializeProperty": "='任务-任务信息'!项目ID"
}
},
"CustomColumns": []
@@ -398,7 +398,7 @@
"Message": "保存成功"
}
],
- "ID": "b87711d4-058f-4e16-adfd-f0fa165ff559"
+ "ID": "32b4fb83-c6c4-4758-9d13-acc9d2fc086a"
}
]
}
@@ -445,7 +445,7 @@
"Message": "保存成功"
}
],
- "ID": "81a081a8-e4b5-417a-aae4-7654a2643b81"
+ "ID": "c8c41ad2-f735-490c-b804-234bbb0418e8"
}
]
}
@@ -655,4 +655,4 @@
"PaperSize": {},
"Margin": {}
}
-}//yhecHa5riH/XBNBi/UAG/T0zFn5+oJGGLa8MjqP6AOlphRN85E/vghUhR/iu20mfqWtlDmx/Sk42H4pjdhfkhI+IXrs4pLRwhEjFHmTD66hZEVWfFJyuhQR9aWFhhIYFOItgX2POqjcmVeQ5MfQtXzyoQw2O1ZqXhG5CfAUvdEbe3Lz0CD8JFbdTqjaiaevzbi/tVwNUA7Wq8QUCDwaIMPQoDmtcr65UM7Tlbggxwcrhl8xra5aMy8ND3h2HsA15Hkw/zdJ5+RAchm6MyeupWxT+f/dy0rMdviu9ldcmirAjjjmkooKuKmKpLnooiZQxav4aFrgCFqU54+bAOLw9lCxT4yVSP/9H5PV+zfJxq40DwUuF4Q1s83TJg5WYerAgjLjrJbxwO0ihSNlZaexmAXD3qp3W4WoB2RNfeOFEs7O/hrgxLYvhZoOkEixHwYBxWLuKdCN2jCutftumK3GaFajZIS09XveReQXYmreIaKi667PlkaVBZMfAXH5abhhIzXQSi6uV2SVP7GVZJnQtsNYBBh8W3aks0Wb9Z+pOTPaRBoxD0o+Wq87wAZUQ+PAdzL4WGtqSwQml3MkgDKI4zw3UpEYdw/B2PbNKv0Xu3dNtkZYVPdiZnPLofpROeznEtVdnJjXwGUeX0CyYbQi0AgiPaulpjtAI42NjIHUnHLLBcCEotyzjGEgQqLRs1wa9Ea0EBaSdvBbex0Ak84EraIkcp9Mgq6/PlYGGTxlN2h1nq0MCrP/C9TMZYhBGvD80SB9NN96CH+9WNDBhAIX2wQaRfZ/kguz4f4221/ZgBYOfGoObJmm9ouUKYZE5gm/IeCAbL7ppjgFcer9JyN0F2l/wmVPUJnUIC+FDa/rHnTl5T3G2EmmQeJwpZoDoC0FEpjQKXVDUvJUcE1S89M8eCw==|920
\ No newline at end of file
+}//pqcHF56tcR9oouw+Xd4krd2XRcN78+WDd0p/JM/IngqYJTAZBt2qWQXrbfZPj4gjFSe2qtvp3GiBN2EjfWEDEyqlmGV7Fn2XBdRtyDYtzt07YfuB001OVlnz3MvtUsyQF1O0soR00kQjNmyfoZTvqMAhU/LPKY6aNJ/x7Op5JMzPCnhX5fH0iVbv7kd0supGcmHW1m/Ng38j7sDqOCn5j6OXbLMJ2U1d1skD55PZhJMQhhuzJ0RjbjhTeY1QRxO0XSL1kanvUD1XDOd9RaEmC+EWR5mHshqfcZbl6sZHYltIlkKkhmiiWSGX94r+P/VQmqktY583fj3qWBPfQqe6zmxhJSywfUwQUJde8EmL7NB+w3j2ds6+5WSAP9bf5yjMq31sAFFz555LeZf+UnbbV3ibu2lj6SZutgkOcTLKHAtR9as/Keio4Miu/W25MtuqloEj3Z/AcyxmOPfRR/G7J+bczYfLfYoqxY5TC5kO+D09wavHC6syunsuvplkC8t3+RrNbKJX877BQw24YuND2ocZjA3BlGwIljCv0d3TP/S9hgLVBVnsHeWRjBE1I53OyiRBZqW8NQ8WMywx/Ew9AAGKAb5L5H+J+2MLmIpZ4cWRekCRjHNtDY2mPMhgLfv9HBoL4bImPwmauzS5lGi+x4e/KcNHFuw8cK5ytkQyyX634wvXU8QfpJoZTnztsTYztIxigUAfOdStFmSusAoxvP46rLP0KtQ8dyQm6OjACw4T+GyPqyYibpAz0YwDJYY8ZizW/St/5X79CdLhT0TjV/U3RexA9O7RpgfXzQkx9f6OXOHzSYCxXLIuD1LkBnb/avcjrbnYyfc7oOHNy6VaBTrUZ3+2GtO5hwXqoNa5a6jXVEHZ9gk82/jKHzgyUMbJI4g3voORActzxqj8HSgGuw==|920
\ No newline at end of file
diff --git a/Pages/任务/任务-基本信息.json b/Pages/任务/任务-基本信息.json
index 4b349ff5..83fcfdb2 100644
--- a/Pages/任务/任务-基本信息.json
+++ b/Pages/任务/任务-基本信息.json
@@ -46,6 +46,11 @@
"DesignLengthInPixel": 15.0
}
},
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
"12": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 15.0
@@ -53,13 +58,7 @@
},
"13": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 38.0,
- "IsHidden": true
- }
- },
- "11": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0
+ "DesignLengthInPixel": 38.0
}
}
},
@@ -288,6 +287,7 @@
},
"CellType": {
"$type": "ElementUI.SelectCellType, ElementUI",
+ "CommandList": [],
"UIPermissions": [
{
"Scope": 2,
@@ -391,7 +391,7 @@
"Message": "保存成功"
}
],
- "ID": "09cdbf3e-cf86-4326-b67d-c6e1f9fe6197"
+ "ID": "8a45faae-8072-4c23-984f-43b245e11b58"
}
]
}
@@ -501,7 +501,7 @@
"Message": "保存成功"
}
],
- "ID": "466209d9-0339-48c8-925b-4b6ff1067338"
+ "ID": "b9598a54-750b-4c5e-926e-5d425ba6652e"
}
]
}
@@ -545,11 +545,11 @@
],
"bindingOptions": {
"$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"BindingInfos": [
{
"BindingInfo": {
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"ColumnName": "ID",
"GUID": "427d6efe-dbdc-45b4-aadb-6b65a8865e3d"
},
@@ -557,7 +557,7 @@
},
{
"BindingInfo": {
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"ColumnName": "分组名称",
"GUID": "b704b64d-ade6-4f0d-b8ea-8e734f9253a8"
},
@@ -567,7 +567,7 @@
"SqlCondition": {
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"ColumnName": "项目ID",
"GUID": "018d99a5-8bc7-4c34-8301-7977f11b6135"
},
@@ -659,7 +659,7 @@
"Message": "保存成功"
}
],
- "ID": "ba1fdf9e-58ac-492e-8e93-a64462fdb55a"
+ "ID": "63a1ae63-60cb-4cb3-ba30-221fb07cd401"
}
]
}
@@ -893,4 +893,4 @@
"PaperSize": {},
"Margin": {}
}
-}//5CczPd0XrWi7folzqjfIrPmNYBwE9WsNYxMGEb8SJeqrkS+P9Of4AZBwbl6t8DzOS/oRzv7D0AZH05gwtryq65hRIqhKT6qm320JCIt/t7rqB5LbU8CTtqpRt8pPdpy/bP2v0gOEsrCO813CX33gGGNvsAsgFjVQAQUhX3Te7ojiR+1DAcCOJ4JbrhRGwhiuuLWLjzo75pdznRI5qGFfK32llFLTgZhjXHnmXCPH2snKzzZDBjdf3WHhq49TIdeNLWTTbfzXoC0MKTkW78Y8WP5K3vQ3K2MM29VrMQhelaEWQEaYqFLCXYZT8ifd4e7Iu5t9pb3N9A5CPqKyMW3EoktwhD/a9nMadiFxUyGI2OryqmnKfijn4JKUMOi2AujJoDsiY7320NBtRdTqAyqammHd9yRQoriBkIZTG86sojTOf6suRSn7gsOqiuHE5F8z0X1eS85hyvMgTzPLV43a7RMm4d9ll/WLmeu+DIvbluofr4U+EQAaXg1Rg90Rx5wK7xtoaFroxtxZER+V386M7kAJ/Nb9a7Xr1XO1WZ+pHyHl04u1GNF+jJkGSGdzzHztUU9qaLcKu/keoL+E1w9t9Sw+BElPMdNoDN53N1d0veUMTm9IRZ+c5xbm48wKKi00iGw2odaSBJkxrYo7p6ifliTR+k3o/RTGimDTxA6IDR911JtE1y8Qz1u8lPb1yGnlVgYGQHadkNMMTaUliR3ABLhM8dedeX25LMtitsBCE+kzpnZ/EbY0HUbROVSHxljQrcs4NGQR99gXCeRXWAmOYI3QgYqHCpdsDxS9bs7OMfSM15OZsL5NP9lMyf7zNb/xFZqRtDpluKtYXWMLs4EoJuZW4FBQpVIU5/Mi10AxW0US36qMnAaffIsRY81NI3GXND4hAbK+D7hmcvGCIDCw7g==|920
\ No newline at end of file
+}//r8QdnPoSyU5SQO/Z3Nx+2bA8MYCuDkW7LnMjlOyLOTD/KNg5odCHVSzPW+3UsqHal9L11Pw4MLtpiXt/arrzL1uUF8+lyhLRgHHAV5iRY/fLxXcWu789cffXgifL0l5psQIvqIryTVZiKZJ2mcf8amVvRIsTgyIqdXSuejIYX/kPxuGGtGxKAvjZwoBjFxSrZUIgFUAwNciMCstE8WKjxjEbv5jyLdMqyUgov12k+9KqduPKTRAJ8YtTsWUa6eVaM7jP/xTDqm8jiZjhmPz8e1of4/1qvNO937oAnnhm3hlmWZrlGtmcars7n9iWm1HX+pgjozvMlyN934kgZ3ByyO2UHks6sGmGZf15iRbKmGXyCKDmctgtyDJIeUfSO/hb5VySIlK0+i/jTkLiT41KxAN90r5BaGazv/XyRtnlOiNxIaB8ui/PCrgjl2V4f+wtNz0JqylhYPO/kyEsJSVaLjpAypKPF0s2eUsFw4d7o0A8Qe5+rn33ndrO5y8Lu+Fz5RB300+qwa1/4+uYUVY5usbseog08KjLL7pdp4bEJMMuAnNUOQoeCGaO3cBspC4eMtRUx+Aqc24O3E7cu6LB+aJptXnaOfe3W+s0iyB5YZ26gJXAFtfZek4cKawtnd21c1Ke7+1dwaVPBCh8fxErOuqJLITuSleZ5fL1z8RNR1k+cNiaGxVEWY/91YKvZXaue91lN5BTmFSyg4/BgoSk8MLOGMHpgxobadTXDTIYyqpKEpCNVYRb/UrOoAQe9zAtpCXy0TXf3qR6rzMbtRI15O8eZuBgZcAaATae5yAOG7svZpnbwHC7EmeiS4tqkllyQS+iScZFFxpk0j2/qzHEmjtkIJg2fBy2sKaa/Cj6iZeT11B2nZPzLfYzzWlOrolzLhsGan/lpWaUeQgfULE0DQ==|920
\ No newline at end of file
diff --git a/Pages/任务/任务首页.json b/Pages/任务/任务首页.json
index 139d9b10..3d7b1e20 100644
--- a/Pages/任务/任务首页.json
+++ b/Pages/任务/任务首页.json
@@ -3,20 +3,17 @@
"RowColumnAttachedInfos": {
"0": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0,
- "IsHidden": true
+ "DesignLengthInPixel": 15.0
}
},
"1": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "IsHidden": true
+ "DesignLengthInPixel": 32.0
}
},
"2": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 15.0,
- "IsHidden": true
+ "DesignLengthInPixel": 15.0
}
},
"3": {
@@ -112,8 +109,7 @@
},
"20": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "IsHidden": true
+ "DesignLengthInPixel": 32.0
}
}
},
@@ -293,7 +289,8 @@
"12,0": "任务-关联资源",
"15,0": "任务-工时",
"18,0": "任务-进展",
- "20,3": "任务ID:"
+ "20,3": "任务ID:",
+ "20,10": "项目ID:"
},
"AttachInfos": {
"1,1": {
@@ -425,6 +422,13 @@
"ColumnName": "ID",
"GUID": "2c5a4904-3a02-4c35-9080-be6d81c7674b"
}
+ },
+ "20,11": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "ID",
+ "GUID": "83e8051b-34cd-41da-a2b4-9699687b73bd"
+ }
}
},
"StyleDatas": {
@@ -463,6 +467,30 @@
"BorderLeft": 1,
"BorderRight": 1
},
+ {
+ "FontFamily": 0
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "HorizontalAlignment": 2
+ },
+ {
+ "Background": 3,
+ "FontFamily": 0,
+ "BorderBottom": 1,
+ "BorderTop": 1,
+ "BorderLeft": 1
+ },
+ {
+ "BorderBottom": 1,
+ "BorderTop": 1
+ },
+ {
+ "BorderBottom": 1,
+ "BorderTop": 1,
+ "BorderRight": 1
+ },
{
"Background": null
}
@@ -840,14 +868,20 @@
"20,4": 5,
"20,5": 6,
"20,6": 6,
- "20,7": 6
+ "20,7": 6,
+ "20,9": 7,
+ "20,10": 8,
+ "20,11": 9,
+ "20,12": 10,
+ "20,13": 10,
+ "20,14": 11
},
"RowStyles": {
- "1": 7,
- "2": 7,
- "3": 7,
- "4": 7,
- "5": 7
+ "1": 12,
+ "2": 12,
+ "3": 12,
+ "4": 12,
+ "5": 12
},
"SheetStyle": {
"FontFamily": 0
@@ -863,7 +897,8 @@
"2,19,1,8",
"1,1,1,2",
"18,0,1,18",
- "3,19,16,10"
+ "3,19,16,10",
+ "20,11,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -905,6 +940,10 @@
{
"Name": "任务ID",
"Formula": "任务首页!$E$21"
+ },
+ {
+ "Name": "项目ID",
+ "Formula": "任务首页!$L$21"
}
]
-}//aZdK146YgWuEr9XDzFHxDp4IaqQToICs0Js23g9Oj59EsblCRlbji2dFWCvMYXJAh27QTc5It9BFvNN7ABUk3WGiAp3FAVOT6iWgd3FU/Coh5eL8BS6USEI4HHIMeoodZY5TRj0ecNYW2KpGruZ8JUBfB7pg77jFVGWEaYIaHJVBSiBwMeR6CVI7E9x9jCY86kmVRmgj8P70hIqhNXX+Om1ewD73bFL0aeOKXCo4Y9lOa3/R9zKNrrnAUjEIqKKIaJsjSlIFfN67ZOUAuZVqYSNfrB2BfcNzN+O/+4UebxkE1WEB4rlIUu1GaMoq6EPWZMjUU/xtYb+k+A9+ODaGxrvOg/qXBBBz/3tFjHcQErw+SiBF1fVa2g7Gf1Bb0vp0xYVqliqJ1HmKC4tl0w0A2xk2/YIb+1rwtX/R8XSnoREJ+rs2DfJc/Hl+4edlrAXgwcUtITmufA9dx/TsGteIjAHQLaTH/inCj1kU/Sj9ztQmNC0pYx8mwErUxvjmwZy/MkSolIvgCRps8oQox8uc9pDKk6pT8g6C8SNcHzoYOCYctejv8eOfeisz/SeA316fq/wm5tplaDnUNeeDyKoKthDw9sZOGSVXW9drEVRslKbpdcWM2bydFQ65lNz8AaiHtgGKkMvK0BS8o+isgwtk1v2MXn6HRhhlixdvJdqZ3fgMIJpFJiHww9NVHqcOHJtfQI1WU+NPJo/TYhda+bzahlYIV18OtpsrjkriHsdn91nPNFMelHJNTt9+c6Lp8Z3CjVAPK1V/twMWUyBFPufBHtW5OqiO1sIEfuGxunQ6voyphzxS2ozu+Uy1zzMg9oeUSKFyghoK5LtI1+kaPhYKjI+8kDEPRyNAIDHJUIxwhJO0shdOtyWbdtLyYZprCGe0833VAUcwfr0JwSrV9o96/w==|920
\ No newline at end of file
+}//K7hmoyKL9RhYkA7fXQ6sFNbe3NNTZU/RhqLfpX0DU28Wm4aHVvmLq4qfJwsU4PeooGCH/FD3JMNaI3BTTD/GUgR7oLXNInMbm+1wL5naUfVQ72g0iQqp8ZJ1RgS5t8qQYR+qnL6+0bFBvV5ICiOGhYZ70urK4hT9MNIy0VSOUTyhVE8Za3MFFZFibfdwzZ+Mc0OudjNHqAa9G+ESuh32VjpgSHnzullZMw7wX/Aff+bAUOTeC2MRQU4R1AWmblbKie80+1vMU8T29kmg6q/3iUvZU/kidfkhF0ytqqPCZHeyAXwj6u8aNeLPXuMPTRQ5fTjdyxZHjgAWqqonEMC5k7BqgM4AtdZC2HVBYMBFslAYW1zFmk57k6rEPV5WGxfl8LnyaxzMi5qCA0Ql8EoeDWXnILEtnJU6gPTtjt9aE3JoS1IUTtZ9ThEaJQSpmLqLk2bwmwYuBIm+TT9b+yajtSxuXtPXeqNq58RjzG5jvKJVFzT8C51Dpg+Xqcm1Nv5ybNG/idqpedliPkykdrS4IhoXsTVpuud4oBjj73KduapJx+qywTmFl7t1WAm3+Topun1gfCrchcr/PEk3zYwygYbURNB+E3JtimQbzDu/QhYmJyjUHscF1eNLhK/dAOiL9bfl8Zxbjo0iVVgLqagTWqGvF56PiMmjcDj/5fvxscTbt8G2rH8eFgQshkjaCm7etg4PB+k+epq82cpeQieSJ8BPC2NiyG3ZzFOzVMQ2m6xl8nlwcGbz4a9oqy3hm9q8PIEXDNWbhz4TEmkIUp2CxEQqRGBqVzMTd96uzaDA90Kd2IJbgXAXxYF+yP7QqznoOu8Feiidv/FqnbN1SuvkUmroUy8rg07kTJR4cQbLoRAluJsZQvY/xvAgfI0VsmBwrbvB4bSR5bc6zmEtUBLC+Q==|920
\ No newline at end of file
diff --git a/Pages/任务/新增任务.json b/Pages/任务/新增任务.json
index 9070b83e..095e4209 100644
--- a/Pages/任务/新增任务.json
+++ b/Pages/任务/新增任务.json
@@ -103,8 +103,7 @@
},
"23": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "IsHidden": true
+ "DesignLengthInPixel": 32.0
}
}
},
@@ -586,11 +585,11 @@
],
"bindingOptions": {
"$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"BindingInfos": [
{
"BindingInfo": {
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"ColumnName": "项目ID",
"GUID": "9c18bfa8-f1bd-4204-b981-f11fae98c3ef"
},
@@ -598,7 +597,7 @@
},
{
"BindingInfo": {
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"ColumnName": "分组名称",
"GUID": "61bc7005-5f31-4301-8ae8-d95065a4d193"
},
@@ -608,7 +607,7 @@
"SqlCondition": {
"$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
"ColumnBindingInfo": {
- "TableName": "项目分组",
+ "TableName": "项目任务分组",
"ColumnName": "项目ID",
"GUID": "7312cf22-060f-4b8b-83d6-52f802b773e8"
},
@@ -1054,7 +1053,7 @@
"ReloadData": true
}
],
- "ID": "3a12056a-4a46-4eb0-99ae-c8669557a213"
+ "ID": "c45105db-cad4-4275-96af-6ba93dee95ee"
},
{
"CommandList": [
@@ -1069,7 +1068,7 @@
"BtnText": "知道了"
}
],
- "ID": "fe408ad0-0bfe-4d9f-8879-bffc267af3f6"
+ "ID": "ab3be2ad-dda5-4344-b512-7c864ad88415"
}
]
}
@@ -1593,4 +1592,4 @@
"Formula": "新增任务!$B$24"
}
]
-}//XMfmd1bcRi8YBJospOz+rRfrJ9llHbVFFDgZ7TGR1ZtHUfe+McUlAvxi8bLrCaH4mMrWEx5NRgasNCeQgrs3i5mEjzlp9NWpKoowcoVOLPkblu7SeQQyVdFsVUBxpUiwunTSYMr1Dx6oWlA0HdGkSoxTRFGfa8CLVqj8WCFaFe3JkK3vLt5+lVe8T7n4ut4jLeKv+4vrnucDNJv88dhMQ8Ej6jK+0+oQgo5Oq6C0mZAGG3Lydn9jJQwua7o6meSGAW2QeNJcOtmi6H6p/uObjiHZsK/u+fp8i/ef9u5e5UJ6MiwgyUL20m3+qFKuK5+Y6spVLHEjPiY3u0o6tgvtWOnQmC9zy33qmYd1T6sgh+8ymXjsDx84z5PnPZC4e9NY6jG0FR51LnNVsrKgWWyn6IuQG+OHvMvjDqf1WjFe4kAr5ZLNmv9H+EF43K2nua7VrF1TgFzRcXb+ozFePT5IjkbuGO6L9mXBbbRM7+c4sk4x1mZkizafMiws0xdLIhdTFtWIzuX0F9fJrcSNzyVDwagkTfNRVc00EKp6mZuRbC1mSLYil6YXxh1+ItIzHypYjUSo1G4ZHo1lEIi0wV1Phhh7+phpQyCmz7rWwGltGKD/L7SjDic0VWx6JDA20NIkDyFwFCkDtSOG9ed0ffDlkzYykvc/liElar2xwb4kBDbiUu63Oz4foBTqianYggijfYSWOf81swCj9cZ0gEYu3reHVY6kxCAuBZJy1zASysvvcMYYDvWdKdWqQdm8iRWkEWkaKMYi7KeK+Wt37hTc5s9OfnA/pljXCWXO5UC5s7QF+BQaYxyjIxlutp6OnYS3VOqggz6ViJOeGsHQqpUZ2gC5hAranCuYq3DbCp8GBP0D3B6WqsqnQbqwSlDZewH9M0QLS9zgYehryF358FFDtQ==|920
\ No newline at end of file
+}//FrSGtKHQzcA0v5DKSl5KALsuDGqjatI2Xx6G+P1p4lyHnRFw7UcNu74fwBTYLl1yBSEhC6yCGlMSNwhDuzmxL5SdyfxaXzISHGTQH7YFTgC+d6oK30ucSXlid11CsfxLmPXXwrAYFVOfqh6Oczx5Bi46vGJCU3fWiFL1nR5A2EL1AAARc7f5Ejnk38HyKvwHdzP1eirR43cIrjbmEE+OCpHSTonBefaXbfOG5Id24xb1SW+0VDkXJiS15s2hMfnuhs5p2bW8RFuzDAlDAL1dat2IfLq+bjYzFZ7IgSc0bgrM5XKHr21n85SukskmU7UAJHPQB5GK8SUdMa1TDJydW1pMlnXtvCeXNSGnXKl8F/K79u8d6JlY87M2b2PZmMjKHkSi16bPwEQUFxWAPLxsSk2sZ1nleHMk9bZOCPsbTRB4r54vMY+4WUXEuK6+doLh7wwSki71t6L2MQWs5itinxrk7QWjH3Vt4vmJjN/7bqQRNnMT5zJzHa/F2s5+Eq+QwLqW99WOEXQVkJ77t9tAtlO/IY4yN7K8TfRpk3MlbZOyloQ4EiesMY6FWnQQq4CDU1yVsiTQ4GyvdLpH7pTP7M5iwCAg4Ef2IAKPkvRNnW/98XAYWqXrblADOpAbNfonJOXVMg+gBEebuRwAeoUo5kYX2V3Gf2oyZPOKv+72dyvRtiAJvHjsKJHXZz5do0P7laKXMlqth6Ol46TA5wM5acQzXifOrpjSu91183iQfA8ivEUzX5CIWG4idLtRY1qL08JcUEBUcyhC6uOrHenFaxziyxLyt/v0tjcLKN+A9zx8AWc+lPocvejabsm6KQkIjrSK44VsuuMZzVBzc52VGfGeYwDaUKyGTjBjMOrpownJ001h/KAv63AU3+H+eHrF1EseIKhTja4gmf8FWfCUXg==|920
\ No newline at end of file
diff --git a/Pages/共用/项目菜单.json b/Pages/共用/项目菜单.json
new file mode 100644
index 00000000..58498674
--- /dev/null
+++ b/Pages/共用/项目菜单.json
@@ -0,0 +1,363 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0
+ }
+ },
+ "3": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0
+ }
+ },
+ "4": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0
+ }
+ },
+ "5": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0
+ }
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 38.0
+ }
+ },
+ "7": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 10.0
+ }
+ },
+ "8": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 37.0,
+ "IsHidden": true
+ }
+ }
+ },
+ "InLogicalVisibleIndexes": [
+ 8
+ ],
+ "Count": 9,
+ "DefaultSize": 38.0
+ },
+ "Cols": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 11.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 152.0
+ }
+ }
+ },
+ "Count": 2,
+ "DefaultSize": 11.0
+ },
+ "Values": {
+ "1,1": "项目信息",
+ "2,1": "项目角色与权限",
+ "3,1": "归档项目",
+ "4,1": "退出项目",
+ "5,1": "移到回收站",
+ "6,1": "更多设置"
+ },
+ "AttachInfos": {
+ "1,1": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!B2"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "Text": "项目信息",
+ "TemplateKey": "链接样式",
+ "Icon": {
+ "Name": "提示.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "2,1": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!B3"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "Text": "项目角色与权限",
+ "TemplateKey": "链接样式",
+ "Icon": {
+ "Name": "人才.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "3,1": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!B4"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "Text": "归档项目",
+ "TemplateKey": "链接样式",
+ "Icon": {
+ "Name": "项目文件.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "4,1": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!B5"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "Text": "退出项目",
+ "TemplateKey": "链接样式",
+ "Icon": {
+ "Name": "退出.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "5,1": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!B6"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "Text": "移到回收站",
+ "TemplateKey": "链接样式",
+ "Icon": {
+ "Name": "回收站.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ },
+ "6,1": {
+ "CellType": {
+ "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+ "PropertyItemsList": [
+ {
+ "TargetCells": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!点击按钮"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=项目菜单!B7"
+ }
+ }
+ ]
+ },
+ {
+ "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+ "PassValueBack": true
+ }
+ ],
+ "Text": "更多设置",
+ "TemplateKey": "链接样式",
+ "Icon": {
+ "Name": "更多.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Formatter": 1,
+ "TextIndent": 8,
+ "HorizontalAlignment": 2
+ },
+ {
+ "FontFamily": 0
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Foreground": 3,
+ "TextIndent": 8,
+ "HorizontalAlignment": 2
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body",
+ "[AUTO]General",
+ "Left",
+ "#FFFF0000"
+ ]
+ },
+ "CellStyles": {
+ "1,1": 0,
+ "2,0": 1,
+ "2,1": 0,
+ "3,0": 1,
+ "3,1": 0,
+ "4,0": 1,
+ "4,1": 0,
+ "5,0": 1,
+ "5,1": 2,
+ "6,0": 1,
+ "6,1": 0,
+ "7,0": 1,
+ "7,1": 0
+ },
+ "SheetStyle": {
+ "FontFamily": 0
+ }
+ },
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "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": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ },
+ "CustomNames": [
+ {
+ "Name": "点击按钮",
+ "Formula": "项目菜单!$B$9"
+ }
+ ]
+}//wz77xcgWtvnJ9JQE34gwgiKO6esCDMI5PVMg4zZIRmiChov/8dPOKOjArVLkjdgblLKIt0Nc4AeeyeVCKfHLWHXTg/WzBAPtHBV6Vwy9Aao+dO5IzFxLoSvR7h5HYKCq7FZUPX9N1ZOKbKbBWs0r6PuSaIhsMsu7ei96OhVyyCbiXbcFEMf85pp861A9Tk01bzIufKa7LMXt2XLKAYRakrxe+C2Uwr4yZK13N5NqHdqr5X9XXwAClfluNuyzv0k+G1tReK1ghx6hT1K/xo3lwjbhjjYhYbJP5if/jAZxvq2l/YFuA7Pmw4JP95d6PcxXcVf9mD1ZEC9+xo1tzL9ab7y0J2n7EPnnU6Ito4Vu58suOMljbfNiVu2lHYcQWW9MBgohbi9uWn+QZZPhLY6xlW+ciRO/sTVFPBj5kL991YTqvYdEViaumoypOPSO4PvhbBnEf+Q2o1sYVBoRnKl24Zjkd1v8pPwZt9NSBgXxDbqshwPOJVo5EDMHCvwamCm86vwdH7kL7PE6HFEvjmxsUQiS8njdxBy5FK1nRY5R26MXJpS4QtQEDIH7rzaQ++Yc5JoQ8agnbABm3o8AQKqZRfhocr7kkaRam+ZJ5lnaCOQfM9cpbXAQ9iED3v6MQEqJXYowrwW/UDbHPovvCFyKAJZ8J75V08+Jk7Dz9byarSpR5lLMrqh1o3V9iscQRZx768Xw5UWN0wU0PoxkIqBIK86v9HOFh+HnxSwDbw7v0Lmh+1INdHg35/NnTD46i3tw6AWrSBCzNmm0KkXXsciDQaplFb9zzMVZG3ZgZjSmr3Wy0GPYx4whvh84zBpkv+KHvMDvqhQzJ2nC1YNqqbU9vz/HEKGNh2bzF7NfMBowslZ7CshQvNqw66Dpko+09m0WESK4IJNVkoIAOvnjxiI6DQ==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目信息.json b/Pages/项目首页/项目信息.json
new file mode 100644
index 00000000..f0f3057c
--- /dev/null
+++ b/Pages/项目首页/项目信息.json
@@ -0,0 +1,530 @@
+{
+ "Rows": {
+ "RowColumnAttachedInfos": {
+ "0": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "1": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "2": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 127.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
+ }
+ },
+ "10": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 118.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
+ }
+ }
+ },
+ "Count": 20,
+ "DefaultSize": 32.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": 32.0
+ }
+ },
+ "11": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "12": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "13": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ },
+ "14": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 32.0
+ }
+ }
+ },
+ "Count": 15,
+ "DefaultSize": 32.0
+ },
+ "Values": {
+ "1,1": "项目封面",
+ "4,1": "项目名称",
+ "7,1": "管理员",
+ "10,1": "分组",
+ "10,8": "权限",
+ "11,8": "0",
+ "13,1": "项目简介"
+ },
+ "AttachInfos": {
+ "2,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目封面",
+ "GUID": "ea261426-d9fd-4d15-a0b6-81a5dcb9b21e",
+ "IsImagePath": true
+ },
+ "CellType": {
+ "$type": "Forguncy.UploadImageCellType, ServerDesignerCommon",
+ "UploadImageLimit": {
+ "AllowExtensions": ".png, .jpeg, .jpg, .bmp, .gif, .ico"
+ },
+ "ImagePath": "app-logo.png"
+ }
+ },
+ "5,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目名称",
+ "GUID": "23a0e2bc-dba9-465b-a867-c5a04c30b2c3"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "text",
+ "resize": "none"
+ }
+ },
+ "8,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "管理员",
+ "GUID": "4491c9cb-7df2-4d89-9db2-a9dd2c07deb3"
+ },
+ "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": "707fd52b-8bf9-4a13-956d-2fec99c72b9d"
+ },
+ "ColumnName": "value"
+ },
+ {
+ "BindingInfo": {
+ "TableName": "用户信息视图",
+ "ColumnName": "全名",
+ "GUID": "c265ea91-5496-4450-a508-38d6c420522c"
+ },
+ "ColumnName": "label"
+ }
+ ],
+ "CustomColumns": []
+ },
+ "placeholder": "请选择",
+ "noDataText": "无数据",
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "noMatchText": "无匹配数据"
+ }
+ },
+ "11,1": {
+ "CellType": {
+ "$type": "ElementUI.SelectCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "options": [
+ {
+ "value": "黄金糕",
+ "label": "黄金糕"
+ },
+ {
+ "value": "双皮奶",
+ "label": "双皮奶"
+ },
+ {
+ "value": "蚵仔煎",
+ "label": "蚵仔煎"
+ },
+ {
+ "value": "龙须面",
+ "label": "龙须面"
+ },
+ {
+ "value": "北京烤鸭",
+ "label": "北京烤鸭"
+ }
+ ],
+ "placeholder": "请选择",
+ "noDataText": "无数据",
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "noMatchText": "无匹配数据"
+ }
+ },
+ "11,8": {
+ "CellType": {
+ "$type": "ElementUI.SelectCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "DefaultValue": "0",
+ "options": [
+ {
+ "value": "0",
+ "label": "私有"
+ },
+ {
+ "value": "1",
+ "label": "公开"
+ }
+ ],
+ "placeholder": "请选择",
+ "noDataText": "无数据",
+ "filterInServerOptions": {
+ "matchMethod": "contains",
+ "loadingText": "加载中"
+ },
+ "noMatchText": "无匹配数据"
+ }
+ },
+ "14,1": {
+ "BindingInfo": {
+ "TableName": "项目表",
+ "ColumnName": "项目简介",
+ "GUID": "7f210e70-588a-495b-ac0a-0a1107bfbe59"
+ },
+ "CellType": {
+ "$type": "ElementUI.InputCellType, ElementUI",
+ "CommandList": [],
+ "UIPermissions": [
+ {
+ "Scope": 2,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 1,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ },
+ {
+ "Scope": 4,
+ "AllowRoles": [
+ "FGC_Anonymous"
+ ]
+ }
+ ],
+ "type": "textarea",
+ "resize": "none"
+ }
+ }
+ },
+ "StyleDatas": {
+ "Styles": [
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332
+ },
+ {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332,
+ "Formatter": 1
+ }
+ ],
+ "Types": {
+ "Strs": [
+ "Body",
+ "[AUTO]General"
+ ]
+ },
+ "CellStyles": {
+ "7,0": 0,
+ "7,1": 1,
+ "7,2": 0,
+ "7,3": 0,
+ "7,4": 0,
+ "7,5": 0,
+ "7,6": 0,
+ "7,7": 0,
+ "7,8": 0,
+ "7,9": 0,
+ "7,10": 0,
+ "7,11": 0,
+ "7,12": 0,
+ "7,13": 0,
+ "7,14": 0,
+ "8,0": 0,
+ "8,1": 0,
+ "8,14": 0,
+ "10,8": 1,
+ "10,9": 0,
+ "10,10": 0,
+ "10,11": 0,
+ "10,12": 0,
+ "10,13": 0,
+ "11,1": 0,
+ "11,7": 0,
+ "11,8": 0,
+ "11,9": 0,
+ "11,10": 0,
+ "11,11": 0,
+ "11,12": 0,
+ "11,13": 0,
+ "13,1": 1
+ },
+ "SheetStyle": {
+ "FontFamily": 0,
+ "FontSize": 13.333333333333332
+ }
+ },
+ "Spans": [
+ "5,1,1,13",
+ "2,1,1,4",
+ "11,1,1,6",
+ "11,8,1,6",
+ "14,1,1,13",
+ "8,1,1,13"
+ ],
+ "PageInfo": {
+ "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+ "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": []
+ },
+ "PrintInfo": {
+ "PaperSize": {},
+ "Margin": {}
+ }
+}//fJzAgEt+FdOeR6Rhd2WPJVdaKFWZLkHfnZBb3+76JbzJg3yKjqRcHWO+IXbxAlPXakOUXlMoP1rEEDSGWgNt3LDGNQKptv0D+FybWyMwlzo8nANOeXC6MYwG7xcm3TT1fUrd1prGCvCdyX90oJcu4A+QBI4AT/ob2Pe6sWT64+6p6VtqBJ70/FeMpUUp1pyRTY9o/+D6thhqoCzSlz36rTNLq6nRzwTdx5ITxYS98RFLBSwyn/qhYI6CT+BirzGvFkzqTw0FUn4PHTgZAshNjn6fYSDiWN2rWRqX8CBGfD8usJKbCvPA5VMc8ay4D9NVOEF5FOEfjproWSL4KFxJmE6OdmLwfDb54Nj04KRKzRslDW001WG/mb3wZSNqlheKY5OGZORINXQgVpL6gBBoDk41+SSy+PimkH0LO+5HD/Sm/p2zrzy+sAKAm32Dcq9iEy85ltJHW1B7hkwy31qqyNfnSFIrJ1r+44B3Xlb0GjbLFSRyWXeza7JP5jIKT94tzgVwGPGlIdRgZQietZJQYqqDdvTLOHc8fHJTvIFOw6w9EcsYdn9NfMpFfzK9E74ThznlbQKSj/Xb1u9X4LvfHuhJ+Nd3gio6oU9zg997D3CpstEvh37FjDe+zPpS31vufbK4TwXSfbGLpzya4djQAvPtD1bDZ8LLg4BIgW2RENKBOf6tAJQ7ABE/4iEaYdzEZNfv43dqL/7xA7c0+sill9WvTKVgYkOwp9eP58s0lC8jjLgK7OGQNG0hbG6fKheduBUDTqmy1W0ha28buzrW18BkL1Gcp5kxP6G+AHSxaqHu0e/IbvajwlQOREb4+G9rY0LHrZdg0g2YGmZ7zhslpEBItT8mxXaIuwIwFXyaGgIepDwBo27g5ZwZLl3xJQMWMjuUVecZdq6JXORdzhtGDw==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目列表.json b/Pages/项目首页/项目列表.json
index 71323048..ed3b6cdc 100644
--- a/Pages/项目首页/项目列表.json
+++ b/Pages/项目首页/项目列表.json
@@ -30,8 +30,7 @@
},
"4": {
"GridRowColumnDefinition": {
- "DesignLengthInPixel": 32.0,
- "IsHidden": true
+ "DesignLengthInPixel": 32.0
}
}
},
@@ -359,7 +358,7 @@
{
"BindingInfo": {
"TableName": "项目表",
- "ColumnName": "项目描述",
+ "ColumnName": "项目简介",
"GUID": "666cc9d2-c737-4f06-b447-3a463992ea46"
},
"ColumnName": "项目描述"
@@ -465,4 +464,4 @@
"PaperSize": {},
"Margin": {}
}
-}//FIiakHwDdLIprxq9CP4J0DoZChZWxfulbUs7ryg/9V5RwEzc7oMzKjbrW2bw57s52w4H2Q7nTaOGpT1fGG+GsAhud8SDHZJQHGuZ8lVWYsYyVlHyfpCdady3Uf+k42nTUOdLNvmb5c55rCKIgxgPP+DVT06tA500ETolSleVpKKvoDgjZgenn09OjVmIynj61rsu9x2lAK8BdSW0KexQ0aGXXFZCKyUBzBsLJ2Gnalg9P0D75Gi3/ai7nyKyDGL4LgLPlegxGBN0RIT6mNIPG6QJAGdMzfzxj8bLAeA61SUa35ZTZyYDoSASpHV4nInO7IoxcoFC9KDY7I00IqjzBjaTT6Pzy3RPRaVHn5QidO9pp+XGMl5pQxYzQVOv3Lz8a21ZjmitBcQ27vpBbq2cTv7CA0VmO5A7gB+Y+XggBaCWaihJxKP3pj2tiUEU3ToEQIr961WYyYeHmgqg+5EwMcNXn/akrC/crxxyNEmqOwpcMcXKT5yiXrzlXwzHJ2sY6Ixw2tN3KOx8AaHqrTnq8Q5VTsyuLve3OV5jcxEP6v59Q4fpyeZ28B2Td3DkIE0JSlJk2To6WjdUMyBPKtOPaJ+d9hjKwh/8XYTxZQJPP7EE1giVLR6whDZ/PWW9NmktV00FAhHT0rB9+gOKzfsiw2uWMZmrFXi4qtHbKvwZgg0MU7gOwHJpg+AtLxNH7ccKLRSzcJGa9RB2C6UnWIiSG9GVkqvOfzL8Xo3rngZaRAtOmvK9bOtWJw1AS3cS7myVsPcVo8fwLbr6fHBzfG+ZFfS/7EXpIUOaQJO/UyM/JQnBw4sr7Ddo028soy2Usk/ft+AGLroqKsCSvK8SOdAkqpur1mWtEQ8KZDC6BgrQeoZ840P0eh3UCX16ZvahKSVimF1Qw7822nsrqObLgl/fgg==|920
\ No newline at end of file
+}//Msyvmq9o/7ftiAS4jHpoylJ3rEUaYpzJWK1LEEOhAAe+7pQ6YQs5+0rwb0G2RKJoNUOWtKqzetmT0TIp4scb9TmU3hI3Jh0RfKmosi+L6TFQIOXgdUPsJzgsIGuKc1m397LX8zqxA/TUZrzxZfPFwLLgTgr0Xtr5BSl71EWqvCnHUBobwlAzT5PiDBSHxZaeV5Oghm6xxSOPYiN+IfQPVwqYUAjbDVkrgjCHDEdIVtBCyeVAQFTpm/dSbe8jWKCrrxpmsNAs4n2UBOdGilRpMmRKSGVzyLchu6cEkK3imHIyAxrNudOVoWYuQtah1V1FcYMu4CGDAriYRzhpg8pAp55e3WCZi1ZO47iiPsMG45Zs2llXAAJlZHE3702GdplB3HSuhquqf4vlfbQqDa+4suhWzVkjAYIKJoWd8wZ6Xnyn1NHlYDRGnCRodIyjYaMjZ9ZZdVoVn9RtV9Mf1vVz7DTOOC+HsgcDqL75JX2QaDJYg7n8LHZrfRGlpJY5kmh6CYDkpirW8FrjUm64K2QdIh1gyc6M/dE06HvBy2qIssvXGqY6nilwvdox3Ly5sH/qa0EFHbPTagchwoPCbr/i3MytfglbHy7mSmQWDG2sBBOP+1ohtKAY+DoKSM5RmfnfKOQSqJm1d1nTjKwiiF25lmGv2WLoSwrf1kzRrAQv40NP7AigceSuSqopikoPaTf1485rZhgoB0O1fgGDbvMmyZf7atgQkM9x0AG3erya+uYfJaTXe40z/VQQ9sggOcNwV6vIHX5f5ohqkDWlp0qJzOlkrNo9pM/SgwtyGJya1SpHgIakTzYGpNh/Kz2fGM8WUC9W/UWW6Kt8B95Rgr42rK3LL1m31UYkHPi2zHhwa5YwpIRJyuDf5KHzpwxLNLP5+T/kD10Dr+9wKoWrc18ZzQ==|920
\ No newline at end of file
diff --git a/Pages/项目首页/项目标题.json b/Pages/项目首页/项目标题.json
index 9f25f465..8267ad29 100644
--- a/Pages/项目首页/项目标题.json
+++ b/Pages/项目首页/项目标题.json
@@ -166,15 +166,36 @@
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
"CommandList": [],
"Text": "自定义",
- "TemplateKey": "Gost"
+ "TemplateKey": "Gost",
+ "Icon": {
+ "Name": "设置 (1).svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
}
},
"1,12": {
"CellType": {
"$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
- "CommandList": [],
+ "CommandList": [
+ {
+ "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+ "PopupDisplayMode": 1,
+ "Placement": {
+ "SerializeProperty": "=项目标题!M2"
+ },
+ "PageName": "项目菜单"
+ }
+ ],
"Text": "菜单",
- "TemplateKey": "Gost"
+ "TemplateKey": "Gost",
+ "Icon": {
+ "Name": "更多1.svg",
+ "Color": "Accent 1",
+ "UseCellTypeForeColor": true
+ },
+ "IconSize": 14.0
}
},
"2,5": {
@@ -339,4 +360,4 @@
"PaperSize": {},
"Margin": {}
}
-}//tAWdfrmdCJu+iQXHJasfYOZRN+iDKnK+gDF5N6/xfAm8MBmNmkhHbQ7TJyVLicrcWRKqx60cXlU6H8Y3pVI8KRKYqwS/bma+fOWR8MQ6wKFkTGGxFoifmAFUZzr5cUYf69pcdy58rwOVK8esnOmeHJgdiMwqPLagF6M/0aEEDhy1PbY1B7pjz2urQt2mSLffhJAtBJRaEufOgqIFDztJkv9t1XmJtHQBxFIWpfKGLbMMwIt1kkV1eWXHne62h+NmyZL82M4lnsr6D4Dh0nAoJAE6uNSmMzp6Uwm7b/0tIXYl5TCzOBv83/yhILRd3ddWXhHWMOry5RA0/5Gtv6Dkl61PGjhvDghio09iPQt9yUMzGBoKQvmiFLVv/K1dcvgulYS35tmNFBKPy1PihGtZiikLCDNh4Pj6Zt9eVSADpjoEChUsRLGoWwPST/UEJWn8hcBN/muAhyt5/wq2erfagEIeD/FmZ5yGQ3l0Ahaxh/s/goQTUye3V4izX+fidLqAuORFy9mtnNKk5E6bPFyarWRZef0n7FDdtI9oyP/2Okt/mffOcXQK+sIUML7bf1I4zA/ipE8GZ02GPXWRL+kRWm0djXdmhf7ZChZTMsbYJou39exPGolSjb3u5opo4J8AdtVbDpxM10JweYTaNxIvLGANdGWbNqNRn+p/+UfjLP756zYA98CTha9WizSm6dkx1Ermm4GXUGHnQhCwaJNmWh3CL54uY2r+V4pmLWgM3p+/pqY9q+hKo+KBsDigcAZ0BqMuiOrxnfvCa1s+65ZPMeZ6mnJSP9ySqNmFI26cATF03qY5aZxsJLbN0I+tEurUmQHc/BtoBQDQrl69DD3ALUImZJtFCXP9HxlmOfWJptnP4iv5fUOlUR/6yVOKCcmPOpucP9H3vGM55u8YGON02w==|920
\ No newline at end of file
+}//p/cLsq4fLsKbKFSTOu/nIrCLJO5aF4aWJPkT63DnX9agYa7ZAQyzd4UQTOC1M2enUkdRf7cEM+GTD75Kz02FanNXN1Ta4BTEQO7fczKaKnHCzIXtnisVhxPuLn0Cz1vMsJUad23ba8OKc2NJkxP1vQK+B1Lv3iFKL9AGCDADZ6ljyKK83u2ByxXXtPp5UyhbdZx8nonCZgizTELJY83zjFK5JFXBrD8J6dYA9Rl5BB3bSC8KlzI6MIR42SN+5P9qCkz89kFQn1MEvbXqJAg9z/JyN2BZdU4wStyLD0vVnHTkuc7JtJPjWzXqjbnSmMkuhcA3oN/P4x0M06SjA99SvDXjo+TI+Pq6jNdN5n2piacj109IOLDzvvUWuKUP2tsvwa4i+AL+QnphkKnXEmqmDyHsy4n0wOjeA6g13nF9KL8os/cjIqPi3QR/7HTKOsj79/hrlVUvrZpKxoCOQTVcTy7sdJomLSedoDHJvH52M3Wtur8RMfutD8OsqSqb+U2UPcxG4l+yQMSDUOymmWPe5j6rEx7Rcv/jZ1PM6KF/x5s2/f2Mp4kWg83tPS3JbTictKB5LWXcd+xDbM8GCLv6DpdsE+x0vz7B/jo+FJVQvb7noAtVNK6bkCCpATm+Loa1uelmCNxaqfb0xbXlbh8OKLGVfggr4dKMXUAExXFB/1hMw6phmdO+jUtTaKJMbYA+Z3tpOOp+LAg0OmJP7dvhnSU3/5YwVrVU3MFAHgJ3WkAPz4JwbfRonKOK3vhOa35TcuDNT1I18bdc80AgNxL1o86/uPc7gzvZ1JIbKL1OG4Kgr6yM/nUtP2OPie2UU9QZB0W5f14zedLs0FHUZ3ujc+7Sv4QcvjeCAOywsJNILVupKO4QPtWkC3hQxS+jcaFXGA/d1qB/hTg0LiNDAZ8uMQ==|920
\ No newline at end of file
diff --git a/Tables/任务/任务表.json b/Tables/任务/任务表.json
index 597651a6..4688eb10 100644
--- a/Tables/任务/任务表.json
+++ b/Tables/任务/任务表.json
@@ -223,7 +223,7 @@
},
{
"PrimarySchema": null,
- "PrimaryTable": "项目分组",
+ "PrimaryTable": "项目任务分组",
"PrimaryColumn": "ID",
"ForeignSchema": null,
"ForeignTable": "任务表",
diff --git a/Tables/项目任务/项目分组.json b/Tables/项目任务/项目任务分组.json
similarity index 95%
rename from Tables/项目任务/项目分组.json
rename to Tables/项目任务/项目任务分组.json
index c8297616..7106f530 100644
--- a/Tables/项目任务/项目分组.json
+++ b/Tables/项目任务/项目任务分组.json
@@ -1,5 +1,5 @@
{
- "Name": "项目分组",
+ "Name": "项目任务分组",
"Columns": [
{
"$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
@@ -49,7 +49,7 @@
"ExternalDatabaseInfo": {
"AllowModifySchema": true,
"ConnectionId": "业务表",
- "SourceTableName": "项目分组",
+ "SourceTableName": "项目任务分组",
"SourceTableSchema": "dbo"
},
"PrimaryKey": [
@@ -62,7 +62,7 @@
"PrimaryTable": "项目表",
"PrimaryColumn": "ID",
"ForeignSchema": null,
- "ForeignTable": "项目分组",
+ "ForeignTable": "项目任务分组",
"ForeignColumn": "项目ID",
"RelationTypeOnDelete": 0,
"RelationTypeOnUpdate": 0,
diff --git a/Tables/项目任务/项目表.json b/Tables/项目任务/项目表.json
index e325abfa..208ecef6 100644
--- a/Tables/项目任务/项目表.json
+++ b/Tables/项目任务/项目表.json
@@ -22,7 +22,7 @@
"$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
"DatabaseColumnType": "nvarchar",
"MaxLength": -1,
- "Name": "项目描述",
+ "Name": "项目简介",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
@@ -43,16 +43,32 @@
"$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
"DatabaseColumnType": "bigint",
"MaxLength": -1,
- "Name": "所属客户",
+ "Name": "项目分组",
"ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
{
"$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
"DatabaseColumnType": "bigint",
"MaxLength": -1,
+ "Name": "所属客户",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DefaultValue": 1,
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
"Name": "默认工时核定方式",
"ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
},
+ {
+ "$type": "Forguncy.Model.Tables.BindingColumn, ServerDesignerCommon",
+ "DefaultValue": 0,
+ "DatabaseColumnType": "bigint",
+ "MaxLength": -1,
+ "Name": "公开",
+ "ColumnType": "System.Int64, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+ },
{
"$type": "Forguncy.Model.Tables.UserExtraBingingColumn, ServerDesignerCommon",
"ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
diff --git a/image/图标/caret-down-small.svg b/image/图标/caret-down-small.svg
new file mode 100644
index 00000000..d88f59ba
--- /dev/null
+++ b/image/图标/caret-down-small.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/产品1.svg b/image/图标/产品1.svg
new file mode 100644
index 00000000..76458c73
--- /dev/null
+++ b/image/图标/产品1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/人才.svg b/image/图标/人才.svg
new file mode 100644
index 00000000..fba02105
--- /dev/null
+++ b/image/图标/人才.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/回收站.svg b/image/图标/回收站.svg
new file mode 100644
index 00000000..69a4dc54
--- /dev/null
+++ b/image/图标/回收站.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/增加.svg b/image/图标/增加.svg
new file mode 100644
index 00000000..0a6c962e
--- /dev/null
+++ b/image/图标/增加.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/提示.svg b/image/图标/提示.svg
new file mode 100644
index 00000000..76b5b71b
--- /dev/null
+++ b/image/图标/提示.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/更多1.svg b/image/图标/更多1.svg
new file mode 100644
index 00000000..234f1de0
--- /dev/null
+++ b/image/图标/更多1.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/编辑.svg b/image/图标/编辑.svg
new file mode 100644
index 00000000..41052c11
--- /dev/null
+++ b/image/图标/编辑.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/设置 (1).svg b/image/图标/设置 (1).svg
new file mode 100644
index 00000000..3b986002
--- /dev/null
+++ b/image/图标/设置 (1).svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/设置.svg b/image/图标/设置.svg
new file mode 100644
index 00000000..a75870e8
--- /dev/null
+++ b/image/图标/设置.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/退出.svg b/image/图标/退出.svg
new file mode 100644
index 00000000..5841510b
--- /dev/null
+++ b/image/图标/退出.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图标/项目文件.svg b/image/图标/项目文件.svg
new file mode 100644
index 00000000..1de9b10e
--- /dev/null
+++ b/image/图标/项目文件.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/image/图片/app-logo.png b/image/图片/app-logo.png
new file mode 100644
index 00000000..03caecb8
Binary files /dev/null and b/image/图片/app-logo.png differ
diff --git a/image/图片/app-logo3.png b/image/图片/app-logo3.png
new file mode 100644
index 00000000..200b076b
Binary files /dev/null and b/image/图片/app-logo3.png differ
diff --git a/image/图片/app-logo横幅1.png b/image/图片/app-logo横幅1.png
new file mode 100644
index 00000000..2fd1ad12
Binary files /dev/null and b/image/图片/app-logo横幅1.png differ