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

* Remove , at the end of row in the lastest children in space.

Browse Source
This commit is contained in:
liumengyi
2023-11-14 15:20:52 +08:00
parent 55545cb514
commit 78a478ce5b
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/space/ui/browse.html.php
+6 -6
View File
@@ -25,7 +25,7 @@ $instances = initTableData($instances, $config->space->dtable->fieldList, $this-
featureBar
(
set::current($browseType),
set::linkParams("spaceID=&browseType={key}"),
set::linkParams("spaceID=&browseType={key}")
);
$app->loadLang('solution');
@@ -39,22 +39,22 @@ toolBar
'url' => createLink('install', 'progress', "solutionID=$solutionID&install=true"),
'data-size' => 'md',
'data-class-name' => 'install-progress',
'data-toggle' => 'modal',
'data-toggle' => 'modal'
))) : null,
$config->inQuickon && $canInstall ? item(set(array
(
'text' => $lang->store->cloudStore,
'icon' => 'program',
'class' => 'btn ghost',
'url' => createLink('store', 'browse'),
'url' => createLink('store', 'browse')
))) : null,
$canInstall ? item(set(array
(
'text' => $lang->space->install,
'icon' => 'plus',
'class' => 'btn primary',
'url' => createLink('space', 'createApplication'),
))) : null,
'url' => createLink('space', 'createApplication')
))) : null
);
dtable
@@ -65,7 +65,7 @@ dtable
set::onRenderCell(jsRaw('window.renderInstanceList')),
set::sortLink(createLink('space', 'browse', "spaceID=&browseType={$browseType}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBys($orderBy),
set::footPager(usePager()),
set::footPager(usePager())
);
a(setStyle('display', 'none'), setID('editLinkContainer'), setData('toggle', 'modal'));
module/space/ui/createapplication.html.php
+22 -23
View File
@@ -53,7 +53,7 @@ if($config->inQuickon)
set::value($appID ? $appID : $defaultApp),
set::disabled(!!$appID),
set::required(true),
on::change('onChangeStoreAppType'),
on::change('onChangeStoreAppType')
)
),
formRow
@@ -68,7 +68,7 @@ if($config->inQuickon)
set::control('radioListInline'),
set::items(array(array('text' => $lang->store->common, 'value' => 'store'), array('text' => $lang->space->handConfig, 'value' => 'external'))),
set::required(true),
on::change('onChangeType'),
on::change('onChangeType')
)
),
formRow
@@ -81,7 +81,7 @@ if($config->inQuickon)
set::name('customName'),
set::control('input'),
set::value($appID ? $apps[$appID] : ''),
set::required(true),
set::required(true)
)
),
$showVersion ? formGroup
@@ -102,7 +102,7 @@ if($config->inQuickon)
input
(
set::type('hidden'),
set::name('version'),
set::name('version')
)
),
formRow
@@ -118,11 +118,11 @@ if($config->inQuickon)
(
setClass('form-control'),
set::name('customDomain'),
set::value($thirdDomain),
set::value($thirdDomain)
),
$this->cne->sysDomain(),
),
),
$this->cne->sysDomain()
)
)
),
formRow
(
@@ -143,8 +143,7 @@ if($config->inQuickon)
set::target('_blank'),
$lang->instance->howToSelectDB
)
),
)
),
formRow
(
@@ -155,9 +154,9 @@ if($config->inQuickon)
set::label($lang->space->instanceType),
set::name('dbService'),
set::items(array()),
set::required(true),
),
),
set::required(true)
)
)
);
}
@@ -175,7 +174,7 @@ formPanel
set::name('appType'),
set::items($lang->space->appType),
set::required(true),
on::change('onChangeAppType'),
on::change('onChangeAppType')
),
$config->inQuickon ? formGroup
(
@@ -185,14 +184,14 @@ formPanel
set::control('radioListInline'),
set::items(array(array('text' => $lang->store->common, 'value' => 'store'), array('text' => $lang->space->handConfig, 'value' => 'external'))),
set::required(true),
on::change('onChangeType'),
on::change('onChangeType')
) : null,
formGroup
(
set::width($colWidth),
set::label($lang->gitlab->name),
set::name('name'),
set::required(true),
set::required(true)
),
formGroup
(
@@ -210,8 +209,8 @@ formPanel
set::width($colWidth),
set::label($lang->user->account),
set::name('account'),
set::required(true),
),
set::required(true)
)
),
formRow
(
@@ -222,8 +221,8 @@ formPanel
set::label($lang->gitlab->token),
set::name('token'),
set::placeholder($lang->gitlab->placeholder->token),
set::required(true),
),
set::required(true)
)
),
formRow
(
@@ -232,9 +231,9 @@ formPanel
(
set::width($colWidth),
set::label($lang->user->password),
set::name('password'),
),
),
set::name('password')
)
)
);
render();