增加后台文档管理日期筛选框，支持时间段筛选文档

docs/changelog.md

@@ -1,7 +1,8 @@
 # 更新记录
 通过访问 https://www.dedebiz.com/git 获取完整更新记录
 
-# V6.2.5beta2
+# V6.2.5
+- 增加后台文档管理日期筛选框，支持时间段筛选文档；
 - 优化系统支付功能，增加微信支付、余额支付，加强支付宝、银行转账支付方式；
 - 优化系统后台，命名为DedeBizAdmin后台；
 - 优化用户头像上传功能，优化会员中心用户资料编辑页；

src/admin/content_list.php

@@ -35,7 +35,17 @@ if (TestPurview('a_List')) {;
     }
     if (TestPurview('a_MyList')) $mid =  $cuserLogin->getUserID();
 }
-
+$stime = 0;
+$etime = 0;
+$timerange = isset($timerange)? explode(" - ",$timerange) : array();
+if (count($timerange) === 2) {
+    $stime = strtotime($timerange[0]);
+    $etime = strtotime($timerange[1]);
+}
+if ($stime > $etime) {
+    $stime = 0;
+    $etime = 0;
+}
 $adminid = $cuserLogin->getUserID();
 $maintable = '#@__archives';
 setcookie('ENV_GOBACK_URL', $dedeNowurl, time() + 3600, '/');
