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 `