From 1233ede848a354fe72a9a85639a6c666efa78ed0 Mon Sep 17 00:00:00 2001 From: liyang Date: Mon, 4 Nov 2024 17:41:25 +0800 Subject: [PATCH] + [task#131010] fix create and edit page. --- module/host/js/browse.ui.js | 4 +- module/host/ui/create.html.php | 63 ----------------------- module/host/ui/edit.html.php | 91 ++++------------------------------ 3 files changed, 11 insertions(+), 147 deletions(-) diff --git a/module/host/js/browse.ui.js b/module/host/js/browse.ui.js index 5453d6eb8c..9bb1612e56 100644 --- a/module/host/js/browse.ui.js +++ b/module/host/js/browse.ui.js @@ -3,9 +3,7 @@ window.renderCell = function(result, {col, row}) if(col.name === 'osVersion') { const{osName, osVersion} = row.data; - if(osName) result[0] = {html: hostLang[osName + 'List'][osVersion]}; - - return result; + if(osName && osVersion) result[0] = {html: hostLang[osName + 'List'][osVersion]}; } return result; diff --git a/module/host/ui/create.html.php b/module/host/ui/create.html.php index ed9364c1c6..2cf942fae1 100644 --- a/module/host/ui/create.html.php +++ b/module/host/ui/create.html.php @@ -16,7 +16,6 @@ formPanel ( set::id('hostCreateForm'), set::title($lang->host->create), - on::change('[name="CD"]')->call('showSpugConfig', jsRaw('this')), formRow ( setID('groupRow'), @@ -41,21 +40,11 @@ formPanel ( formGroup ( - setID('openName'), set::width('1/3'), set::name('name'), set::label($lang->host->name) ), formGroup - ( - setID('sshPort'), - setClass('hidden'), - set::width('1/3'), - set::label($lang->host->sshPort), - set::required(true), - set::name('sshPort') - ), - formGroup ( set::width('1/3'), set::label($lang->host->osName), @@ -64,35 +53,6 @@ formPanel set::items($lang->host->osNameList), set::value($osName ? $osName : $host->osName), on::change('osChange') - ), - formGroup - ( - setClass('useManual hidden'), - set::width('1/3'), - set::label($lang->host->osVersion), - set::control('picker'), - set::name('osVersion'), - set::items($lang->host->{"{$osName}List"}) - ) - ), - formRow - ( - setID('spugConfig'), - setClass('hidden'), - formGroup - ( - setID('admin'), - set::width('1/3'), - set::label($lang->host->admin), - set::name('admin'), - ), - formGroup - ( - set::width('1/3'), - set::label($lang->host->password), - set::name('password'), - set::required(true), - set::control('password') ) ), formRow @@ -105,26 +65,17 @@ formPanel ), formGroup ( - setClass('useSpug'), set::width('1/3'), set::label($lang->host->osVersion), set::control('picker'), set::name('osVersion'), set::items($lang->host->{"{$osName}List"}) - ), - formGroup - ( - setClass('useManual hidden'), - set::width('1/3'), - set::name('extranet'), - set::label($lang->host->extranet) ) ), formRow ( formGroup ( - setClass('useSpug'), set::width('1/3'), set::name('extranet'), set::label($lang->host->extranet) @@ -135,26 +86,12 @@ formPanel set::name('cpuNumber'), set::label($lang->host->cpuNumber), set::control(array('type' => 'number', 'min' => 1)) - ), - formGroup - ( - setClass('useManual hidden'), - set::width('1/3'), - set::name('memory'), - set::label($lang->host->memory), - set::control(array - ( - 'type' => 'inputControl', - 'suffix' => 'GB', - 'suffixWidth' => 40 - )) ) ), formRow ( formGroup ( - setClass('useSpug'), set::width('1/3'), set::name('memory'), set::label($lang->host->memory), diff --git a/module/host/ui/edit.html.php b/module/host/ui/edit.html.php index c57d59a9ef..72e8581371 100644 --- a/module/host/ui/edit.html.php +++ b/module/host/ui/edit.html.php @@ -18,7 +18,6 @@ formPanel ( set::id('hostEditForm'), set::title($lang->host->edit), - on::change('[name="CD"]')->call('showSpugConfig', jsRaw('this')), formRow ( setID('groupRow'), @@ -45,23 +44,12 @@ formPanel ( formGroup ( - setID('openName'), set::width('1/3'), set::name('name'), set::label($lang->host->name), set::value($host->name) ), formGroup - ( - setID('sshPort'), - setClass('hidden'), - set::width('1/3'), - set::label($lang->host->sshPort), - set::required(true), - set::name('sshPort'), - set::value(zget($host, 'sshPort') ? $host->sshPort : '') - ), - formGroup ( set::width('1/3'), set::label($lang->host->osName), @@ -70,38 +58,6 @@ formPanel set::items($lang->host->osNameList), set::value($osName ? $osName : $host->osName), on::change('osChange') - ), - formGroup - ( - setClass('useManual hidden'), - set::width('1/3'), - set::label($lang->host->osVersion), - set::control('picker'), - set::name('osVersion'), - set::items($lang->host->{"{$osName}List"}), - set::value($host->osVersion) - ) - ), - formRow - ( - setID('spugConfig'), - setClass('hidden'), - formGroup - ( - setID('admin'), - set::width('1/3'), - set::label($lang->host->account), - set::name('admin'), - set::value($host->admin) - ), - formGroup - ( - set::width('1/3'), - set::label($lang->host->password), - set::name('password'), - set::control('password'), - set::required(true), - set::value($lang->host->defaultPWD) ) ), formRow @@ -115,28 +71,18 @@ formPanel ), formGroup ( - setClass('useSpug'), set::width('1/3'), set::label($lang->host->osVersion), set::control('picker'), set::name('osVersion'), set::items($lang->host->{"{$osName}List"}), set::value($host->osVersion) - ), - formGroup - ( - setClass('useManual hidden'), - set::width('1/3'), - set::name('extranet'), - set::label($lang->host->extranet), - set::value($host->extranet) ) ), formRow ( formGroup ( - setClass('useSpug'), set::width('1/3'), set::name('extranet'), set::label($lang->host->extranet), @@ -165,35 +111,18 @@ formPanel )) ) ), - formRow + formGroup ( - formGroup + set::width('1/3'), + set::name('diskSize'), + set::label($lang->host->diskSize), + set::value(zget($host, 'diskSize', '') ? $host->diskSize : ''), + set::control(array ( - setClass('useSpug'), - set::width('1/3'), - set::name('memory'), - set::label($lang->host->memory), - set::value(zget($host, 'memory', '') ? $host->memory : ''), - set::control(array - ( - 'type' => 'inputControl', - 'suffix' => 'GB', - 'suffixWidth' => 40 - )) - ), - formGroup - ( - set::width('1/3'), - set::name('diskSize'), - set::label($lang->host->diskSize), - set::value(zget($host, 'diskSize', '') ? $host->diskSize : ''), - set::control(array - ( - 'type' => 'inputControl', - 'suffix' => 'GB', - 'suffixWidth' => 40 - )) - ) + 'type' => 'inputControl', + 'suffix' => 'GB', + 'suffixWidth' => 40 + )) ), formGroup (