Merge branch 'main' into feature/doctemplate

This commit is contained in:
xieqiyu
2025-03-10 10:50:32 +08:00
63 changed files with 4428 additions and 1265 deletions
+8
View File
@@ -1541,6 +1541,10 @@ $lang->resource->doc->sortDoc = 'sortDoc';
$lang->resource->doc->deleteCatalog = 'deleteCatalog';
// $lang->resource->doc->displaySetting = 'displaySetting';
$lang->resource->doc->exportFiles = 'exportFiles';
$lang->resource->doc->addChapter = 'addChapter';
$lang->resource->doc->editChapter = 'editChapter';
$lang->resource->doc->sortChapter = 'sortChapter';
$lang->resource->doc->deleteChapter = 'deleteChapter';
$lang->doc->methodOrder[5] = 'index';
$lang->doc->methodOrder[10] = 'mySpace';
@@ -1570,6 +1574,10 @@ $lang->doc->methodOrder[135] = 'sortDoc';
$lang->doc->methodOrder[140] = 'deleteCatalog';
// $lang->doc->methodOrder[145] = 'displaySetting';
$lang->doc->methodOrder[150] = 'exportFiles';
$lang->doc->methodOrder[160] = 'addChapter';
$lang->doc->methodOrder[170] = 'editChapter';
$lang->doc->methodOrder[180] = 'sortChapter';
$lang->doc->methodOrder[190] = 'deleteChapter';
/* Mail. */
$lang->resource->mail = new stdclass();
+4
View File
@@ -3613,6 +3613,9 @@ $config->group->package->manageDoc->privs['doc-batchMoveDoc'] = array('edition'
$config->group->package->manageDoc->privs['doc-sortDoclib'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 10, 'depend' => array('doc-index'), 'recommend' => array());
$config->group->package->manageDoc->privs['doc-sortCatalog'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 11, 'depend' => array('doc-index'), 'recommend' => array('doc-addCatalog', 'doc-editCatalog'));
$config->group->package->manageDoc->privs['doc-sortDoc'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 12, 'depend' => array('doc-index'), 'recommend' => array('doc-create', 'doc-edit', 'doc-moveDoc'));
$config->group->package->manageDoc->privs['doc-addChapter'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 13, 'depend' => array('doc-index'), 'recommend' => array('doc-editChapter', 'doc-sortChapter'));
$config->group->package->manageDoc->privs['doc-editChapter'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 14, 'depend' => array('doc-index'), 'recommend' => array('doc-addChapter', 'doc-sortChapter'));
$config->group->package->manageDoc->privs['doc-sortChapter'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 15, 'depend' => array('doc-index'), 'recommend' => array('doc-addChapter', 'doc-editChapter'));
$config->group->package->deleteDoc = new stdclass();
$config->group->package->deleteDoc->order = 20;
@@ -3623,6 +3626,7 @@ $config->group->package->deleteDoc->privs['doc-deleteLib'] = array('edition'
$config->group->package->deleteDoc->privs['doc-delete'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 60, 'depend' => array('doc-index'), 'recommend' => array());
$config->group->package->deleteDoc->privs['doc-deleteFile'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 65, 'depend' => array('doc-index', 'doc-showFiles'), 'recommend' => array());
$config->group->package->deleteDoc->privs['doc-deleteCatalog'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 110, 'depend' => array('doc-index'), 'recommend' => array());
$config->group->package->deleteDoc->privs['doc-deleteChapter'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 110, 'depend' => array('doc-index'), 'recommend' => array('doc-addChapter', 'doc-editChapter'));
$config->group->package->exportDoc = new stdclass();
$config->group->package->exportDoc->order = 25;