diff --git a/.collaboration b/.collaboration index 1412def8..57465e89 100644 --- a/.collaboration +++ b/.collaboration @@ -658,19 +658,7 @@ }, { "ModuleName": "PCPage/项目版本管理", - "State": 1, - "LockedBy": { - "UserName": "cuckooent", - "Email": "phoben@qq.com" - }, - "LockDateTime": "2025-05-07T11:02:12.0608715+08:00", - "ModuleType": 1, - "ToRemoveFiles": [ - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本\\项目版本管理.json", - "Pages\\项目\\项目首页\\项目首页-容器页面\\项目版本\\项目版本管理.rd", - "Pages\\97bdc47834844e0d8f3a5aef747785e.json", - "Pages\\97bdc47834844e0d8f3a5aef747785e.rd" - ] + "ModuleType": 1 }, { "ModuleName": "Pages/项目/项目首页/项目首页-容器页面/任务容器页面", diff --git a/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json b/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json index 43861651..9f78f8fd 100644 --- a/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json +++ b/Pages/项目/项目首页/项目首页-容器页面/项目版本/项目版本管理.json @@ -537,19 +537,44 @@ } ], "SqlCondition": { - "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", - "ColumnBindingInfo": { - "TableName": "项目版本环境配置", - "ColumnName": "版本ID", - "GUID": "2d4fc22b-6b89-4c2b-bcb5-12486dfc36e8" - }, - "Value": { - "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", - "SerializeProperty": "=项目版本管理!当前版本" - } + "$type": "ForguncyDataAccess.RelationSqlCondition, ForguncyDataAccess", + "SubConditions": [ + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本环境配置", + "ColumnName": "项目ID", + "GUID": "ba221365-28c7-4e26-b9b4-6fe84d5abfb0" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目首页!项目ID" + } + }, + { + "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess", + "ColumnBindingInfo": { + "TableName": "项目版本环境配置", + "ColumnName": "版本ID", + "GUID": "2d4fc22b-6b89-4c2b-bcb5-12486dfc36e8" + }, + "Value": { + "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon", + "SerializeProperty": "=项目版本管理!当前版本" + } + } + ] }, - "NullFormulaValueQueryPolicy": 1, - "CustomColumns": [] + "CustomColumns": [ + "ID", + "配置项", + "类型", + "地址", + "端口", + "账号", + "密码", + "备注" + ] }, "autoGenerateColumnsByDataSource": false, "columns": [ @@ -825,7 +850,7 @@ "BreakpointIdentity": "229bd61c-f8f3-4af0-8e22-5fa8109e61d4" } ], - "ID": "5099d418-ff40-4634-a614-be399038e8ea" + "ID": "5e5b5fe2-c968-4cfb-9448-49267d0fba54" } ], "BreakpointIdentity": "4c7680a1-eea1-4ae5-a6e5-4ffcf0a40a7a" @@ -1108,4 +1133,4 @@ "Formula": "项目版本管理!$G$9" } ] -}//WjlXyo0Kg/64fkfben8pi6mP+8Ov86XaV1eUTovIksoTxyEbf3Rab/vpCCUTIz17O/YY30zf8Yp8amo3tNFQDpYW3cnWwrjhzekqA5FZouPsh3FpHzteiub74v4WpbzE/JyOLL/Ta2MJUUiyFook/nGDpXmCX/UdM+cFJEtyzMXYetgi54UBu/NQN1kzC3qNJBmv6kAR58naoWpw3WCayl8V/J7IYKm5AAxY4yK17aTgWW2qolCAHlOpG6KcmsTXjnuBtnthhzObj7XJWs7s79lqb3tuue0aDU8ZnqP/cmXg1ZCYr5aM3yvS0C8u2ffaitp7ewbTlPTKksQ00ccF6qU1gnFgTHm3B4m1C0Ge6fGOVAykkNwhlkeHsTOfmKI3kaHZ7k9YW/sEwj1Ceqhs3fUYQ1hAuYGzW7unksbfYp8JGG3hagEJiQVbaBsdatCDQ8nG0O5PBGiy/b6v5pZR8QoqLqEIeJsNFMjB8lKQhZGJn2dnyH/C+gfLO4ApvtsdRMgxC2xICYvY8e9oBLEIUNxXPKAILzzGEjoZgsG1vwDE9oACmpLIjCGOVwCV8OlDIUFpSy116NDJXCZ8ol5pDdRA2ROzuCUtDLMgr0G8pZE3zneDF8MCcQbmtfQzAJggg6/4g9KS9OBS/MXVWj25S4SZ4okTrdVTZKMqaYqmWBv/n12JzzDTvhI4KxslBo81vjiJitoxoI/N3Led/eDkU5yedWnfxj9pwjKNLJNmUlPOh8qGFjWLY8QnWP6nXDdwYdCvcGiSaagZUUUspj1Cihggm+GMp7FzfFeeePCcabdE8iZ9hmK0JhYDxLeiPwT+7WoxExiMnW/+2sVeN1kAZaAqd+N1sdDnE/LtcuQlgBSeXK13QNavxCZNI4cgBfwzyS2Q19Ij8h7IBsB+RnfN1g==|920 \ No newline at end of file +}//mFelVLZ+dFv6z9dSdRWdbLxwbcNfQSKFQMs9r9vEXgKbs03nMIJJsv2FZWXemH4rw/VZdlzTXgKADp+ALWJy0VimrnzkApEk8B6ybNr9p94avJA/k/4KVoWTy5P9xy12qDXOHmdDqvugLawlD1ACQ47deXulFl87z+WMxhFaxgd35mzGOEEcqMOhTy+qRXgb8KaQNMQuzHwkcqMyTna86IRJvq9GdA9dlKV7Mn1yJ7Kwncusr222s9NBS1+CRYwwSp51ZHifXZthgHxWu+5/dE2iFl9yL8IrZsnNnw9zd+k4Yy5bRX829VEiWeiOWy7FpzWPAgDrOBh80QokeS4B0cBLIzVvJqsR9R4P5ssxTihejOQpl8yC3TL6QwITh2GbP2LJAL6KEccsVd6xfT5VD8d0oKtdZqwFxL34C75P+V5kWxig04ucg0CZKIBGRmeLXMAnOY1t0yJZbr/5EM/kRrRZaGEP2YS9JLvHpmcjDO2L3tpv3asg64OGZEH6fE4+mEFQHNmfn2ySjem9F8M38VdBhXp+fPhWGDU4llJeEm2PKd/uSOavQvCGZMz0aVm1n43X2/FqDkRswAUK0a1GNaUS7Fl19l0tr0up7fRJwjsZ8F60xJKlCSdf3UVZ8wVJmotdCBe5dBrDvU+XfBKynfgOajz8ZxRoOrZ+Og9N2xwH3rqwMdka6sAn7vlHH8Lkn91oq+hQouzxcFB4Zhpxiryd9oYtECfzaZsblh2wGDM4Z/Kc7b39mSIBdothj3WfL/oyFQLcDedShxnpa+gC6kZX3J/TNS7r5w6GBJZAz60wuHED6RYC8Eeu6wbEoSLMSw/IEQywXy2YbLupJQUKoZI8OOIZhqCgjbekVzRSERiAnH0sN1EdFlo0J13fMHZkhJLyJXZcSeFsdZv5NfrT9Q==|920 \ No newline at end of file