mirrors/buildadmin
1
0
Fork 0
mirror of https://gitee.com/wonderful-code/buildadmin synced 2024-11-22 07:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat:模块安装时在模块的ini文件内标记依赖待安装

Browse Source
This commit is contained in:
妙码生花 2022-08-17 11:45:53 +08:00
parent 100d5abd0f
commit 7991098880
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
extend/ba/module/Manage.php
View File

@ -150,6 +150,7 @@ class Manage
*/
public function conflictHandle()
{
$info = $this->getInfo();
// 文件冲突
$fileConflict = Server::getFileList($this->modulesDir, true);
// 依赖冲突
@ -223,20 +224,31 @@ class Manage
}
if ($installDepend) {
$npm = false;
$composer = false;
foreach ($installDepend as $key => $item) {
if ($key == 'require') {
$composer = true;
$dependObj->addComposerRequire($item, false, true);
} elseif ($key == 'require-dev') {
$composer = true;
$dependObj->addComposerRequire($item, true, true);
} elseif ($key == 'dependencies') {
$npm = true;
$dependObj->addNpmDependencies($item, false, true);
} elseif ($key == 'devDependencies') {
$npm = true;
$dependObj->addNpmDependencies($item, true, true);
}
}
$this->setInfo([
'state' => self::DEPENDENT_WAIT_INSTALL,
]);
if ($npm) {
$info['npm_dependent_wait_install'] = 1;
}
if ($composer) {
$info['composer_dependent_wait_install'] = 1;
}
$info['state'] = self::DEPENDENT_WAIT_INSTALL;
$this->setInfo([], $info);
}
// 备份将被覆盖的文件