diff --git a/.collaboration b/.collaboration
index 6d751be3..323f5ee9 100644
--- a/.collaboration
+++ b/.collaboration
@@ -578,17 +578,7 @@
},
{
"ModuleName": "PCPage/任务首页",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:20:55.414995+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.json",
- "Pages\\项目\\项目首页\\项目首页-容器页面\\任务容器页面\\任务首页.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "PCPage/项目周报列表",
@@ -1204,17 +1194,7 @@
},
{
"ModuleName": "MasterPCPage/FGC_母版页",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:05:22.0887637+08:00",
- "ModuleType": 3,
- "ToRemoveFiles": [
- "MasterPages\\FGC_母版页.json",
- "MasterPages\\FGC_母版页.rd"
- ]
+ "ModuleType": 3
},
{
"ModuleName": "UserControlPage/工时记录列表",
@@ -1706,17 +1686,7 @@
},
{
"ModuleName": "ApplicationSetting",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:10:30.4385232+08:00",
- "ModuleType": 8,
- "ToRemoveFiles": [
- "ApplicationSettings.json",
- "favicon.ico"
- ]
+ "ModuleType": 8
},
{
"ModuleName": "Theme",
@@ -2240,19 +2210,7 @@
},
{
"ModuleName": "CustomLibrary",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:06:39.2283834+08:00",
- "ModuleType": 12,
- "ToRemoveFiles": [
- "CustomLibraries.json",
- "UserFile\\BaseCss.css",
- "UserFile\\CustomFormula.js",
- "UserFile\\Load.js"
- ]
+ "ModuleType": 12
},
{
"ModuleName": "MapJsonFile",
@@ -2272,51 +2230,7 @@
},
{
"ModuleName": "Plugin",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:24:39.4341169+08:00",
- "ModuleType": 40,
- "ToRemoveFiles": [
- "Plugin\\DingTalkPlugin1.zip",
- "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\\OPENAIFORGUNCY.zip",
- "Plugin\\PC组件包-格友工作室定制版-10_0_2_0.zip",
- "Plugin\\ReadLogs.zip",
- "Plugin\\SqlServerWrapper.zip",
- "Plugin\\Tiny富文本编辑器-10_0_2_0.zip",
- "Plugin\\UI操作工具箱-9_0_103_0.zip",
- "Plugin\\Unlayer-9_0_103_0(1).zip",
- "Plugin\\xTools快速开发工具包-9_0_4_0(1).zip",
- "Plugin\\内容编辑器-9_0_103_0.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\\应用服务器操作工具集合-8_0_3_0.zip",
- "Plugin\\异步运行命令-9_0_103_0(1).zip",
- "Plugin\\支持预览的附件上传-10_0_2_0.zip",
- "Plugin\\服务端缓存操作工具库-8_0_3_0.zip",
- "Plugin\\标签页和打开标签命令-10_0_2_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(1).zip"
- ]
+ "ModuleType": 40
},
{
"ModuleName": "PublishSetting",
@@ -2476,45 +2390,15 @@
},
{
"ModuleName": "ServerCommand/GetUpdateLogs",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:09:33.9392447+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\OPENAPI\\GetUpdateLogs.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "PCPage/更新日志",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:12:35.5829226+08:00",
- "ModuleType": 1,
- "ToRemoveFiles": [
- "Pages\\系统\\更新日志.json",
- "Pages\\系统\\更新日志.rd",
- "Pages\\aa07c23eb2ac48e48fa3e23cdaeb509.json",
- "Pages\\aa07c23eb2ac48e48fa3e23cdaeb509.rd"
- ]
+ "ModuleType": 1
},
{
"ModuleName": "ServerCommand/获取更新日志",
- "State": 1,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:08:04.1777572+08:00",
- "ModuleType": 15,
- "ToRemoveFiles": [
- "ServerCommands\\系统\\获取更新日志.json"
- ]
+ "ModuleType": 15
},
{
"ModuleName": "Table/钉钉待办储存表",
@@ -2598,12 +2482,6 @@
},
{
"ModuleName": "ServerCommand/复活流程",
- "State": 3,
- "LockedBy": {
- "UserName": "cuckooent",
- "Email": "phoben@qq.com"
- },
- "LockDateTime": "2024-10-17T17:19:09.2947836+08:00",
"ModuleType": 15
}
]
\ No newline at end of file
diff --git a/ApplicationSettings.json b/ApplicationSettings.json
index 6463f06e..18174b8c 100644
--- a/ApplicationSettings.json
+++ b/ApplicationSettings.json
@@ -7,7 +7,7 @@
"GlobalProperties": [
{
"Name": "全局_业务配置",
- "Value": "{\"项目ID\":\"6\",\"版本ID\":\"4\",\"版本名\":\"Develop\",\"版本号\":\"1.0.0\"}"
+ "Value": "{\"项目ID\":\"1\",\"版本ID\":\"1\",\"版本名\":\"Develop\",\"版本号\":\"1.0.0\"}"
},
{
"Name": "全局_Gitee",
@@ -30,7 +30,8 @@
"ProcessUserInfoDisplayMode": 1,
"SuppressedWarningMessages": [
"项目首页->页面加载命令->Notify加载, 在命令条件之后的命令可能不会被执行，因为此时页面可能已经跳转到新的页面。",
- "项目首页->页面容器(A2), 页面容器没有设置子页面"
+ "项目首页->页面容器(A2), 页面容器没有设置子页面",
+ "数据表, 有部分连接到外部数据库的数据表没有检查过连接状态，如果无法连接到数据库可能会导致数据无法在页面上显示。如需确认数据库的连接状态，请点击数据表右键菜单里的“刷新”"
],
"SyncUserInfoCacheForBuiltInView": false,
"MultipleLanguageSettings": {
diff --git a/MasterPages/FGC_母版页.json b/MasterPages/FGC_母版页.json
index 30131e52..e4751182 100644
--- a/MasterPages/FGC_母版页.json
+++ b/MasterPages/FGC_母版页.json
@@ -162,6 +162,7 @@
"DefaultSize": 230.0
},
"Values": {
+ "1,1": "1.0.0",
"5,0": "%CurrentUser.UserName%",
"5,2": "%CurrentUser.FullName%"
},
@@ -188,7 +189,7 @@
"PageName": "更新日志"
}
],
- "Text": "",
+ "Text": "1.0.0",
"ClickMode": 1,
"TemplateKey": "_RS_Main"
}
@@ -560,8 +561,8 @@
{
"FontFamily": 7,
"FontSize": 13.333333333333332,
- "Foreground": 8,
- "HorizontalAlignment": 9,
+ "Foreground": 5,
+ "HorizontalAlignment": 8,
"BorderBottom": null,
"BorderTop": null,
"BorderLeft": null,
@@ -569,19 +570,19 @@
},
{
"FontSize": 12.0,
- "Foreground": 8
+ "Foreground": 5
},
{
- "Background": 8
+ "Background": 5
},
{
"HorizontalAlignment": 4
},
{
- "Background": 10,
+ "Background": 9,
"FontSize": 13.333333333333332,
- "Foreground": 11,
- "HorizontalAlignment": 12
+ "Foreground": 10,
+ "HorizontalAlignment": 11
}
],
"Types": {
@@ -591,10 +592,9 @@
"Normal",
"Background 2 0",
"Left",
- "black",
+ "Background 1 0",
"General",
"Body",
- "Background 1 0",
"Right",
"Background 1 -5",
"#FFFF0000",
@@ -1213,7 +1213,7 @@
"IsOpenInNewTab": true
}
],
- "ID": "a5552457-0f23-4b07-bd3b-c1b0196f52c1"
+ "ID": "43341a36-1203-4102-b894-9a2f00c664e2"
},
{
"CommandList": [
@@ -1234,12 +1234,12 @@
]
}
],
- "ID": "8e91303c-493b-4872-a281-614ecef02b73"
+ "ID": "fb137f98-eda9-4143-b306-d82c4e29abe5"
}
]
}
],
- "ID": "7478f903-6932-44d1-9493-d816fc765f00"
+ "ID": "710184ac-cfb4-44c2-a677-47cc6ff825cf"
},
{
"Condition": {
@@ -1289,7 +1289,7 @@
]
}
],
- "ID": "0aed8bff-c308-4d04-ac0d-056c5bb9888d"
+ "ID": "130f4c04-f562-409e-9522-d52b35df46d0"
},
{
"Condition": {
@@ -1323,7 +1323,7 @@
]
}
],
- "ID": "f7d43ab3-2a8d-4165-9eef-a8cd1b940e6e"
+ "ID": "99092a31-4b85-489e-bb3a-db7ab8edaa7f"
},
{
"Condition": {
@@ -1359,7 +1359,7 @@
]
}
],
- "ID": "6f5368a5-d833-42b9-a559-d9833f008086"
+ "ID": "f701cf67-bde7-4144-addb-6d293dc40f93"
},
{
"Condition": {
@@ -1394,17 +1394,17 @@
]
}
],
- "ID": "01e6b996-f8e2-43b7-a790-633b05efa493"
+ "ID": "88ea32a3-773f-4658-a7f9-8f7ad34c7919"
}
]
}
],
- "ID": "41c64d04-0b57-478f-a473-cd00f7be9edc"
+ "ID": "ea26a52b-5f66-4366-a343-faf122098c52"
}
]
}
],
- "ID": "60892b27-b96f-4925-ae64-ced0840201c5"
+ "ID": "2bead1a4-fb6a-4764-8095-43560a6d550b"
}
]
}
@@ -1417,7 +1417,7 @@
}
}
],
- "ID": "57716715-c4e6-4a64-989b-05457d83008b"
+ "ID": "87a8256a-0288-46a8-a625-88ec488b918f"
},
{
"Condition": {
@@ -1524,7 +1524,7 @@
"IsOpenInNewTab": true
}
],
- "ID": "e3e2e3be-c16d-44c2-814e-756c98a8ee7b"
+ "ID": "918f39ad-f6c9-4916-8efe-35e1984f2c0d"
},
{
"CommandList": [
@@ -1545,12 +1545,12 @@
]
}
],
- "ID": "d427c963-f226-4e5b-a518-fb2691348f17"
+ "ID": "9a4f00f4-8ee9-46e4-955b-a23fea6b560b"
}
]
}
],
- "ID": "7ec0f794-63cb-4ae7-afa3-6082bbe01ef1"
+ "ID": "e1a7387b-4eef-48d6-bf59-4674db635b07"
},
{
"Condition": {
@@ -1600,7 +1600,7 @@
]
}
],
- "ID": "73bab0de-a1e0-4736-8212-9a0091ecce79"
+ "ID": "a23b4aa2-f6ff-4915-bcf9-611b9cfb0310"
},
{
"Condition": {
@@ -1634,7 +1634,7 @@
]
}
],
- "ID": "c05ab309-f13b-41b4-a305-896f99848850"
+ "ID": "30eeece8-5353-4003-9ee9-d28c4d0ad54c"
},
{
"Condition": {
@@ -1670,7 +1670,7 @@
]
}
],
- "ID": "e0f0a247-4b14-45b9-bfe8-4d7ee826b003"
+ "ID": "dd23e865-de6a-44dd-8e70-8b6a6d79fb26"
},
{
"Condition": {
@@ -1705,17 +1705,17 @@
]
}
],
- "ID": "8a2c5593-0f88-4943-98a1-8563d80ee197"
+ "ID": "4d8b2e8f-b846-4cda-9bac-02eb68819df0"
}
]
}
],
- "ID": "4b67aa74-46dd-4ff5-a95f-6fefa4a13a48"
+ "ID": "e7d9e053-7624-48e7-8ab4-f59995ec194a"
}
]
}
],
- "ID": "c61315fb-5ca7-4614-bc0b-2ebb505ee0ae"
+ "ID": "4fd3b799-d15b-436f-ae9d-5820f1fdb47f"
}
]
}
@@ -1728,7 +1728,7 @@
}
}
],
- "ID": "b83c3217-f1b5-4295-959c-db8d15d9ac22"
+ "ID": "74b0526c-ca91-4bcc-a8dd-6d4485e603f8"
},
{
"Condition": {
@@ -1835,7 +1835,7 @@
"IsOpenInNewTab": true
}
],
- "ID": "b60edb41-cc61-489e-8cd4-e4f5c6386548"
+ "ID": "0e4c46cc-2fb8-4df0-86e3-551895a8bf52"
},
{
"CommandList": [
@@ -1856,12 +1856,12 @@
]
}
],
- "ID": "56a7456f-6810-45fa-b60f-0fe454c0b882"
+ "ID": "af244887-ded8-44d8-8459-002448af1e3f"
}
]
}
],
- "ID": "6e3d5064-0ae0-45d6-b84a-f287213169a8"
+ "ID": "0dac53ed-5343-46e2-89bb-7f218681eb78"
},
{
"Condition": {
@@ -1911,7 +1911,7 @@
]
}
],
- "ID": "8a8ecdf1-819e-45d7-8601-0851f5586d04"
+ "ID": "61e26e65-af12-490e-b1f3-eb1d8e534317"
},
{
"Condition": {
@@ -1945,7 +1945,7 @@
]
}
],
- "ID": "12f7bda8-e673-4fdf-848a-86893e8d4184"
+ "ID": "883910c6-4b67-4d83-a407-3dff5082ed61"
},
{
"Condition": {
@@ -1981,7 +1981,7 @@
]
}
],
- "ID": "26f54cdd-5add-49df-88be-33a62815174d"
+ "ID": "745b8d64-290f-48b3-b186-05f3de85a2e7"
},
{
"Condition": {
@@ -2016,17 +2016,17 @@
]
}
],
- "ID": "89ff70eb-6995-4b7a-a413-9047394a847e"
+ "ID": "69198ca3-3880-474a-b991-c141e63fe5c8"
}
]
}
],
- "ID": "2955398e-9184-48a0-a9e6-15306068b37e"
+ "ID": "e65c4788-343a-4ba8-b2ce-5498b059ee23"
}
]
}
],
- "ID": "026069d3-f550-4cb6-9354-390bc28bcd65"
+ "ID": "1799e4a7-3b85-4827-9777-3d3b85cdfa31"
}
]
}
@@ -2039,7 +2039,7 @@
}
}
],
- "ID": "d0e09da9-c161-4651-a3bb-9422e19d2b94"
+ "ID": "68094ecd-fdd7-406e-86b5-f816dcaaec29"
},
{
"Condition": {
@@ -2146,7 +2146,7 @@
"IsOpenInNewTab": true
}
],
- "ID": "95e24f54-0bbc-4ade-b904-6cb4f265bcf0"
+ "ID": "e801dabc-3d82-4210-b1af-891697046f95"
},
{
"CommandList": [
@@ -2167,12 +2167,12 @@
]
}
],
- "ID": "19ca4d60-fb79-4273-9545-2b2877b7dc5a"
+ "ID": "7ce0b0f4-e022-45ac-ba4c-fb109ead9690"
}
]
}
],
- "ID": "3c74de99-3d93-4c2e-89c3-837f160f073a"
+ "ID": "fc2ee3b2-0289-4ae4-9560-8c3af1d8669e"
},
{
"Condition": {
@@ -2222,7 +2222,7 @@
]
}
],
- "ID": "9fd75a2c-66e1-4e55-a77e-e9d95e21014d"
+ "ID": "ca4ea551-2f9b-4144-a57f-d032f04f17ff"
},
{
"Condition": {
@@ -2256,7 +2256,7 @@
]
}
],
- "ID": "489b51b7-a611-4a1c-ab0f-038643a05fe3"
+ "ID": "bf09b0aa-f6bf-45d1-a82f-c254bfb45ab2"
},
{
"Condition": {
@@ -2292,7 +2292,7 @@
]
}
],
- "ID": "95efa171-46b3-49f0-b7ea-5462bbc37dac"
+ "ID": "1f259e39-22c3-4dd5-acb5-5d718d8ba770"
},
{
"Condition": {
@@ -2327,17 +2327,17 @@
]
}
],
- "ID": "09dd1cec-6c64-42d1-845b-cecb98a31cba"
+ "ID": "307f9d21-4633-4c09-9444-22647893364f"
}
]
}
],
- "ID": "fc97f422-1611-41f9-8d17-85cc0eb84076"
+ "ID": "37517c52-3989-452d-84cb-80a47a76e49d"
}
]
}
],
- "ID": "ef1185ea-4cdc-46bc-99b0-994032c1a04d"
+ "ID": "c3096f2d-84f2-45b5-8ca5-280acdb43206"
}
]
}
@@ -2350,12 +2350,12 @@
}
}
],
- "ID": "268826c5-3326-4c50-969d-0096aa690579"
+ "ID": "dd0f3ec1-df3d-41c0-86b4-cbf86cefc4aa"
}
]
}
],
- "ID": "5c71c500-c342-4d42-8ca1-a8749019888e"
+ "ID": "bb02ca1d-81da-4a73-862b-59eb84d89501"
},
{
"Condition": {
@@ -2438,12 +2438,12 @@
}
}
],
- "ID": "66534e31-1a17-4e68-832d-52d38db86fcd"
+ "ID": "27fdd3a4-9e5f-4b4a-8cdf-749ebde18f55"
}
]
}
],
- "ID": "aa9ba494-3b31-4cb1-9410-f18c161c269f"
+ "ID": "bbc8d190-720e-48a1-9c59-e41284bc4448"
}
]
}
@@ -2488,7 +2488,7 @@
]
}
],
- "ID": "9d292281-a56f-4e5c-8c79-ba5b981dcd59"
+ "ID": "249b6f55-09bb-484c-8193-9e8d2e85a8c7"
}
]
}
@@ -2518,7 +2518,7 @@
"CheckDataValidation": false
}
],
- "ID": "73dab744-34b8-48f6-86ae-13e870cac8b3"
+ "ID": "d3ea8610-97bf-4681-9888-d5cf4b35ca72"
}
]
}
@@ -2566,4 +2566,4 @@
"Formula": "FGC_母版页!$C$7"
}
]
-}//8W2+eW43L3RrpKkGORXIYXOo8lHg0Rml3XecmpFku+eHhSZyWZmbavjgg82azaMhok2RAC4StzKvycOS2ueD00RVmMUrp0aQIifSuKNk6OTuVuvztPs8jq4W5r63CMPFmrDE+8KE7ZI4BqBHYe01oJIW9Wol2FA3zGGAByKtURcm/GqjqEzpZo87reRRnTuM9RzSNSZlbth0bh+UyZVav0TSvYSYI50w6mVnAPc/VKfPV0LTsAnaSwF9kwpEjPyHHSvV4eo5vBLXk+WeoEmXYEnrrctNiBV9IMlHjq1b1YC9iTxWaT5NBKlsLUUN1JWIX9d7CmmP3rai4itMNRWHUlUicekQGYBLmCzNpZOChFi2YvqOYAsliUzO5VFzY/gCOWvR6D09yUxAOEq+YBqlFqKSZZtbayU/lfSeS09Xxu0VYCMUCL3FNcgDII8Jr/fNELt29n8VQ8ox445JRMQ/+o/SLr18kc1FbTy45RyYpgRdAUElJ4AZSvJ1xt7T0eQ4XsEGjo6GzLhiiShop/hnyA9l3oKRq8pkMlY5RTBXvDIU48sbDB6iI+AX1I15jlf0bQcCIqVRaatM85/mTqXL5F/a6/jEt6nKp4OPvoT1Cs4skZCPf8xZEhCfeqythaYyagZ7PYAbaDhNsZpFX4StmU/9zkrRPIActoWq3DJ7BwP8r/OqHwAyWlLva0Pvc+9Rx988Dk2cH0iMS9Soc0W+eNw2x7iEFvC1rUeVXoo9xru7SQeqYIYM1xwu6VO3k4uMPSC82n71h2vxmcdl4kdqaGRyldR/N+1H3wMWOeFtI2rbEVJp/AFK6uj5rPa5YmpVGxsi53wM+eaNwt2LKKNgU7QGL1tFc3p2d1Ea5Ky8TzHyAauvnfTDI7RgPkYWTO9muPhLJJNyzfUd09QeDSgLlg==|920
\ No newline at end of file
+}//A04NhS7uAhLCywMNenj3xEapsriWHPlq5DRmI0uOwlYp5pA5Vk+WhLqfYg6SRVNF1UzpkP75c+zl97lEz6O5WiXhGO2mtAmOvwIA6y0vMsrnmkkckKzhkzbHPGpi6MICga901GF4ZtNenmpjoDKe8G1aqYKrVXgeNLUGsb4zQ1H+6bbwTXutoy5TaM+BQ5qfHSyURF2gj46AG1Qyt6tVGmMxWppurSEJ3cXZ/5oDz80qo1Noa6OOjK3kg/0lrbsYYYzVJH79XfDTDNR2E44M00zgslhc6LvWUbwbtZ+rapf9nfLVapN3IG/96Ph61P9t09mRPO2JXR9mU/slzGuEIE8/70E+GA1uR2RPpwHiaW5iFCnjK8+pgKHPAQXquc9Bhi+57xNNtPPQglKl0CyaBaaqWBK/5RNlYfaL6fAYxz9G6AMK6e2BKqoofHWb79pM4h/4OG2fTK/WBkLm7Cy8RcYej+4O2C5ZAgG3+ACNFg6zzgm52AR9/8oRhrjEdGtpE1ODpVsZ8OKcK711C3fADr/rQbjRiHn5C5Sp6xkRLHeEG43E7KukumiaUZK3RQ5gMknlACd/kVUDl26THmuMVe5iBbXoz7reGsBjNYfG5hVlN5XdtAXIOQND85RW8l2/bX8jjqRwAdSt4iS7+ndi1nv512dCNfS+iWewx/XvVef08JToUDFI8Fhn5NmyLsOnXW5n+7qtQubN9S5QU/3PScBSPwkDaR8FWeZdoyXIpuTYpreZXM35xOVe9LGBOIFiut5D3nV+r/7sFLSrYpTJxJVkPyyn5LlV7iyUYBPV2qjxN3OMliKfu45xNDedCz2CwG+k/ZZmqpgA7FJ7EfEQyvEOH66Eop09MJ5AWKdrsAchzHN/SEg7h7xk0pDxKDJhyEGT6cEo2va3cZCAR7he0Q==|920
\ No newline at end of file
diff --git a/Pages/aa07c23eb2ac48e48fa3e23cdaeb509.json b/Pages/aa07c23eb2ac48e48fa3e23cdaeb509.json
index 1463323e..2461a13b 100644
--- a/Pages/aa07c23eb2ac48e48fa3e23cdaeb509.json
+++ b/Pages/aa07c23eb2ac48e48fa3e23cdaeb509.json
@@ -27,15 +27,15 @@
"DesignLengthInPixel": 10.0
}
},
- "6": {
- "GridRowColumnDefinition": {
- "DesignLengthInPixel": 16.0
- }
- },
"5": {
"GridRowColumnDefinition": {
"DesignLengthInPixel": 34.0
}
+ },
+ "6": {
+ "GridRowColumnDefinition": {
+ "DesignLengthInPixel": 16.0
+ }
}
},
"Count": 7,
@@ -80,7 +80,7 @@
},
"AttachInfos": {
"1,1": {
- "TemplateCellSource": "版本名称"
+ "TemplateCellSource": "标题"
},
"1,5": {
"CellType": {
@@ -143,7 +143,8 @@
"$type": "HtmlRichEditor.HtmlRichEditor, HtmlRichEditor",
"ShowToolBars": false,
"ReadOnly": true
- }
+ },
+ "TemplateCellSource": "发布内容"
},
"5,1": {
"TemplateCellSource": "发布时间"
@@ -191,10 +192,10 @@
}
},
"Spans": [
- "1,1,1,4",
"5,4,1,2",
"5,1,1,2",
- "3,1,1,5"
+ "3,1,1,5",
+ "1,1,1,4"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.TemplatePage, ServerDesignerCommon",
@@ -204,4 +205,4 @@
"PaperSize": {},
"Margin": {}
}
-}//XIqlPo1nUixPekeyUEXjetp/gijo1BFdJC8puRzP9WyR40A9lzYLlHWbSTe4q4N5e+zXqeXl0xCbTwQgErGjNWgscUcQED8EhRz82Q9lzyT06gh/YkLjwQWNuAhSsT0OQES9iOOEYc1c88bbsxjAcqYU/92u3uwnoyZu/MZnS7ILUl7cJpeor8tqopHNvuvlNYuoBiDgzO8dd5disxPwLHqVIx1euD+NEJz3QphYAJlk7TGIa2zWyYojm77Z20RESc0/TDnMgWr1lG3V9ptdpZ3YCKtQgPoXIUX45fp/fYvvLuOci4sgZgd7CsNlTr9ElCoNczk56XrLfPt24KGGVAmJ75FaeVAWm4/6UmWneMcqyGjs4DfikPxBPpryckbWE6Wgo4POCfW7frA8nOhhqwJxpCmpn05R4BTHS1uSpCDd8QZAgZKjeWDc6ndNx16c+r2s0Xj25ClYTPzCZc36OVJ/qPSvH+NMJF0b2968S8THOFRxcKFEbrVRJm6t90pMAzflE3qtxdGhKI4tcQi+AxOa/OhemY20eV8HxMtcW7nE1DcKzViGqmRGrxBXFYCoxliXG3uDAGRzHW86iw6u3Cig2ruGI//7DsWGwajguiL4kmLITMiKC6zNQ5kepWE3l6V6ljrpHoLeweCxsA82pepaD+v9xs+v6s5980uMizTK9+7a5zhEiMmn2waD2gNfNs+cshRbj257PE24eoc57RIEqbyJnNCLoqGMgy0z7sWfzm6v9qYnosBT728AT2ujM3YUVSflIWsy3v2QnrXfAWeadlT3RCzI3sx0m5tYd+15RHW/jyi1ca2wMWii0PtZiJjGmhdEKT7hQfFbvBn3QO7Ny2SKkv9tyU+0fkQjzThVWMutKA432BjbmOqpETgfPdYtIRcJyL68Yr6ogxnHHw==|920
\ No newline at end of file
+}//uOkfLfY+ZLfaWV+obU0F8R933kPp5N+as103+DhKJARPotYeQfPW6Io7+J3UryVogK/vxPG3wFFdCIHh66KX7ZNUjouAOPe/MZCwqDw7uUw12vwKox7ui+oVALaYly8xVrdFFgjeTwwhJOoh8dp3U02MsW3y2c7qUXFn0AnvYFZtFNMnqngYInQINSQPX6yP+F2l/nhWMNVFOiFQkzgIIX7BxNs/aP8bZTetcIy4VrSlUns4UDREWIcVsf3tJXlrExK5YAzh4YD66vTR0vI2KPf8Z05niDRVbYeqaUNRpgZs25+OmSbj1N1wYwHBm6lKLwZ20H0KNNSj51W6VKOjkgwNOlgPKQkRyblmeXQ96Ht5iw4Yo5E6P+y03QEi48xQGiAF+oB5qHCC+5SkSnjerSpuZtDB+3J0Ko1qXtgzSua18Z7WsvINy/cMW2kl5cSxyRuRSL0EijpYHVsVrv9xYDmGHj56oboMoLEfnU+T7G/r7F+SrFooNxW+NUq/GtMu9MFFIj0s1zkmNjBatAZIEobfH/f5aOqSHTyBl2e/MuOExzXUnyXahY86knSJXAxEPZpse2NiUyjH6HG51mAAkEyPGxvJVXHMXgudu0Mox1DN1yAFWF4Io4B7lnGjoTc7Kur9mc5KHlsRh/IRnJ4Mp4N6CNAEGygS9AfhcRVyZR1c0dZ7cIpgsGxt+JrfNs9AQdHlKHRmNSNHU3VChib7M0WhdDo8ba3Ww0r1GmdVn6rdv0fErsvsJtyLCsEAczCaUfg3C4qI4x6jcwpEW5B4WDN1+QskhkgKo2YCDSa01NozWfrYW15Q1UNa9y98wwSPEZWEpWofzYm5j9iEmqXrEoHHleUYKpatCuU/a2WYIBNMiathS/KgZQP7kNmYaKskXhlD7Dx2/VaIlFgnjeddHA==|920
\ No newline at end of file
diff --git a/Pages/系统/更新日志.json b/Pages/系统/更新日志.json
index 60a35922..58a5c5da 100644
--- a/Pages/系统/更新日志.json
+++ b/Pages/系统/更新日志.json
@@ -67,10 +67,14 @@
}
},
"InLogicalVisibleIndexes": [
- 10
+ 10,
+ 11,
+ 12,
+ 13,
+ 14
],
- "Count": 11,
- "DefaultSize": 24.0
+ "Count": 15,
+ "DefaultSize": 32.0
},
"Cols": {
"RowColumnAttachedInfos": {
@@ -296,7 +300,16 @@
"DefaultSize": 32.0
},
"Values": {
- "1,1": "%PageTitle%"
+ "1,1": "%PageTitle%",
+ "11,1": "版本名称",
+ "11,6": "版本号",
+ "11,10": "发布时间",
+ "11,16": "发布内容",
+ "11,21": "发布人",
+ "11,24": "标题"
+ },
+ "Formulas": {
+ "12,24": "B13&\" \"&G13"
},
"AttachInfos": {
"4,1": {
@@ -345,7 +358,7 @@
]
}
],
- "ID": "c8444ecb-b071-4f4f-baed-60dc63937f78"
+ "ID": "c40e010d-1070-47d2-bb6a-74a5b3020912"
},
{
"CommandList": [
@@ -358,7 +371,7 @@
"LoadBindingDataOption": 2
}
],
- "ID": "a28d9359-afce-4c9d-9830-e24bab63b4dd"
+ "ID": "a1a2c24b-162a-4a73-b823-359b69abf09e"
}
]
}
@@ -372,7 +385,7 @@
"管理员": "管理员"
}
},
- "DataSourceType": 1,
+ "ListviewName": "表格1",
"DataSource": {
"$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
"TableName": "项目发布记录",
@@ -445,6 +458,39 @@
"TemplateKey": "竖排横线分割",
"DoNotLoadDataWhenLoadPage": true
}
+ },
+ "11,1": {
+ "ListViewInfo": {
+ "Name": "表格1",
+ "RowIndex": 11,
+ "ColumnIndex": 1,
+ "RowCount": 4,
+ "ColumnCount": 40,
+ "TopCondition": null,
+ "ListViewStyleName": "_RS_NewFashionListStyle2",
+ "ShowColumnHeaderInDesigner": true,
+ "ShowEditStatusIcon": true,
+ "UseSimpleBar": true,
+ "ColumnOperation": 2
+ }
+ },
+ "12,1": {
+ "NameUsedInJavaScript": "版本名称"
+ },
+ "12,6": {
+ "NameUsedInJavaScript": "版本号"
+ },
+ "12,10": {
+ "NameUsedInJavaScript": "发布时间"
+ },
+ "12,16": {
+ "NameUsedInJavaScript": "发布内容"
+ },
+ "12,21": {
+ "NameUsedInJavaScript": "发布人"
+ },
+ "12,24": {
+ "NameUsedInJavaScript": "标题"
}
},
"StyleDatas": {
@@ -546,7 +592,20 @@
}
},
"Spans": [
- "4,1,6,41"
+ "4,1,6,41",
+ "12,1,1,5",
+ "12,6,1,4",
+ "12,10,1,6",
+ "13,1,2,40",
+ "11,1,1,5",
+ "11,6,1,4",
+ "11,10,1,6",
+ "11,16,1,5",
+ "12,16,1,5",
+ "11,21,1,3",
+ "12,21,1,3",
+ "12,24,1,6",
+ "11,24,1,6"
],
"PageInfo": {
"$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -575,16 +634,20 @@
},
{
"$type": "JsonDataSource.ImportJsonDataToListviewCommand, JsonDataSource",
- "Listview": "图文列表表格1",
+ "Listview": "表格1",
"ListviewColumnInfos": [
{
- "ListViewColumnCell": "版本名称",
+ "ListViewColumnCell": "标题",
"PropertyName": "版本名称"
},
{
"ListViewColumnCell": "版本号",
"PropertyName": "版本号"
},
+ {
+ "ListViewColumnCell": "版本名称",
+ "PropertyName": "版本名称"
+ },
{
"ListViewColumnCell": "发布时间",
"PropertyName": "发布时间"
@@ -602,7 +665,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=更新日志!logs"
},
- "SampleJson": "[\r\n {\r\n \"版本名称\": \"GA\",\r\n \"版本号\": \"1.0.2\",\r\n \"发布时间\": \"2024-08-31T14:05:43.66\",\r\n \"发布内容\": \"有绪管理平台 1.0.2版本更新日志- BUG：需求列表无法查询；
- BUG：超哥提交的关于2的BUG类反馈；
\",\r\n \"发布人\": \"夏超\"\r\n },\r\n {\r\n \"版本名称\": \"GA\",\r\n \"版本号\": \"1.0.1\",\r\n \"发布时间\": \"2024-08-31T13:56:11.617\",\r\n \"发布内容\": \"有绪管理平台 1.0.0版本更新日志\",\r\n \"发布人\": \"林希\"\r\n },\r\n {\r\n \"版本名称\": \"GA\",\r\n \"版本号\": \"1.0.0\",\r\n \"发布时间\": \"2024-07-02T15:04:15.793\",\r\n \"发布内容\": \"1.xxx\\n2.xxx\\n3.xxx\",\r\n \"发布人\": \"管理员\"\r\n }\r\n ]"
+ "SampleJson": "[\r\n {\r\n \"版本名称\": \"GA\",\r\n \"版本号\": \"1.0.2\",\r\n \"发布时间\": \"2024-08-31T14:05:43.66\",\r\n \"发布内容\": \"有绪管理平台 1.0.2版本更新日志- BUG：需求列表无法查询；
- BUG：超哥提交的关于2的BUG类反馈；
\",\r\n \"发布人\": \"夏超\"\r\n },\r\n {\r\n \"版本名称\": \"GA\",\r\n \"版本号\": \"1.0.1\",\r\n \"发布时间\": \"2024-08-31T13:56:11.617\",\r\n \"发布内容\": \"有绪管理平台 1.0.0版本更新日志\",\r\n \"发布人\": \"林希\"\r\n },\r\n {\r\n \"版本名称\": \"GA\",\r\n \"版本号\": \"1.0.0\",\r\n \"发布时间\": \"2024-07-02T15:04:15.793\",\r\n \"发布内容\": \"1.xxx\\n2.xxx\\n3.xxx\",\r\n \"发布人\": \"管理员\"\r\n }\r\n]"
},
{
"$type": "Notiflix_Forguncy.Loading_Command, Notiflix_Forguncy",
@@ -634,4 +697,4 @@
"PaperSize": {},
"Margin": {}
}
-}//OSyb9FzHclJmKixHy0/GWSVPs94aYJXdHR1LKmHOBWvxDnHj/95msEeIOXg3SC2v+fnoNsqneOLsgJUeGNGIn7bBnO4R+UrtXll76lZm5afNUbXelqS4Jvn2Fiezjk3IWmA+57xCYbaSCe0a5be4/qB2l+r2Kyb127SinllZvZlnemuciuX+dcdZedQLq5GALVckpMdkEMpmRF7RESY9NE01h4YWkQwL1mPwd8X2ScBMhphJsyjeP1NvRS+Dwv9e697SXXDmAwrOvh38dKY8WRNO86YoCs88l4RQu+Ekh0E+KsVDGT/1FIUhrP+jv0nX9nBddYBHF4d6zNDoJSFHcB/opUJtvZBo07N7p/X3mc82EHacNNmQ9uS84DvUEMmuEnPuyXKLr3u7Z/oI+pheawTTPGUl0HQhdH5rGdpSdzd1nxluAOms349PsTPo0TUReqQhyQ6DgEomBqZcEQaONZryJlzfVuDg/Ue6tZ1dbRGNS2tv6D5B9gyAJCdQ8uUTGoA3iEkf9V6xL3gdRbDcfagJ0QvLtsh3BWYnOXnuK7VcN9cb5RwdwUeftNxfLOFiUM6lCnrJgBboBtKgcrMu111ovxas8dtoeoux7ZZ4ZyYNtx57oB6EJc2RdUCpbVLJMB/h6m2RnLmZyAWi2YdVNVrhl1OP/BN1q1vl8MoIrBr2egSnHSWkKkj8QUmUMeJMTwPcvmdbVYw1eraRJx/3Rdlb291imZx6R/b0lajoEVR+TvrTTenuV3pjzJ4pIVJGp2ZHeJ2r7KZCG7GFSXMozuAgS9BZjRHizh/Ea+LyqTXzwQG/cRD0SFvUmkicI8+d6wDqZ0vtcJTQz+hI7tqIldElbOSJiBB5/zlVSMaN7/9Va0FNGWFFq9gosHY1ENadtZfOPor+el8iyTSpEmGnwQ==|920
\ No newline at end of file
+}//McWzcR5Awq3OCem5jg8anaPavtGL9Xiqo4vqhv5F1rGm632TDMyyoCuKYkzgAKv2n/ITRIz1BeLLMLwDstbGgmTs/S3xS9mozWe1dUJp+gAmSaUhD1ii84d6zN/CKo9+4L0kQaDPUa9o5ki5L8bPq+wPk4QRdqzXIaPaoT+98ci0vspsCLoHYQkK8Q6dnyVZPDENxt/D5oL8pyOBY6/pE2b+Tl5G3/B9bKxoxm1hTyhEUThmhH7g46hHYTAjlFKbP2a3X7DscAK7RZ7xBbLaYS95k4yDmDWulu1W6w04x5NGcqz0wnElwy7ygki6bl7eeDwFmmFLnLDp/uZS90eJm7mv8AXNrqKuBCPGjO7OfIKYUO0Wxp2afXtm1pqFiPV7ahDF8hyfk1V3KtWsVq62NdH4KDftMra52/2aZfqNSOHTo67Fc7fc/s0tjAjyT8jzssMDtuvl3XgmMrTrfW1m145xoKJcLfQm91sduGg+PPhrNeoCoO/+VUIv3Ut2M7PK1YsNqGX0TdEQzQPBav1YW9iXoeDa2g2Q48PlZpNLN3IgP5VfPLhTxfj/JqCUTOyNPnoZGKIAMjFlrT+A8uZmfWb/4vuXBjtbMffnPdvHdI1Nd0bBS5RpKC+G10EocOaYlUJs9TMQN5l1rD8avmHsclDCsoEhCTKsbmuEr9gSHAt8EXC/WpNEqTe1SWnZvUSxC7obo7RsdS9MuQddPtXXALu53J2prnwxmNuvTdiIXlybSBzswPfJw3hvDixp7iqj2/X1CzvMmmmlYbVhqcoyoIRqlJerFe63OZLrEZ48iQLi2HvkJGf7SEtUSGxPdrHYcALCardsI4b8X8YSsZXeLGhat1gTVxI0z+7shc+sHT3tdgY6o6KMMRHqAdHWMDFsc3Eb3Xq5PhcK0lVwNCwN4w==|920
\ No newline at end of file
diff --git a/Pages/系统/更新日志.rd b/Pages/系统/更新日志.rd
index d216c2cd..425bd0bb 100644
--- a/Pages/系统/更新日志.rd
+++ b/Pages/系统/更新日志.rd
@@ -1,5 +1,8 @@
{
"PageType": 0,
"ColumnCount": 43,
- "RowCount": 11
+ "RowCount": 15,
+ "Formulas": {
+ "12,24": "B13&\" \"&G13"
+ }
}
\ No newline at end of file
diff --git a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
index f3ba26e8..99d66996 100644
--- a/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
+++ b/Pages/项目/项目首页/项目首页-容器页面/任务容器页面/任务首页.json
@@ -345,12 +345,12 @@
"$type": "Forguncy.Model.StopCommand, ServerDesignerCommon"
}
],
- "ID": "aaa0fe74-20d5-43bf-9029-47476b0cc233"
+ "ID": "ce13e5fb-6769-41e4-8b8f-f0dcf311304e"
}
]
}
],
- "ID": "065c1923-2736-4272-a96b-921ab651b038"
+ "ID": "bd5ea903-b268-4f5f-9486-5fbc0e8cad91"
}
]
}
@@ -398,7 +398,7 @@
"ID": "e2e848e0e72d48229c97757429d446a2"
}
],
- "ID": "7b739eff-a88e-4a39-9732-5c4541e12bfa"
+ "ID": "58a155da-71fb-4d10-a1cc-94c7c49b472e"
}
]
},
@@ -499,8 +499,8 @@
]
},
{
- "Value": "发起流程",
- "Text": "发起流程",
+ "Value": "启动流程",
+ "Text": "启动流程",
"IconPath": "Application/156_processCentre_1.svg",
"SelectedIconColor": "Background 1",
"SelectedIconColorUseItemColor": true,
@@ -532,17 +532,11 @@
"$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
"tableData": {
"TableName": "任务表",
- "ColumnName": "流程实例ID",
- "GUID": "86f2955b-aacd-48c0-83a8-057a6f48f46c",
- "RelationBinding": {
- "RelatedTable": "ACT_HI_PROCINST_View",
- "RelatedColumn": "ID_",
- "DisplayColumn": "END_TIME_"
- }
+ "ColumnName": "任务状态",
+ "GUID": "37f93d36-89c7-4003-8d8e-c9a6d2e94244"
}
},
- "value": "%Null%",
- "compareType": 1
+ "value": "0"
}
],
"RelationType": 1
@@ -615,7 +609,7 @@
"MethodName": "Refresh"
}
],
- "ID": "783b8a5c-fe6f-43c7-8b6a-8fc026bc7dfb"
+ "ID": "969b7bb2-9564-45ff-b3e3-b71fdf8ce206"
},
{
"CommandList": [
@@ -630,12 +624,185 @@
"BtnText": "知道了"
}
],
- "ID": "0c908444-e6ce-4436-8fd3-7fa330758c59"
+ "ID": "7bc47725-f228-4f2e-8184-9baa44d40938"
}
]
}
],
- "ID": "d226c3cd-7db9-4460-8a19-286cebc0bfcc"
+ "ID": "bdf8d94f-31b2-4751-bf18-9a16128c4dfa"
+ },
+ {
+ "Condition": {
+ "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
+ "SubConditions": [
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+ "tableData": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "f06b7465-cf64-4c12-9538-ce24dabd73eb"
+ }
+ },
+ "value": "4"
+ },
+ {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+ "tableData": {
+ "TableName": "任务表",
+ "ColumnName": "任务状态",
+ "GUID": "3dd8a6c2-f5d7-44c6-8aea-cea7b92d1b41"
+ }
+ },
+ "value": "5"
+ }
+ ],
+ "RelationType": 1
+ },
+ "CommandList": [
+ {
+ "$type": "ElementUI.Commands.ShowMessageBox, ElementUI",
+ "Title": "复活流程",
+ "Message": "请填写复活原因",
+ "Type": "info",
+ "ConfirmButtonText": "确定",
+ "ShowCancelButton": true,
+ "CancelButtonText": "取消",
+ "ShowClose": false,
+ "DialogResult": "按钮结果",
+ "AdvancedSettings": {
+ "ShowInput": true,
+ "InputPlaceholder": "请输入",
+ "InputBoxResult": "备注"
+ }
+ },
+ {
+ "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+ "ConditionAndCommandPairList": [
+ {
+ "Condition": {
+ "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+ "param": {
+ "$type": "Forguncy.Model.IfConditionPageElementParam, ServerDesignerCommon",
+ "cellLocations": [
+ {
+ "SerializeProperty": "=按钮结果"
+ }
+ ]
+ },
+ "value": "confirm"
+ },
+ "CommandList": [
+ {
+ "$type": "LoadingCommand.StartLoadingCommand, LoadingCommand",
+ "LoadingText": "提交中...",
+ "LoadingTextColor": "Background 1 0"
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommand, ServerDesignerCommon",
+ "ServerCommandName": "复活流程",
+ "Parameters": [
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "流程实例ID",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!流程实例ID"
+ }
+ },
+ {
+ "$type": "Forguncy.Model.RequestServerCommandObjectParam, ServerDesignerCommon",
+ "ParamName": "备注",
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!备注"
+ }
+ }
+ ],
+ "ResultErrorCodeTo": {
+ "SerializeProperty": "code"
+ },
+ "ResultMessageTo": {
+ "SerializeProperty": "msg"
+ },
+ "RefreshAfterFinish": true,
+ "CheckDataValidation": true
+ },
+ {
+ "$type": "LoadingCommand.EndLoadingCommand, LoadingCommand"
+ },
+ {
+ "$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.Notify_Command, Notiflix_Forguncy",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!msg"
+ }
+ },
+ {
+ "$type": "Forguncy.Model.OperateCellTypeCommand, ServerDesignerCommon",
+ "TargetPageElement": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!刷新任务"
+ },
+ "TargetType": "Forguncy.ButtonCellType, ServerDesignerCommon, Version=10.0.5.0, Culture=neutral, PublicKeyToken=967100671921c115",
+ "MethodName": "ExecuteCommand"
+ }
+ ],
+ "ID": "8db413d1-d466-4946-bb44-a26ecc978a28"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "failure",
+ "Message": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=任务首页!msg"
+ }
+ }
+ ],
+ "ID": "f97dc843-df1d-45d2-bb88-acd36957408e"
+ }
+ ]
+ }
+ ],
+ "ID": "e1be8051-f92f-4be9-acb1-18c13447efb9"
+ }
+ ]
+ }
+ ],
+ "Comments": "如果已经结束，可以复活",
+ "ID": "cf6abb1e-6ac4-4352-a836-8c88a153b66c"
+ },
+ {
+ "CommandList": [
+ {
+ "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+ "FourStandardStyle": "warning",
+ "Message": "当前任务正在执行中，无法启动流程"
+ }
+ ],
+ "ID": "f0b731af-9ad0-405a-b81b-ce28b9344595"
}
]
}
@@ -773,7 +940,7 @@
"ReloadData": true
}
],
- "ID": "c0e0f42f-65fc-4453-88af-4f66538f728b"
+ "ID": "35d9430f-9751-4818-8ffe-6028d02216fe"
},
{
"CommandList": [
@@ -788,12 +955,12 @@
"BtnText": "知道了"
}
],
- "ID": "c179cb75-63ef-4063-8bef-b6687f38872c"
+ "ID": "65af7d6f-f984-4536-b1b0-0bab7ab0a366"
}
]
}
],
- "ID": "d26e275a-2e2f-4d65-97ab-c2f79c8b4576"
+ "ID": "cf5b0bf4-6ee1-4a7e-bd8d-96beda1d7e31"
},
{
"CommandList": [
@@ -808,12 +975,12 @@
"BtnText": "知道了"
}
],
- "ID": "0350da11-5208-4daf-bab4-37e50968361f"
+ "ID": "000929de-55cd-4381-9582-6326a13ee27e"
}
]
}
],
- "ID": "cf09e133-b718-4663-ad78-30b7d53eccee"
+ "ID": "e32b8d41-1911-47f1-817d-4a5ca67ad21f"
}
]
}
@@ -942,7 +1109,7 @@
}
}
],
- "ID": "4f6dd506-e0fb-4bc0-812c-97b18c499c04"
+ "ID": "cdc3c85d-44c0-4edd-a3fc-b04d2a6f400c"
}
]
},
@@ -983,7 +1150,7 @@
}
}
],
- "ID": "00be3c11-a590-4c62-9983-d914e04d03ac"
+ "ID": "ae1b388b-63b1-4cf1-ad7f-803916f5f2f1"
}
]
}
@@ -1098,7 +1265,7 @@
"Disabled": true
}
],
- "ID": "9bba74eb-9b7f-4aa6-bae3-11794e439f19"
+ "ID": "f1d9d041-d47f-4187-be34-fe22aca2097d"
}
]
}
@@ -1276,7 +1443,7 @@
]
}
],
- "ID": "46f49595-bd9f-490b-946a-60298fddc625"
+ "ID": "55077d25-6c14-404a-889a-639dc91f7ffd"
},
{
"CommandList": [
@@ -1293,7 +1460,7 @@
]
}
],
- "ID": "dee61cf7-44bf-40aa-9e3c-d2427715f4dc"
+ "ID": "e3e5a401-b1a5-4c70-8867-62a3af8f4f27"
}
]
},
@@ -2019,7 +2186,7 @@
}
}
],
- "ID": "ad5f281a-2039-4e6c-a004-46a78afa5edb"
+ "ID": "2fca294b-427b-472c-8713-a308010a5d4a"
}
]
},
@@ -2129,4 +2296,4 @@
"Formula": "任务首页!$Y$8"
}
]
-}//I9dY+/Eg6IAaEJxYTfP1J/tbdOVuAzz7kBQfkECnxHvEsjeSR9rg3rUPvZdS0kL5cnduMwSxIW/ji3b+pqGqxQUyoUVFlcgKzBumSU9xoi9qzhgrj5zyDXQqdYddvsT/5dd+Do0AopO2ySr9j+Erm/FCYymNxvCsbEf7tVQR87+zYMrJlz6PDnYFGOkrYsnYT+bVO9LNkRwpo2dKQH+wqQUA0/FlVRqIjmUjJQQeZVbnqqULYHUOS/wdHz7y4lwsa9ea7sjGJ1HbaETv5/ANci2LnjZTSl8AI1r1md2dRRgHBzwbr+dBzEKk8Q2/dsWs0pH7Has8kl8+wxgZmdgfQBQKfcoPZpF9+oDx56P5rYOVwhGwcrZeKpl9nqNqoGPIqDDU66KP+dKiHfbl7P5s+4LAL2firgi7nT8dABjDIgkgs4n/3KJtoI7GZjxAxpi2DXqsi3/roK3BHIM3bRLTFSPo6eMf21rIrrZ1p3rGeUwtr0qkg2halvk5oADccXZAoLLXpEaum3VzRQcxrS8jU8QvDhBefd1JjxBtfW8aR20Gxk6OEIjbYgeMrcvkUA8ct3tvsMzRFvBOAboh737BlHpdyFWmLGDtP+3S0gMObWHBTh41YztivqG8yrwq7/09+8ij8eZmRFOXJaRgEiFuBXXMEp2KHcUJAkoytfozSHbv1MswHTxsW9hClz0jxTItkQNwALojUKR+A20LCE4COLbiSMEfHrlRnnnZa4PscsAmnPwzVkPmftatq1p9L3C1yj5A4VTYbbYojPeXt3xUZpC+TakyKpTZVWlTdiJzYXZ7BvEiPY0Q4fCfDiZgrMEUbmh5pMZFJxocRev1bgAr3Wu+DFpHxaCyO5p0IlpP6es6jelHZe8Vb9mrGGLr1pa9BdquJEa7M9Ua17UO4JgWHg==|920
\ No newline at end of file
+}//oxw78mn/CcqqH92fL+PsNsSZgcYfsyiTR9Xm6bRVn2Z25Ww8x9roDz1UW4SNAk6ePtA4WIqfq4n1taegxNch14c8g5j05LKWpzBnI9/o14cLgf67MuDkASMxp/fJ6Cvemue+EpgybB8HMW05rz1VslYxo4/ZT/4cZY3pgTl9Tkv3evZydqxRZtjv8CBj2ACPoZ6GNexNdkqE+wZxXiQbjSl5AW67CFeIJ8BpCJL/hb9OQSFWyhMxELo5ESyP8pA7EcdLavKLN2UJAqBZVhtRTsjZ0zUAJc/ZvkMVyhlCPoLjzXm5vxS85u6+n8lqFLBZ4QzTcvfAu4iQdNrwA3T7Sxlq+yuhsVeeeJHx+O3xg9mLxu5y4FNz3SaN5/LfxjK2izxr5427+DyiZ5qOFALrTTRWCJVD2UGxSY7cPuf6x7fAjYyQyCpS7bJVL9smExb1/UIAZaZEmvmlv3tKhqxEETAT+lqamOejudiGqkca3AT9JDQ5ia4g7fLc55i/TFNVUWEh3h/jOcFuKM/+n78/6Kd4rth0UVsjD8mY8uqD0sdtGA3tSdJiLCo0UYy6kIN6HdZC/p7BYpC7Am0bzhOmX7SX/ldU0PsYsxNFtHnqnSxsHVNPKUk/w5uwWFm8KmLf3M0SnIdwZa4+RL0jl9LdAGipqQxBCPMbl9AzPS7puH723+y3GJOQraaObZi2bJzauLZSGfLd3YcdMd1BAvap/sur/zm6+W/AFjH/ReQQT//IjSYvajGkVl7FnkqAoRsSV3mhUqjb/GuU6nRXzK8CJYvkRPtSUWrAU2LXpePgPec+g4uBi84jG5quxkDN/zkbTrVuiKsSi/8FRDTYDAQrdjqFaQwePFNXWHkshJtcmQGrNYiyAEN6G9s1+SfkETOkvwRsWyU98UTkF6QFY5fpOw==|920
\ No newline at end of file
diff --git a/Plugin/加载动画-10_0_2_0.zip b/Plugin/加载动画-10_0_2_0.zip
new file mode 100644
index 00000000..a2f8b7f5
Binary files /dev/null and b/Plugin/加载动画-10_0_2_0.zip differ
diff --git a/ServerCommands/OPENAPI/GetUpdateLogs.json b/ServerCommands/OPENAPI/GetUpdateLogs.json
index 5ec89ce6..61ab7139 100644
--- a/ServerCommands/OPENAPI/GetUpdateLogs.json
+++ b/ServerCommands/OPENAPI/GetUpdateLogs.json
@@ -21,7 +21,6 @@
]
}
},
- "HttpMethod": 3,
"Parameters": [
{
"Name": "key",
@@ -52,7 +51,7 @@
"TableName": "项目发布记录",
"BindingInfos": [
{
- "GUID": "271b8c4f-df87-4f13-a055-c230d8ed2551",
+ "GUID": "a9b867e6-ec78-46dd-884b-a749afcf5a69",
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "版本ID",
@@ -66,7 +65,7 @@
"ColumnName": "版本名称"
},
{
- "GUID": "51cf6d6a-f2a1-4c71-9fa2-de108cfaacd9",
+ "GUID": "3e2727c2-111d-47c2-ab65-7c72e9df56ea",
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布版本号",
@@ -75,7 +74,7 @@
"ColumnName": "版本号"
},
{
- "GUID": "6a4ec77a-c58c-4785-997b-acd42f443db3",
+ "GUID": "fded42f3-3b62-462e-9145-e1d0417504ac",
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布时间",
@@ -84,7 +83,7 @@
"ColumnName": "发布时间"
},
{
- "GUID": "65cbf608-1409-441d-8de1-725725ee09f5",
+ "GUID": "a39645c6-efa9-451c-a8dc-583a3c43e28d",
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布内容",
@@ -93,7 +92,7 @@
"ColumnName": "发布内容"
},
{
- "GUID": "dbacc996-f268-412b-9e1c-587ab1450002",
+ "GUID": "646085ad-602e-4bc6-8943-614717ba52f5",
"BindingInfo": {
"TableName": "项目发布记录",
"ColumnName": "发布人",
@@ -111,56 +110,16 @@
"ExpiredTime": 120
},
"SqlCondition": {
- "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess",
- "SubConditions": [
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "项目发布记录",
- "ColumnName": "项目ID",
- "GUID": "779f1eb0-baa5-44fb-a207-964a134ddb0e"
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=key"
- }
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "项目发布记录",
- "ColumnName": "项目ID",
- "GUID": "ad07bb5b-b503-42be-a2c6-af32382ec913",
- "RelationBinding": {
- "RelatedTable": "项目表",
- "RelatedColumn": "ID",
- "DisplayColumn": "项目名称"
- }
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=key"
- }
- },
- {
- "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
- "ColumnBindingInfo": {
- "TableName": "项目发布记录",
- "ColumnName": "项目ID",
- "GUID": "2ec0d510-82c7-41f2-b87c-67872a8a22eb",
- "RelationBinding": {
- "RelatedTable": "项目表",
- "RelatedColumn": "ID",
- "DisplayColumn": "项目代号"
- }
- },
- "Value": {
- "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=key"
- }
- }
- ],
- "RelationType": 1
+ "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+ "ColumnBindingInfo": {
+ "TableName": "项目发布记录",
+ "ColumnName": "版本ID",
+ "GUID": "4fb8e0ea-968f-4b4b-96bd-398415f1cfbe"
+ },
+ "Value": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=key"
+ }
},
"NullFormulaValueQueryPolicy": 0,
"TopCount": {
@@ -184,7 +143,7 @@
]
}
},
- "ID": "666e24bb55394a66a8e773a8c81f8134"
+ "ID": "1e63ef583b5c4ece9b3b4ddd5032265d"
},
{
"$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
diff --git a/ServerCommands/系统/复活流程.json b/ServerCommands/系统/复活流程.json
new file mode 100644
index 00000000..aab9737b
--- /dev/null
+++ b/ServerCommands/系统/复活流程.json
@@ -0,0 +1,56 @@
+{
+ "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"
+ ]
+ }
+ ]
+ }
+ },
+ "Parameters": [
+ {
+ "Name": "流程实例ID",
+ "DataValidationInfo": {
+ "IgnoreBlank": false
+ }
+ },
+ {
+ "Name": "备注",
+ "DataValidationInfo": {}
+ }
+ ]
+ }
+ ],
+ "Commands": [
+ {
+ "$type": "Forguncy.Model.ProcessInstanceCommand, ServerDesignerCommon",
+ "ProcessInstanceId": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=流程实例ID"
+ },
+ "OperateType": 350,
+ "Comment": {
+ "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+ "SerializeProperty": "=备注"
+ }
+ },
+ {
+ "$type": "Forguncy.Model.ReturnCommand, ServerDesignerCommon",
+ "ErrorCode": "0",
+ "Message": "复活流程成功"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/ServerCommands/系统/获取更新日志.json b/ServerCommands/系统/获取更新日志.json
index 8062ef57..3aa175e9 100644
--- a/ServerCommands/系统/获取更新日志.json
+++ b/ServerCommands/系统/获取更新日志.json
@@ -32,7 +32,7 @@
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
"SerializeProperty": "=全局_业务配置"
},
- "SampleJson": "{\r\n \"项目ID\":6,\r\n \"版本名\": \"Develop\",\r\n \"版本号\": 4,\r\n \"版本ID\":1\r\n}",
+ "SampleJson": "{\r\n \"版本ID\": 4,\r\n \"版本名\": \"Beta\",\r\n \"版本号\": \"1.0.13\"\r\n}",
"ToParameter": "业务配置"
},
{
@@ -68,7 +68,7 @@
"DataItemType": 0,
"Data": {
"$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
- "SerializeProperty": "=业务配置.项目ID"
+ "SerializeProperty": "=业务配置.版本ID"
}
}
]
@@ -116,7 +116,7 @@
]
}
],
- "ID": "1db86dd5-c0ad-4eb1-b62c-cd9b152cea1a"
+ "ID": "29f80a54-8d88-494d-b3e1-9a53927975d8"
},
{
"CommandList": [
@@ -137,12 +137,12 @@
]
}
],
- "ID": "9fb2e014-b0cc-4f2c-a093-ad0758a20c68"
+ "ID": "787e2797-117b-482b-bf96-0221c3e6e6fb"
}
]
}
],
- "ID": "093744d5-70ae-47de-8c84-dc30f86037b7"
+ "ID": "73a9052d-3a56-4f87-89cc-344aff591c52"
},
{
"CommandList": [
@@ -157,7 +157,7 @@
]
}
],
- "ID": "4c2dcd0b-2718-48df-89ff-bfae141b022e"
+ "ID": "737411cd-3680-4df2-9978-a1ad7e60e3a5"
}
]
}
diff --git a/UserFile/BaseCss.css b/UserFile/BaseCss.css
index f1d0268e..d4e046fb 100644
--- a/UserFile/BaseCss.css
+++ b/UserFile/BaseCss.css
@@ -114,7 +114,7 @@
}
/* 版本标签样式 */
-.versionTag label {
+.versionTag label,.versionTag a {
width: auto !important;
display: inline !important;
padding: 2px 6px;