@@ -62,6 +72,10 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) {
     if (!empty($cid)) {
         $tinyQuerys[] = " typeid in(".GetSonIds($cid).") ";
     }
+    if ($stime > 0 && $etime > 0) {
+        $tinyQuerys[] = " senddate>$stime ";
+        $tinyQuerys[] = " senddate<$etime ";
+    }
     if (count($tinyQuerys) > 0) {
         $tinyQuery = "WHERE ".join(' AND ', $tinyQuerys);
     }
@@ -128,6 +142,9 @@ if ($flag != '') {
 if ($cid != 0) {
     $whereSql .= ' AND arc.typeid IN ('.GetSonIds($cid).')';
 }
+if ($stime > 0 && $etime > 0) {
+    $whereSql .=  "AND arc.senddate>$stime AND arc.senddate<$etime";
+}
 if ($arcrank != '') {
     $whereSql .= " AND arc.arcrank = '$arcrank' ";
     $CheckUserSend = "<button type='button' class='btn btn-success btn-sm' onClick=\"location='catalog_do.php?cid=".$cid."&dopost=listArchives&gurl=content_list.php';\">所有文档</button>";
@@ -151,6 +168,11 @@ $dlist->SetParameter('orderby', $orderby);
 $dlist->SetParameter('arcrank', $arcrank);
 $dlist->SetParameter('channelid', $channelid);
 $dlist->SetParameter('f', $f);
+$strTimerange = "";
+if ($stime > 0 && $etime > 0) {
+    $strTimerange = implode(" - ",array(MyDate("Y-m-d H:i:s",$stime),MyDate("Y-m-d H:i:s",$etime)));
+    $dlist->SetParameter('timerange', $strTimerange);
+}
 //模板
 if (empty($s_tmplets)) $s_tmplets = 'templets/content_list.htm';
 $dlist->SetTemplate(DEDEADMIN.'/'.$s_tmplets);

src/admin/content_sg_list.php

@@ -50,7 +50,21 @@ if ($cid == 0) {
 }
 $optionarr = $tl->GetOptionArray($cid, $admin_catalogs, $channelid);
 $whereSql = $channelid == 0 ? " WHERE arc.channel < -1 " : " WHERE arc.channel = '$channelid' ";
+$stime = 0;
+$etime = 0;
+$timerange = isset($timerange)? explode(" - ",$timerange) : array();
+if (count($timerange) === 2) {
+    $stime = strtotime($timerange[0]);
+    $etime = strtotime($timerange[1]);
+}
+if ($stime > $etime) {
+    $stime = 0;
+    $etime = 0;
+}
 if (!empty($mid)) $whereSql .= " AND arc.mid = '$mid' ";
+if ($stime > 0 && $etime > 0) {
+    $whereSql .=  "AND arc.senddate>$stime AND arc.senddate<$etime";
+}
 if ($keyword != '') $whereSql .= " AND (arc.title like '%$keyword%') ";
 if ($cid != 0 && !empty(GetSonIds($cid))) $whereSql .= " AND arc.typeid in (".GetSonIds($cid).")";
 if ($arcrank != '') {
@@ -66,6 +80,11 @@ $dlist->SetParameter("dopost", "listArchives");
 $dlist->SetParameter("keyword", $keyword);
 $dlist->SetParameter("cid", $cid);
 $dlist->SetParameter("channelid", $channelid);
+$strTimerange = "";
+if ($stime > 0 && $etime > 0) {
+    $strTimerange = implode(" - ",array(MyDate("Y-m-d H:i:s",$stime),MyDate("Y-m-d H:i:s",$etime)));
+    $dlist->SetParameter('timerange', $strTimerange);
+}
 $dlist->SetTemplate(DEDEADMIN."/templets/content_sg_list.htm");
 $dlist->SetSource($query);
 $dlist->Display();

src/admin/templets/content_i_list.htm

@@ -6,10 +6,13 @@
 		<title>图片文档列表</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<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/bootstrap.min.js"></script>
 		<script src="../static/web/js/webajax.js"></script>
+		<script src="../static/web/js/moment.min.js"></script>
+		<script src="../static/web/js/daterangepicker.js"></script>
 		<script src="js/main.js"></script>
 		<script src="js/list.js"></script>
 	</head>
@@ -33,6 +36,7 @@
 		</table>
 		<form name="form3" action="content_i_list.php" method="get">
 			<input type="hidden" name="dopost" value="listArchives">
+			<input type="hidden" name="channelid" value="2">
 			<table cellpadding="1" cellspacing="1" align="center" class="table maintable mb-3">
 				<tr bgcolor="#f5f5f5">
 					<td width="380"><input type="text" name="keyword" class="admin-input-md" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id"></td>
@@ -52,6 +56,9 @@
 							<option value="lastpost">最后评论</option>
 						</select>
 					</td>
+					<td width="200">
+						<input autocomplete="off" value="<?php echo $strTimerange;?>" type="text" name="timerange" id="timerange" class="admin-input-sm">
+					</td>
 					<td><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
 				</tr>
 			</table>
@@ -116,5 +123,28 @@
 				<td bgcolor="#f5f5f5" align="center">{dede:pagelist listsize='6'/}</td>
 			</tr>
 		</table>
+		<script>
+			$(document).ready(function() {
+				$('#timerange').daterangepicker({
+					autoUpdateInput: false,
+					timePicker: true,
+					locale : {
+						format: 'YYYY-MM-DD HH:mm',
+						applyLabel: '确定',
+						cancelLabel: '清空',
+						daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+						monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+						firstDay: 1
+					},
+				});
+				$('#timerange').on('apply.daterangepicker', function(ev, picker) {
+					$(this).val(picker.startDate.format('YYYY-MM-DD HH:mm') + ' - ' + picker.endDate.format('YYYY-MM-DD HH:mm'));
+				});
+
+				$('#timerange').on('cancel.daterangepicker', function(ev, picker) {
+					$(this).val('');
+				});
+			})
+		</script>
 	</body>
 </html>

src/admin/templets/content_list.htm

@@ -6,10 +6,13 @@
 		<title>文档列表</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<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/bootstrap.min.js"></script>
 		<script src="../static/web/js/webajax.js"></script>
+		<script src="../static/web/js/moment.min.js"></script>
+		<script src="../static/web/js/daterangepicker.js"></script>
 		<script src="js/main.js"></script>
 		<script src="js/list.js"></script>
 	</head>
@@ -58,6 +61,9 @@
 							{dede:global.flagsArr/}
 						</select>
 					</td>
+					<td width="200">
+						<input autocomplete="off" value="<?php echo $strTimerange;?>" type="text" name="timerange" id="timerange" class="admin-input-sm">
+					</td>
 					<td><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
 				</tr>
 			</table>
@@ -116,5 +122,28 @@
 				</tr>
 			</table>
 		</form>
+		<script>
+			$(document).ready(function() {
+				$('#timerange').daterangepicker({
+					autoUpdateInput: false,
+					timePicker: true,
+					locale : {
+						format: 'YYYY-MM-DD HH:mm',
+						applyLabel: '确定',
+						cancelLabel: '清空',
+						daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+						monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+						firstDay: 1
+					},
+				});
+				$('#timerange').on('apply.daterangepicker', function(ev, picker) {
+					$(this).val(picker.startDate.format('YYYY-MM-DD HH:mm') + ' - ' + picker.endDate.format('YYYY-MM-DD HH:mm'));
+				});
+
+				$('#timerange').on('cancel.daterangepicker', function(ev, picker) {
+					$(this).val('');
+				});
+			})
+		</script>
 	</body>
 </html>

src/admin/templets/content_s_list.htm

@@ -6,7 +6,10 @@
 		<title>专题列表</title>
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.min.css">
 		<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/moment.min.js"></script>
+		<script src="../static/web/js/daterangepicker.js"></script>
 		<script src="js/list.js"></script>
 	</head>
 	<body>
@@ -22,6 +25,7 @@
 		</table>
 		<form name="form3" action="content_s_list.php" method="get">
 			<input type="hidden" name="dopost" value="listArchives">
+			<input type="hidden" name="channelid" value="3">
 			<table cellpadding="1" cellspacing="1" align="center" class="table maintable my-3">
 				<tr bgcolor="#f5f5f5">
 					<td width="380"><input type="text" name="keyword" class="admin-input-md" value="<?php echo $keyword?>" placeholder="请输入文档标题或文档id"></td>
@@ -82,5 +86,28 @@
 				<td bgcolor="#f5f5f5" colspan="9" align="center">{dede:pagelist listsize='6'/}</td>
 			</tr>
 		</table>
+		<script>
+			$(document).ready(function() {
+				$('#timerange').daterangepicker({
+					autoUpdateInput: false,
+					timePicker: true,
+					locale : {
+						format: 'YYYY-MM-DD HH:mm',
+						applyLabel: '确定',
+						cancelLabel: '清空',
+						daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+						monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+						firstDay: 1
+					},
+				});
+				$('#timerange').on('apply.daterangepicker', function(ev, picker) {
+					$(this).val(picker.startDate.format('YYYY-MM-DD HH:mm') + ' - ' + picker.endDate.format('YYYY-MM-DD HH:mm'));
+				});
+
+				$('#timerange').on('cancel.daterangepicker', function(ev, picker) {
+					$(this).val('');
+				});
+			})
+		</script>
 	</body>
 </html>

src/admin/templets/content_sg_list.htm

@@ -6,10 +6,13 @@
 		<title>文档管理列表</title>
 		<link rel="stylesheet" href="../static/web/css/bootstrap.min.css">
 		<link rel="stylesheet" href="../static/web/font/css/font-awesome.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/bootstrap.min.js"></script>
 		<script src="../static/web/js/webajax.js"></script>
+		<script src="../static/web/js/moment.min.js"></script>
+		<script src="../static/web/js/daterangepicker.js"></script>
 		<script src="js/main.js"></script>
 		<script src="js/list.js"></script>
 	</head>
@@ -32,6 +35,7 @@
 		</table>
 		<form name="form3" action="content_sg_list.php" method="get">
 			<input type="hidden" name="dopost" value="listArchives">
+			<input type="hidden" name="channelid" value="{dede:global.channelid/}">
 			<table cellpadding="1" cellspacing="1" align="center" class="table maintable mb-3">
 				<tr bgcolor="#f5f5f5">
 					<td width="380"><input type="text" name="keyword" class="admin-input-md" value="{dede:global.keyword/}" placeholder="请输入文档标题或文档id"></td>
@@ -41,6 +45,9 @@
 							{dede:global.optionarr/}
 						</select>
 					</td>
+					<td width="200">
+						<input autocomplete="off" value="<?php echo $strTimerange;?>" type="text" name="timerange" id="timerange" class="admin-input-sm">
+					</td>
 					<td><button type="submit" class="btn btn-success btn-sm">搜索</button></td>
 				</tr>
 			</table>
@@ -97,5 +104,28 @@
 				<td bgcolor="#f5f5f5" colspan="9" align="center">{dede:pagelist listsize='6'/}</td>
 			</tr>
 		</table>
+		<script>
+			$(document).ready(function() {
+				$('#timerange').daterangepicker({
+					autoUpdateInput: false,
+					timePicker: true,
+					locale : {
+						format: 'YYYY-MM-DD HH:mm',
+						applyLabel: '确定',
+						cancelLabel: '清空',
+						daysOfWeek: ['日', '一', '二', '三', '四', '五', '六'],
+						monthNames: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+						firstDay: 1
+					},
+				});
+				$('#timerange').on('apply.daterangepicker', function(ev, picker) {
+					$(this).val(picker.startDate.format('YYYY-MM-DD HH:mm') + ' - ' + picker.endDate.format('YYYY-MM-DD HH:mm'));
+				});
+
+				$('#timerange').on('cancel.daterangepicker', function(ev, picker) {
+					$(this).val('');
+				});
+			})
+		</script>
 	</body>
 </html>

src/static/web/css/admin.css

@@ -620,6 +620,9 @@ span.page-link {
 }
 @media (min-width:480px) {
 	.modal-dialog {
-	max-width:500px
+		max-width:500px
+	}
 }
+#timerange{
+	width: 230px;
 }