From 96038ac9e70e17412e289dcf16414f693b95b000 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 14 Nov 2023 09:04:03 +0800
Subject: [PATCH] * Remove `,` at the end of row in the lastest children in
 doc.

---
 module/doc/ui/create.html.php         | 22 ++++++++++-----------
 module/doc/ui/createbutton.html.php   |  2 +-
 module/doc/ui/createlib.html.php      | 28 +++++++++++++--------------
 module/doc/ui/displaysetting.html.php |  2 +-
 module/doc/ui/doclist.html.php        |  2 +-
 module/doc/ui/edit.html.php           | 22 ++++++++++-----------
 module/doc/ui/editlib.html.php        | 16 +++++++--------
 module/doc/ui/lefttree.html.php       |  2 +-
 module/doc/ui/mydoclist.html.php      |  2 +-
 module/doc/ui/selectlibtype.html.php  | 16 +++++++--------
 module/doc/ui/showfiles.html.php      | 28 +++++++++++++--------------
 module/doc/ui/tablecontents.html.php  |  2 +-
 module/doc/ui/view.html.php           | 22 ++++++++++-----------
 13 files changed, 83 insertions(+), 83 deletions(-)

diff --git a/module/doc/ui/create.html.php b/module/doc/ui/create.html.php
index a5c8346afd..525aeb38c5 100644
--- a/module/doc/ui/create.html.php
+++ b/module/doc/ui/create.html.php
@@ -69,9 +69,9 @@ else
                     set::name('execution'),
                     set::id('execution'),
                     set::items($executions),
-                    set::value(isset($execution) ? $objectID : ''),
+                    set::value(isset($execution) ? $objectID : '')
                 )
-            ) : null,
+            ) : null
         );
     }
 
@@ -89,8 +89,8 @@ else
                 input
                 (
                     set::name('title'),
-                    set::placeholder($lang->doc->titlePlaceholder),
-                ),
+                    set::placeholder($lang->doc->titlePlaceholder)
+                )
             ),
             btn
             (
@@ -100,7 +100,7 @@ else
                     (
                         'class' => 'btn secondary save-draft mr-2',
                         'text'  => $lang->doc->saveDraft,
-                        'btnType' => 'submit',
+                        'btnType' => 'submit'
                     )
                 )
             ),
@@ -124,7 +124,7 @@ else
             set::name('content'),
             set::size('full'),
             set::resizable(false),
-            set::placeholder($lang->noticePasteImg),
+            set::placeholder($lang->noticePasteImg)
         ),
         formHidden('status', 'normal'),
         formHidden('contentType', 'html'),
@@ -185,7 +185,7 @@ else
                     set::label($lang->doc->keywords),
                     input
                     (
-                        set::name('keywords'),
+                        set::name('keywords')
                     )
                 ),
                 formGroup
@@ -200,7 +200,7 @@ else
                     (
                         set::multiple(true),
                         set::name('mailto[]'),
-                        set::items($users),
+                        set::items($users)
                     )
                 ),
                 formGroup
@@ -223,13 +223,13 @@ else
                     (
                         set::name('groups[]'),
                         set::items($groups),
-                        set::multiple(true),
+                        set::multiple(true)
                     ),
                     picker
                     (
                         set::name('users[]'),
                         set::items($users),
-                        set::multiple(true),
+                        set::multiple(true)
                     )
                 ),
                 formRow
@@ -244,7 +244,7 @@ else
                                 array
                                 (
                                     'class'   => 'btn primary',
-                                    'btnType' => 'submit',
+                                    'btnType' => 'submit'
                                 )
                             ),
                             $lang->doc->release
diff --git a/module/doc/ui/createbutton.html.php b/module/doc/ui/createbutton.html.php
index b0c7d4b663..b31be6b008 100644
--- a/module/doc/ui/createbutton.html.php
+++ b/module/doc/ui/createbutton.html.php
@@ -49,7 +49,7 @@ $buildCreateBtn = function($type, $typeID, $libID, $moduleID, $templateParam, $b
             btn(setClass('btn primary dropdown-toggle'),
             setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))),
             set::placement('bottom-end'),
