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

* [task#124813,done,1h] fitler space, add sort func.

Browse Source
This commit is contained in:
sunguangming
2024-08-08 13:28:52 +08:00
committed by 王怡栋
parent cf8fa10125
commit d149592abc
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+34 -2
View File
@@ -99,6 +99,7 @@ class docModel extends model
$stmt = $this->dao->select('*')->from(TABLE_DOCLIB)->where('id')->in($appendLibs)->orderBy("`order`_asc, id_asc")->query();
while($lib = $stmt->fetch())
{
if($lib->type == 'custom' && $lib->parent == 0) continue;
if(!isset($libPairs[$lib->id]) && $this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = $lib->name;
}
}
@@ -165,7 +166,11 @@ class docModel extends model
}
if($lib->project != 0) $lib->name = zget($projects, $lib->project, '') . ' / ' . $lib->name;
if($lib->type == 'mine') $lib->name = $this->lang->doc->person . ' / ' . $lib->name;
if($lib->type == 'custom') $lib->name = $this->lang->doc->team . ' / ' . $lib->name;
if($lib->type == 'custom')
{
if($lib->parent == 0) continue;
$lib->name = $this->lang->doc->team . ' / ' . $lib->name;
}
}
$libPairs[$lib->id] = $lib->name;
}
@@ -1052,6 +1057,8 @@ class docModel extends model
if(dao::isError()) return false;
$docID = $this->dao->lastInsertID();
$this->dao->update(TABLE_DOC)->set('`order`')->eq($docID)->where('id')->eq($docID)->exec();
$this->file->updateObjectID($this->post->uid, $docID, 'doc');
$files = $this->file->saveUpload('doc', $docID);
@@ -2426,7 +2433,7 @@ class docModel extends model
$showDoc = $this->loadModel('setting')->getItem('owner=' . $this->app->user->account . '&module=doc&key=showDoc');
$showDoc = $showDoc === '0' ? 0 : 1;
if($this->app->rawMethod == 'view' && $lib->type != 'apiLib' && $showDoc)
if($this->app->rawMethod == 'view' && $lib->type != 'apiLib' && $showDoc && !($lib->type == 'custom' && $lib->parent == 0))
{
$docIDList = $this->getPrivDocs(array($lib->id));
$docs = $this->dao->select('*, title as name')->from(TABLE_DOC)
@@ -2905,6 +2912,31 @@ class docModel extends model
return !dao::isError();
}
/**
* 更新文档顺序。
* Update doc order.
*
* @param array $sortedIdList
* @access public
* @return void
*/
public function updateDocOrder(array $sortedIdList): void
{
/* Remove programID. */
$sortedIdList = array_values(array_filter(array_map(function($id){return (is_numeric($id) and $id > 0) ? $id : null;}, $sortedIdList)));
if(empty($sortedIdList)) return;
$docs = $this->dao->select('`order`, id')->from(TABLE_DOC)->where('id')->in($sortedIdList)->orderBy('order_asc')->fetchPairs('order', 'id');
/* Update order by sorted id list. */
foreach($docs as $order => $id)
{
$newID = array_shift($sortedIdList);
if($id == $newID) continue;
$this->dao->update(TABLE_DOC)->set('`order`')->eq($order)->where('id')->eq($newID)->exec();
}
}
/**
* 更新目录顺序。
* Update catalog order.
module/doc/ui/doclist.html.php
+6 -3
View File
@@ -19,9 +19,10 @@ foreach($config->doc->dtable->fieldList as $colName => $col)
$cols[$colName] = $col;
}
$params = "objectID={$objectID}&libID={$libID}&moduleID={$moduleID}&browseType={$browseType}&orderBy={$orderBy}&param={$param}&recTotal={recTotal}&recPerPage={recPerPage}&pageID={page}";
$tableData = empty($docs) ? array() : initTableData($docs, $cols);
$createDocLink = '';
$params = "objectID={$objectID}&libID={$libID}&moduleID={$moduleID}&browseType={$browseType}&orderBy={$orderBy}&param={$param}&recTotal={recTotal}&recPerPage={recPerPage}&pageID={page}";
$tableData = empty($docs) ? array() : initTableData($docs, $cols);
$createDocLink = '';
$canUpdateOrder = !($lib->type == 'custom' && $lib->parent == 0) && hasPriv('doc', 'sortDoc') && $orderBy == 'order_asc';
if($browseType != 'bysearch' && $libID && common::hasPriv('doc', 'create')) $createDocLink = createLink('doc', 'create', "objectType={$type}&objectID={$objectID}&libID={$lib->id}&moduleID={$moduleID}&type=html");
$docContent = dtable(
setID('docTable'),
@@ -41,6 +42,8 @@ $docContent = dtable(
set::createLink($createDocLink),
set::createTip($lang->doc->create),
set::orderBy($orderBy),
set::onSortEnd($canUpdateOrder ? jsRaw('window.onSortEnd') : null),
$canUpdateOrder ? set::plugins(array('sortable')) : null,
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))))
);