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

This commit is contained in:
liumengyi
2023-11-14 15:12:51 +08:00
parent f2d9be04bc
commit a7eb3bf00c
18 changed files with 125 additions and 125 deletions
+9 -9
View File
@@ -60,7 +60,7 @@ elseif($suffix == 'binary')
set::href($this->repo->createLink('download', "repoID=$repoID&path=" . $this->repo->encodePath($entry) . "&fromRevision=$revision")),
icon('download'),
set::target('_blank'),
set::title($this->lang->repo->download),
set::title($this->lang->repo->download)
)
);
}
@@ -73,7 +73,7 @@ else
'autoIndent' => true,
'contextmenu' => true,
'automaticLayout' => true,
'EditorMinimapOptions' => array('enabled' => false),
'EditorMinimapOptions' => array('enabled' => false)
);
if($type == 'diff') $options = array(
'language' => $lang,
@@ -82,7 +82,7 @@ else
'contextmenu' => true,
'automaticLayout' => true,
'renderSideBySide' => false,
'EditorMinimapOptions' => array('enabled' => false),
'EditorMinimapOptions' => array('enabled' => false)
);
$wg = monaco
(
@@ -114,14 +114,14 @@ $logWg = div
btn
(
setClass('ghost text-black bg-light bg-opacity-50'),
set::icon('ellipsis-v rotate-90'),
set::icon('ellipsis-v rotate-90')
),
set::items
(
$dropMenus
),
) : '',
),
)
) : ''
)
);
$relatedWg = div
@@ -140,8 +140,8 @@ $relatedWg = div
set::key('tab1'),
set::title(''),
tableData()
),
),
)
)
),
div(set::className('table-empty-tip'), p($this->lang->repo->notRelated))
);
+8 -8
View File
@@ -19,7 +19,7 @@ $breadcrumbItems[] = h::a
(
set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID")),
set('data-app', $app->tab),
$repo->name,
$repo->name
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
@@ -33,7 +33,7 @@ foreach($paths as $pathName)
(
set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath))),
set('data-app', $app->tab),
trim($pathName, '/'),
trim($pathName, '/')
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
}
@@ -42,7 +42,7 @@ if($fileName) $breadcrumbItems[] = h::span($fileName);
$breadcrumbItems[] = h::span
(
setClass('ml-2 label secondary'),
html($revisionName),
html($revisionName)
);
foreach($blames as $key => $blame)
@@ -97,15 +97,15 @@ panel
set::items($encodes),
set::arrow(true),
set::flip(true),
set::placement('bottom-end'),
),
),
set::placement('bottom-end')
)
)
),
dtable
(
set::cols($config->repo->blameDtable->fieldList),
set::data($blames),
),
set::data($blames)
)
);
render();
+25 -25
View File
@@ -53,7 +53,7 @@ $breadcrumbItems[] = h::a
(
set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID")),
set('data-app', $app->tab),
$repo->name,
$repo->name
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
@@ -67,7 +67,7 @@ foreach($paths as $index => $pathName)
(
set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath))),
set('data-app', $app->tab),
trim($pathName, '/'),
trim($pathName, '/')
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
}
@@ -90,8 +90,8 @@ if($fileName) $breadcrumbItems[] = h::span($fileName);
setID('repoBranchDropMenu'),
set::objectID($selected),
set::text($selected),
set::data(array('data' => $menuData, 'tabs' => $tabs)),
) : null,
set::data(array('data' => $menuData, 'tabs' => $tabs))
) : null
),
...$breadcrumbItems
);
@@ -122,18 +122,18 @@ $downloadWg = div
set::type('text'),
set::name('svnUrl'),
set::value($cloneUrl->svn),
set::readOnly(true),
),
set::readOnly(true)
)
),
formGroup
(
set::width('50px'),
btn
(
set::icon('copy'),
set::icon('copy')
)
)
),
)
) : null,
!empty($cloneUrl->ssh) ? div
@@ -149,8 +149,8 @@ $downloadWg = div
set::type('text'),
set::name('sshUrl'),
set::value($cloneUrl->ssh),
set::readOnly(true),
),
set::readOnly(true)
)
),
formGroup
(
@@ -158,10 +158,10 @@ $downloadWg = div
btn
(
set::className('copy-btn'),
set::icon('copy'),
set::icon('copy')
)
)
),
)
) : null,
!empty($cloneUrl->http) ? div
@@ -177,8 +177,8 @@ $downloadWg = div
set::type('text'),
set::name('httpUrl'),
set::value($cloneUrl->http),
set::readOnly(true),
),
set::readOnly(true)
)
),
formGroup
(
@@ -186,10 +186,10 @@ $downloadWg = div
btn
(
set::className('copy-btn'),
set::icon('copy'),
set::icon('copy')
)
)
),
)
) : null,
div
@@ -199,9 +199,9 @@ $downloadWg = div
(
set::icon('down-circle'),
set::className('downloadZip-btn'),
set::text($lang->repo->downloadZip),
set::text($lang->repo->downloadZip)
)
),
)
);
toolbar
@@ -223,17 +223,17 @@ toolbar
to::items
(
array($downloadWg)
),
)
),
hasPriv('repo', 'create') && $app->tab == 'project' ? item
(
set($createItem + array
(
'icon' => 'plus',
'class' => 'btn primary',
'class' => 'btn primary'
)),
set('data-app', $this->app->tab),
) : null,
set('data-app', $this->app->tab)
) : null
);
dtable
@@ -242,7 +242,7 @@ dtable
set::data($tableData),
set::onRenderCell(jsRaw('window.renderCell')),
set::canRowCheckable(jsRaw('function(rowID){return false;}')),
set::footPager(),
set::footPager()
);
/* zin: Define the sidebar in main content. */
@@ -280,8 +280,8 @@ sidebar
set::footToolbar($footToolbar),
set::footer(array('toolbar', 'flex', 'pager')),
set::footPager(usePager('pager', 'noTotalCount')),
set::showToolbarOnChecked(false),
),
set::showToolbarOnChecked(false)
)
);
render();
+15 -15
View File
@@ -46,7 +46,7 @@ formPanel
set::control(array("type" => "picker","multiple" => true)),
set::items($products),
set::value(empty($objectID) ? '' : implode(',', array_keys($products)))
),
)
),
formGroup
(
@@ -73,8 +73,8 @@ formPanel
h::span
(
setClass('tips-git leading-8 ml-2'),
html($lang->repo->syncTips),
),
html($lang->repo->syncTips)
)
),
formRow
(
@@ -88,7 +88,7 @@ formPanel
set::value(""),
set::control("picker"),
set::items($serviceHosts)
),
)
),
formRow
(
@@ -99,8 +99,8 @@ formPanel
set::name("serviceProject"),
set::items(array()),
set::label($lang->repo->serviceProject),
set::control("picker"),
),
set::control("picker")
)
),
formGroup
(
@@ -120,8 +120,8 @@ formPanel
set::label($lang->repo->path),
set::required(true),
set::control("text"),
set::placeholder($lang->repo->example->path->git),
),
set::placeholder($lang->repo->example->path->git)
)
),
formGroup
(
@@ -131,7 +131,7 @@ formPanel
set::required(true),
set::value("utf-8"),
set::control("text"),
set::placeholder($lang->repo->encodingsTips),
set::placeholder($lang->repo->encodingsTips)
),
formRow
(
@@ -143,7 +143,7 @@ formPanel
set::label($lang->repo->client),
set::required(true),
set::control("text")
),
)
),
formRow
(
@@ -154,7 +154,7 @@ formPanel
set::name("account"),
set::label($lang->user->account),
set::control("text")
),
)
),
formRow
(
@@ -189,7 +189,7 @@ formPanel
set::name("desc"),
set::label($lang->story->spec),
set::control("input"),
set::placeholder($lang->repo->descPlaceholder),
set::placeholder($lang->repo->descPlaceholder)
),
formRow
(
@@ -202,7 +202,7 @@ formPanel
set::control('radioList'),
set::items($lang->repo->aclList),
set::value('open'),
on::change('onAclChange'),
on::change('onAclChange')
)
),
formRow
@@ -240,8 +240,8 @@ formPanel
))),
setClass('mt-2')
)
),
),
)
)
);
render();
+1 -1
View File
@@ -48,7 +48,7 @@ formPanel
(
set::name('name'),
set::label($lang->repo->branchName),
set::required(true),
set::required(true)
),
set::actions(array('submit'))
);
+9 -9
View File
@@ -46,7 +46,7 @@ formPanel
set::control(array("type" => "picker","multiple" => true)),
set::items($products),
set::value(empty($objectID) ? '' : implode(',', array_keys($products)))
),
)
),
formGroup
(
@@ -69,7 +69,7 @@ formPanel
set::value(""),
set::control("picker"),
set::items($serviceHosts)
),
)
),
formGroup
(
@@ -78,7 +78,7 @@ formPanel
set::label($lang->repo->namespace),
set::required(true),
set::items($repoGroups),
set::control("picker"),
set::control("picker")
),
formRow
(
@@ -91,8 +91,8 @@ formPanel
set::label($lang->repo->client),
set::required(true),
set::control("text"),
set::placeholder($lang->repo->example->client->git),
),
set::placeholder($lang->repo->example->client->git)
)
),
formGroup
(
@@ -108,7 +108,7 @@ formPanel
set::name("desc"),
set::label($lang->story->spec),
set::control("input"),
set::placeholder($lang->repo->descPlaceholder),
set::placeholder($lang->repo->descPlaceholder)
),
formRow
(
@@ -121,7 +121,7 @@ formPanel
set::control('radioList'),
set::items($lang->repo->aclList),
set::value('open'),
on::change('onAclChange'),
on::change('onAclChange')
)
),
formRow
@@ -159,8 +159,8 @@ formPanel
))),
setClass('mt-2')
)
),
),
)
)
);
render();
+5 -5
View File
@@ -41,7 +41,7 @@ $breadcrumbItems[] = h::a
(
set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID"), $repo->name, '', "data-app='{$app->tab}'"),
set('data-app', $app->tab),
$repo->name,
$repo->name
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
@@ -58,7 +58,7 @@ foreach($paths as $pathName)
(
set::href($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath))),
set('data-app', $app->tab),
trim($pathName, '/'),
trim($pathName, '/')
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
@@ -110,7 +110,7 @@ else
setStyle('width', '160px'),
set::name('oldRevision'),
set::value($oldRevision),
set::placeholder($lang->repo->source),
set::placeholder($lang->repo->source)
);
$breadcrumbItems[] = span(setClass('label label-exchange mr-2'), icon('exchange'));
$breadcrumbItems[] = input
@@ -119,7 +119,7 @@ else
setStyle('width', '160px'),
set::name('newRevision'),
set::value($newRevision),
set::placeholder($lang->repo->target),
set::placeholder($lang->repo->target)
);
$breadcrumbItems[] = btn
(
@@ -135,7 +135,7 @@ else
(
backBtn(set::icon('back'), setClass('bg-transparent diff-back-btn'), set::back('GLOBAL'), $lang->goback),
item(set::type('divider')),
...$breadcrumbItems,
...$breadcrumbItems
);
if($diffs) include 'diffeditor.html.php';
+6 -6
View File
@@ -51,10 +51,10 @@ div(
icon
(
'close',
set::className('monaco-close'),
set::className('monaco-close')
)
),
div(set::id('tab-' . $currentEntry)),
div(set::id('tab-' . $currentEntry))
),
dropdown
(
@@ -65,15 +65,15 @@ div(
btn
(
setClass('ghost text-black pull-right'),
set::icon('ellipsis-v rotate-90'),
set::icon('ellipsis-v rotate-90')
),
set::items
(
$dropMenus
),
)
),
div(set::className('absolute top-0 left-0 z-20 arrow-left btn-left'), icon('chevron-left')),
div(set::className('absolute top-0 right-0 z-20 arrow-right btn-right'), icon('chevron-right')),
div(set::className('absolute top-0 right-0 z-20 arrow-right btn-right'), icon('chevron-right'))
)
);
@@ -90,7 +90,7 @@ sidebar
set::expandedIcon('folder-open'),
set::normalIcon('file-text-alt'),
set::activeKey($entry),
set::onClickItem(jsRaw('window.treeClick')),
set::onClickItem(jsRaw('window.treeClick'))
)
);
+18 -18
View File
@@ -59,8 +59,8 @@ formPanel
h::span
(
setClass('tips-git leading-8 ml-2'),
html($lang->repo->syncTips),
),
html($lang->repo->syncTips)
)
),
formRow
(
@@ -73,8 +73,8 @@ formPanel
set::required(true),
set::value(isset($repo->gitService) ? $repo->gitService : ''),
set::control("picker"),
set::items(!empty($serviceHosts) ? $serviceHosts : array()),
),
set::items(!empty($serviceHosts) ? $serviceHosts : array())
)
),
formRow
(
@@ -87,8 +87,8 @@ formPanel
set::required(true),
set::control("picker"),
set::items(!empty($projects) ? $projects : array()),
set::value(isset($repo->project) ? $repo->project : ''),
),
set::value(isset($repo->project) ? $repo->project : '')
)
),
formGroup
(
@@ -97,7 +97,7 @@ formPanel
set::label($lang->user->name),
set::required(true),
set::control("text"),
set::value($repo->name),
set::value($repo->name)
),
formRow
(
@@ -110,8 +110,8 @@ formPanel
set::required(true),
set::control("text"),
set::placeholder($lang->repo->example->path->git),
set::value($repo->path),
),
set::value($repo->path)
)
),
formGroup
(
@@ -121,7 +121,7 @@ formPanel
set::required(true),
set::value($repo->encoding),
set::control("text"),
set::placeholder($lang->repo->encodingsTips),
set::placeholder($lang->repo->encodingsTips)
),
formRow
(
@@ -133,8 +133,8 @@ formPanel
set::label($lang->repo->client),
set::required(true),
set::control("text"),
set::value($repo->client),
),
set::value($repo->client)
)
),
formRow
(
@@ -145,8 +145,8 @@ formPanel
set::name("account"),
set::label($lang->user->account),
set::control("text"),
set::value($repo->account),
),
set::value($repo->account)
)
),
formRow
(
@@ -182,7 +182,7 @@ formPanel
set::label($lang->story->spec),
set::control("input"),
set::placeholder($lang->repo->descPlaceholder),
set::value(strip_tags($repo->desc)),
set::value(strip_tags($repo->desc))
),
formRow
(
@@ -195,7 +195,7 @@ formPanel
set::control('radioList'),
set::items($lang->repo->aclList),
set::value($repo->acl->acl),
on::change('onAclChange'),
on::change('onAclChange')
)
),
formRow
@@ -233,8 +233,8 @@ formPanel
))),
setClass('mt-2')
)
),
),
)
)
);
render();
+4 -4
View File
@@ -31,7 +31,7 @@ foreach($repoList as $repo)
(
setClass('form-title'),
set::href($this->createLink('repo', 'import')),
$lang->repo->batchCreate,
$lang->repo->batchCreate
),
picker
(
@@ -43,7 +43,7 @@ foreach($repoList as $repo)
set::placeholder($lang->repo->importServer),
set::items(array('' => '') + $gitlabPairs),
set::value($gitlab->id)
),
)
);
formBatchPanel
@@ -52,7 +52,7 @@ formBatchPanel
(
set::type('hidden'),
set::name('serviceHost'),
set::value($gitlab->id),
set::value($gitlab->id)
),
set::id('repoList'),
set::back('repo-maintain'),
@@ -61,7 +61,7 @@ formBatchPanel
set::items($items),
set::data($repoList),
set::maxRows(count($repoList)),
on::change('[data-name="product"]', 'loadProductProjects'),
on::change('[data-name="product"]', 'loadProductProjects')
);
render();
+2 -2
View File
@@ -18,7 +18,7 @@ detailHeader
to::prefix(''),
to::title
(
$lang->productplan->linkBug,
$lang->productplan->linkBug
)
);
@@ -54,7 +54,7 @@ dtable
set::checkable(true),
set::footToolbar($footToolbar),
set::sortLink(jsRaw('createSortLink')),
set::footPager(usePager()),
set::footPager(usePager())
);
render();
+2 -2
View File
@@ -18,7 +18,7 @@ detailHeader
to::prefix(''),
to::title
(
$lang->repo->linkStory,
$lang->repo->linkStory
)
);
@@ -57,7 +57,7 @@ dtable
set::checkable(true),
set::footToolbar($footToolbar),
set::sortLink(jsRaw('createSortLink')),
set::footPager(usePager()),
set::footPager(usePager())
);
render();
+2 -2
View File
@@ -18,7 +18,7 @@ detailHeader
to::prefix(''),
to::title
(
$lang->repo->linkTask,
$lang->repo->linkTask
)
);
@@ -49,7 +49,7 @@ dtable
set::checkable(true),
set::footToolbar($footToolbar),
set::sortLink(jsRaw('createSortLink')),
set::footPager(usePager()),
set::footPager(usePager())
);
render();
+3 -3
View File
@@ -29,7 +29,7 @@ $breadcrumbItems = array();
$breadcrumbItems[] = h::a
(
set::href($this->repo->createLink('log', "repoID=$repoID&objectID=$objectID")),
$repo->name,
$repo->name
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
@@ -42,7 +42,7 @@ foreach($paths as $pathName)
$breadcrumbItems[] = h::a
(
set::href($this->repo->createLink('log', "repoID=$repoID&objectID=$objectID&entry=" . $this->repo->encodePath($postPath))),
trim($pathName, '/'),
trim($pathName, '/')
);
$breadcrumbItems[] = h::span('/', setStyle('margin', '0 5px'));
}
@@ -84,7 +84,7 @@ dtable
set::footToolbar($footToolbar),
set::footer(array('toolbar', 'flex', 'pager')),
set::footPager(usePager('pager', 'noTotalCount')),
set::showToolbarOnChecked(false),
set::showToolbarOnChecked(false)
);
render();
+6 -6
View File
@@ -63,7 +63,7 @@ $queryMenuLink = createLink('repo', 'maintain', "objectID=$objectID&orderBy=&rec
(
set::current('all'),
set::queryMenuLinkCallback(fn($key) => str_replace('{queryID}', (string)$key, $queryMenuLink)),
li(searchToggle(set::open($type == 'bySearch'))),
li(searchToggle(set::open($type == 'bySearch')))
);
toolBar
@@ -71,17 +71,17 @@ toolBar
hasPriv('repo', 'createRepo') ? item(set($createRepoItem + array
(
'icon' => 'plus',
'class' => 'btn primary',
'class' => 'btn primary'
))) : null,
!hasPriv('repo', 'create') && hasPriv('repo', 'import') ? item(set($batchCreateItem + array
(
'icon' => 'plus',
'class' => 'btn primary',
'class' => 'btn primary'
))) : null,
!hasPriv('repo', 'import') && hasPriv('repo', 'create') ? item(set($createItem + array
(
'icon' => 'plus',
'class' => 'btn primary',
'class' => 'btn primary'
))) : null,
hasPriv('repo', 'import') && hasPriv('repo', 'create') ? btnGroup
(
@@ -91,8 +91,8 @@ toolBar
btn(setClass('btn primary dropdown-toggle'),
setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))),
set::placement('bottom-end'),
set::items(array($createItem, $batchCreateItem)),
),
set::items(array($createItem, $batchCreateItem))
)
) : null,
);
+5 -5
View File
@@ -63,10 +63,10 @@ div(
icon
(
'close',
set::className('monaco-close'),
set::className('monaco-close')
)
),
div(set::id('tab-' . $file)),
div(set::id('tab-' . $file))
),
empty($monacoDropMenus) ? null : dropdown
(
@@ -77,15 +77,15 @@ div(
btn
(
setClass('ghost text-black pull-right'),
set::icon('ellipsis-v rotate-90'),
set::icon('ellipsis-v rotate-90')
),
set::items
(
$monacoDropMenus
),
)
),
div(set::className('absolute top-0 left-0 z-20 arrow-left btn-left'), icon('chevron-left')),
div(set::className('absolute top-0 right-0 z-20 arrow-right btn-right'), icon('chevron-right')),
div(set::className('absolute top-0 right-0 z-20 arrow-right btn-right'), icon('chevron-right'))
)
);
+2 -2
View File
@@ -47,7 +47,7 @@ $bugs = initTableData($bugs, $config->repo->reviewDtable->fieldList);
\zin\featureBar
(
set::linkParams("repoID={$repoID}&browseType={key}&objectID={$objectID}"),
set::linkParams("repoID={$repoID}&browseType={key}&objectID={$objectID}")
);
dtable
@@ -58,5 +58,5 @@ dtable
set::sortLink(createLink('repo', 'review', "repoID=$repoID&browseType=$browseType&objectID={$objectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
set::orderBy($orderBy),
set::onRenderCell(jsRaw('window.renderRepobugList')),
set::footPager(usePager()),
set::footPager(usePager())
);
+3 -3
View File
@@ -63,7 +63,7 @@ formPanel
(
set::width('2/3'),
set::label($lang->repo->objectRule),
$moduleDom,
$moduleDom
),
formGroup
(
@@ -247,7 +247,7 @@ formPanel
set::value($config->repo->rules['unit']['left'])
)
)
),
)
),
formGroup
(
@@ -264,7 +264,7 @@ formPanel
set::label($lang->repo->rules->exampleLabel),
div
(
setID('example'),
setID('example')
)
)
);