-            set::items($buttonItems),
+            set::items($buttonItems)
         )
     );
 };
diff --git a/module/doc/ui/createlib.html.php b/module/doc/ui/createlib.html.php
index a9366a864e..c7f1244c36 100644
--- a/module/doc/ui/createlib.html.php
+++ b/module/doc/ui/createlib.html.php
@@ -25,7 +25,7 @@ formPanel
             set::items($lang->doclib->type),
             set::value('wiki'),
             set::inline(true),
-            on::change('changeDoclibAcl'),
+            on::change('changeDoclibAcl')
         )
     ) : null,
     in_array($type, array('product', 'project', 'execution')) ? formRow
@@ -52,7 +52,7 @@ formPanel
             set::name('execution'),
             set::items($executionPairs),
             set::placeholder($lang->doclib->tip->selectExecution),
-            set::disabled(!$project->multiple),
+            set::disabled(!$project->multiple)
         ),
         formGroup
         (
@@ -64,7 +64,7 @@ formPanel
                 set('data-placement', 'right'),
                 set('data-type', 'white'),
                 set('data-class-name', 'text-gray border border-light'),
-                setClass('ml-2 mt-2 text-gray'),
+                setClass('ml-2 mt-2 text-gray')
             )
         )
     ) : null,
@@ -75,7 +75,7 @@ formPanel
         (
             set::label($lang->doclib->name),
             set::width('3/4'),
-            set::name('name'),
+            set::name('name')
         )
     ),
     formRow
@@ -86,7 +86,7 @@ formPanel
             set::label($lang->api->baseUrl),
             set::width('3/4'),
             set::name('baseUrl'),
-            set::placeholder($lang->api->baseUrlDesc),
+            set::placeholder($lang->api->baseUrlDesc)
         )
     ),
     formRow
@@ -101,9 +101,9 @@ formPanel
                 set::name('acl'),
                 set::items($lang->doclib->aclList),
                 set::value($acl),
-                on::change("toggleAcl('lib')"),
-            ),
-        ),
+                on::change("toggleAcl('lib')")
+            )
+        )
     ),
     formRow
     (
@@ -125,7 +125,7 @@ formPanel
                         (
                             set::name('groups[]'),
                             set::items($groups),
-                            set::multiple(true),
+                            set::multiple(true)
                         )
                     )
                 ),
@@ -138,7 +138,7 @@ formPanel
                         (
                             set::name('users[]'),
                             set::items($users),
-                            set::multiple(true),
+                            set::multiple(true)
                         )
                     )
                 )
@@ -155,7 +155,7 @@ formPanel
             radioList
             (
                 set::name('acl'),
-                set::items($lang->api->aclList),
+                set::items($lang->api->aclList)
             )
         )
     ),
@@ -169,11 +169,11 @@ formPanel
             radioList
             (
                 set::name('acl'),
-                set::items($lang->doclib->aclList),
+                set::items($lang->doclib->aclList)
             )
         ),
-        formHidden('type', $type),
-    ),
+        formHidden('type', $type)
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/doc/ui/displaysetting.html.php b/module/doc/ui/displaysetting.html.php
index 7f2afa5c50..efc7e44d74 100644
--- a/module/doc/ui/displaysetting.html.php
+++ b/module/doc/ui/displaysetting.html.php
@@ -22,7 +22,7 @@ formPanel
             set::inline(true),
             set::name('showDoc'),
             set::items($lang->doc->showDocList),
-            set::value($showDoc),
+            set::value($showDoc)
         )
     )
 );
