Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ [task#131010] fix create and edit page.

Browse Source
This commit is contained in:
liyang
2024-11-08 08:31:19 +08:00
committed by 李阳
parent 3bc1838a37
commit 1233ede848
3 changed files with 11 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/host/js/browse.ui.js
+1 -3
View File
@@ -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;
module/host/ui/create.html.php
-63
View File
@@ -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),
module/host/ui/edit.html.php
+10 -81
View File
@@ -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
(