首頁 探索 說明
註冊 登入
root
/
qii
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

Merge dev to master

Zhu Jinhui 7 年之前
父節點
fd365ee3f6
當前提交
73f2df5555
共有 3 個文件被更改，包括 14 次插入 和 2 次删除
統一視圖 顯示文件統計
  1. 12 0
      demo/private/controller/dirs.php
  2. 1 1
      demo/private/helper/tools.php
  3. 1 1
      demo/private/view/manage/folder/dir.html

+ 12 - 0
demo/private/controller/dirs.php
查看文件 

@@ -89,4 +89,16 @@ class dirs extends base
 
 		$download = new \Qii\Library\Download();
 
 		$download = new \Qii\Library\Download();
 
 		$download->download($file);
 
 		$download->download($file);
 
 	}
 
 	}
 
+
 
+	protected function echoJson($data)
 
+	{
 
+		echo $this->jsonEncode($data);
 
+	}
 
+
 
+	protected function jsonEncode($data)
 
+	{
 
+		if (empty($data)) return '{}';
 
+		if (isset($data['code']) && $data['code'] > 0 && !isset($data['msg'])) $data['msg'] = _i($data['code']);
 
+		return json_encode($data, JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_AMP | JSON_UNESCAPED_UNICODE);
 
+	}
 
 }
 
 }

+ 1 - 1
demo/private/helper/tools.php
查看文件 

@@ -115,7 +115,7 @@ class tools
 
 			if ($filter != '*' && !$isDir && !preg_match('/' . $filter . '$/', $file)) continue;
 
 			if ($filter != '*' && !$isDir && !preg_match('/' . $filter . '$/', $file)) continue;
 
 			$array = array();
 
 			$array = array();
 
 			$type = self::fileType($fullPath);
 
 			$type = self::fileType($fullPath);
 
-			$array['name'] = $file;
 
+			$array['name'] = iconv('GBK', 'UTF-8', $file);
 
 			if (!in_array($type, $filetype)) {
 
 			if (!in_array($type, $filetype)) {
 
 				$array['icon'] = _link('filetype/unknow.png');
 
 				$array['icon'] = _link('filetype/unknow.png');
 
 			} else {
 
 			} else {

+ 1 - 1
demo/private/view/manage/folder/dir.html
查看文件 

@@ -13,7 +13,7 @@
 
     <script type="text/javascript" src="{#_link("static/js/jquery.multiSelect.js")#}"></script>
 
     <script type="text/javascript" src="{#_link("static/js/jquery.multiSelect.js")#}"></script>
 
     <script type="text/javascript" src="{#_link("static/js/tips.js")#}"></script>
 
     <script type="text/javascript" src="{#_link("static/js/tips.js")#}"></script>
 
     <script type="text/javascript" src="{#_link("static/js/notify-custom.min.js")#}"></script>
 
     <script type="text/javascript" src="{#_link("static/js/notify-custom.min.js")#}"></script>
 
-    <script type="text/javascript" src="{#_link("static/js/static/layer/layer.js")#}"></script>
 
+    <script type="text/javascript" src="{#_link("static/layer/layer.js")#}"></script>
 
 </head>
 
 </head>
 
  <body>
 
  <body>
 
   <div class="place"> 
   <div class="place">