diff --git a/.collaboration b/.collaboration index b5ccb910..183179e6 100644 --- a/.collaboration +++ b/.collaboration @@ -1094,17 +1094,7 @@ }, { "ModuleName": "PCPage/其他登录方式", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:15:11.2758775+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\内建页面\\其他登录方式.json", - "Pages\\内建页面\\其他登录方式.rd" - ] + "ModuleType": 1 }, { "ModuleName": "PCPage/FGC_修改密码", @@ -2244,19 +2234,7 @@ }, { "ModuleName": "CustomLibrary", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:14:28.1605481+08:00", - "ModuleType": 12, - "ToRemoveFiles": [ - "CustomLibraries.json", - "UserFile\\BaseCss.css", - "UserFile\\CustomFormula.js", - "UserFile\\echart.js" - ] + "ModuleType": 12 }, { "ModuleName": "MapJsonFile", @@ -2372,16 +2350,7 @@ }, { "ModuleName": "ServerCommand/获取CorpId", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:20:54.6152158+08:00", - "ModuleType": 15, - "ToRemoveFiles": [ - "ServerCommands\\钉钉\\获取CorpId.json" - ] + "ModuleType": 15 }, { "ModuleName": "ServerCommand/解绑钉钉", @@ -2389,32 +2358,14 @@ }, { "ModuleName": "ServerCommand/钉钉授权登录", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:17:21.4261528+08:00", "ModuleType": 15 }, { "ModuleName": "ServerCommand/dingtalkLogin", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:26:56.4097864+08:00", "ModuleType": 15 }, { "ModuleName": "PCPage/dingtalkLogin", - "State": 3, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2024-09-04T21:32:22.1895554+08:00", "ModuleType": 1 } ] \ No newline at end of file diff --git a/CustomLibraries.json b/CustomLibraries.json index a3d37b26..16dd45be 100644 --- a/CustomLibraries.json +++ b/CustomLibraries.json @@ -1,7 +1,7 @@ { "UserJSFileList": [ { - "Name": "echart.js" + "Name": "Load.js" }, { "Name": "CustomFormula.js" diff --git a/Pages/内建页面/其他登录方式.json b/Pages/内建页面/其他登录方式.json index d3c4834c..f4cf2382 100644 --- a/Pages/内建页面/其他登录方式.json +++ b/Pages/内建页面/其他登录方式.json @@ -282,5 +282,177 @@ "PrintInfo": { "PaperSize": {}, "Margin": {} - } -}//w98U2Abneso2cTt9p9eT9w69TCyXvH7XssbQDldNjjCoqosQesiobwtr0dwOCyPFzuq3bZLhVst9YgZKqdI4hWnY9NuaRvZg7LA6esNy6x0klE1PwOT/NE0YFycJp2vQXLGB+3et68YSDmqjPQteMAYNhgtkQsNUFGXg6ggyQ4Mv7F09nEYq/US3trMAK426v3G8LxjkQ/oYd6NbF74Vj6/XoppApeMQDy/avG/MgPFrt/92S27e72knbvOU/BTNG94H7aJwAdprPX0Ur7iXeQE92Y925eJcUcWK4llERz2ACh8y5nRPl3mg3zMAWo9glG9vTCsmOIskKwQS4hLxVAYufNkr48mNvW/vpAE5KiFRcbw58e8Czqy0ARudtuD9+EKfCsyKKNwjurYc1t8Lxyc49uapYuYTkHABFi590vLEPFu59xABu9ZaFEfv4KxfgCzqmGC48wwAn32epCdrMRRVo4cP2nMqRRrY6xHuiV11yXy/PfwLOxif0FikdWB0yP6dwY/6rDQlmpG2tW/JfZ3tX6LKWWDlFYft1UP6cvjPjsVBAB07Sa1tL6bzEZf/BCbvH0jG5TUejTmu30jH5nHlMCkzMymqrdXOMCtH0opgZnF8tEXuv/KB0VFZqjyx7bEycDN7puvQWasJScUX9MsLxBLC7hMKf8zmO96yJneUXc3qrikPUH9Wl724jItSBTxLUVFJPGl6FTGo7IFlIXGdvrabFKw1cAkHXsT+4AvsV0jxOGIT6T2Vduu4jNMYiTBAI4BbJ6d0EYnUGq7BrABMdlKeB1q0Nlk25pPbWjJShEbEtOGUE+f1BLi/hePsfIcxDaR5xcgicNgnpTZYBLtx2JLtt9xRBrE5KRtN5zNCGOxz/+P5O2h9rpHgtwpATP3zr70NIKlBT02helL9Sw==|920 \ No newline at end of file + }, + "BackgroundPictures": [ + { + "Name": "da000f9b-c36e-468a-8f6c-ce9d154bc686.png", + "DisplayName": "背景图1", + "PictureCommands": [ + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "JSText": "return isDingTalk();", + "CommandList": [ + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "获取CorpId", + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "ReturnPropertiesTo": [ + { + "ResultPropertyName": "CorpId", + "ResultTo": { + "SerializeProperty": "CorpId" + } + } + ], + "CheckDataValidation": false + }, + { + "$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": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "DingTalkPlugin.RequestAuthCode, DingTalkPlugin", + "CorpId": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!CorpId" + }, + "Code": "授权码" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "钉钉授权登录", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "授权码", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!授权码" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "RefreshAfterFinish": true, + "CheckDataValidation": true + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon", + "cellLocations": [ + { + "SerializeProperty": "=其他登录方式!code" + } + ] + }, + "value": "0", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "工作台首页" + } + ], + "ID": "98ca1d91-b72e-4172-b029-7949bb8a43a7" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!msg" + } + } + ], + "ID": "02ba1636-1a09-495e-b3ac-e8ed81ee0e5f" + } + ] + } + ], + "ID": "356772ce-5911-4de9-b0e0-f848e5cf7748" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy", + "FourStandardStyle": "warning", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=其他登录方式!msg" + } + } + ], + "ID": "c0af7abd-b0e6-4d07-b775-3668a4177e61" + } + ] + } + ], + "ID": "ad3b38df-8af5-4845-832d-1c1543a01ac1" + }, + { + "CommandList": [ + { + "$type": "DingTalkPlugin.DingtalkLogin, DingTalkPlugin", + "client_id": "dingus6w0kbp5wgiiepu", + "redirect_uri": "https://www.yugasoft.cn/clue/dingtalkLogin" + } + ], + "ID": "4a11eeeb-7983-4595-9747-eb1616bd62be" + } + ] + } + ], + "StyleInfo": { + "Fill": "Background 1 0 0", + "StrokeDashType": 8, + "Stroke": "black", + "StrokeThickness": 0.0 + }, + "IsAutomaticStroke": false, + "IsAutomaticFill": false, + "Location": "69,0", + "Size": "56,68" + } + ] +}//5+wpLuKddKNhdUpNAjyMf113EQvPMPtJt3SOpn3qnwzJag5D3Lhow3wx6LvfUlV6lBSOqX/dtoE0y5iyw/WrorssDMHcMIib0OOott7KXYBxRARKHbzaKYNMSyeZz58l9H8mISkY2kf8NaEZSVJgymspfnMKkG3IiTw8rr5NRDCT9brIojwsD5KXpVz3KSM7SYH/V6vldsP3zTpjvN2ctVU3jc3CVAgYsIgptMtTQOSX+nOHcgte9sm+Dx5WxauZbE5CpVIul5WnRNA8QD09cNxDjeC+9ESlZO45KtuqtqTDArzcia5Ie7jOBPyJjnedsMvD2lb/ldf4akF6/9M70vd9Qbqpt2LdcdTK8amvkd4l2RM4vVazEaq2fvd0r1kBzQaZYcSmM1uHDkUJ0+2Z0My8ILCeLf8NyJ5nVwKDvvlgjKZzdtaoroedTR2k+25Ecfg7dZhKIlOvvTCpCZc6JqxY/HgTfczyCTmxTQ9HmJIkkOfP40DI3Aa9UI+bF4SxCctQ/ZBSHRIadOGYHGir1wawlVpHsJzsByRTgZXoXjF7HPokaxzA9+1yCK5IRriUaMJGzTJ/rEP4ffeTJSnlSglROJ9/KxcxTCcGqvTrE2fCyvB1TezKZOu3yEhZvNTlS/8JY2oJ7U6nENHQfnYJwVUD2ARYV57yKXVd8GC7vWCtxhpgoOhHynAJPLgYNZV2pz1pxd3w6/F16KCLGx6Pk3ND+sjIPIms0HVLuqg4K7jicfpHWZvuGRkepiWxrjYp3e+lPzWj/raHWV+fw4kFNA507FrqlTt8kbmu1+QZs6NKRKlx0LJwxqJbogDYi9BIJ3Lu2I5zJxmL8YqUp7PNzFCTiVSzWO1kh/wNz1qWqH9alVgbyhiLUFgRM30a7EywPEZDjf/mwHINO+TdXMHBkg==|920 \ No newline at end of file diff --git a/Pages/系统/dingtalkLogin.json b/Pages/系统/dingtalkLogin.json new file mode 100644 index 00000000..3922f54b --- /dev/null +++ b/Pages/系统/dingtalkLogin.json @@ -0,0 +1,528 @@ +{ + "Rows": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + } + }, + "InLogicalVisibleIndexes": [ + 24 + ], + "Count": 25, + "DefaultSize": 32.0 + }, + "Cols": { + "RowColumnAttachedInfos": { + "0": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + }, + "1": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "2": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "3": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "4": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "5": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "6": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "7": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "8": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "9": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "10": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "11": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "12": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "13": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "14": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "15": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "16": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "17": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "18": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "19": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "20": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "21": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "22": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "23": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "24": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "25": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "26": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "27": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "28": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "29": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "30": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "31": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "32": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "33": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "34": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "35": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "36": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "37": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0 + } + }, + "38": { + "GridRowColumnDefinition": { + "DesignLengthInPixel": 32.0, + "Mode": 2, + "MinLength": { + "Unit": 1 + }, + "MaxLength": { + "Value": 1.0 + } + } + } + }, + "Count": 39, + "DefaultSize": 32.0 + }, + "Values": { + "9,15": "授权登陆中..." + }, + "Formulas": { + "24,1": "GETURLQUERYVALUE(\"authCode\")" + }, + "AttachInfos": { + "24,1": { + "CellType": { + "$type": "Forguncy.TextCellType, ServerDesignerCommon", + "SavedValidators": [ + { + "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon" + } + ], + "TemplateKey": "_RS_NewLittleRoundCorner", + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "Title": "加载中" + }, + { + "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon", + "ServerCommandName": "dingtalkLogin", + "Parameters": [ + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "authCode", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=dingtalkLogin!Code" + } + }, + { + "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon", + "ParamName": "state", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=GETURLQUERYVALUE(\"state\")" + } + } + ], + "ResultErrorCodeTo": { + "SerializeProperty": "code" + }, + "ResultMessageTo": { + "SerializeProperty": "msg" + }, + "CheckDataValidation": false + }, + { + "$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy", + "FunctionName": "remove", + "Title": "加载中" + }, + { + "$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.NavigateCommand, ServerDesignerCommon", + "PageName": "工作台首页" + } + ], + "ID": "4d92d47b-1e90-4b47-ad9b-aa9c7f3aed2d" + }, + { + "CommandList": [ + { + "$type": "Notiflix_Forguncy.Report_Command, Notiflix_Forguncy", + "FunctionName": "info", + "Title": "温馨提示", + "Message": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=dingtalkLogin!msg" + }, + "BtnText": "知道了" + }, + { + "$type": "Forguncy.Model.NavigateCommand, ServerDesignerCommon", + "PageName": "FGC_登录" + } + ], + "ID": "a5ad277e-7a9d-48eb-b645-2b9baa24a09f" + } + ] + } + ] + } + } + }, + "StyleDatas": { + "Styles": [ + { + "FontFamily": 0, + "FontSize": 13.333333333333332, + "HorizontalAlignment": 1 + }, + { + "Formatter": 2 + } + ], + "Types": { + "Strs": [ + "Body", + "Center", + "@" + ] + }, + "CellStyles": { + "9,15": 0, + "24,1": 1 + }, + "SheetStyle": { + "FontFamily": 0 + } + }, + "Spans": [ + "9,15,1,6", + "24,1,1,4" + ], + "PageInfo": { + "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon", + "PermissionData": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core", + "permissionResource": { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core" + }, + "permissionBindings": [ + { + "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core", + "roleNames": [ + "FGC_Anonymous" + ] + } + ] + }, + "RowBreakLines": [], + "RepeatRangeSettings": [] + }, + "PrintInfo": { + "PaperSize": {}, + "Margin": {} + }, + "CustomNames": [ + { + "Name": "Code", + "Formula": "dingtalkLogin!$B$25" + } + ] +}//eMUL0ZzkOspSg8S2cqdXQvbqsheEL6cNDl/glh4D8Tn6Lmn5mtML4YDOu51zj8RX1eXng9Ye8OoK8JKDB9VEWDgIKbmx2I7YOtuPx3/xvyhfolWG6DkCwtLxrxW2V4RAPjIP/Lmhpk5iGW6izgm4F6d2oIvHaxFom0mh2UKXBOELdnRs/gmMgdwjU6V+m9uoTC/Um0ghBOBJTsFDjUjz6F14yf1uCbJrKZzHQoeuVWf94yBBiLiWI4h/6oiUweKvPWRF4ICK3CgO31UEKsuCWzKYT8ualbVhpROoi6Ff/s3NoZUntd2ZSkNh/tdf+v4Wotf4JHHU3/lIPHJm/Py1kuxp/sdEx0Qc5M3y2J3NQDjQC00CwfNc18PXL1V3j+R20zPOXXPhrv63HcqOR/nPsGYFlWqfk6SmMnjRPH3ICA227ueXx1r57Y0XkQ200IfQvaew2Xr6uDYHMCb/Mq8pTb/uLBB33cBE6mAwsBIj+GLq5kB0H432pe37mrBhPx9pAYMBrcLQoLC+BWEGEG8iTFnCWD1NezOIJN6bOtkTlfT9hdZpiguLx3S8Yp7gPWiuVfG8UBCANKqJ9MGADNiQxCzQI4i4LH02PCxtyE+qhcCZljf47zW6jcFmoWjRkw4ui5pkrAQ//TQW/BWqkCHTvBwHd3b0Jdwe1oQ8MtnPiM5I9i5q77ufkwOl+GFVS3gUaU8rpNtQ6u+hdOYoKnSlmI5NWDMHYg3xv4/JauEnm9xNhssjP0Ey5mq60jiiMAzH1ZC7s+/WCuD0gncJVGZhO6rTPY/7qed2n9sjBNu3GkrUExncuhuhczIRt5Jar6ibmByKcPpQ9+Bn76nn41ah2MBS/cPdn3MVzoQeM6TKDCIQsIKGOr60eGfIKw4hokSM8BNkI744a40fi4u7SMB19Q==|920 \ No newline at end of file diff --git a/Pages/系统/dingtalkLogin.rd b/Pages/系统/dingtalkLogin.rd new file mode 100644 index 00000000..4f4ac518 --- /dev/null +++ b/Pages/系统/dingtalkLogin.rd @@ -0,0 +1,14 @@ +{ + "PageType": 0, + "ColumnCount": 39, + "RowCount": 25, + "Formulas": { + "24,1": "GETURLQUERYVALUE(\"authCode\")" + }, + "CustomNames": [ + { + "Name": "Code", + "Formula": "dingtalkLogin!$B$25" + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/dingtalkLogin.json b/ServerCommands/钉钉/dingtalkLogin.json new file mode 100644 index 00000000..5777ea60 --- /dev/null +++ b/ServerCommands/钉钉/dingtalkLogin.json @@ -0,0 +1,169 @@ +{ + "Name": "dingtalkLogin", + "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_Anonymous" + ] + } + ] + } + }, + "HttpMethod": 3, + "Parameters": [ + { + "Name": "authCode", + "DataValidationInfo": { + "IgnoreBlank": false + } + }, + { + "Name": "state", + "DataValidationInfo": {} + } + ] + } + ], + "Commands": [ + { + "$type": "DingTalkPlugin.GetUserToken, DingTalkPlugin", + "Code": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=authCode" + }, + "ResultTo": "Result" + }, + { + "$type": "DingTalkPlugin.GetUserWithOptions, DingTalkPlugin", + "Token": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=Result.AccessToken" + }, + "UnionId": "me", + "ResultTo": "个人信息" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "查找用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "091476fe-6eb5-4527-9cda-e8d32077337a", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "1f400365-2901-41d6-a354-c6ebb1a6a41f" + }, + "ColumnName": "用户名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "8f9a3983-cded-410b-b825-8c5094d18049" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人信息.UnionId" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "d954848ee70b4bf884e8265e47ec577f" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.用户名" + }, + "FullName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人信息.Nick" + }, + "Email": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人信息.Email" + }, + "ExtendedProperties": [ + { + "Name": "DingTalkUnionID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=个人信息.UnionId" + } + } + ] + } + }, + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "101", + "CommandOperator": { + "$type": "UserManagementCommandsV2.LoginOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.用户名" + }, + "IsCheckPassword": false, + "RememberMe": "1" + } + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "登录成功" + } + ], + "ID": "711e6405-f2b3-4a58-aaf2-86afae80e8d0" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "请先使用账号登录，前往个人中心绑定钉钉后方可使用钉钉登录。" + } + ], + "ID": "f355aff9-e63b-4147-9319-e09f6f808512" + } + ] + } + ] +} \ No newline at end of file diff --git a/ServerCommands/钉钉/获取CorpId.json b/ServerCommands/钉钉/获取CorpId.json index 24632d7d..f8964555 100644 --- a/ServerCommands/钉钉/获取CorpId.json +++ b/ServerCommands/钉钉/获取CorpId.json @@ -14,12 +14,13 @@ { "$type": "Forguncy.RbacPermission.Core.Impl.ServerCommand.ServerCommandPermissionBinding, Forguncy.RbacPermission.Core", "roleNames": [ - "FGC_LoginUser" + "FGC_Anonymous" ] } ] } - } + }, + "HttpMethod": 3 } ], "Commands": [ diff --git a/ServerCommands/钉钉/钉钉授权登录.json b/ServerCommands/钉钉/钉钉授权登录.json new file mode 100644 index 00000000..484da18e --- /dev/null +++ b/ServerCommands/钉钉/钉钉授权登录.json @@ -0,0 +1,148 @@ +{ + "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_Anonymous" + ] + } + ] + } + }, + "HttpMethod": 3, + "Parameters": [ + { + "Name": "授权码", + "DataValidationInfo": { + "IgnoreBlank": false + } + } + ] + } + ], + "Commands": [ + { + "$type": "DingTalkPlugin.Getuserinfo, DingTalkPlugin", + "Code": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=授权码" + }, + "UserInfo": "用户信息" + }, + { + "$type": "Forguncy.Model.Commands.SetParameterCommand, ServerDesignerCommon", + "ParameterName": "查找用户", + "TableValue": { + "TableName": "用户信息视图", + "TableValueType": 1, + "BindingInfos": [ + { + "GUID": "38bab2f8-693a-431c-8b04-6befe101687c", + "BindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "用户名", + "GUID": "37f86a0d-9aa8-4731-8aef-ab55b140fe53" + }, + "ColumnName": "用户名" + } + ], + "SqlCondition": { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "用户信息视图", + "ColumnName": "DingTalkUnionID", + "GUID": "44ae3fa7-ee61-42a7-a76c-4654379d177f" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.unionid" + } + }, + "NullFormulaValueQueryPolicy": 0, + "TopCount": "1" + }, + "ID": "83afb5df01fa4520b302ab0cc912b78c" + }, + { + "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon", + "ConditionAndCommandPairList": [ + { + "Condition": { + "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon", + "param": { + "$type": "Forguncy.Model.IfConditionServerSiteParam, ServerDesignerCommon", + "ParamObject": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户" + } + }, + "value": "%Null%", + "compareType": 1 + }, + "CommandList": [ + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "202", + "CommandOperator": { + "$type": "UserManagementCommandsV2.UpdateUserOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.用户名" + }, + "ExtendedProperties": [ + { + "Name": "DingTalkUnionID", + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=用户信息.unionid" + } + } + ] + } + }, + { + "$type": "UserManagementCommandsV2.UserManagementCommand, UserManagementCommandsV2", + "OperationType": "101", + "CommandOperator": { + "$type": "UserManagementCommandsV2.LoginOperator, UserManagementCommandsV2", + "UserName": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=查找用户.用户名" + }, + "IsCheckPassword": false, + "RememberMe": "1" + } + }, + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "0", + "Message": "登录成功" + } + ], + "ID": "1e2e9225-9a6f-4372-a72f-df5bdf80e57d" + }, + { + "CommandList": [ + { + "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon", + "ErrorCode": "400", + "Message": "请先使用账号登录，前往个人中心绑定钉钉后方可使用钉钉登录。" + } + ], + "ID": "e3e5479d-4ca5-4c73-821b-9225e1f99b96" + } + ] + } + ] +} \ No newline at end of file diff --git a/UserFile/Load.js b/UserFile/Load.js new file mode 100644 index 00000000..c9769b0a --- /dev/null +++ b/UserFile/Load.js @@ -0,0 +1,4 @@ +function isDingTalk() { + const userAgent = navigator.userAgent || navigator.vendor || window.opera; + return /DingTalk/i.test(userAgent); +} diff --git a/UserFile/echart.js b/UserFile/echart.js deleted file mode 100644 index b323497f..00000000 --- a/UserFile/echart.js +++ /dev/null @@ -1,67 +0,0 @@ -// 改变页面图表样式 -let bgColor = "#fff"; -let color = ["#0090FF", "#ffc300", "#f64662", "#ec610a", "#00c9b1", "#6730ec"]; - -function hexToRgba(hex, opacity) { - return ( - "rgba(" + - parseInt("0x" + hex.slice(1, 3)) + - "," + - parseInt("0x" + hex.slice(3, 5)) + - "," + - parseInt("0x" + hex.slice(5, 7)) + - "," + - opacity + - ")" - ); -} -// 修改折线图样式 -Forguncy.Helper.preSetEchartOption = (op, page, chart) => { - console.log(op); - op.series = op.series.map((element, index) => { - if (element.type == "line") { - var s1 = {}; - s1.smooth = true; - element.symbol = "emptyCircle"; - element.symbolSize = 8; - s1.zlevel = 3; - s1.showSymbol = false; - s1.lineStyle = { - normal: { - color: color[index], - shadowBlur: 5, - shadowColor: hexToRgba(color[index], 0.1), - shadowOffsetY: 6 - } - }; - s1.areaStyle = { - normal: { - color: new echarts.graphic.LinearGradient( - 0, - 0, - 0, - 1, - [ - { - offset: 0, - color: hexToRgba(color[index], 0.3) - }, - { - offset: 1, - color: hexToRgba(color[index], 0.1) - } - ], - false - ), - shadowColor: hexToRgba(color[index], 0.1), - shadowBlur: 10 - } - }; - - element = { ...element, ...s1 }; - } - return element; - }); - - return op; -}; \ No newline at end of file