调整

src/admin/inc/inc_menu.php

@@ -35,7 +35,7 @@ $gitUrl = DEDEBIZURL."/git";
 $dedebizUrl = DEDEBIZURL;
 $adminMenu1 = $adminMenu2 = '';
 if ($cuserLogin->getUserType() >= 10) {
-    $adminMenu1 = (DEDEBIZ_SAFE_MODE? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa fa-cube'>
+    $adminMenu1 = (DEDEBIZ_SAFE_MODE ? "" : "<m:top item='11_' name='模板管理' rank='temp_One,temp_Other,temp_MyTag,temp_test,temp_All' icon='fa fa-cube'>
     <m:item name='默认模板管理' link='templets_main.php' rank='temp_All' target='main' />
     <m:item name='标签源码管理' link='templets_tagsource.php' rank='temp_All' target='main' />
     <m:item name='自定义宏标记' link='mytag_main.php' rank='temp_MyTag' target='main' />
@@ -43,7 +43,7 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='全局标记测试' link='tag_test.php' rank='temp_Test' target='main' />
 </m:top>")."
 <m:top item='4_' name='模型管理' rank='t_List,t_AccList,c_List,temp_One' icon='fa fa-area-chart'>
-    ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='文档模型管理' link='mychannel_main.php' rank='c_List' target='main' />")."
+    ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='文档模型管理' link='mychannel_main.php' rank='c_List' target='main' />")."
     <m:item name='文档单页管理' link='templets_one.php' rank='temp_One' target='main' />
     <m:item name='联动类型管理' link='stepselect_main.php' rank='c_Stepseclect' target='main' />
     <m:item name='自由列表管理' link='freelist_main.php' rank='c_List' target='main' />
@@ -64,8 +64,8 @@ if ($cuserLogin->getUserType() >= 10) {
     <m:item name='图片水印设置' link='sys_info_mark.php' rank='sys_Edit' target='main' />
     <m:item name='自定义文档属性' link='content_att.php' rank='sys_Att' target='main' />
     <m:item name='软件下载设置' link='soft_config.php' rank='sys_SoftConfig' target='main' />
-    ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='数据备份还原' link='sys_data.php' rank='sys_Data' target='main' />")."
-    ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='SQL命令工具' link='sys_sql_query.php' rank='sys_Data' target='main' />")."
+    ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='数据备份还原' link='sys_data.php' rank='sys_Data' target='main' />")."
+    ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='SQL命令工具' link='sys_sql_query.php' rank='sys_Data' target='main' />")."
     <m:item name='文件扫描工具' link='sys_safetest.php' rank='sys_verify' target='main' />
     <m:item name='系统修复工具' link='sys_repair.php' rank='sys_verify' target='main' />
 </m:top>";
@@ -94,7 +94,7 @@ $adminMenu1
     <m:item name='文档关键词维护' link='article_keywords_main.php' rank='sys_Keyword' target='main' />
     <m:item name='搜索关键词维护' link='search_keywords_main.php' rank='sys_Keyword' target='main' />
     <m:item name='自动摘要分页' link='article_description_main.php' rank='sys_Keyword' target='main' />
-    ".(DEDEBIZ_SAFE_MODE? "" : "<m:item name='数据库字段替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />")."
+    ".(DEDEBIZ_SAFE_MODE ? "" : "<m:item name='数据库字段替换' link='sys_data_replace.php' rank='sys_ArcBatch' target='main' />")."
 </m:top>
 {$GLOBALS['menusMoudle']}
 <m:top item='8_' name='更新网站' rank='sys_MakeHtml' icon='fa fa-repeat'>

src/admin/inc/inc_menu_module.php

@@ -26,7 +26,7 @@ while ($row = $dsql->GetObject()) {
 }
 $adminMenu = '';
 if ($cuserLogin->getUserType() >= 10) {
-    $adminMenu = DEDEBIZ_SAFE_MODE? "" : "<m:top item='6_' name='模块管理' icon='fa fa-database'>
+    $adminMenu = DEDEBIZ_SAFE_MODE ? "" : "<m:top item='6_' name='模块管理' icon='fa fa-database'>
     <m:item name='模块管理' link='module_main.php' rank='sys_module' target='main' />
     <m:item name='模块打包' link='module_make.php' rank='sys_module' target='main' />
     </m:top>";

src/admin/templets/index.htm

@@ -35,7 +35,7 @@
 					<?php if ($cuserLogin->getUserType() >= 5) {?>
 					<li class="d-none d-lg-block"><a href="catalog_main.php" target="main" title="栏目管理"><i class="fa fa-bars"></i></a></li>
 					<li class="d-none d-lg-block"><a href="tags_main.php" target="main" title="标签管理"><i class="fa fa-tags"></i></a></li>
-					<li class="d-none d-lg-block"><a href="file_manage_main.php<?php echo DEDEBIZ_SAFE_MODE?'?activepath='.$cfg_medias_dir:'';?>" target="main" title="文件管理"><i class="fa fa-folder"></i></a></li>
+					<li class="d-none d-lg-block"><a href="file_manage_main.php<?php echo DEDEBIZ_SAFE_MODE ? '?activepath='.$cfg_medias_dir:'';?>" target="main" title="文件管理"><i class="fa fa-folder"></i></a></li>
 					<li class="d-none d-lg-block"><a href="diy_main.php" target="main" title="自定义表单管理"><i class="fa fa-area-chart"></i></a></li>
 					<?php }?>
 					<?php if (!DEDEBIZ_SAFE_MODE) {?>

src/data/admin/ver.txt

@@ -1 +1 @@
-20231010
+20231108

src/install/index.php

@@ -11,7 +11,7 @@ error_reporting(E_ALL || ~E_NOTICE);
 define('INSLOCKFILE', dirname(__FILE__).'/install_lock.txt');
 $verMsg = 'V6';
 $dfDbname = 'DedeBIZ';
-$cfg_version_detail = '6.2.12'; //详细版本号
+$cfg_version_detail = '6.3.0'; //详细版本号
 $errmsg = '';
 if (version_compare(PHP_VERSION, '8.0.0', '>=') && function_exists("mysqli_report")) {
     mysqli_report(MYSQLI_REPORT_OFF);

src/static/web/css/admin.css

@@ -119,7 +119,7 @@ body.menu-show .body-right{left:220px;transition:all 0.5s}
 #file_list li:hover .tools{display:block}
 #file_list li .tools .remove{cursor:pointer}
 #file_list li .tools .remove:after{font-family:'FontAwesome';font-size:18px;color:var(--danger);content:'\f1f8'}
-#selColor{padding:5px;width:35px}
+#selColor{padding:0.22rem;width:45px}
 #edsta{display:none;padding:0.5rem;position:absolute;top:100px;left:200px;width:450px;height:auto;background:var(--bg);border:1px solid var(--gray-300)}
 #browsehappy{padding:1rem 30px;color:var(--orange);background:var(--yellow)}
 .browsehappy-close{float:right;cursor:pointer}

src/static/web/img/colornew.htm

@@ -1,4 +1,4 @@
-<table width="100" border="0">
+<table width="100" border="0" class="mb-2">
 	<tr> 
 		<td bgcolor="#FF0000" onClick="ColorSel('#FF0000', 'color');" width="20%">&nbsp;</td>
 		<td bgcolor="#0000FF" onClick="ColorSel('#0000FF', 'color');" width="20%">&nbsp;</td>
@@ -28,5 +28,5 @@
 		<td bgcolor="#FFFF00" onClick="ColorSel('#FFFF00', 'color');">&nbsp;</td>
 	</tr>
 </table>
-<p class="my-2">自定义：<input type="color" id="selColor"></p>
+<input type="color" id="selColor">
 <button onclick="ColorSel(document.querySelector('#selColor').value, 'color')" class="btn btn-sm btn-success">确定</button>

src/system/common.inc.php

@@ -188,7 +188,7 @@ $cfg_soft_dir = $cfg_medias_dir.'/soft';
 $cfg_other_medias = $cfg_medias_dir.'/media';
 //软件摘要信息，请不要删除，否则系统无法正确接收系统漏洞或升级信息
 $cfg_version = 'V6';
-$cfg_version_detail = '6.2.12';//详细版本号
+$cfg_version_detail = '6.3.0';//详细版本号
 $cfg_soft_lang = 'utf-8';
 $cfg_soft_public = 'base';
 $cfg_softname = '得德系统';