diff --git a/module/doc/ui/doclist.html.php b/module/doc/ui/doclist.html.php
index 2e8003f247..e766703556 100644
--- a/module/doc/ui/doclist.html.php
+++ b/module/doc/ui/doclist.html.php
@@ -41,5 +41,5 @@ $docContent = dtable(
     set::createTip($lang->doc->create),
     set::orderBy($orderBy),
     set::sortLink(createLink($app->rawModule, $app->rawMethod, "objectID={$objectID}&libID={$libID}&moduleID={$moduleID}&browseType={$browseType}&orderBy={name}_{sortType}&param={$param}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}")),
-    set::footPager(usePager(array('linkCreator' => helper::createLink('doc', $app->rawMethod, $params)))),
+    set::footPager(usePager(array('linkCreator' => helper::createLink('doc', $app->rawMethod, $params))))
 );
diff --git a/module/doc/ui/edit.html.php b/module/doc/ui/edit.html.php
index 469dfd66fd..9c2420a3b2 100644
--- a/module/doc/ui/edit.html.php
+++ b/module/doc/ui/edit.html.php
@@ -31,8 +31,8 @@ form
             (
                 set::name('title'),
                 set::value($doc->title),
-                set::placeholder($lang->doc->titlePlaceholder),
-            ),
+                set::placeholder($lang->doc->titlePlaceholder)
+            )
         ),
         $doc->status == 'draft' ? btn
         (
@@ -42,7 +42,7 @@ form
                 (
                     'class' => 'btn secondary mr-2 save-draft',
                     'text'  => $lang->doc->saveDraft,
-                    'btnType' => 'submit',
+                    'btnType' => 'submit'
                 )
             )
         ) : null,
@@ -54,7 +54,7 @@ form
                 (
                     'class' => 'btn primary save-btn',
                     'text'  => $lang->doc->release,
-                    'btnType' => 'submit',
+                    'btnType' => 'submit'
                 )
             )
         ),
@@ -98,8 +98,8 @@ form
                     set::level(1),
                     set::text($doc->title),
                     set::reverse(true),
-                    setClass('pl-2'),
-                ),
+                    setClass('pl-2')
+                )
             ),
             set::id('modalBasicInfo'),
             on::change('#product',   "loadObjectModules"),
@@ -138,7 +138,7 @@ form
                 input
                 (
                     set::name('keywords'),
-                    set::value($doc->keywords),
+                    set::value($doc->keywords)
                 )
             ),
             formGroup
@@ -154,7 +154,7 @@ form
                     set::multiple(true),
                     set::name('mailto[]'),
                     set::items($users),
-                    set::value($doc->mailto),
+                    set::value($doc->mailto)
                 )
             ),
             formGroup
@@ -178,14 +178,14 @@ form
                     set::name('groups[]'),
                     set::items($groups),
                     set::multiple(true),
-                    set::value($doc->groups),
+                    set::value($doc->groups)
                 ),
                 picker
                 (
                     set::name('users[]'),
                     set::items($users),
                     set::multiple(true),
-                    set::value($doc->users),
+                    set::value($doc->users)
                 )
             ),
             formRow
@@ -200,7 +200,7 @@ form
                             array
                             (
                                 'class'   => 'btn primary',
-                                'btnType' => 'submit',
+                                'btnType' => 'submit'
                             )
                         ),
                         $lang->doc->release
diff --git a/module/doc/ui/editlib.html.php b/module/doc/ui/editlib.html.php
index 9710a2c47a..4e2a059126 100644
--- a/module/doc/ui/editlib.html.php
+++ b/module/doc/ui/editlib.html.php
@@ -24,7 +24,7 @@ formPanel
     (
         set::label($lang->doc->{$lib->type}),
         set::control('static'),
-        set::value($object->name),
+        set::value($object->name)
     ) : null,
     formGroup
     (
@@ -36,8 +36,8 @@ formPanel
             setClass('hidden'),
             set::name('acl'),
             set::items($lang->doc->libTypeList),
-            set::value($lib->type),
-        ),
+            set::value($lib->type)
+        )
     ),
     formRow
     (
@@ -50,8 +50,8 @@ formPanel
                 set::name('acl'),
                 set::items($lib->type == 'api' ? $lang->api->aclList : $lang->doclib->aclList),
                 set::value(empty($lib->main) ?  $lib->acl : 'default'),
-                on::change("toggleAcl('lib')"),
-            ),
+                on::change("toggleAcl('lib')")
+            )
         )
     ),
     formRow
