This commit is contained in:
全栈小学生 2025-03-14 09:37:46 +08:00
parent 6ee13de48e
commit a9de59b00a
2 changed files with 5 additions and 1 deletions

View File

@ -197,6 +197,7 @@ class UpgradeService extends BaseAdminService
if (!$this->upgrade_task) return true;
$steps = isset($this->upgrade_task['steps']) ? array_keys($this->upgrade_task['steps']) : array_keys($this->steps);
if (isset($this->upgrade_task['steps'])) $this->steps = $this->upgrade_task['steps'];
$index = array_search($this->upgrade_task['step'], $steps);
$step = $steps[ $index + 1 ] ?? '';
$params = $this->upgrade_task['params'] ?? [];

View File

@ -79,8 +79,11 @@ trait WapTrait
$addon_arr[] = $v[ 'key' ];
}
}
$addon_arr[] = $addon; // 追加新装插件
if(!empty($addon)) {
$addon_arr[] = $addon; // 追加新装插件
}
$addon_arr = array_unique($addon_arr);
foreach ($addon_arr as $k => $v) {
$addon_path = $compile_path . str_replace('/', DIRECTORY_SEPARATOR, 'addon/' . $v . '/components/diy'); // 插件自定义组件根目录
$addon_file_arr = getFileMap($addon_path);