From dc425fd92364abf9ce7c9ca829c9c17ecb6c3bbb Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 16 Dec 2022 10:36:40 +0800
Subject: [PATCH 1/2] * Fix bug#30891.

---
 module/story/view/blocktwins.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/view/blocktwins.html.php b/module/story/view/blocktwins.html.php
index 7b4764ec33..4301823fd0 100644
--- a/module/story/view/blocktwins.html.php
+++ b/module/story/view/blocktwins.html.php
@@ -22,7 +22,7 @@ foreach($twins as $twin)
     echo "<li title='$title' class='twins'>";
     echo "<span class='label {$labelClass} label-outline label-badge' title='$branch'>{$branch}</span> ";
     echo "<span class='label label-outline' title='{$stage}'>{$stage}</span> ";
-    echo ($canViewLinkStory ? html::a($this->createLink('story', 'view', "id=$id", '', true), "$title", '', "class='$class viewlink' data-width='80%'") : "$title");
+    echo ($canViewLinkStory ? html::a($this->createLink('story', 'view', "id=$id", '', true), "$title", '', "class='$class viewlink' data-width='90%'") : "$title");
     if($canRelieved) echo "<a class='unlink $hide' data-id='$id' data-toggle='popover'><i class='icon icon-unlink btn-info'></i></a>";
     echo "</li>";
 }

From f17dbd2c68e0afab15278787c68e43137f89b178 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Fri, 16 Dec 2022 11:01:03 +0800
Subject: [PATCH 2/2] * Fix bug#30861.

---
 module/tree/control.php        | 2 +-
 module/tree/view/edit.html.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/tree/control.php b/module/tree/control.php
index dc5c7d5285..0da550e752 100644
--- a/module/tree/control.php
+++ b/module/tree/control.php
@@ -390,7 +390,7 @@ class tree extends control
         }
         else
         {
-            $this->view->optionMenu = $this->tree->getOptionMenu($module->root, $module->type, 0, $module->branch, 'noMainBranch');
+            $this->view->optionMenu = $this->tree->getOptionMenu($module->root, $module->type, 0, $module->branch, 'noMainBranch|nodeleted');
         }
 
         if($type == 'doc') $this->view->libs = $this->loadModel('doc')->getLibs('all', $extra = 'withObject', '', 0, 'book');
diff --git a/module/tree/view/edit.html.php b/module/tree/view/edit.html.php
index ab7acc3ce7..7b014e9ed7 100644
--- a/module/tree/view/edit.html.php
+++ b/module/tree/view/edit.html.php
@@ -189,7 +189,7 @@ function loadModules(branch)
     if(typeof(branchID) == 'undefined') branchID = 0;
     if(typeof(moduleID) == 'undefined') moduleID = 0;
 
-    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=' + type + '&branch=' + branchID + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=excludeModuleID=' + <?php echo $module->id;?> + ',noMainBranch&currentModuleID=' + moduleID);
+    link = createLink('tree', 'ajaxGetOptionMenu', 'productID=' + productID + '&viewtype=' + type + '&branch=' + branchID + '&rootModuleID=0&returnType=html&fieldID=&needManage=true&extra=excludeModuleID=' + <?php echo $module->id;?> + ',noMainBranch,nodeleted&currentModuleID=' + moduleID);
     $(moduleBox).load(link, function()
     {
         $(this).children('select').attr('id', 'parent').attr('name', 'parent');