@@ -74,7 +74,7 @@ formPanel
                             set::name('groups[]'),
                             set::items($groups),
                             set::value($lib->groups),
-                            set::multiple(true),
+                            set::multiple(true)
                         )
                     )
                 ),
@@ -88,13 +88,13 @@ formPanel
                             set::name('users[]'),
                             set::items($users),
                             set::value($lib->users),
-                            set::multiple(true),
+                            set::multiple(true)
                         )
                     )
                 )
             )
         )
-    ),
+    )
 );
 
 /* ====== Render page ====== */
diff --git a/module/doc/ui/lefttree.html.php b/module/doc/ui/lefttree.html.php
index 9745449818..37264e25be 100644
--- a/module/doc/ui/lefttree.html.php
+++ b/module/doc/ui/lefttree.html.php
@@ -42,6 +42,6 @@ sidebar
         set::menuLink(isset($objectDropdown['link']) ? $objectDropdown['link'] : ''),
         set::settingLink($app->rawModule == 'doc' && $app->rawMethod == 'view' && common::hasPriv('doc', 'displaySetting') ? inlink('displaySetting') : ''),
         set::settingText($lang->doc->displaySetting),
-        set::defaultNestedShow($defaultNestedShow),
+        set::defaultNestedShow($defaultNestedShow)
     )
 );
diff --git a/module/doc/ui/mydoclist.html.php b/module/doc/ui/mydoclist.html.php
index 325d8ec68d..d0f7399e60 100644
--- a/module/doc/ui/mydoclist.html.php
+++ b/module/doc/ui/mydoclist.html.php
@@ -48,5 +48,5 @@ $docContent = dtable
     set::emptyTip($lang->doc->noDoc),
     set::createLink($createDocLink),
     set::createTip($lang->doc->create),
-    set::footPager(usePager(array('linkCreator' => helper::createLink('doc', $app->rawMethod, $params)))),
+    set::footPager(usePager(array('linkCreator' => helper::createLink('doc', $app->rawMethod, $params))))
 );
diff --git a/module/doc/ui/selectlibtype.html.php b/module/doc/ui/selectlibtype.html.php
index b3e599a9e8..740596fb2a 100644
--- a/module/doc/ui/selectlibtype.html.php
+++ b/module/doc/ui/selectlibtype.html.php
@@ -31,7 +31,7 @@ form
             set::items($spaceList),
             set::value(key($spaceList)),
             set::inline(true),
-            on::change('changeSpace'),
+            on::change('changeSpace')
         )
     ),
     formRow
@@ -46,7 +46,7 @@ form
                 set::items($typeList),
                 set::value(''),
                 set::inline(true),
-                on::change('changeDocType'),
+                on::change('changeDocType')
             )
         )
     ),
@@ -63,7 +63,7 @@ form
                 set::name('apiType'),
                 set::items($lang->doc->apiTypeList),
                 set::value(''),
-                on::change('changeApiType'),
+                on::change('changeApiType')
             )
         )
     ),
@@ -80,7 +80,7 @@ form
                 setID('projectBox'),
                 set::name('project'),
                 set::items($projects),
-                set::value(key($projects)),
+                set::value(key($projects))
             )
         ),
         formGroup
@@ -94,7 +94,7 @@ form
                 set::name('execution'),
                 set::items(array()),
                 set::value(''),
-                on::change("loadObjectModules('execution')"),
+                on::change("loadObjectModules('execution')")
             )
         ),
         formGroup
