From 9143129aa180c720172f0f62a661e95a5543ad3e Mon Sep 17 00:00:00 2001
From: tianya <yanghuxiao@vip.qq.com>
Date: Sat, 4 Mar 2023 23:46:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=B8=E8=A7=84=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/content_s_list.htm |  2 ++
 src/system/customfields.func.php      | 18 ++++++++++++------
 src/theme/plus/post_diyform.htm       |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm
index 0476b15e..0b8395dc 100644
--- a/src/admin/templets/content_s_list.htm
+++ b/src/admin/templets/content_s_list.htm
@@ -8,6 +8,7 @@
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/css/daterangepicker.css">
 		<link rel="stylesheet" href="../static/web/css/admin.css">
+		<script src="../static/web/js/jquery.min.js"></script>
 		<script src="../static/web/js/moment.min.js"></script>
 		<script src="../static/web/js/daterangepicker.js"></script>
 		<script src="js/list.js"></script>
@@ -35,6 +36,7 @@
 							<?php echo $optionarr?>
 						</select>
 					</td>
+					<td width="240"><input type="text" name="timerange" autocomplete="off" value="<?php echo $strTimerange;?>" id="timerange" class="admin-input-md"></td>
 					<td><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
 				</tr>
 			</table>
diff --git a/src/system/customfields.func.php b/src/system/customfields.func.php
index c8cf3782..2c30c11a 100755
--- a/src/system/customfields.func.php
+++ b/src/system/customfields.func.php
@@ -104,7 +104,8 @@ function GetFormItem($ctag, $admintype = 'admin')
         $nowtime = GetDateTimeMk(time());
         $innertext = "<input type=\"text\" name=\"$fieldname\" value=\"$nowtime\" id=\"$fieldname\" class=\"form-control admin-input-md\">";
     } else if ($fieldType == 'img' || $fieldType == 'imgfile') {
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('addcontent.$fieldname','big')\">";
+        $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('$fname.$fieldname','big')\">";
     } else if ($fieldType == 'media') {
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-md' placeholder='请输入多媒体文件地址'>";
     } else if ($fieldType == 'addon') {
@@ -405,18 +406,23 @@ function GetFormItemValue($ctag, $fvalue, $admintype = 'admin', $fieldname = '')
                 $fvalue = trim($ntag->GetInnerText());
             }
         }
-        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('addcontent.$fieldname','big')\">";
+        $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
+        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('$fname.$fieldname','big')\">";
     } else if ($ftype == "imgfile") {
-        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('addcontent.$fieldname','big')\">";
+        $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
+        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectImage('$fname.$fieldname','big')\">";
     } else if ($ftype == "media") {
-        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button'  name='".$fieldname."_bt' class='btn btn-success btn-sm'value='浏览' onClick=\"SelectMedia('addcontent.$fieldname')\">";
+        $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
+        $innertext = "<input type='text' name='$fieldname' value='$fvalue' id='$fieldname' class='form-control admin-input-md'> <input type='button'  name='".$fieldname."_bt' class='btn btn-success btn-sm'value='浏览' onClick=\"SelectMedia('$fname.$fieldname')\">";
     } else if ($ftype == "addon") {
-        $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('addcontent.$fieldname')\">";
+        $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
+        $innertext = "<input type='text' name='$fieldname' id='$fieldname' value='$fvalue' class='form-control admin-input-md'> <input type='button' name='".$fieldname."_bt' class='btn btn-success btn-sm' value='浏览' onClick=\"SelectSoft('$fname.$fieldname')\">";
     } else if ($ftype == "int" || $ftype == "float") {
         $innertext = "<input type='text' name='$fieldname' id='$fieldname' class='form-control admin-input-xs' value='$fvalue'>";
     } else if ($ftype == "relation") {
+        $fname = defined('DEDEADMIN')? 'form1' : 'addcontent';
         $channel = ($ctag->GetAtt('channel') == "") ? "1" : $ctag->GetAtt('channel');
-        $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$fvalue</textarea><br><button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"addcontent.$fieldname\", $channel);'>选择关联文档</button>";
+        $innertext = "<textarea name='$fieldname' id='$fieldname' class='form-control admin-textarea-sm'>$fvalue</textarea><br><button type='button' class='btn btn-success btn-sm' onclick='SelectArcList(\"$fname.$fieldname\", $channel);'>选择关联文档</button>";
         if ($ctag->GetAtt('automake') == 1) {
             $innertext .= "<input type='hidden' name='automake[$fieldname]' value='1'>";
         }
diff --git a/src/theme/plus/post_diyform.htm b/src/theme/plus/post_diyform.htm
index e4a2493e..5eabd0de 100644
--- a/src/theme/plus/post_diyform.htm
+++ b/src/theme/plus/post_diyform.htm
@@ -8,7 +8,7 @@
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/font/css/font-awesome.min.css">
 		<link rel="stylesheet" href="<?php echo $cfg_cmsurl;?>/static/web/css/style.css">
 		<script src="<?php echo $cfg_cmsurl;?>/static/web/js/jquery.min.js"></script>
-		<script src="<?php echo $cfg_cmsurl;?>/static/web/js/user.js"></script>
+		<script src="<?php echo $cfg_cmsurl;?>/static/web/js/diy.js"></script>
 	</head>
 	<body>
 		<?php pasterTempletDiy('top.htm');?>