From 926d1a1a4f06271cb39de001d74c68832fc004c7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 26 三月 2024 17:12:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/ProjectWeb/src/views/base/uiDefineVO.js | 363 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 277 insertions(+), 86 deletions(-)
diff --git a/Source/ProjectWeb/src/views/base/uiDefineVO.js b/Source/ProjectWeb/src/views/base/uiDefineVO.js
index 204d860..697d06d 100644
--- a/Source/ProjectWeb/src/views/base/uiDefineVO.js
+++ b/Source/ProjectWeb/src/views/base/uiDefineVO.js
@@ -1085,55 +1085,6 @@
"checkOutBy": null,
"checkOutTime": null,
"componentVOs": [
-
- {
- "btmname": null,
- "buttons": [],
- "checkInBy": null,
- "checkInTime": null,
- "checkOutBy": null,
- "checkOutTime": null,
- "copyFromVersion": null,
- "createTime": null,
- "creator": null,
- "customClass": "I:processreview#DepartmentProcessReview_web?param=xxx",
- "data": null,
- "description": "",
- "extendAttr": "",
- "firstR": null,
- "firstV": null,
- "formDefineVO": null,
- "id": null,
- "lastModifier": null,
- "lastModifyTime": null,
- "lastR": null,
- "lastV": null,
- "lcStatus": null,
- "lcStatusText": null,
- "lctid": null,
- "name": "鑷畾涔夋樉绀�",
- "nameOid": null,
- "oid": "A05C554A-5589-F964-2004-15CB05CBEE6D",
- "orderNum": 2,
- "owner": null,
- "pkLayout": "C08F5364-F23D-9602-2165-2487E3DD9E0C",
- "revisionOid": null,
- "revisionRule": null,
- "revisionSeq": 0,
- "revisionValue": null,
- "secretGrade": null,
- "secretGradeText": null,
- "tableDefineVO": null,
- "treeDefineVO": null,
- "treeTableDefineVO": null,
- "ts": null,
- "uiComponentType": "customer",
- "uiComponentTypeText": "鑷畾涔夋ā鏉�",
- "uiParseClass": "",
- "versionRule": null,
- "versionSeq": 0,
- "versionValue": null
- },
{
"btmname": null,
"buttons": [
@@ -2619,6 +2570,54 @@
"versionRule": null,
"versionSeq": 0,
"versionValue": null
+ },
+ {
+ "btmname": null,
+ "buttons": [],
+ "checkInBy": null,
+ "checkInTime": null,
+ "checkOutBy": null,
+ "checkOutTime": null,
+ "copyFromVersion": null,
+ "createTime": null,
+ "creator": null,
+ "customClass": "test2:processreview#DepartmentProcessReview_web?param=xxx",
+ "data": null,
+ "description": "",
+ "extendAttr": "",
+ "firstR": null,
+ "firstV": null,
+ "formDefineVO": null,
+ "id": null,
+ "lastModifier": null,
+ "lastModifyTime": null,
+ "lastR": null,
+ "lastV": null,
+ "lcStatus": null,
+ "lcStatusText": null,
+ "lctid": null,
+ "name": "鑷畾涔夋樉绀�",
+ "nameOid": null,
+ "oid": "A05C554A-5589-F964-2004-15CB05CBEE6D",
+ "orderNum": 2,
+ "owner": null,
+ "pkLayout": "C08F5364-F23D-9602-2165-2487E3DD9E0C",
+ "revisionOid": null,
+ "revisionRule": null,
+ "revisionSeq": 0,
+ "revisionValue": null,
+ "secretGrade": null,
+ "secretGradeText": null,
+ "tableDefineVO": null,
+ "treeDefineVO": null,
+ "treeTableDefineVO": null,
+ "ts": null,
+ "uiComponentType": "customer",
+ "uiComponentTypeText": "鑷畾涔夋ā鏉�",
+ "uiParseClass": "",
+ "versionRule": null,
+ "versionSeq": 0,
+ "versionValue": null
}
],
"copyFromVersion": null,
@@ -3188,42 +3187,7 @@
"versionRule": null,
"versionSeq": 0,
"versionValue": null
- }
- ],
- "checkInBy": null,
- "checkInTime": null,
- "checkOutBy": null,
- "checkOutTime": null,
- "copyFromVersion": null,
- "createTime": "2022-02-08 10:40:50.000",
- "creator": "developer",
- "data": null,
- "description": "",
- "eastAreas": null,
- "firstR": null,
- "firstV": null,
- "id": "ProcessReviewList_web",
- "lastModifier": "developer",
- "lastModifyTime": "2022-07-18 17:30:51.000",
- "lastR": null,
- "lastV": null,
- "lcStatus": null,
- "lcStatusText": null,
- "lctid": null,
- "linkTypeFlag": false,
- "linkTypeId": null,
- "name": "宸ヨ壓璇勫鍒楄〃_web",
- "nameOid": null,
- "northAreas": [],
- "oid": "DBB13AF7-021F-ED27-B285-03E8599548EB",
- "owner": null,
- "revisionOid": null,
- "revisionRule": null,
- "revisionSeq": 0,
- "revisionValue": null,
- "secretGrade": null,
- "secretGradeText": null,
- "southAreas": [
+ },
{
"btmname": null,
"checkInBy": null,
@@ -3882,7 +3846,234 @@
"versionRule": null,
"versionSeq": 0,
"versionValue": null
- }
+ },
+ {
+ "btmname": null,
+ "checkInBy": null,
+ "checkInTime": null,
+ "checkOutBy": null,
+ "checkOutTime": null,
+ "componentVOs": [
+ {
+ "btmname": null,
+ "buttons": [],
+ "checkInBy": null,
+ "checkInTime": null,
+ "checkOutBy": null,
+ "checkOutTime": null,
+ "copyFromVersion": null,
+ "createTime": null,
+ "creator": null,
+ "customClass": "test:processreview#DepartmentProcessReview_web?param=xxx",
+ "data": null,
+ "description": "",
+ "extendAttr": "",
+ "firstR": null,
+ "firstV": null,
+ "formDefineVO": null,
+ "id": null,
+ "lastModifier": null,
+ "lastModifyTime": null,
+ "lastR": null,
+ "lastV": null,
+ "lcStatus": null,
+ "lcStatusText": null,
+ "lctid": null,
+ "name": "鑷畾涔夋樉绀�",
+ "nameOid": null,
+ "oid": "A05C554A-5589-F964-2004-15CB05CBEE6D",
+ "orderNum": 2,
+ "owner": null,
+ "pkLayout": "C08F5364-F23D-9602-2165-2487E3DD9E0C",
+ "revisionOid": null,
+ "revisionRule": null,
+ "revisionSeq": 0,
+ "revisionValue": null,
+ "secretGrade": null,
+ "secretGradeText": null,
+ "tableDefineVO": null,
+ "treeDefineVO": null,
+ "treeTableDefineVO": null,
+ "ts": null,
+ "uiComponentType": "customer",
+ "uiComponentTypeText": "鑷畾涔夋ā鏉�",
+ "uiParseClass": "",
+ "versionRule": null,
+ "versionSeq": 0,
+ "versionValue": null
+ }
+ ],
+ "copyFromVersion": null,
+ "createTime": "2022-02-08 10:40:50.000",
+ "creator": "developer",
+ "data": null,
+ "description": "",
+ "displayExpression": "",
+ "enableStatus": true,
+ "extendAttr": "",
+ "firstR": null,
+ "firstV": null,
+ "id": "2",
+ "international": null,
+ "lastModifier": "developer",
+ "lastModifyTime": "2022-07-18 17:30:52.000",
+ "lastR": null,
+ "lastV": null,
+ "layoutAreaType": "center",
+ "layoutAreaTypeText": null,
+ "lcStatus": null,
+ "lcStatusText": null,
+ "lctid": null,
+ "name": "鑷畾涔�",
+ "nameOid": null,
+ "oid": "90D6FE27-C15F-CEFF-3F5E-CB349F7954EE",
+ "orderNum": 2,
+ "owner": null,
+ "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB",
+ "revisionOid": null,
+ "revisionRule": null,
+ "revisionSeq": 0,
+ "revisionValue": null,
+ "secretGrade": null,
+ "secretGradeText": null,
+ "title": "鑷畾涔�",
+ "ts": null,
+ "uiParseClass": "",
+ "versionRule": null,
+ "versionSeq": 0,
+ "versionValue": null
+ },
+ ],
+ "checkInBy": null,
+ "checkInTime": null,
+ "checkOutBy": null,
+ "checkOutTime": null,
+ "copyFromVersion": null,
+ "createTime": "2022-02-08 10:40:50.000",
+ "creator": "developer",
+ "data": null,
+ "description": "",
+ "eastAreas": null,
+ "firstR": null,
+ "firstV": null,
+ "id": "ProcessReviewList_web",
+ "lastModifier": "developer",
+ "lastModifyTime": "2022-07-18 17:30:51.000",
+ "lastR": null,
+ "lastV": null,
+ "lcStatus": null,
+ "lcStatusText": null,
+ "lctid": null,
+ "linkTypeFlag": false,
+ "linkTypeId": null,
+ "name": "宸ヨ壓璇勫鍒楄〃_web",
+ "nameOid": null,
+ "northAreas": [],
+ "oid": "DBB13AF7-021F-ED27-B285-03E8599548EB",
+ "owner": null,
+ "revisionOid": null,
+ "revisionRule": null,
+ "revisionSeq": 0,
+ "revisionValue": null,
+ "secretGrade": null,
+ "secretGradeText": null,
+ "southAreas": [
+ {
+ "btmname": null,
+ "checkInBy": null,
+ "checkInTime": null,
+ "checkOutBy": null,
+ "checkOutTime": null,
+ "componentVOs": [
+ {
+ "btmname": null,
+ "buttons": [],
+ "checkInBy": null,
+ "checkInTime": null,
+ "checkOutBy": null,
+ "checkOutTime": null,
+ "copyFromVersion": null,
+ "createTime": null,
+ "creator": null,
+ "customClass": "UI:processreview#DepartmentProcessReview_web?param=xxx",
+ "data": null,
+ "description": "",
+ "extendAttr": "",
+ "firstR": null,
+ "firstV": null,
+ "formDefineVO": null,
+ "id": null,
+ "lastModifier": null,
+ "lastModifyTime": null,
+ "lastR": null,
+ "lastV": null,
+ "lcStatus": null,
+ "lcStatusText": null,
+ "lctid": null,
+ "name": "鑷畾涔夋樉绀�",
+ "nameOid": null,
+ "oid": "A05C554A-5589-F964-2004-15CB05CBEE6D",
+ "orderNum": 2,
+ "owner": null,
+ "pkLayout": "C08F5364-F23D-9602-2165-2487E3DD9E0C",
+ "revisionOid": null,
+ "revisionRule": null,
+ "revisionSeq": 0,
+ "revisionValue": null,
+ "secretGrade": null,
+ "secretGradeText": null,
+ "tableDefineVO": null,
+ "treeDefineVO": null,
+ "treeTableDefineVO": null,
+ "ts": null,
+ "uiComponentType": "customer",
+ "uiComponentTypeText": "鑷畾涔夋ā鏉�",
+ "uiParseClass": "",
+ "versionRule": null,
+ "versionSeq": 0,
+ "versionValue": null
+ }
+ ],
+ "copyFromVersion": null,
+ "createTime": "2022-02-08 10:40:50.000",
+ "creator": "developer",
+ "data": null,
+ "description": "",
+ "displayExpression": "",
+ "enableStatus": true,
+ "extendAttr": "",
+ "firstR": null,
+ "firstV": null,
+ "id": "2",
+ "international": null,
+ "lastModifier": "developer",
+ "lastModifyTime": "2022-07-18 17:30:52.000",
+ "lastR": null,
+ "lastV": null,
+ "layoutAreaType": "center",
+ "layoutAreaTypeText": null,
+ "lcStatus": null,
+ "lcStatusText": null,
+ "lctid": null,
+ "name": "璇勫闂鍒楄〃",
+ "nameOid": null,
+ "oid": "90D6FE27-C15F-CEFF-3F5E-CB349F7954EE",
+ "orderNum": 2,
+ "owner": null,
+ "pkContent": "DBB13AF7-021F-ED27-B285-03E8599548EB",
+ "revisionOid": null,
+ "revisionRule": null,
+ "revisionSeq": 0,
+ "revisionValue": null,
+ "secretGrade": null,
+ "secretGradeText": null,
+ "title": "璇勫闂鍒楄〃",
+ "ts": null,
+ "uiParseClass": "",
+ "versionRule": null,
+ "versionSeq": 0,
+ "versionValue": null
+ },
],
"ts": null,
"versionRule": null,
--
Gitblit v1.9.3