diff --git a/.collaboration b/.collaboration index 917488a4..365c102d 100644 --- a/.collaboration +++ b/.collaboration @@ -690,17 +690,7 @@ }, { "ModuleName": "PCPage/新增报工", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-09-16T09:36:02.9248493+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\工时\\新增报工.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/分配计划工时", @@ -1252,19 +1242,7 @@ }, { "ModuleName": "PCPage/切换项目", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-09-16T09:30:03.0142589+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\共用\\切换项目.json", - "Pages\\共用\\切换项目.rd", - "Pages\\4d6923ff8d3742f5aeb5e04927a28f5.json", - "Pages\\4d6923ff8d3742f5aeb5e04927a28f5.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/收益", diff --git a/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json index 98405c83..094f211c 100644 --- a/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json +++ b/Pages/4d6923ff8d3742f5aeb5e04927a28f5.json @@ -90,11 +90,14 @@ "StyleDatas": { "Styles": [ { - "FontSize": 13.333333333333332 + "FontSize": 13.333333333333332, + "Ellipsis": true }, { "FontSize": 12.0, - "Foreground": 0 + "Foreground": 0, + "WordWrap": true, + "Ellipsis": true } ], "Types": { @@ -122,4 +125,4 @@ "PaperSize": {}, "Margin": {} } -}//ZFGNJEwUDV6HJOj787uj5SGKqxK9xClovuNvaZSO3S8kj38M+FLIaLH5QPKkGGzGhBPE0wUF6IoCJ3OzzAzL69pb11ac9sYhkTY5gFyMA6vUG+5kv6D4sh6kW5pHlTcmJV0u7gyIQo3frX6K10mBRy06MUeEr4sSt8bgP5tB5c2/RvHpty3R0LyO5K/mWjfGR+ehIvO1AQXA2kEM7Xgs7XzevL1i5Ohl855hfhhJp6UeosIPEVv99HrHWe6doE8IeaTiOt1d0qmEhwi754FrmXU+WTmyYy29Iwkhw4m8ERQW/qoW3vc0n8FnaBDkirXarRRZp5LiSTbWF0nf7jKPlonvElGCnVqgCPzrRBckcYguhZuiZ3XdwNopngugGDqjsNW3aHXDnkhymqrq4ekKvylIvQSOVAHmsDWP+Pr0u/PzjYV0kMtJqkkfgTAgXevNPUoF/ZXhR7PNFEPQcbgaNCMgSc8yLiaOkg0kOVLNsqr/t1q1v9jUQ8WQCPc/aSCcNitbGw7zvUvxoqSGc5/l3bGjHNNfJa7+z3txgElMLBFW+/zrT7VCHMIFy5b7eeE5MFGAcl3q/VXVhK0iVafd80+H95/dDvFu5NLl4bu0F4i7QqhUVWpZd39N/E0CxS8ra9u3XHhiFO8udcFC/cbMrysUCRrIicnKrHwIPV8oAsgnZeCPjMs9m49kw+78VudPh/V+IG6r+ApIMcQyokzghd0UISTQtBGaNSbFwPVkxglbmTwRv7Y28bIDyZTeLIcQgyTjjtrtluDz8yq77X6533ko7l0UPmNc5h27Z2yxn8MLmJN09C6QHDfPzqoOZZgVwDLO8ZA5VSf3QADpY3btNyFUSbt+kuoTe12bcFgzeqHy05LTq0wp3Mxj44yif756PcRKGIbtyQtIO9jrxiDrkg==|920 \ No newline at end of file +}//GiDRSIONxgeu8+je0fmP8IeOYu+vrHpSsMdmNXpIqT1X8HeNm2XuQtbTL8xUajwK7w5lpCf22JaDNn+1TQtm7tXo/Z3UcAg6UNmX/kgz6wqh6urBi4qQesuyFr4KNs7QV1xTDXgzj5wqEtFTOpHgzzumyApqJNvV4w7Cyt01ySaW2laMx8MYT38IZj0n8ExlkGPSYL0qTD31VqbyH7h9BM6axqpk+6YVvAFyqAISTuYoykw4aV25IwMjG/M0ZOtKL9dMICC24D2+/6ohbzI6HCXjuaqAfFRY/MkyMRXzDsnl9inDg7f1IgHGciDH9p3jrDS9hM8DKqZ+0GxbFjXxYYamcPmrQP5L6SWzUR9w8mJhktaOktyEMovtmLk/2PzfHR48peaG2qDMK9k7t0WId6QgZECx6Hfie6zpwSzeCAAASTzkjaVVsUivATnUFQWT8DtNwREbNYZ7mMV707baQ9PU1cT3gvVRC1mhemKJwt8XcOApzq0Jhc4JFbG1uDl71IkKDASUK/vKUap+u+EOxhRenU/4De2lMdO6mA7hnQC2LEikEZF1rK82xNs2sfpttybZRsHBHP0zKwvxbHuOFyEp21H7FcU29BIE3O/GTl6QTp4QA30RquNhC7xhfKCnFn4lvYb7FpTh078kMPzoUiTlvHRiuVtv7IKH+0wOLFavRE16QTN0kEtjrxryaCc91ZlSref46f/2JP8SXRUdn7HR9W16uwFjkAGFntdcDP2AsdXln5FprkgzTsOyd07NoWaNr/SFhKCN+kaEfAolV4t554fuHnk8KfFIB/1g6ZyYEJeJHvhwDsg+2VKqYy+kuAA4NaL5BUDqaFUCISvtxwZeuiIvU5YqqOhuWta8N/2RU5rnIbTt7Sknu2TK7mCHUq3GpAFTgQDTI43GMoSotw==|920 \ No newline at end of file diff --git a/Pages/共用/切换项目.json b/Pages/共用/切换项目.json index 8ed4ab05..f53c9f07 100644 --- a/Pages/共用/切换项目.json +++ b/Pages/共用/切换项目.json @@ -6,6 +6,11 @@ "DesignLengthInPixel": 10.0 } }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, "3": { "GridRowColumnDefinition": { "DesignLengthInPixel": 552.0 @@ -15,11 +20,6 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 10.0 } - }, - "1": { - "GridRowColumnDefinition": { - "DesignLengthInPixel": 30.0 - } } }, "Count": 5, @@ -29,15 +29,25 @@ "RowColumnAttachedInfos": { "0": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 223.0 + "DesignLengthInPixel": 15.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 214.0 } } }, - "Count": 1, - "DefaultSize": 223.0 + "Count": 3, + "DefaultSize": 15.0 }, "AttachInfos": { - "1,0": { + "1,1": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", "CommandList": [], @@ -169,7 +179,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=切换项目!A2" + "SerializeProperty": "=切换项目!B2" }, "LeftBracket": 1 }, @@ -183,7 +193,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=切换项目!A2" + "SerializeProperty": "=切换项目!B2" } }, { @@ -196,7 +206,7 @@ }, "Value": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=切换项目!A2" + "SerializeProperty": "=切换项目!B2" }, "RightBracket": 1 } @@ -236,14 +246,18 @@ }, "StyleDatas": { "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332 + }, { "FontSize": 13.333333333333332, "TextIndent": 8, - "HorizontalAlignment": 0, + "HorizontalAlignment": 1, "Underline": false }, { - "FontFamily": 1, + "FontFamily": 0, "FontSize": 13.333333333333332, "TextIndent": 8, "HorizontalAlignment": 2, @@ -255,22 +269,30 @@ ], "Types": { "Strs": [ - "Center", "Body", + "Center", "Left" ] }, "CellStyles": { - "3,0": 0, - "4,0": 1 + "1,1": 0, + "3,0": 1, + "3,1": 1, + "3,2": 1, + "4,0": 2, + "4,1": 2, + "4,2": 2 }, "RowStyles": { - "1": 2 + "1": 3 }, "SheetStyle": { - "FontFamily": 1 + "FontFamily": 0 } }, + "Spans": [ + "3,0,1,3" + ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", "PermissionData": { @@ -294,4 +316,4 @@ "PaperSize": {}, "Margin": {} } -}//KznBCxmxaEcMXhR70nNv3wDXSiqjH4ZPgYCsQAJyqlVhpBdQIorOVC6DAgbpesJ+HV4ekI7Mj5GmElrISzbCijmONddbgnOrTmTm7bMFHUfwPhwLwUSgMZOiafWj0RNm/V9yIj7jh7FaweQtMyxQdCCPgTXnF+wCcHIq+hBbXCIt6gKRl8gw6ragY2qj2J8V45DVOCjIXXFGGHZlQBh/xQCsxR6JVYQ30By8Ci+722/Sbcww9WRpFF7z0QBdmnglEqbinnID+o1sDe2JSNLW7S87r9NfR1GIOh4iRFKK22RJCUmxBc0bU/YhmIDgmp7jUkANC44hSX9u92LTUEkY0tTpWfNJ7uvDanUkP1sXEh4sgNC934w5IjHWPagPohIt3QKe0xB4WXj7w8ZAdCFgog4hwmvL2k9MeucXQkU/Imo6xLEmlaSLDgg1KyoD9Gig++TMep1QAaSoK7jM0OABQWBIb5AezEyDepOkyzuMFd4oytXvEUu0kPJa3VpKe8fiFt9P9Zo7ICYh90gDR3Nt/CjI8fnBqoxXNYlgF/H4K5kjsXBJRnGlSPcnusH53ekz9QqWkyUnWuruKSSGsM4DX/m9DT2/W9PcH/R/JLLyCUZeQd6ph0PZTx0jerGMlBLntzDqmy1meav1oGX94y1S54fMVoHBzWJNRklzpERzFCN+NqjbEYuFrfEVIHiu7hDY6FH5/SuMmt5oOsEioGFBsEZjLNVXOqqmdet47ZHP7RCidCIXXKlv510BKJUUcsKjgUhK4Kep2pnC+ZU4Mo431/kXjWJs+m81Tqm7U7km3Hg9f/Neufp9G2YS4O4P7/RM92O0a00uQ4vUMYsNusPLepLBKHzv3s9Xi0/W3Nc9w/qWyeIhCmW9S2DFOgWT+zedF+Q8TsyYM051HO5aO+NqvQ==|920 \ No newline at end of file +}//n+edyYIb4M9BXEGSlmDOp1oC6A8DOa9fhkgurjKHg7dmEkKR9y8e6N3fPqEw4afVeo+uePKZhRC1wlrF1hqfFzvWIk3iE9rIFZGHcuRycAhZTUT8C4hqYVO4PZiYmdP8xnU5VK6f3MUZFv0p+qhhV2SUWvG2cDyY8qoZM1A5zTTH3UtNnCHS+gkydUtmjU4GywpxZhsqO4chIF+YAjR/hk9Ap3NzQ9WkdNlCxY4NVIINv4sSZ6yUJqj8OPKW82iC6mN1RljYX/aQ9HbJwgRwsoREL2UgpIWxM3J+i6R68gqfnLJ3rnbdXKdU77iiF8rlOQM+vJKmb+EW3lcaS9VA4yZUk1faW4BuSa7hj0tQjscVu3JLL71TF0vmq5bvXPeeyfp1vyvnkGfvzTFnyaLbXfeetknLF82c+n/gHbNo7OHNA6MEsHvvPfK7AXF3Coe28gGXi0cqqCiXqHy1cf0t+aeYir3gxf/SNiaE3BDp1DisN9AFZpot3eP7q165/2B3kN7upw2hPgOI52D7aUpxNPCBgw/HePGm9iS8cDHwfird9XIS27fwDz7h2m1Hv9p6kIjPitIbODmaiB4cvhQFFXTvSbd1aE3QN9r0fIKf3kpiw1XYTihapm7NMmj5evAgGMDLw4ua2ExD9griPDtWXvUL0G5BQunmXr4ZluWwnryIDFgZF6N7Zc2S6AqgRFIsIFTofr7KJqdpNTSpJ8BtEdUcXSOtreRDflVop1+EmOeoIhgz7NPtMgG0rk0Cc51HB+wb1geGq51FPb0v8LaFJI3j0rH9unrfw/XxSPhC51fWRp4i5vwHy0mm2mdHO8AmWcR+cL/oSkmGU5StN0A/MsIVMXHJbtX0rYf7LTlf7pux8wskmEfaOiMvLH5BCtX8cb/g7z5jWR6UznloIDeW8A==|920 \ No newline at end of file diff --git a/Pages/共用/切换项目.rd b/Pages/共用/切换项目.rd index d0fbc858..18490e17 100644 --- a/Pages/共用/切换项目.rd +++ b/Pages/共用/切换项目.rd @@ -1,5 +1,5 @@ { "PageType": 0, - "ColumnCount": 1, + "ColumnCount": 3, "RowCount": 5 } \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json index 6efdfffb..a48adb71 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json +++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/工时/新增报工.json @@ -591,7 +591,7 @@ "BreakpointIdentity": "288ae14e-7ae8-4471-a9d8-d1117ba04e93" } ], - "ID": "80745e39-b0fb-452c-8511-72a7cffd1a71" + "ID": "b1838b47-7374-4d9a-b87d-5524b447156c" } ], "BreakpointIdentity": "7f14170f-5452-40d1-ac31-92b4ec16a0ee" @@ -740,127 +740,254 @@ "tableData": { "TableName": "任务表", "ColumnName": "版本", - "GUID": "c9cb6b63-e8c1-4be4-ad93-b2c246a02403", - "RelationBinding": { - "RelatedTable": "项目版本", - "RelatedColumn": "ID", - "DisplayColumn": "仓库ID" - } + "GUID": "f17bdc48-d174-4117-a41e-a27c06d72347" } }, - "value": "%Null%" + "value": "%Null%", + "compareType": 1 }, "CommandList": [ { - "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", - "CurrentRowInfo": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目版本", - "ColumnName": "ID", - "GUID": "18f33063-3dca-4746-8af3-7ed6ec586f98" + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon", + "tableData": { + "TableName": "任务表", + "ColumnName": "版本", + "GUID": "c9cb6b63-e8c1-4be4-ad93-b2c246a02403", + "RelationBinding": { + "RelatedTable": "项目版本", + "RelatedColumn": "ID", + "DisplayColumn": "仓库ID" + } + } + }, + "value": "%Null%" + }, + "CommandList": [ + { + "$type": "SetCurrentRowCommand.SetCurrentRowCommand, SetCurrentRowCommand", + "CurrentRowInfo": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本", + "ColumnName": "ID", + "GUID": "18f33063-3dca-4746-8af3-7ed6ec586f98" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!B34" + } + }, + "BreakpointIdentity": "d8d0ebb8-32a3-4a2a-8d2b-a41b7d6e40ea" + }, + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "PageName": "项目版本详情", + "LoadBindingDataOption": 1, + "BreakpointIdentity": "0d0bef79-95e2-4d42-aead-5d9b81a7b68e" + } + ], + "ID": "7b6feba5-6ff3-43c4-a04e-8c469d63ae85" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!B34" + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "Title": "加载中", + "BreakpointIdentity": "813c3ebc-fb5d-4389-91fe-17725bdcc0d5" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "user", + "ParameterValue": "%CurrentUser%", + "ID": "a578339d9674437eb7301ba38d58d5d5", + "BreakpointIdentity": "d2a243a1-c40d-4cad-a596-f360b8f489bb" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "在线获取仓库某日提交数据", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "仓库ID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!仓库ID" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "分支名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!分支名称" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "成员用户名", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!user" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "开始日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!开始日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "结束日期", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!结束日期" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "过滤无效信息", + "Value": "1" + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "提交信息", + "ResultTo": { + "SerializeProperty": "GItee提交信息" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true, + "BreakpointIdentity": "ebadf3c1-e254-4726-a3e8-b29b265ca548" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=新增报工!code" + } + ] + }, + "value": "0" + }, + "CommandList": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "现有内容", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "ID": "da946dc1d1ce457cb0b6e5bc9cd62213", + "BreakpointIdentity": "6ab39cd8-7f16-4a67-93ac-d966b2d031d6" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "生成进展内容", + "ID": "11744f7dde9d4e939301529c3b430a2b", + "BreakpointIdentity": "cc6c8da5-54c5-4d3e-9958-d708e07012ce" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "var olddata = Forguncy.CommandHelper.getVariableValue(\"现有内容\");\r\nvar datalist = Forguncy.CommandHelper.getVariableValue(\"GItee提交信息\")\r\ndatalist = datalist ? datalist.split('\\n') : [];\r\n\r\nvar oldList = olddata ? olddata.split('\\n').map(item => {\r\n var temp_str = item.split('.');\r\n return temp_str.length > 1 ? temp_str[1].trim() : temp_str[0];\r\n}) : [];\r\n\r\nvar newList = datalist.map((item, index) => {\r\n var temp_str = item.split('.');\r\n return temp_str.length > 1 ? temp_str[1].trim() : temp_str[0];\r\n});\r\n\r\nfullList = oldList.concat(newList);\r\nfullList = [...new Set(fullList)];\r\nvar content = fullList.map((item, index) => {\r\n // 检查每个item的最后一个字符是否为\";\" \r\n if (!item.endsWith(\";\") && !item.endsWith(\"；\")) {\r\n item += \"；\";\r\n }\r\n // 如果是最后一个元素，用\".\"替换最后的\";\" \r\n if (index === fullList.length - 1) {\r\n item = item.slice(0, -1) + \"。\";\r\n }\r\n return `${index + 1}. ${item}`;\r\n}).join('\\n');\r\nForguncy.CommandHelper.setVariableValue(\"生成进展内容\", content);\r\n", + "ID": "bdbc6dd65a5842ff9f2823956f74a539", + "BreakpointIdentity": "54907c13-db9b-446e-9cc6-d7b5f9421dea" + }, + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!生成进展内容" + } + } + ], + "BreakpointIdentity": "b38d8382-037a-4107-843b-18b4f9d4734e" + } + ], + "ID": "052468dc-5b1d-4cfe-8df4-ac5a0734ff4d" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!msg" + }, + "BreakpointIdentity": "501b28a5-c8f7-46ee-88d2-33eb5f342309" + } + ], + "ID": "afcbaf54-ea77-45b9-a765-6840325d66e7" + } + ], + "BreakpointIdentity": "4b586371-e2fc-4bed-b83c-8239fb260ce0" + }, + { + "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Cell": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=新增报工!工作进展" + }, + "Title": "加载中", + "BreakpointIdentity": "ae522a8b-93ba-4c50-b449-76ab8877fa24" + } + ], + "ID": "cf0eebb9-186d-44f2-949b-0acd655e0016" } - }, - "BreakpointIdentity": "192eb566-4308-4a85-9b6a-05a84f54f6cf" - }, - { - "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", - "PageName": "项目版本详情", - "LoadBindingDataOption": 1, - "BreakpointIdentity": "5a93ac16-d8bb-4810-99ca-aba9158ae768" + ], + "BreakpointIdentity": "d6424b9f-7e12-4c6b-bf8d-9e90b9f27090" } ], - "ID": "77f3d121-f29e-45eb-b4e0-fc965215c512" + "ID": "cee1b463-7772-44b8-a9a6-5cf14bd6c7be" }, { "CommandList": [ { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!工作进展" - }, - "Title": "加载中", - "BreakpointIdentity": "640ea649-eacf-41b0-81ef-e87c6d42dad2" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "user", - "ParameterValue": "%CurrentUser%", - "ID": "a578339d9674437eb7301ba38d58d5d5", - "BreakpointIdentity": "9b86016e-a1ed-47ac-a702-281fc703c568" - }, - { - "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", - "ServerCommandName": "在线获取仓库某日提交数据", - "Parameters": [ - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "仓库ID", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!仓库ID" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "分支名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!分支名称" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "成员用户名", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!user" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "开始日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!开始日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "结束日期", - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!结束日期" - } - }, - { - "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", - "ParamName": "过滤无效信息", - "Value": "1" - } - ], - "ResultErrorCodeTo": { - "SerializeProperty": "code" - }, - "ResultMessageTo": { - "SerializeProperty": "msg" - }, - "ReturnPropertiesTo": [ - { - "ResultPropertyName": "提交信息", - "ResultTo": { - "SerializeProperty": "GItee提交信息" - } - } - ], - "RefreshAfterFinish": true, - "CheckDataValidation": true, - "BreakpointIdentity": "1c4ef860-4369-4e4f-adb3-2f39739d7964" + "$type": "ElementUI.Commands.ShowMessageBox, ElementUI", + "Title": "提示", + "Message": "项目还未设置版本，需要立即设置吗？", + "Type": "warning", + "ConfirmButtonText": "确定", + "ShowCancelButton": true, + "CancelButtonText": "取消", + "ShowClose": false, + "DialogResult": "按钮结果", + "AdvancedSettings": {}, + "BreakpointIdentity": "3c2040ba-4af3-41d4-938e-7ccbbcbc25e1" }, { "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", @@ -872,89 +999,81 @@ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", "cellLocations": [ { - "SerializeProperty": "=新增报工!code" + "SerializeProperty": "=新增报工!按钮结果" } ] }, - "value": "0" + "value": "confirm" }, "CommandList": [ { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "现有内容", - "ParameterValue": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!工作进展" + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "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": "ElementUI.Commands.ShowMessage, ElementUI", + "Message": "请再次尝试从Gitee导入", + "Type": "success", + "Duration": 3000, + "BreakpointIdentity": "e855ccf6-6d77-426f-9274-b06e8d9981e5" + } + ], + "ID": "48910e5d-8e12-4447-aa01-f151d17c71e8" + } + ], + "BreakpointIdentity": "4238bcac-d715-4e82-ad19-ac4ce9db399c" + } + ], + "ParamProperties": { + "IsOK": "是否为确定" + } }, - "ID": "da946dc1d1ce457cb0b6e5bc9cd62213", - "BreakpointIdentity": "fbe36423-4603-4ecb-a557-6c655b83f350" - }, - { - "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", - "ParameterName": "生成进展内容", - "ID": "11744f7dde9d4e939301529c3b430a2b", - "BreakpointIdentity": "ad6d20f5-a9df-45c4-9daf-ab2a8433fb1a" - }, - { - "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", - "JavaScript": "var olddata = Forguncy.CommandHelper.getVariableValue(\"现有内容\");\r\nvar datalist = Forguncy.CommandHelper.getVariableValue(\"GItee提交信息\")\r\ndatalist = datalist ? datalist.split('\\n') : [];\r\n\r\nvar oldList = olddata ? olddata.split('\\n').map(item => {\r\n var temp_str = item.split('.');\r\n return temp_str.length > 1 ? temp_str[1].trim() : temp_str[0];\r\n}) : [];\r\n\r\nvar newList = datalist.map((item, index) => {\r\n var temp_str = item.split('.');\r\n return temp_str.length > 1 ? temp_str[1].trim() : temp_str[0];\r\n});\r\n\r\nfullList = oldList.concat(newList);\r\nfullList = [...new Set(fullList)];\r\nvar content = fullList.map((item, index) => {\r\n // 检查每个item的最后一个字符是否为\";\" \r\n if (!item.endsWith(\";\") && !item.endsWith(\"；\")) {\r\n item += \"；\";\r\n }\r\n // 如果是最后一个元素，用\".\"替换最后的\";\" \r\n if (index === fullList.length - 1) {\r\n item = item.slice(0, -1) + \"。\";\r\n }\r\n return `${index + 1}. ${item}`;\r\n}).join('\\n');\r\nForguncy.CommandHelper.setVariableValue(\"生成进展内容\", content);\r\n", - "ID": "bdbc6dd65a5842ff9f2823956f74a539", - "BreakpointIdentity": "75e1d68e-dc2e-4746-8492-ac26eb1d6eed" - }, - { - "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", - "PropertyItemsList": [ + "PageName": "项目版本详情", + "PassValues": [ { - "TargetCells": { + "Source": { "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!工作进展" + "SerializeProperty": "=新增报工!项目ID" }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!生成进展内容" + "TargetCell": { + "SerializeProperty": "=项目版本详情!项目ID" } } ], - "BreakpointIdentity": "f0c63aab-624f-4261-8c4a-bb5297b965e0" + "LoadBindingDataOption": 2, + "BreakpointIdentity": "8c38ef8b-de11-4209-b013-53aaf1f1705c" } ], - "ID": "44f6ad08-17ba-4449-a37d-3cd0c93948db" - }, - { - "CommandList": [ - { - "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", - "FourStandardStyle": "warning", - "Message": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!msg" - }, - "BreakpointIdentity": "b39da01c-4746-4b70-9f96-566c899c52c0" - } - ], - "ID": "aed03210-4ddd-4f70-a918-2fcf832c2f43" + "ID": "68e882e2-0ea9-430c-9879-47a529e72ffd" } ], - "BreakpointIdentity": "892e92c7-7bd0-41c2-9a8a-b79f74c2a848" - }, - { - "$type": "Notiflix_Forguncy.Block_Command, Notiflix_Forguncy", - "FunctionName": "remove", - "Cell": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=新增报工!工作进展" - }, - "Title": "加载中", - "BreakpointIdentity": "45e1ac21-fa09-49b0-8f04-8e0f37b47cdd" + "BreakpointIdentity": "b73e3c41-27d4-4584-9465-673f3a55ee14" } ], - "ID": "546e734e-7aa2-4eb6-b640-43c7efbc843c" + "ID": "1b01782c-75a1-4904-85db-facf120139f5" } ], - "BreakpointIdentity": "0a4bc035-9eb0-4273-b7dc-8f8abc84129c" + "BreakpointIdentity": "3180054e-3742-4235-959e-9497be92df93" } ], - "ID": "e623a5a1-73d0-4a6a-90a9-30b68ae16b7d" + "ID": "55d37c5f-8655-4dea-9532-85ce79f4392a" }, { "Condition": { @@ -1132,7 +1251,7 @@ "BreakpointIdentity": "bc782bdf-defb-4114-8feb-9acc88997380" } ], - "ID": "3cda75b9-e7cc-4a6b-bfe5-68494ab34988" + "ID": "a8e9201e-3295-4262-98f6-663779be74da" }, { "CommandList": [ @@ -1142,13 +1261,13 @@ "BreakpointIdentity": "7336e69c-fccf-4984-b772-6f90bf0c2ac9" } ], - "ID": "d6759962-17a8-4577-9e81-8dfab1492c2a" + "ID": "2e511fc3-753f-4ff1-becf-374b8286a2cc" } ], "BreakpointIdentity": "ae9024a5-a15f-4fdd-aa20-843a2fb33efa" } ], - "ID": "3158a0cf-09e1-4463-b397-18f839fdeaf4" + "ID": "dbbf8dac-5add-4439-92ee-b1638f568eef" } ], "BreakpointIdentity": "2067e7f3-4a3c-443d-bb29-4717d6cc34a0" @@ -1204,13 +1323,13 @@ "BreakpointIdentity": "507b7a54-bc30-4b84-abee-fd163cd856ba" } ], - "ID": "5e9981d6-40bf-487e-884b-96e7fcff14b3" + "ID": "df602a8d-594b-4171-88a2-e328b3123c1e" } ], "BreakpointIdentity": "372608e7-4d70-481f-8afe-902ca1d1f546" } ], - "ID": "1c8d7951-b200-4b78-a0e2-322728375b0b" + "ID": "838109c8-8186-4a60-bcd4-50bf36cf45f5" } ], "BreakpointIdentity": "4bc6b6dc-b3c8-4ec9-9283-2bdf729ff1c2" @@ -1704,7 +1823,7 @@ "BreakpointIdentity": "9a5ead74-4e20-4bf5-88b4-bea61d050a2d" } ], - "ID": "e561e0ed-5e4c-4956-8866-12c04b6a0bd6" + "ID": "34dea028-c92d-4a2c-ac66-1694313492bc" }, { "CommandList": [ @@ -1720,13 +1839,13 @@ "BreakpointIdentity": "3697b31d-8759-4a2a-8b3f-fa4aacc0e369" } ], - "ID": "de16121a-5596-4586-8637-7490e3c74efd" + "ID": "8f7075d1-55b3-49ba-a324-2961ed5b0f0f" } ], "BreakpointIdentity": "438a3a0d-f98e-418d-9a29-a59df3fd4510" } ], - "ID": "978c9336-08e8-4810-992d-894cd4002ab8" + "ID": "0e169277-040c-4cd2-add7-43d251b733b4" } ], "BreakpointIdentity": "40cf13ed-3c5a-49f3-925c-f3203401639c" @@ -1814,7 +1933,7 @@ "BreakpointIdentity": "6c2551be-d3f1-407a-aa58-1ddfe5f912de" } ], - "ID": "118601ba-5697-460e-84f5-745839218a05" + "ID": "47d712dd-7821-4969-bbdb-10af350ea105" }, { "CommandList": [ @@ -1830,7 +1949,7 @@ "BreakpointIdentity": "542f964e-2ad1-41f2-b904-dae10b780399" } ], - "ID": "c11ef773-48c3-452b-a2bf-654b23a2dd5a" + "ID": "1ef5857b-bdaf-496d-98ff-7b8bf26f1b31" } ], "BreakpointIdentity": "414200cd-0974-4b5d-a707-c9c9b91ceeea" @@ -2322,7 +2441,7 @@ "BreakpointIdentity": "5f419cb3-3648-4bd9-9b11-04d5c09db727" } ], - "ID": "76e9d47c-2a3e-4c79-a546-696b44755eaa" + "ID": "9197091b-7adc-4961-a99b-6351b99ea3e9" }, { "CommandList": [ @@ -2340,7 +2459,7 @@ "BreakpointIdentity": "bdc7ba4a-7ff5-4c48-a983-1394685a4bce" } ], - "ID": "28f95711-59e2-4e9a-9275-70319cd06dd2" + "ID": "fe8ba6ce-31ad-4353-ae76-916c5e74698a" } ], "BreakpointIdentity": "b1871849-00b3-4090-a8fe-67a8292b2f59" @@ -2420,4 +2539,4 @@ "Formula": "新增报工!$B$28" } ] -}//gFfmHaSWwD5aPcKwu2ijTkk6kewjj96JUlHdTGpvRuTaxHxjGSdHf+6Cajq4LlI5Ku2/RYD/gWL4IcIkkMKdFb0LBEJofcOZlMfQw6Y5k1yKeteQAORErgaMFX7VQ33HidRh3QlTosg8TBznuvLy48gfTN3ThPrK5aECGlbdcbu+x63ll9GoV9jZf9hgcFM9hBTkrviPqcpdcKcwaGrBX/y7gZ4YC9cSSpig47bocnoDUyXF6jS7SivNCfkcrj3dF5y5HZ/MikGpT+Lt0vUJjKupKdCW2tQMF9/TljSNIRAMfpz6KGoxLLj88TSLxcGU8pIJDX9VaulhgAtAr9jbKmkTrKGEKnIXp5p1K7mIW5SmPlQy8bvERFcIDW2N0bzMhNLWD7hhLEelUoAm1trNCWW8RB3v8Ggm+CrijcGcX+BY30i6x66ltSBQf8NT7JrvCISwxQ3BkBf64lt9N3yEfEniQ6g0kINu0l+Ue6ZzcR046TXgobQ3IKGCdiiyMVTGTBAcWi1MRQ97zItrz0fKyaMI3KMhPJSyKAnhLjpCrkPJMn7Hq5fmq6OvwlLS9Ix5Y+IKDKs5+mbZUkpaoTdt7o8JsqVn/0N70WOdzx87PVWg9WA/CjSjiLrqITszMgKcFvbdDZt1j9QUYRM5eh/9kcctEGAPZDMdEcM1JpfbdVY16MhmRd4IATfVCOfzXfTKoEzSTYJHNcRpDVvF/7iX2SNxuHSSDdSeHhZNlw/RE2mH1btVQ3WIA9H07VA/YzFyPqHXJSrjBz3I3CNpxLWF8UfO6sZaC0/Z4HfVEI12dw79WBR16mqlMOOAlN27Ex4C5yj3BkmgKXVLbeMnWIhPBTRKY20jBlgR6q1kxuplF5NdRxBiY+98mvfHs0cqCQE5nwzACjGSH4/loHA8vGo3UA==|920 \ No newline at end of file +}//7BCsKaD8Od8mvOi6a8ymV6vx1XnmEJMhtQ8P48wVo4/svOjsil+mUWdna3TJaj/8UDZK+ELhK1WuVre/hXEqdWGGeGxATDsP+hOOj9qdSn39/nS29/g2zqTBzwcld/ibHdGXDsNgUDpRbarz1TB/vYqQdLFNc6j9iorhzT5h1JhzslaC29c898KRvxe6omXyflBMyokNnByYrGrnBFJVGksQUy56BI1LVfbt07tMNgqQw5dZB36fgOCvvcwVsJoYNrYoybTgPaKJFeQEth0sDtKLO/tALmkW++WjDTyc8uhxU2T9MiU/SgU+lhBsd3NFKmHyR4ryvxlH9HP3jdUJljtbLo/haP6NMxpukm0t2kkDRopSsO4gxFtul15yB53NLS/NmoNGtbRNCxnI7uB328VK1SCOgrGqUZUfd89xaRwTRqt/Y4FVnH+7UG81XizvFmsQSJbVnEBRs03hBOVMqMBO4HWs9w14qN2i5PbgQU/BHK561+QrKq6r2LQw5FxiwajnQ/qnvu5FtjNRzCN9P7NglqQu7GIFcNvqFwTNUn0CsGT8h/xQBZ/CjDLmzSS7Z3if5s/MOaBNWQ7bjDsVOwHoMd00ofJ8CWSt+4z0bnonSDqfUgstmFEwHS8cg37ipNtUjKAXOifOgqb+EM0oP8gweBMMyl8Ya1BLJVAOweLjPLLuu5OwuyVw/ZmkmnBj+OegI9U0Q2Ym5AFX8kfltnjbe7O3mRX7j7Gp0J7iZbTTROFHve8cQ9Kwpkbzvt4lXq3U/qFgj+trfag4cqilByLR1hrhAlEGb28IaY1HIzHutgTbtQImeFIGyCub9EpwhtPjjHA5dGFbE1lkeSleq+vjyTrytystnJ2R2WCpmsw4KdozsZbM9x/ZqJUBLbMfhSM4CB1wg4xvQ/mbr+Vi/g==|920 \ No newline at end of file