diff --git a/.collaboration b/.collaboration index d97afba3..5595f25d 100644 --- a/.collaboration +++ b/.collaboration @@ -638,17 +638,7 @@ }, { "ModuleName": "PCPage/版本发布详情", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T17:45:03.2434294+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目发布\\版本发布详情.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/项目发布历史", @@ -916,17 +906,7 @@ }, { "ModuleName": "PCPage/个人中心", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T16:57:11.7563297+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心.json", - "Pages\\个人中心\\个人中心.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-我的收益", @@ -938,17 +918,7 @@ }, { "ModuleName": "PCPage/个人中心-基本信息", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T16:57:20.5710729+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\个人中心\\个人中心-基本信息.json", - "Pages\\个人中心\\个人中心-基本信息.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/个人中心-积分列表", @@ -2260,18 +2230,7 @@ }, { "ModuleName": "UserService", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T16:58:31.8212222+08:00", - "ModuleType": 11, - "ToRemoveFiles": [ - "UserServiceDB.sqlite3", - "CloudStorageProvider\\data.json", - "SecurityProviderV2\\data.json" - ] + "ModuleType": 11 }, { "ModuleName": "CustomLibrary", @@ -2295,46 +2254,7 @@ }, { "ModuleName": "Plugin", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T18:25:47.2160308+08:00", - "ModuleType": 40, - "ToRemoveFiles": [ - "Plugin\\Echarts图表-10_0_3_0.zip", - "Plugin\\Editormd-6_0_102_0.zip", - "Plugin\\Forguncy.CustomMenu.zip", - "Plugin\\JSON 序列化和反序列化-10_0_2_0.zip", - "Plugin\\JSON数据源-10_0_2_0.zip", - "Plugin\\Lottie动画插图-10_0_2_0(1).zip", - "Plugin\\Notiflix-9_0_103_0.zip", - "Plugin\\OPENAI套件-10_0_3_0(1).zip", - "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip", - "Plugin\\SqlServerWrapper.zip", - "Plugin\\Tiny富文本编辑器-10_0_2_0.zip", - "Plugin\\UI操作工具箱-9_0_6_0.zip", - "Plugin\\Unlayer-9_0_103_0(1).zip", - "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip", - "Plugin\\发送HTTP请求命令-10_0_2_0.zip", - "Plugin\\取消当前行-9_0_103_0.zip", - "Plugin\\增强关闭页面-9_0_6.zip", - "Plugin\\复制到剪贴板-7_0_3_0.zip", - "Plugin\\客户端缓存操作工具库-8_0_0_0(1).zip", - "Plugin\\富文本编辑器-10_0_2_0.zip", - "Plugin\\对象与集合操作工具-8_0_0_0(1).zip", - "Plugin\\异步运行命令-9_0_103_0(1).zip", - "Plugin\\支持预览的附件上传-10_0_2_0.zip", - "Plugin\\服务端缓存操作工具库-8_0_3_0.zip", - "Plugin\\模板引擎操作库-9_0_103_0.zip", - "Plugin\\用户管理命令 V2-10_0_5_0.zip", - "Plugin\\网络操作库-9_0_102_0.zip", - "Plugin\\设置当前行命令-10_0_2_0.zip", - "Plugin\\设置焦点命令-10_0_2_0.zip", - "Plugin\\豪~豪插件合集-7_0_102_0.zip", - "Plugin\\超哥富文本增强工具包-9_0_103_0.zip" - ] + "ModuleType": 40 }, { "ModuleName": "PublishSetting", @@ -2402,22 +2322,10 @@ }, { "ModuleName": "ServerCommand/获取活字格发布日志", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T17:42:57.5444316+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/导入活字格发布日志", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T18:03:50.4649394+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.json b/Pages/个人中心/个人中心-基本信息.json index acb9701d..c45b1197 100644 --- a/Pages/个人中心/个人中心-基本信息.json +++ b/Pages/个人中心/个人中心-基本信息.json @@ -55,12 +55,32 @@ "GridRowColumnDefinition": { "DesignLengthInPixel": 24.0 } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } } }, "InLogicalVisibleIndexes": [ - 14 + 18 ], - "Count": 15, + "Count": 19, "DefaultSize": 32.0 }, "Cols": { @@ -255,7 +275,16 @@ "8,5": "%CurrentUser.GIT用户名%", "10,1": "Gitee密码", "10,5": "%CurrentUser.GIT密码%", - "12,5": "保存Gitee信息" + "12,5": "保存Gitee信息", + "14,1": "三方认证", + "16,1": "钉钉", + "16,5": "未绑定", + "16,9": "%CurrentUser.DingTalkUnionID%", + "17,1": "企业微信", + "17,5": "暂不支持" + }, + "Formulas": { + "16,5": "IF(ISBLANK(J17),\"未绑定\",\"已绑定\")" }, "AttachInfos": { "2,5": { @@ -374,12 +403,12 @@ } } ], - "ID": "940b3d50-837f-4043-99f5-4bb4a5c1c375" + "ID": "798fe1aa-87e2-492d-83d7-daf57c6dd9d8" } ] } ], - "ID": "55023001-e584-404c-b7df-a7ef67185215" + "ID": "c1c99258-f376-4255-8681-3bb7075bea76" } ] } @@ -528,12 +557,12 @@ } } ], - "ID": "87431b22-ad31-43b3-9532-2797525d2c20" + "ID": "05707b8b-4471-42f8-bcd4-98e9ef397c1a" } ] } ], - "ID": "88f5af6a-0216-4a80-87dc-35b95cd56b2c" + "ID": "e47bb419-34cd-4381-8df8-171b5ad8b4fe" } ] } @@ -713,12 +742,12 @@ } } ], - "ID": "e18f972b-7467-4ed3-ba47-12071b90b479" + "ID": "f2f89395-d95e-4029-a303-5ec13a336c9a" } ] } ], - "ID": "8c54a7c3-873c-4585-a4f9-8ef9139f9e63" + "ID": "74721a77-bdca-4ccb-9adf-1b06575026d8" } ] } @@ -862,12 +891,12 @@ } } ], - "ID": "f90f4f5c-cedd-4fa3-8506-555db6fde73b" + "ID": "6d53538a-b213-4e3c-8698-37f3973747e4" } ] } ], - "ID": "f7d804fd-83b6-4f13-bab7-5f5f9d28b8b0" + "ID": "42d2dacf-0f08-4bc4-9762-82ad91cee66d" } ] } @@ -928,6 +957,7 @@ "8,5": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -956,6 +986,7 @@ "10,5": { "CellType": { "$type": "ElementUI.InputCellType, ElementUI", + "CommandList": [], "UIPermissions": [ { "Scope": 2, @@ -1099,7 +1130,7 @@ "ReloadData": true } ], - "ID": "c77719bd-81e6-4f28-8ba5-1c0f3d27a3f6" + "ID": "c4bd7db4-cd51-4753-9490-a6a0ea093d32" }, { "CommandList": [ @@ -1114,12 +1145,12 @@ "BtnText": "知道了" } ], - "ID": "307ceb0b-4520-4245-b0e5-cc7b82d3c0a7" + "ID": "3709f584-e096-4d4e-84e1-e696d4084980" } ] } ], - "ID": "ddbb2903-5484-4644-a959-99815986d24e" + "ID": "bd15c9cf-7e0e-4f7a-9acb-9a08494bdb56" }, { "CommandList": [ @@ -1131,7 +1162,7 @@ "BtnText": "知道了" } ], - "ID": "544a6289-7971-43d6-9af0-26c5477c660d" + "ID": "08185035-e6ed-43cc-85de-0e2e9085e9d1" } ] } @@ -1145,6 +1176,39 @@ }, "IconSize": 14.0 } + }, + "16,5": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "Text": "未绑定", + "ClickMode": 1, + "IsDisabled": true, + "TemplateKey": "_RS_Main" + }, + "RulesGuidList": [ + "17fd8ca6-62d2-4e2d-a85d-59d4979374ea" + ] + }, + "16,9": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "Text": "%CurrentUser.DingTalkUnionID%", + "ClickMode": 1, + "IsInvisible": true, + "TemplateKey": "_RS_Main" + } + }, + "17,5": { + "CellType": { + "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon", + "Text": "暂不支持", + "ClickMode": 1, + "IsDisabled": true, + "TemplateKey": "_RS_Main" + }, + "RulesGuidList": [ + "0cf98f29-3c70-4382-91a3-d822c1c333cd" + ] } }, "StyleDatas": { @@ -1220,6 +1284,26 @@ "Formatter": 6, "HorizontalAlignment": 5 }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 10, + "HorizontalAlignment": 5, + "Underline": false + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 3, + "Underline": false + }, + { + "FontFamily": 2, + "FontSize": 13.333333333333332, + "Foreground": 3, + "HorizontalAlignment": 5, + "Underline": false + }, { "FontSize": -1.0 } @@ -1235,7 +1319,8 @@ "[AUTO]General", "Left", "0\"小时\"", - " ¥#,##0.00_);[Red] ¥(#,##0.00)" + " ¥#,##0.00_);[Red] ¥(#,##0.00)", + "Accent 2 0" ] }, "CellStyles": { @@ -1538,14 +1623,14 @@ "13,2": 5, "13,3": 5, "13,4": 5, - "13,5": 8, - "13,6": 8, - "13,7": 8, - "13,8": 8, - "13,9": 8, - "13,10": 8, - "13,11": 8, - "13,12": 8, + "13,5": 12, + "13,6": 12, + "13,7": 12, + "13,8": 12, + "13,9": 12, + "13,10": 9, + "13,11": 9, + "13,12": 9, "13,14": 5, "13,15": 5, "13,16": 5, @@ -1559,47 +1644,161 @@ "13,24": 9, "13,25": 9, "13,27": 4, - "13,28": 12, - "13,29": 12, - "13,30": 12, - "13,31": 12, - "13,32": 12, "13,33": 4, "13,34": 3, "13,35": 3, - "14,1": 5, - "14,2": 13, - "14,3": 13, - "14,4": 13, - "14,5": 13, - "14,6": 13, - "14,7": 13, - "14,8": 13, - "14,9": 13, - "14,10": 13, + "14,0": 3, + "14,1": 10, + "14,2": 3, + "14,3": 3, + "14,4": 3, + "14,5": 3, + "14,6": 3, + "14,7": 3, + "14,8": 3, + "14,9": 3, + "14,10": 3, "14,11": 3, - "14,12": 5, - "14,13": 5, - "14,14": 5, - "14,15": 5, - "14,16": 9, - "14,17": 9, - "14,18": 9, - "14,19": 9, - "14,20": 9, - "14,21": 9, + "14,12": 3, + "14,13": 3, + "14,14": 3, + "14,15": 3, + "14,16": 3, + "14,17": 3, + "14,18": 3, + "14,19": 3, + "14,20": 3, + "14,21": 3, "14,22": 3, - "14,23": 5, - "14,24": 5, - "14,25": 5, - "14,26": 5, - "14,27": 4, - "14,28": 4, - "14,29": 4, - "14,30": 4, - "14,31": 4, - "14,32": 4, - "14,33": 4 + "14,23": 3, + "14,24": 3, + "14,25": 3, + "14,26": 3, + "14,27": 3, + "14,28": 3, + "14,29": 3, + "14,30": 3, + "14,31": 3, + "14,32": 3, + "14,33": 3, + "14,34": 11, + "14,35": 3, + "15,0": 3, + "15,1": 3, + "15,2": 3, + "15,3": 3, + "15,4": 3, + "15,5": 3, + "15,6": 3, + "15,7": 3, + "15,8": 3, + "15,9": 3, + "15,10": 3, + "15,11": 3, + "15,12": 3, + "15,13": 3, + "15,14": 3, + "15,15": 3, + "15,16": 3, + "15,17": 3, + "15,18": 3, + "15,19": 3, + "15,20": 3, + "15,21": 3, + "15,22": 3, + "15,23": 3, + "15,24": 3, + "15,25": 3, + "15,26": 3, + "15,27": 3, + "15,28": 3, + "15,29": 3, + "15,30": 3, + "15,31": 3, + "15,32": 3, + "15,33": 3, + "15,34": 3, + "15,35": 3, + "16,0": 3, + "16,1": 5, + "16,2": 3, + "16,3": 3, + "16,4": 3, + "16,5": 13, + "16,8": 3, + "16,9": 14, + "16,33": 3, + "16,34": 3, + "16,35": 3, + "17,0": 3, + "17,1": 5, + "17,2": 3, + "17,3": 3, + "17,4": 3, + "17,5": 15, + "17,6": 3, + "17,7": 3, + "17,8": 3, + "17,9": 14, + "17,10": 14, + "17,11": 14, + "17,12": 14, + "17,13": 14, + "17,14": 14, + "17,15": 14, + "17,16": 14, + "17,17": 14, + "17,18": 14, + "17,19": 14, + "17,20": 14, + "17,21": 14, + "17,22": 14, + "17,23": 14, + "17,24": 14, + "17,25": 14, + "17,26": 14, + "17,27": 14, + "17,28": 14, + "17,29": 14, + "17,30": 14, + "17,31": 14, + "17,32": 14, + "17,33": 3, + "17,34": 3, + "17,35": 3, + "18,1": 5, + "18,2": 16, + "18,3": 16, + "18,4": 16, + "18,5": 16, + "18,6": 16, + "18,7": 16, + "18,8": 16, + "18,9": 16, + "18,10": 16, + "18,11": 3, + "18,12": 5, + "18,13": 5, + "18,14": 5, + "18,15": 5, + "18,16": 9, + "18,17": 9, + "18,18": 9, + "18,19": 9, + "18,20": 9, + "18,21": 9, + "18,22": 3, + "18,23": 5, + "18,24": 5, + "18,25": 5, + "18,26": 5, + "18,27": 4, + "18,28": 4, + "18,29": 4, + "18,30": 4, + "18,31": 4, + "18,32": 4, + "18,33": 4 }, "SheetStyle": { "FontFamily": 2, @@ -1623,7 +1822,12 @@ "10,1,1,4", "8,5,1,28", "10,5,1,28", - "12,5,1,5" + "12,5,1,5", + "16,1,1,4", + "16,5,1,3", + "16,9,1,24", + "17,1,1,4", + "17,5,1,3" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1642,7 +1846,43 @@ ] }, "RowBreakLines": [], - "RepeatRangeSettings": [] + "RepeatRangeSettings": [], + "ConditionFormatRulesCollection": { + "Rules": [ + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ISBLANK('个人中心-基本信息'!$J$17)" + }, + "GUID": "17fd8ca6-62d2-4e2d-a85d-59d4979374ea", + "StyleInfo": { + "Foreground": "Accent 1 0", + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + }, + { + "$type": "Forguncy.ConditionFormat.FormulaRule, ServerDesignerCommon", + "Formula": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=ISBLANK('个人中心-基本信息'!$J$17)" + }, + "GUID": "0cf98f29-3c70-4382-91a3-d822c1c333cd", + "StyleInfo": { + "Foreground": "Accent 1 0", + "Underline": null, + "Strikethrough": null + }, + "IsDisabled": false, + "IsInvisible": false, + "IsReadOnly": false + } + ] + } }, "PrintInfo": { "PaperSize": {}, @@ -1668,6 +1908,26 @@ "IsAutomaticFill": false, "Location": "3,135", "Size": "3,18" + }, + { + "Name": "BackgroundPicture2", + "DisplayName": "背景图3", + "StyleInfo": { + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "3,342", + "Size": "3,18" + }, + { + "Name": "BackgroundPicture3", + "DisplayName": "背景图4", + "StyleInfo": { + "Fill": "Accent 1 0" + }, + "IsAutomaticFill": false, + "Location": "3,342", + "Size": "3,18" } ], "CustomNames": [ @@ -1696,4 +1956,4 @@ "Formula": "'个人中心-基本信息'!$F$11" } ] -}//zd2qQY+HsZIepb3ShWpEOi7wXFdxkueyNpaHeYLr1NAnqPKwGrqw+Njwhk/voCLhJ7sotpFDSzLxL3i4L4QJxyL0pk/0I0ml29AYpFlmtXABEZh5EVOvOSuldVySJYB6ypT0j9touWHhoDbw886iQXZRjYOHxxGg1KF3lOeDsZ8p6ArJIjByIe7Qk/gDKWI+Kv8qrb5nnpj+eEbaDbZf6/SouplaIx+LP0y5DQJ/zl9sJx8e0E0N0rEcMTwBdorRkD6nl6HhTtgmRJqdJIzA5HUVXgEB7G9hcCcRL9czupJcEpJMHGQNzOJgcBW0K1dA+TkIl/ucaowHy1XtEfzfLcd3SrkL21LrSCc6vZ17G7GHLkJqUAjd0fnSv1XR19uh4LCFGQztyY3LiiveJU3GyQHr6AlXhDeYlfHpcceOveJb98s8gGBAnb3ftCqE9flyMmeWVfolyTCFPmmN+Dh7bv45tG5ewqWHlfnufvAOtiqZvGhCk35H4N9Spl/d2DGLPNTHrf9w8QHfHm84m9NiIQ2pSGt7jtDr7L7T+7S60NY2wpVCQf2zo9fOBjGX97oiMVKuRQrjTs/W+brwDLbg2PcnHO+CotQujvP3/sE9x9CKRM2b0aLPQw5xKrWxti2fqjVQrtdREM5/XXNrLsmUCikVsxgsTr8OGKpaJiHzIvK6nnH+PJkJqc7HBvyr9KAqrkznz6xEHY1HKiIiQJlnYHNbK6NWnPPlgS64OURTG5+F1KHE7JWlB6QYKAy4REGgk9mE2zt0Eq7Ir8lNzB8ve/rLl1xt5SPc7nUKLJfSEtoJ156PB2No3f5nu9aweUEFS2EDKH8gzWxfcG8pSPzl5VUNA1nEEmpKJmgcGH0vNqZr/FBARC4qQXn1IV6MRRS3dDEEkaDR4vCro58FACtUog==|920 \ No newline at end of file +}//Strh0xU14QD30L78KDfprk85TQ5s7LAJyjRSBGN2Sb6BAM8Gia7l78Kt2P0qHMUDM4lBBPEXeZ3EZ7KiYEHNG7y07ZhGwtVsHTyABn8cImdCJn+VyXYp+/jTj5Xy00DlhNjhLTWEXPKBH0cvB82v7QfBEtBt3gpLGb56TMDlCywatJ/N3R3eXG+kwrN7BNdcMPA5Ps8UtGLxarMrdq1FDU5RmCcEX0KDl3wOW5R4EiSV6tcJy36MKkwNaz9jVcur1ebu+JjFdhX/P7/ABt8NuBAO7MO2R3xLRA2YiG6/zNFSaDBtkk8JCLdn9unpTBbHv6bOiXIqwoM79/n5iN8wOC1UIga9qHRybg4IzDEDG0A7GIqznEdGL50qzN6c99paGAbm6J0+yLbp2DexwiS+9nQhStjJ6/q3RRsaF1JeHxWyqvhxr4UMF76iNh2qxPtr8+PS5tFvNake/k0Na92MPiIjcjiYpmXDSBbB/a/mGO25QIXT1R4CRM48elNTZlWeseXM0z/CJ9p+P3wzm/bw92QaQxijfY135UO0j+mbISXJQVaCrdGMnig8l9VTjNy9DwrRbGumACAoGTs7e3m77WpZViHAWHLbqZEDK+galwniRUlgN+usNERnCUKJO4hsM1qA1b+HsY/ivQEqD2k9uC8j20dbN2Gsp6a0RDh74T7n1DrWOLA5AenzSo+Z0B89acA+CcnWkPEaTvAC7ug82GFelX1YfhLUrLqeeN1WR8cVDSDr/KgjFEQ+AbLpijmfED3tQIdGXI9W0dFhXEKeYVShz7AGC3kA+963d62d+SdUE2OCXh1Y6c14onMcKj5PmI7T/2s2FI5QzkENblZ1JQGMVlcQRWz+oDJr+QiUDLnIleD9IqmbpZmwybe/xnIbm/sdPiqGfTxCKrDnGtXUVQ==|920 \ No newline at end of file diff --git a/Pages/个人中心/个人中心-基本信息.rd b/Pages/个人中心/个人中心-基本信息.rd index 1500d5c9..e1da5b82 100644 --- a/Pages/个人中心/个人中心-基本信息.rd +++ b/Pages/个人中心/个人中心-基本信息.rd @@ -1,7 +1,10 @@ { "PageType": 0, "ColumnCount": 36, - "RowCount": 15, + "RowCount": 19, + "Formulas": { + "16,5": "IF(ISBLANK(J17),\"未绑定\",\"已绑定\")" + }, "CustomNames": [ { "Name": "姓名", diff --git a/Pages/个人中心/个人中心.json b/Pages/个人中心/个人中心.json index 5ce985c7..e61c5d63 100644 --- a/Pages/个人中心/个人中心.json +++ b/Pages/个人中心/个人中心.json @@ -53,7 +53,7 @@ }, "11": { "GridRowColumnDefinition": { - "DesignLengthInPixel": 199.0, + "DesignLengthInPixel": 324.0, "Mode": 1 } }, @@ -724,7 +724,7 @@ "Fill": "Background 2 0" }, "IsAutomaticFill": false, - "Size": "1264,1452" + "Size": "1264,1577" }, { "Name": "b1bb40d2-d28b-4daf-b63c-cfb309eb5e55.png", @@ -739,7 +739,7 @@ "IsAutomaticStroke": false, "IsAutomaticFill": false, "Location": "56,24", - "Size": "1152,1404", + "Size": "1152,1529", "BoxShadowString": "5 5 0 5 #08000000" }, { @@ -756,4 +756,4 @@ "Size": "1137,332" } ] -}//jBp4QrwlxZIyKxm0xf1/7NrMoWTwdaV4QySXPeEFa/+QExVCDXd4f3YtMLj6dFHmMAnAyN9/w9Oy+lFv3CWBADQrx4B93eSLn0ewQYM8r0cfVr2GmfPR6RFq/6DIEIF2K4efZuWXmvc1z9VOO/Jsp0V1ShXUfetaFRijsGEHaan8wc5gebePl41061KBkH91bkrxAVwfrybKgxJtQhiVIdEJnajujxfy04OGqJUGXa36b0dNsDU9x9tZm+rR/NPWU7Bj4X6NmX9ueDTSEQYuHP+K6eaxC0i5LQFVs450X0Dvhk2BXhXEkzIQkANWKHPj6FYcgXc9AUYYsCx9r823GRC/+EWhF3hVJU2zrTwH0ZG+H2VVe48CnW0VHVkZ7Io+WV0GvylfZuGcZMxMLv/YTRwkPKm7rbivKFHfkiTIHTNkNGId4DQs9MosQaPncvXCcMhyZiqKozinPxYoFxRQ+AAkA8vaIB2PK0qKTojKqe1vlg5yI7gTwiY1D9+UI8EO0bAfu3v/AggYq0ruBWt9d6XTN2sSbhaM8k6duj9Qs3pD/QvWVolN3ExHCHWnyUugriLMZC13K8ZgEWBh+g05jK6HlponkohcIyDB7TW6NwvaLbW4PX11RseTLXg+vg2z+u/UlMfa5aMZQxCum05HSeRZOD9fYS2AWEJj3fKGW/uUJlFLy00VPAt3Yg6wBYfrFi3jKFNCHtNtUBnRjpIisdRwMMqpN5LYdlrDIa+gC0kUDoKtvCbRrJwNEHMZgWWEfLcoztCTBS62a28QWuv7CsfeTxsTuOzCPk93oRPeBkpnAxFAAotA+IUZGGjDDhN6FXRFVSUwRxizim5hihNvJDlZChAYUSY6S6kIw1flmfuB7J1102AaDjG+wPIyDR8z6kraPRBXRDOsVKgCoNtgdQ==|920 \ No newline at end of file +}//WscF9In1emE7ZOSy/Fb/ImMxHek2UdJo0C9HnO+mJKCkEW1JNXxzWC4HM+RV+zrb+ucJYff34sKan6a249uzaA5yjNNdZNv84wp73BGd91P8UzhLsh0BficAI9GMLQk7+ks0F0jh0i2aOhwGr4jgFu7yUKofCwEly9QxaIlGKxZELb4wgTJJpvb7D35SMMMgY6lP2Q39iWu7DOYnKHFIMUWlj9Dar5T/ZK8R/Stweu3i1INk9iVIr4uq4Xhw8FJ1dwjCON54VEZ7nnXat25Lu8eAYTRgsQnfpWiSSRPpT1+PMyld6WtlT4peTz+Pq8Uydqa/JtiKh6p8lhTI/jXwFPZHhMyxp0GrbuJDXuNfy53PUJh7nCl71hNp0j/kUd8o1znUfBJwkNfF3Q1HQ8YsZUqpQ+dDSoRyljrb08y1LECo7AcTGmMxN3oOUduUvH9ALI2uSczEvGEuwjN7WesCTibNH9xRLrTAvSuBGR/TqnXpaqFK9wCyEcAPbiL3RBg8ElEULG+14zylBHZWx7Y7vY58T6swHMvx10VKLIx6mLw1lP3rxPXmMIgEc6obpzkeheNqsZ4bORVhDuHwCXfBvM1/Sz5ieLtNlwNTQTz6c0IeI3rpAZaXYm4MKiz7hMtmV7NbeugHclW5w6OZO2s7SlwjSIsMbQRjEBZaZPPA1IZUwa74pxeAP6vbizjktSUiy+1Xx2YU0BLn7cjit57HIwxQD55HbEE6K9MXOmRmEQOPW7FukJKXh6t7tOrh0YVYvTXQ+gtbzXnCMl/rZ1qXMQ2TA/+xopawUlZEQiDMRzBy9WB+BGrI44IY1HSBbowDjJ4pSB6XchbFzGgnNdAmXtM8sTDZUslt8RdLnQN0VehmZW8rZV9KUhc0bybS0Oy8CroOgeiVhp80eHkc5T4A2A==|920 \ No newline at end of file diff --git a/Pages/共用/导入活字格发布日志.json b/Pages/共用/导入活字格发布日志.json new file mode 100644 index 00000000..acbb1026 --- /dev/null +++ b/Pages/共用/导入活字格发布日志.json @@ -0,0 +1,636 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 35.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 30.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 534.0 + } + } + }, + "Count": 5 + }, + "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 + } + }, + "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 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 15.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "Count": 33, + "DefaultSize": 32.0 + }, + "Values": { + "1,1": "从活字格发布日志导入", + "1,25": "读取日志", + "1,29": "确认选择" + }, + "AttachInfos": { + "1,25": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "获取活字格发布日志", + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "日志列表", + "ResultTo": { + "SerializeProperty": "list" + } + } + ], + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=code" + } + ] + }, + "value": "0" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=list" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入活字格发布日志!B4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "SetJsonDataSource", + "ParameterValues": { + "dataSource": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入活字格发布日志!list" + } + } + } + ], + "ID": "b34f0ecc-871f-490b-a446-d083c0efd24a" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入活字格发布日志!msg" + } + } + ], + "ID": "34b13a5f-112e-4ef5-8dae-b25e4d7c3661" + } + ] + } + ], + "Text": "读取日志", + "TemplateKey": "_RS_Success3" + } + }, + "1,29": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=获取表格数据源" + } + ] + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=导入活字格发布日志!获取表格数据源.length" + } + ] + }, + "value": "0", + "compareType": 2 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入活字格发布日志!B4" + }, + "TargetType": "ElementUI.TableCellType, ElementUI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=e50995ee76bfe560", + "MethodName": "GetSourceData", + "RetrunParamNames": { + "SourceData": { + "SerializeProperty": "获取表格数据源" + } + } + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "返回内容", + "ID": "0fc4db61cbac43c8a846b86b3124321a" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "var data = Forguncy.CommandHelper.getVariableValue(\"获取表格数据源\");\r\nvar content = data.map(item => {\r\n return `
  • ${item[\"备注\"]}
  • `\r\n}).join('');\r\nvar result = \"\";\r\nForguncy.CommandHelper.setVariableValue(\"返回内容\", result)\r\n", + "ID": "1abf5bb329fb41aba58e48d490c5c6fc" + }, + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupReturnValues": [ + { + "Name": "选取内容", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入活字格发布日志!返回内容" + } + } + ] + } + ], + "ID": "e9d0f2c8-d40b-496b-80fa-7423b58f2b5b" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon", + "ClosePopupResult": 1 + } + ], + "ID": "5fd0c860-f435-4403-99f5-b450ecbdb357" + } + ] + } + ], + "Text": "确认选择", + "TemplateKey": "_RS_Main1" + } + }, + "3,1": { + "CellType": { + "$type": "ElementUI.TableCellType, ElementUI", + "ElTableName": "EL表格1", + "autoGenerateColumnsByDataSource": false, + "columns": [ + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "创建时间", + "label": "发布时间", + "width": 180, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "110283d3-e6ee-4603-a484-a3c17b74d9d1", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "用户名", + "label": "发布人", + "width": 180, + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "showOverflowTooltip": false, + "key": "946b14c2-ea2b-4259-b49b-9dfbe6afff63", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "备注", + "label": "发布内容", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "key": "769204a2-9d36-4069-9fdf-9966beb26909", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "是否成功", + "label": "是否成功", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "c469b89d-f59b-4851-82ca-ba66f1d75792", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "应用名称", + "label": "应用名称", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "02f04732-47b6-4fc4-b8db-e1e4d4476c40", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + }, + { + "$type": "ElementUI.ColumnSetting, ElementUI", + "dataColumnName": "追踪上下文ID", + "label": "追踪上下文ID", + "align": "center", + "headerAlign": "center", + "colfixed": "false", + "type": "Default", + "tagType": "info", + "imgType": "cover", + "resizable": false, + "showOverflowTooltip": false, + "hide": true, + "key": "e29e7207-05c7-4456-bc74-f3b03924d959", + "UIPermissions": [ + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ] + } + ], + "actionButtons": [ + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "编辑", + "shape": "default" + }, + { + "$type": "ElementUI.ActionButton, ElementUI", + "UIPermissions": [ + { + "Scope": 2, + "AllowRoles": [ + "FGC_Anonymous" + ] + }, + { + "Scope": 1, + "AllowRoles": [ + "FGC_Anonymous" + ] + } + ], + "type": "button", + "Name": "删除", + "styleType": "Accent 5", + "shape": "default" + } + ], + "sumText": "合计", + "size": "small", + "showSelectColumn": true + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontSize": 18.666666666666664 + }, + { + "FontFamily": 0, + "Formatter": 1 + }, + { + "FontFamily": 0 + } + ], + "Types": { + "Strs": [ + "Body", + "[AUTO]General" + ] + }, + "CellStyles": { + "1,1": 0, + "1,25": 1, + "1,26": 2, + "1,27": 2 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "3,1,1,31", + "1,25,1,3", + "1,29,1,3" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PageLoadedCommandList": [ + { + "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon", + "TargetPageElement": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=导入活字格发布日志!Z2" + }, + "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.5.0, Culture=neutral, PublicKeyToken=967100671921c115", + "MethodName": "ExecuteCommand" + } + ], + "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": {} + } +}//2M25d/3QklxMKKLDnV4Dzz4hSKX5IfgRrbrkDC+ejT/QDSWTwVR4nlO9kb0dbSakq/fTPVNkZLK35jTwHLZk/O3sdBfF8FtB+df8hEg/dE6C+HqFXDTm0w96up07ZZ9SO+lgTGPvQlhMIzINgSFgJIg8dNM8+lM6fpxon05YG+kej3LmS0F6zRs9yTSdqMMIZD338RvQtxEdDr8JwEuEpTqfYOTvrzBy4+kb3GKjPtpsAYH6MnKvdv3vrebOJWUYB+Hl/fKLlji9ge2y0ils0H0MDXkSktpAFjEgjqUkRntqKcvsCFjQSXnoiKk+aS4gZVKIu9A8ugJ6GpyiY+jOh9PwkTDUWMiBuoOsSgl8LvrSwm624cWwqVXPG5CvcKSUKROQ70vJveVcn6lo5ntvmmWBDRqzh7Ft+akR7ohR/h1EMHN90+j6YxPfmSvRlnOCQnNXMnwaE9WK3qggAC+Glshmb6XAIugEvS/4Vbdn13TAQpNb3D8pgaZwIJhOZduhuye+E/vLaURY36tvDvHaEKanjL6sGyV3egmJ56fpOzqLKeutI0i1iak8TeEbUCQhkL/Qh+8FXIkUjd+xG5sUpGS6bVswUYH9DaPnhMNU+70cQsDG5HSYy52fc6Wt42RNvFSj04D2OR+ZMWOK0a342SCSCFSe1lZ0EKvQdEuRX1DPU4I1UXjmVle3vL3eh0xQwb0zj+cg85lYpFncgL13q1CJQOTWadg0PHwZff4pAJYuyW0XvZsbhAugx6JROy+PeVa0laO6kmPywFgTgVAYN6EwvLZmffozZZryhAMOfFJuyHouijtgVBrBnGJeeNZUG1jXqUuDQ/Y8ZUvku1Qzu27jXg53FgQ0vH3/yVGDIbrG+Apj8LPbWtf981TGjE0y6ORHZj3KMjwrSRjMsDUNyA==|920 \ No newline at end of file diff --git a/Pages/共用/导入活字格发布日志.rd b/Pages/共用/导入活字格发布日志.rd new file mode 100644 index 00000000..5fd2aeac --- /dev/null +++ b/Pages/共用/导入活字格发布日志.rd @@ -0,0 +1,5 @@ +{ + "PageType": 0, + "ColumnCount": 33, + "RowCount": 5 +} \ No newline at end of file diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json index 4cd09e00..79e9491b 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目发布/版本发布详情.json @@ -252,6 +252,7 @@ "7,1": "关联客户反馈", "7,34": "从反馈中导入", "11,1": "发布内容", + "11,27": "从活字格发布日志导入", "11,34": "从反馈生成", "15,31": "删除", "15,35": "保存" @@ -740,12 +741,12 @@ "MethodName": "ExecuteCommand" } ], - "ID": "b307d2de-6df1-4d09-9186-9da70d9adae2" + "ID": "dc7f572e-d787-4010-a6c0-df22fa0657b8" } ] } ], - "ID": "6e9ca147-ac47-4b05-b364-57538dc617ee" + "ID": "b421007a-64fc-4a54-b512-1981b9e478be" }, { "CommandList": [ @@ -763,7 +764,7 @@ } } ], - "ID": "09022e3d-c3d1-407d-8ded-13f0962d3ae4" + "ID": "376ebb2a-0797-481a-ac35-60b86b2e873b" } ] } @@ -796,7 +797,7 @@ ] } ], - "ID": "06ca62a3-e0cc-41f3-bfc3-49685e63ac2e" + "ID": "f6fa6dce-52fb-47f2-a21e-c0796ca4b03d" }, { "CommandList": [ @@ -810,7 +811,7 @@ "MethodName": "Focus" } ], - "ID": "8f074400-dd83-4ed8-a824-294ca73d39c1" + "ID": "9f0e53d9-3105-4f82-bf7e-e5f6d8aa590d" } ] } @@ -1142,27 +1143,8 @@ ] } ], + "showActionButtons": true, "actionButtons": [ - { - "$type": "ElementUI.ActionButton, ElementUI", - "UIPermissions": [ - { - "Scope": 2, - "AllowRoles": [ - "FGC_Anonymous" - ] - }, - { - "Scope": 1, - "AllowRoles": [ - "FGC_Anonymous" - ] - } - ], - "type": "button", - "Name": "编辑", - "shape": "default" - }, { "$type": "ElementUI.ActionButton, ElementUI", "UIPermissions": [ @@ -1182,13 +1164,118 @@ "type": "button", "Name": "删除", "styleType": "Accent 5", - "shape": "default" + "shape": "default", + "Commands": { + "$type": "GrapeCity.Forguncy.Commands.CustomCommandObject, Forguncy.Commands", + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "当前ID", + "ParameterValue": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=版本发布详情!行数据.ID" + }, + "ID": "f65770525f0c42118ec695d70fa8d1ea" + }, + { + "$type": "Forguncy.Model.RunJavaScriptCommand, ServerDesignerCommon", + "JavaScript": "var sourceData = Forguncy.Page.getCell(\"反馈ID列表\").getValue()\r\nvar row = Forguncy.CommandHelper.getVariableValue(\"行数据\");\r\nvar removeId = row.ID;\r\n\r\nif (sourceData && removeId) {\r\n var dataList = sourceData.split(',');\r\n dataList = dataList.filter(id => id !== removeId);\r\n var resultData = dataList.join(',');\r\n Forguncy.CommandHelper.setVariableValue(\"更新后的反馈ID数组\", resultData);\r\n Forguncy.Page.getCell(\"反馈ID列表\").setValue(resultData)\r\n}", + "ID": "10cda0ee8d5b4e8b9cce8f25dac946f5", + "Comments": "删除某个ID,使EL表格更新" + } + ], + "ParamProperties": { + "dataRow": "行数据" + } + } } ], "sumText": "合计", "size": "small" } }, + "11,27": { + "CellType": { + "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", + "CommandList": [ + { + "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon", + "ClosePopupCallbackCommand": { + "Commands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=是否为确定" + } + ] + }, + "value": "1" + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=选取内容" + } + ] + }, + "value": "%Null%", + "compareType": 1 + } + ] + }, + "CommandList": [ + { + "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon", + "PropertyItemsList": [ + { + "TargetCells": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=版本发布详情!B14" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=版本发布详情!选取内容" + } + } + ] + } + ], + "ID": "836bfeac-aca5-4284-8899-3ca9fa8836fc" + } + ] + } + ], + "ParamProperties": { + "IsOK": "是否为确定", + "选取内容": "选取内容" + } + }, + "PageName": "导入活字格发布日志" + } + ], + "Text": "从活字格发布日志导入", + "TemplateKey": "_RS_Main3", + "Icon": { + "Name": "发送.svg", + "Color": "Accent 1", + "UseCellTypeForeColor": true + }, + "IconSize": 14.0 + } + }, "11,34": { "CellType": { "$type": "Forguncy.ButtonCellType, ServerDesignerCommon", @@ -1291,7 +1378,7 @@ "Title": "加载中" } ], - "ID": "ec71b9f9-e3ef-4b91-91f3-b67a8ec647c6" + "ID": "4e881b0a-cb11-418b-9a04-7c3d94087858" }, { "CommandList": [ @@ -1301,7 +1388,7 @@ "Message": "请先导入客户反馈" } ], - "ID": "a7e76ab2-e49e-462e-a0f6-727e1877f67a" + "ID": "811fca5c-8edc-47b5-beb5-dcb3e1a50382" } ] } @@ -1375,7 +1462,7 @@ "ReloadData": true } ], - "ID": "5884499a-7c31-4827-ae0b-811664e896ac" + "ID": "9ff0bba8-2d21-40ac-8d99-da5dda5d8352" } ] } @@ -1507,7 +1594,7 @@ "ReloadData": true } ], - "ID": "ebbeab5e-933f-4801-8b77-d2bc72da44be" + "ID": "21f7d158-25a5-4d06-ae3e-b5d619f89373" }, { "CommandList": [ @@ -1522,12 +1609,12 @@ "BtnText": "知道了" } ], - "ID": "5bf0fa4f-0770-48b0-bebe-b52cb322354a" + "ID": "717f1eec-005f-4d19-afbb-26e4156350fa" } ] } ], - "ID": "b329735b-39a7-41ca-a1c5-24dbbd37c963" + "ID": "a3e5b03e-9cc9-4b53-8fbc-c14f592019bd" }, { "CommandList": [ @@ -1545,7 +1632,7 @@ "ReloadData": true } ], - "ID": "71451a83-0fd7-41eb-8eb1-3ed60d4601fe" + "ID": "034fb171-1e7a-43af-8a33-219a51681562" } ] } @@ -1599,6 +1686,18 @@ "HorizontalAlignment": 4, "Underline": false }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Foreground": 6, + "Formatter": 1 + }, + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "Formatter": 1, + "HorizontalAlignment": 5 + }, { "FontSize": 13.333333333333332 } @@ -1610,7 +1709,8 @@ "Accent 1 0", "\"当前版本号:\"@", "Right", - "Center" + "Center", + "Text 1 35" ] }, "CellStyles": { @@ -1807,14 +1907,9 @@ "11,22": 1, "11,23": 1, "11,24": 1, - "11,25": 1, + "11,25": 5, "11,26": 1, - "11,27": 1, - "11,28": 1, - "11,29": 1, - "11,30": 1, - "11,31": 1, - "11,32": 1, + "11,27": 6, "11,33": 1, "11,34": 3, "11,35": 1, @@ -1854,7 +1949,7 @@ "15,35": 1, "15,36": 1, "15,37": 1, - "17,4": 5 + "17,4": 7 }, "SheetStyle": { "FontFamily": 0, @@ -1876,7 +1971,8 @@ "5,17,1,13", "5,1,1,7", "1,26,1,4", - "13,1,1,37" + "13,1,1,37", + "11,27,1,6" ], "PageInfo": { "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", @@ -1975,4 +2071,4 @@ "Formula": "版本发布详情!$N$18" } ] -}//XkeVcUv6QZUxbxSFE5bXjbSEDeyVaAy49Z62JZeFFVFhte55hlON82r8Uhu0a0rYlYnz9gm3wvYui5kkBYHuzDBcVIOi1qyyvrGyHosuFpLU5y2135R3F0WpcMbw2Aagsi4XXR5pHOp+aztvdgcTTyC0uPtVFZgyhjl086tzWHnYQ+FIx5Xe5SoQ1AAh/auntxYHx0VbYPu+C7qvShqKyLcX2j23z60Y97ViBOPhQYYgCeb4k+ayZJS/ZbbMa0+kw647j/uz2SHpafYDYniQXz2jlAIKhKCSjrP0HpweLHbEmF/hRgEaamFW5cX4D+kHSvJpi5fa6StovWOWubHG+u4GSzX6uEvJtFt7LViMh5NXopyng8+ubc5P03wuMn/fOc/P4L3j7VG42U58EP5L6He7M+OdYGBraRHyXwmuv94jdc9u1XTyfDxuZUkQIjcYh965ObO/KJs1wyrViG/heitQUVAlYm+diHn/dl9rprk70PyTZrjsCcRBa/I+8Ok/3/xU2fezGVIbNtYMVFWK15YnEFHoXPiEdBadol4KWyfnBdJICnXLczJBBo2resvbdO/bw1axODzziDyziRmQFO+A0VJta4yM54WWMq30IeMy9IlpbP5XOTqqoTOP1ZkQYmzEtep0L4OAu/vf/vMAADTHhVGXoZKEGwgYdPF57rgdwOkXCH3amvj1oObfpDzhiH+MGv61u2BpUc7OPdZCv+O9pRoVW5OpGrNPL1mP34vOnlVG0mbLkH+Omp9pLIMIXMGo50XF+0tId8pEIaaE3LnZSXYgeBDcBwiECFOP59m9G6tsMzeiiRmCciDWzCxGlL9vH8wOdYpCXaJVcBhsmcgVoNx/Fu90Nx6dC8u8mxLxjJOSCyH1k2j3CwjEu0SispNvQAV9MzGzh36gDtpM+g==|920 \ No newline at end of file +}//vE0/TpOuAIfWleWTpDAir8eV1pWcPp6pGMLaaCoiowb3TP75IIbALj5UgqMy96UB6f9XOnKUcSTG1gaStWycWQDKdFnS7JcRdsUh3qMysk6Xynk/2N4YpXW1bOjqEZIKBQcyDWLmA/yLDzDoZ+HVEIdog9lbL2MN9DaMkwLWSQsHoU03YU93iLccWeGhRe/RZaGSeiROOkqAjWYyYb/UHI+4wwJb0Fb0XUG6ATlu7K6ty/BK/7N7dudgs55E15jUHZnhItre3WgvKR/IaqcV5j4Uk5NZyexMDXmCb3WnCXyWio8PfE25vTMvEok+WPzaMsIEUj5wwWVkiT4ScaI899z+56A7JILiv1lP9W4RAw4CnbS/4EvfpBqk5lm3N0sumqstI+FER0EZ2iGVku2E4hxsw0czDQg3u31NCNLaYDNh2aH+C/tDRMESqy8EHB0YmQGWwry2wt4CGQa3T7R5cmUgx/wjTbW2f87rGc9A4DQASanwMtTSoMuNAVQSxVUQNtAeCsCuT0WwhzTR1A53mkVy3cxSzW5MEP2mgri9e7dO/Hv5CROCy9QT2MhnIa/3nzZVnyksDYO3rVNJv7RCUMUV2aeqqxKa5/732OmzlkbxTcldz3fJCw4ZJdX3vMTPY6hDHMf8wx2HGf2Qsy3gPbT+NTHniT2eMVjA8d0Ek1qqcbEVfhGDODy1izmFZg6H38v9j0BEEPUG0KbiJvQ8ib4ockTDUJgnRHHnMQhUHeu4c9HHMzDWlpAMldvTqEFRB4joBaXFDDLqj2zzztaiRndb94J/bZk8nvntoziNecMb6ZqTwo5Gm8rKqbmoUHsR4N7DBTVSQnEvhXpSRxQohHPeAZRrKqdw35bojnbRSJeN/PWx2kFz7LpZndf9WY1zwLGRn/qrklWeJCYCqfbAJg==|920 \ No newline at end of file diff --git a/Plugin/ReadLogs.zip b/Plugin/ReadLogs.zip new file mode 100644 index 00000000..ce387cc5 Binary files /dev/null and b/Plugin/ReadLogs.zip differ diff --git a/Plugin/内容编辑器-9_0_103_0.zip b/Plugin/内容编辑器-9_0_103_0.zip new file mode 100644 index 00000000..439281c8 Binary files /dev/null and b/Plugin/内容编辑器-9_0_103_0.zip differ diff --git a/ServerCommands/系统/获取活字格发布日志.json b/ServerCommands/系统/获取活字格发布日志.json new file mode 100644 index 00000000..aefec081 --- /dev/null +++ b/ServerCommands/系统/获取活字格发布日志.json @@ -0,0 +1,155 @@ +{ + "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" + ] + } + ] + } + }, + "InvokeTriggerTestData": { + "UserName": "Administrator" + } + } + ], + "Commands": [ + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "日志路径", + "ParameterValue": "C:\\Windows\\Temp\\ForguncyServerLog\\ForguncyUserService\\WebsiteLog", + "ID": "3716b28549d34f30bf94e62264fe7b61" + }, + { + "$type": "ReadLogs.ReadLogsMain, ReadLogs", + "LogPath": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=日志路径" + }, + "AppName": "clue", + "ModuleType": "PublishLog", + "ResultTo": "获取结果" + }, + { + "$type": "CollectionOperationKit.ServerSideArrayQuery, CollectionOperationKit", + "InParamater": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=获取结果" + }, + "OperationParamaterPairs": [ + { + "Name": "备注", + "Op": 1, + "Value": "%null%" + } + ], + "OutParamaterName": "有备注的列表" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=有备注的列表" + } + }, + "value": "%Null%", + "compareType": 1 + }, + { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=有备注的列表.Count" + } + }, + "value": "0", + "compareType": 2 + } + ] + }, + "CommandList": [ + { + "$type": "ContentEditor.ContentEditor, ContentEditor", + "Content": "{{#.}}\r\n{{备注}}\r\n{{/.}}", + "Result": "模板内容", + "Disabled": true + }, + { + "$type": "MustachePlugin.Render, MustachePlugin", + "DataSrouce": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=模板内容" + }, + "UseCustomsDataHash": true, + "CustomsDataHash": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=有备注的列表" + }, + "SetMaxRecursionDepth": 3, + "ResultTo": "输出结果", + "Disabled": true + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "获取成功", + "CustomReturns": [ + { + "ReturnPropertyName": "日志列表", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=有备注的列表" + } + } + ] + } + ], + "ID": "78370418-f177-48d4-9b49-b5f9726dace6" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "近期无有效发布内容", + "CustomReturns": [ + { + "ReturnPropertyName": "日志列表" + } + ] + } + ], + "ID": "e68613a9-dc6e-4227-9807-6a98daed4783" + } + ] + } + ], + "ReturnProperties": [ + { + "Name": "日志列表" + } + ] +} \ No newline at end of file diff --git a/UserServiceDB.sqlite3 b/UserServiceDB.sqlite3 index a43888c4..dd7689b8 100644 Binary files a/UserServiceDB.sqlite3 and b/UserServiceDB.sqlite3 differ