@@ -108,7 +108,7 @@ form
                 set('data-placement', 'right'),
                 set('data-type', 'white'),
                 set('data-class-name', 'text-gray border border-light'),
-                setClass('ml-2 mt-2 text-gray'),
+                setClass('ml-2 mt-2 text-gray')
             )
         )
     ),
@@ -125,7 +125,7 @@ form
                 set::name('product'),
                 set::items($products),
                 set::value(key($products)),
-                on::change("loadObjectModules('product')"),
+                on::change("loadObjectModules('product')")
             )
         )
     ),
@@ -139,7 +139,7 @@ form
             setID('moduleBox'),
             set::name('module'),
             set::items(array()),
-            set::value(''),
+            set::value('')
         )
     )
 );
diff --git a/module/doc/ui/showfiles.html.php b/module/doc/ui/showfiles.html.php
index e1e70bae50..dbd0966dbb 100644
--- a/module/doc/ui/showfiles.html.php
+++ b/module/doc/ui/showfiles.html.php
@@ -27,7 +27,7 @@ if(!empty($files))
                 set::cols($config->doc->showfiles->dtable->fieldList),
                 set::data($tableData),
                 set::onRenderCell(jsRaw('window.renderCell')),
-                set::footPager(usePager($linkTpl)),
+                set::footPager(usePager($linkTpl))
             );
     }
     else
@@ -62,9 +62,9 @@ if(!empty($files))
                                     img
                                     (
                                         setClass(empty($file->imageWidth) ? 'not-exist' : ''),
-                                        set('src', $file->webPath),
+                                        set('src', $file->webPath)
                                     )
-                                ) : html($file->fileIcon),
+                                ) : html($file->fileIcon)
                             ),
                             div
                             (
@@ -81,7 +81,7 @@ if(!empty($files))
                                     set::href(createLink(($file->objectType == 'requirement' ? 'story' : $file->objectType), 'view', "objectID={$file->objectID}")),
                                     set::title($file->sourceName),
                                     $file->sourceName,
-                                    $file->objectType != 'doc' ? set(array('data-toggle' => 'modal', 'data-size' => 'lg')) : null,
+                                    $file->objectType != 'doc' ? set(array('data-toggle' => 'modal', 'data-size' => 'lg')) : null
                                 )
                             )
                         )
@@ -100,7 +100,7 @@ if(!empty($files))
                 ),
                 pager(
                     set::_className('flex justify-end items-center'),
-                    set(usePager($linkTpl)),
+                    set(usePager($linkTpl))
                 )
             );
     }
@@ -114,7 +114,7 @@ else
             (
                 setClass('text-gray'),
                 $lang->pager->noRecord
-            ),
+            )
         );
 }
 
@@ -133,13 +133,13 @@ div
                 (
                     set::name('title'),
                     set::value($searchTitle),
-                    set::placeholder($lang->doc->fileTitle),
+                    set::placeholder($lang->doc->fileTitle)
                 ),
                 span
                 (
                     setClass('input-control-suffix'),
-                    btn(set(array('icon' => 'search', 'class' => 'ghost', 'onclick' => 'searchTitle()'))),
-                ),
+                    btn(set(array('icon' => 'search', 'class' => 'ghost', 'onclick' => 'searchTitle()')))
+                )
             )
         ),
         div
@@ -154,7 +154,7 @@ div
                     setClass('btn switchBtn'),
                     setClass($viewType == 'list' ? ' text-primary' : ''),
                     set::href(inlink('showFiles', "type=$type&objectID=$objectID&viewType=list&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}&searchTitle={$searchTitle}")),
