github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-16 14:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2024-12-03 08:30:56 +08:00
parent df917001d3
commit 4c5c071b21
5 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Api/FileController.php
View File

@ -47,8 +47,7 @@ class FileController extends AbstractController
{ {
$user = User::auth(); $user = User::auth();
// //
$data = Request::all(); $pid = intval(Request::input('pid'));
$pid = intval($data['pid']);
// //
return Base::retSuccess('success', (new File)->getFileList($user, $pid)); return Base::retSuccess('success', (new File)->getFileList($user, $pid));
} }

2
app/Models/File.php
View File

@ -111,6 +111,8 @@ class File extends AbstractModel
* 获取文件列表 * 获取文件列表
* @param user $user * @param user $user
* @param int $pid * @param int $pid
* @param string $type
* @param bool $isGetparent
* @return array * @return array
*/ */
public function getFileList($user, int $pid, $type = "all", $isGetparent = true) public function getFileList($user, int $pid, $type = "all", $isGetparent = true)

1
electron/electron.js vendored
View File

@ -351,6 +351,7 @@ function createChildWindow(args) {
browser = preloadWindow; browser = preloadWindow;
preloadWindow = null; preloadWindow = null;
isPreload = true; isPreload = true;
options.title && browser.setTitle(options.title);
options.parent && browser.setParentWindow(options.parent); options.parent && browser.setParentWindow(options.parent);
browser.setSize(options.width, options.height); browser.setSize(options.width, options.height);
browser.setMinimumSize(options.minWidth, options.minHeight); browser.setMinimumSize(options.minWidth, options.minHeight);

2
resources/assets/js/pages/manage/messenger.vue
View File

@ -1004,7 +1004,7 @@ export default {
}, },
showProfessionDesc(dialog_user) { showProfessionDesc(dialog_user) {
if (dialog_user) { if (dialog_user && dialog_user.profession) {
return `[${dialog_user.profession}]` return `[${dialog_user.profession}]`
} }
return '' return ''

1
resources/assets/sass/pages/common.scss vendored
View File

@ -877,6 +877,7 @@ body.window-portrait {
margin-right: 4px; margin-right: 4px;
} }
> em { > em {
display: inline-block;
margin-right: 4px; margin-right: 4px;
cursor: pointer; cursor: pointer;
color: #2b85e4; color: #2b85e4;