-                    set('data-app', $app->tab),
+                    set('data-app', $app->tab)
                 ),
                 a
                 (
@@ -162,8 +162,8 @@ div
                     setClass('btn switchBtn'),
                     setClass($viewType != 'list' ? ' text-primary' : ''),
                     set::href(inlink('showFiles', "type=$type&objectID=$objectID&viewType=card&orderBy=$orderBy&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}&searchTitle=$searchTitle")),
-                    set('data-app', $app->tab),
-                ),
+                    set('data-app', $app->tab)
+                )
             ),
             common::hasPriv('doc', 'createLib') ? btn
             (
@@ -171,8 +171,8 @@ div
                 set::text($lang->doc->createLib),
                 set::icon('plus'),
                 set::url(createLink('doc', 'createLib', "type={$type}&objectID={$objectID}")),
-                set('data-toggle', 'modal'),
-            ) : null,
+                set('data-toggle', 'modal')
+            ) : null
         )
     ),
     div
diff --git a/module/doc/ui/tablecontents.html.php b/module/doc/ui/tablecontents.html.php
index 148cfc26ad..8008de03bb 100644
--- a/module/doc/ui/tablecontents.html.php
+++ b/module/doc/ui/tablecontents.html.php
@@ -35,7 +35,7 @@ toolbar
         'icon'  => 'treemap',
         'class' => 'ghost',
         'text'  => $lang->api->struct,
-        'url'   => createLink('api', 'struct', "libID={$libID}"),
+        'url'   => createLink('api', 'struct', "libID={$libID}")
     ))) : null,
     $libType == 'api' && common::hasPriv('api', 'releases') ? item(set(array
     (
diff --git a/module/doc/ui/view.html.php b/module/doc/ui/view.html.php
index c4545a1acc..7ff7b1bba9 100644
--- a/module/doc/ui/view.html.php
+++ b/module/doc/ui/view.html.php
@@ -156,14 +156,14 @@ $contentDom = div
                 (
                     set::url(createLink('doc', 'edit', "docID=$doc->id")),
                     setClass('btn ghost'),
-                    icon('edit'),
+                    icon('edit')
                 ) : null,
                 common::hasPriv('doc', 'delete') ? btn
                 (
                     set::url(createLink('doc', 'delete', "docID=$doc->id")),
                     setClass('btn ghost ajax-submit'),
                     set('data-confirm', $lang->doc->confirmDelete),
-                    icon('trash'),
+                    icon('trash')
                 ) : null,
                 btn
                 (
@@ -171,8 +171,8 @@ $contentDom = div
                     set::url('###)'),
                     setClass('btn ghost'),
                     icon('clock'),
-                    on::click('showHistory'),
-                ),
+                    on::click('showHistory')
+                )
             ),
             div
             (
@@ -193,7 +193,7 @@ $contentDom = div
                 'contacts',
                 setClass('mr-2')
             ),
-            $createInfo,
+            $createInfo
         ),
         span
         (
@@ -203,7 +203,7 @@ $contentDom = div
                 'star',
                 setClass('mr-2')
             ),
-            $doc->collects ? $doc->collects : 0,
+            $doc->collects ? $doc->collects : 0
         ),
         span
         (
@@ -213,13 +213,13 @@ $contentDom = div
                 'eye',
                 setClass('mr-2')
             ),
-            $doc->views,
+            $doc->views
         ),
         $keywordsLabel ? span
         (
             setClass('keywords'),
             $keywordsLabel
-        ) : null,
+        ) : null
     ),
     div
     (
@@ -233,7 +233,7 @@ $contentDom = div
         $doc->files ? fileList
         (
             set::files($doc->files)
-        ) : null,
+        ) : null
     )
 );
 
@@ -253,7 +253,7 @@ $toggleTreeBtn = isset($outlineTree) ? btn
         setID('outlineToggle'),
         setClass('btn ghost'),
         icon('menu-arrow-right'),
-        on::click('toggleOutline'),
+        on::click('toggleOutline')
     ) : null;
 
 $historyDom = div
@@ -273,5 +273,5 @@ panel
         $treeDom,
         $toggleTreeBtn,
         $historyDom
-    ),
+    )
 );