github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-20 07:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

no msg

Browse Source
This commit is contained in:
kuaifan 2022-03-18 09:28:34 +08:00
parent c163c20c3d
commit ef7a64644b
14 changed files with 212 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd
View File

@ -296,13 +296,17 @@ if [ $# -gt 0 ]; then
while [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/db.opt" ]; do while [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/db.opt" ]; do
((remaining=$remaining-1)) ((remaining=$remaining-1))
if [ $remaining -lt 0 ]; then if [ $remaining -lt 0 ]; then
echo -e "${Error} ${RedBG} 数据库安装失败! ${Font}" echo -e "${Error} ${RedBG} 数据库初始化失败! ${Font}"
exit 1 exit 1
fi fi
chmod -R 775 "${cur_path}/docker/mysql/data" chmod -R 775 "${cur_path}/docker/mysql/data"
sleep 3 sleep 3
done done
run_exec php "php artisan migrate --seed" run_exec php "php artisan migrate --seed"
if [ ! -f "${cur_path}/docker/mysql/data/$(env_get DB_DATABASE)/$(env_get DB_PREFIX)migrations.ibd" ]; then
echo -e "${Error} ${RedBG} 数据库安装失败! ${Font}"
exit 1
fi
# 设置初始化密码 # 设置初始化密码
res=`run_exec mariadb "sh /etc/mysql/repassword.sh"` res=`run_exec mariadb "sh /etc/mysql/repassword.sh"`
$COMPOSE up -d $COMPOSE up -d

258
database/seeders/ProjectFlowItemsTableSeeder.php
View File

@ -28,13 +28,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 1, 'flow_id' => 1,
'name' => '待处理', 'name' => '待处理',
'status' => 'start', 'status' => 'start',
'turns' => '[1,2,3,4]', 'turns' => '[1,2,3,4,26]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 0, 'sort' => 0,
'created_at' => '2022-01-15 23:43:15', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:15', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
1 => 1 =>
array ( array (
@ -43,13 +43,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 1, 'flow_id' => 1,
'name' => '进行中', 'name' => '进行中',
'status' => 'progress', 'status' => 'progress',
'turns' => '[1,2,3,4]', 'turns' => '[1,2,3,4,26]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 1, 'sort' => 1,
'created_at' => '2022-01-15 23:43:15', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:15', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
2 => 2 =>
array ( array (
@ -58,13 +58,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 1, 'flow_id' => 1,
'name' => '已完成', 'name' => '已完成',
'status' => 'end', 'status' => 'end',
'turns' => '[1,2,3,4]', 'turns' => '[1,2,3,4,26]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 2, 'sort' => 3,
'created_at' => '2022-01-15 23:43:15', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:15', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
3 => 3 =>
array ( array (
@ -73,13 +73,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 1, 'flow_id' => 1,
'name' => '已取消', 'name' => '已取消',
'status' => 'end', 'status' => 'end',
'turns' => '[1,2,3,4]', 'turns' => '[1,2,3,4,26]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 3, 'sort' => 4,
'created_at' => '2022-01-15 23:43:15', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:15', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
4 => 4 =>
array ( array (
@ -88,13 +88,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 2, 'flow_id' => 2,
'name' => '待处理', 'name' => '待处理',
'status' => 'start', 'status' => 'start',
'turns' => '[5,6,7,8]', 'turns' => '[5,6,7,8,27]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 0, 'sort' => 0,
'created_at' => '2022-01-15 23:43:23', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:23', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
5 => 5 =>
array ( array (
@ -103,13 +103,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 2, 'flow_id' => 2,
'name' => '进行中', 'name' => '进行中',
'status' => 'progress', 'status' => 'progress',
'turns' => '[5,6,7,8]', 'turns' => '[5,6,7,8,27]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 1, 'sort' => 1,
'created_at' => '2022-01-15 23:43:23', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:23', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
6 => 6 =>
array ( array (
@ -118,13 +118,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 2, 'flow_id' => 2,
'name' => '已完成', 'name' => '已完成',
'status' => 'end', 'status' => 'end',
'turns' => '[5,6,7,8]', 'turns' => '[5,6,7,8,27]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 2, 'sort' => 3,
'created_at' => '2022-01-15 23:43:23', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:23', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
7 => 7 =>
array ( array (
@ -133,13 +133,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 2, 'flow_id' => 2,
'name' => '已取消', 'name' => '已取消',
'status' => 'end', 'status' => 'end',
'turns' => '[5,6,7,8]', 'turns' => '[5,6,7,8,27]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 3, 'sort' => 4,
'created_at' => '2022-01-15 23:43:23', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:23', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
8 => 8 =>
array ( array (
@ -148,13 +148,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 3, 'flow_id' => 3,
'name' => '待处理', 'name' => '待处理',
'status' => 'start', 'status' => 'start',
'turns' => '[9,10,11,12]', 'turns' => '[9,10,11,12,28]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 0, 'sort' => 0,
'created_at' => '2022-01-15 23:43:28', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:28', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
9 => 9 =>
array ( array (
@ -163,13 +163,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 3, 'flow_id' => 3,
'name' => '进行中', 'name' => '进行中',
'status' => 'progress', 'status' => 'progress',
'turns' => '[9,10,11,12]', 'turns' => '[9,10,11,12,28]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 1, 'sort' => 1,
'created_at' => '2022-01-15 23:43:28', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:28', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
10 => 10 =>
array ( array (
@ -178,13 +178,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 3, 'flow_id' => 3,
'name' => '已完成', 'name' => '已完成',
'status' => 'end', 'status' => 'end',
'turns' => '[9,10,11,12]', 'turns' => '[9,10,11,12,28]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 2, 'sort' => 3,
'created_at' => '2022-01-15 23:43:28', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:28', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
11 => 11 =>
array ( array (
@ -193,13 +193,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 3, 'flow_id' => 3,
'name' => '已取消', 'name' => '已取消',
'status' => 'end', 'status' => 'end',
'turns' => '[9,10,11,12]', 'turns' => '[9,10,11,12,28]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 3, 'sort' => 4,
'created_at' => '2022-01-15 23:43:28', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:28', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
12 => 12 =>
array ( array (
@ -208,13 +208,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 4, 'flow_id' => 4,
'name' => '待处理', 'name' => '待处理',
'status' => 'start', 'status' => 'start',
'turns' => '[13,14,15,16]', 'turns' => '[13,14,15,16,29]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 0, 'sort' => 0,
'created_at' => '2022-01-15 23:43:34', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:34', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
13 => 13 =>
array ( array (
@ -223,13 +223,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 4, 'flow_id' => 4,
'name' => '进行中', 'name' => '进行中',
'status' => 'progress', 'status' => 'progress',
'turns' => '[13,14,15,16]', 'turns' => '[13,14,15,16,29]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 1, 'sort' => 1,
'created_at' => '2022-01-15 23:43:34', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:34', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
14 => 14 =>
array ( array (
@ -238,13 +238,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 4, 'flow_id' => 4,
'name' => '已完成', 'name' => '已完成',
'status' => 'end', 'status' => 'end',
'turns' => '[13,14,15,16]', 'turns' => '[13,14,15,16,29]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 2, 'sort' => 3,
'created_at' => '2022-01-15 23:43:34', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:34', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
15 => 15 =>
array ( array (
@ -253,13 +253,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 4, 'flow_id' => 4,
'name' => '已取消', 'name' => '已取消',
'status' => 'end', 'status' => 'end',
'turns' => '[13,14,15,16]', 'turns' => '[13,14,15,16,29]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 3, 'sort' => 4,
'created_at' => '2022-01-15 23:43:34', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:34', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
16 => 16 =>
array ( array (
@ -268,13 +268,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 5, 'flow_id' => 5,
'name' => '待处理', 'name' => '待处理',
'status' => 'start', 'status' => 'start',
'turns' => '[17,18,19,20]', 'turns' => '[17,18,19,20,30]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 0, 'sort' => 0,
'created_at' => '2022-01-15 23:43:40', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:40', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
17 => 17 =>
array ( array (
@ -283,13 +283,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 5, 'flow_id' => 5,
'name' => '进行中', 'name' => '进行中',
'status' => 'progress', 'status' => 'progress',
'turns' => '[17,18,19,20]', 'turns' => '[17,18,19,20,30]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 1, 'sort' => 1,
'created_at' => '2022-01-15 23:43:40', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:40', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
18 => 18 =>
array ( array (
@ -298,13 +298,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 5, 'flow_id' => 5,
'name' => '已完成', 'name' => '已完成',
'status' => 'end', 'status' => 'end',
'turns' => '[17,18,19,20]', 'turns' => '[17,18,19,20,30]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 2, 'sort' => 3,
'created_at' => '2022-01-15 23:43:40', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:40', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
19 => 19 =>
array ( array (
@ -313,13 +313,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 5, 'flow_id' => 5,
'name' => '已取消', 'name' => '已取消',
'status' => 'end', 'status' => 'end',
'turns' => '[17,18,19,20]', 'turns' => '[17,18,19,20,30]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 3, 'sort' => 4,
'created_at' => '2022-01-15 23:43:40', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:40', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
20 => 20 =>
array ( array (
@ -328,13 +328,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 6, 'flow_id' => 6,
'name' => '待处理', 'name' => '待处理',
'status' => 'start', 'status' => 'start',
'turns' => '[21,22,23,24]', 'turns' => '[21,22,23,24,25]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 0, 'sort' => 0,
'created_at' => '2022-01-15 23:43:45', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:45', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
21 => 21 =>
array ( array (
@ -343,13 +343,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 6, 'flow_id' => 6,
'name' => '进行中', 'name' => '进行中',
'status' => 'progress', 'status' => 'progress',
'turns' => '[21,22,23,24]', 'turns' => '[21,22,23,24,25]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 1, 'sort' => 1,
'created_at' => '2022-01-15 23:43:45', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:45', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
22 => 22 =>
array ( array (
@ -358,13 +358,13 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 6, 'flow_id' => 6,
'name' => '已完成', 'name' => '已完成',
'status' => 'end', 'status' => 'end',
'turns' => '[21,22,23,24]', 'turns' => '[21,22,23,24,25]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 2, 'sort' => 3,
'created_at' => '2022-01-15 23:43:45', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:45', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
23 => 23 =>
array ( array (
@ -373,13 +373,103 @@ class ProjectFlowItemsTableSeeder extends Seeder
'flow_id' => 6, 'flow_id' => 6,
'name' => '已取消', 'name' => '已取消',
'status' => 'end', 'status' => 'end',
'turns' => '[21,22,23,24]', 'turns' => '[21,22,23,24,25]',
'userids' => '[]', 'userids' => '[]',
'usertype' => 'add', 'usertype' => 'add',
'userlimit' => 0, 'userlimit' => 0,
'sort' => 3, 'sort' => 4,
'created_at' => '2022-01-15 23:43:45', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:45', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
),
24 =>
array (
'id' => 25,
'project_id' => 7,
'flow_id' => 6,
'name' => '待测试',
'status' => 'test',
'turns' => '[21,22,23,24,25]',
'userids' => '[]',
'usertype' => 'add',
'userlimit' => 0,
'sort' => 2,
'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => seeders_at('2021-07-01 12:27:12'),
),
25 =>
array (
'id' => 26,
'project_id' => 2,
'flow_id' => 1,
'name' => '待测试',
'status' => 'test',
'turns' => '[1,2,3,4,26]',
'userids' => '[]',
'usertype' => 'add',
'userlimit' => 0,
'sort' => 2,
'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => seeders_at('2021-07-01 12:27:12'),
),
26 =>
array (
'id' => 27,
'project_id' => 3,
'flow_id' => 2,
'name' => '待测试',
'status' => 'test',
'turns' => '[5,6,7,8,27]',
'userids' => '[]',
'usertype' => 'add',
'userlimit' => 0,
'sort' => 2,
'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => seeders_at('2021-07-01 12:27:12'),
),
27 =>
array (
'id' => 28,
'project_id' => 4,
'flow_id' => 3,
'name' => '待测试',
'status' => 'test',
'turns' => '[9,10,11,12,28]',
'userids' => '[]',
'usertype' => 'add',
'userlimit' => 0,
'sort' => 2,
'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => seeders_at('2021-07-01 12:27:12'),
),
28 =>
array (
'id' => 29,
'project_id' => 5,
'flow_id' => 4,
'name' => '待测试',
'status' => 'test',
'turns' => '[13,14,15,16,29]',
'userids' => '[]',
'usertype' => 'add',
'userlimit' => 0,
'sort' => 2,
'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => seeders_at('2021-07-01 12:27:12'),
),
29 =>
array (
'id' => 30,
'project_id' => 6,
'flow_id' => 5,
'name' => '待测试',
'status' => 'test',
'turns' => '[17,18,19,20,30]',
'userids' => '[]',
'usertype' => 'add',
'userlimit' => 0,
'sort' => 2,
'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
)); ));

24
database/seeders/ProjectFlowsTableSeeder.php
View File

@ -26,48 +26,48 @@ class ProjectFlowsTableSeeder extends Seeder
'id' => 1, 'id' => 1,
'project_id' => 2, 'project_id' => 2,
'name' => 'Default', 'name' => 'Default',
'created_at' => '2022-01-15 23:43:15', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:15', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
1 => 1 =>
array ( array (
'id' => 2, 'id' => 2,
'project_id' => 3, 'project_id' => 3,
'name' => 'Default', 'name' => 'Default',
'created_at' => '2022-01-15 23:43:23', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:23', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
2 => 2 =>
array ( array (
'id' => 3, 'id' => 3,
'project_id' => 4, 'project_id' => 4,
'name' => 'Default', 'name' => 'Default',
'created_at' => '2022-01-15 23:43:28', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:28', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
3 => 3 =>
array ( array (
'id' => 4, 'id' => 4,
'project_id' => 5, 'project_id' => 5,
'name' => 'Default', 'name' => 'Default',
'created_at' => '2022-01-15 23:43:34', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:34', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
4 => 4 =>
array ( array (
'id' => 5, 'id' => 5,
'project_id' => 6, 'project_id' => 6,
'name' => 'Default', 'name' => 'Default',
'created_at' => '2022-01-15 23:43:40', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:40', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
5 => 5 =>
array ( array (
'id' => 6, 'id' => 6,
'project_id' => 7, 'project_id' => 7,
'name' => 'Default', 'name' => 'Default',
'created_at' => '2022-01-15 23:43:45', 'created_at' => seeders_at('2021-07-01 12:27:12'),
'updated_at' => '2022-01-15 23:43:45', 'updated_at' => seeders_at('2021-07-01 12:27:12'),
), ),
)); ));

2
electron/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.12.7", "version": "0.12.8",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"main": "electron.js", "main": "electron.js",
"license": "MIT", "license": "MIT",

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "DooTask", "name": "DooTask",
"version": "0.12.7", "version": "0.12.8",
"description": "DooTask is task management system.", "description": "DooTask is task management system.",
"scripts": { "scripts": {
"start": "./cmd dev", "start": "./cmd dev",

2
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

2
public/js/build/476.js → public/js/build/214.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/js/build/466.js vendored
View File

File diff suppressed because one or more lines are too long

1
public/js/build/669.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

4
resources/assets/js/pages/login.vue
View File

@ -262,7 +262,7 @@ export default {
chackServerUrl(tip) { chackServerUrl(tip) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.$Electron && this.isNotServer()) { if (this.isNotServer()) {
if (tip === true) { if (tip === true) {
$A.messageWarning("请设置服务器") $A.messageWarning("请设置服务器")
} }
@ -287,7 +287,7 @@ export default {
isNotServer() { isNotServer() {
let apiHome = $A.getDomain(window.systemInfo.apiUrl) let apiHome = $A.getDomain(window.systemInfo.apiUrl)
return apiHome == "" || apiHome == "public" return this.$Electron && (apiHome == "" || apiHome == "public")
}, },
onBlur() { onBlur() {

11
resources/assets/js/pages/manage/dashboard.vue
View File

@ -28,11 +28,10 @@
</li> </li>
</ul> </ul>
<div class="dashboard-list overlay-y"> <div class="dashboard-list overlay-y">
<div <template
:ref="`type_${column.type}`" v-for="column in columns"
v-for="(column, index) in columns" v-if="column.list.length > 0">
v-if="column.list.length > 0" <div :ref="`type_${column.type}`" class="dashboard-ref"></div>
:key="index">
<div class="dashboard-title">{{column.title}}</div> <div class="dashboard-title">{{column.title}}</div>
<ul class="dashboard-ul"> <ul class="dashboard-ul">
<li <li
@ -75,7 +74,7 @@
</ETooltip> </ETooltip>
</li> </li>
</ul> </ul>
</div> </template>
</div> </div>
</div> </div>
</div> </div>

2
resources/assets/sass/pages/components/project-workflow.scss vendored
View File

@ -50,7 +50,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
> div { > div {
height: 22px; height: 24px;
line-height: 22px; line-height: 22px;
margin-right: 8px; margin-right: 8px;
padding: 0 8px; padding: 0 8px;

9
resources/assets/sass/pages/page-dashboard.scss vendored
View File

@ -8,7 +8,8 @@
background-color: #ffffff; background-color: #ffffff;
.dashboard-wrapper { .dashboard-wrapper {
width: 100%; width: 100%;
max-height: 80%; height: auto;
max-height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
@ -22,7 +23,7 @@
margin: 0 auto; margin: 0 auto;
} }
.dashboard-hello { .dashboard-hello {
padding: 0 12px; padding: 6% 12px 0;
color: #333333; color: #333333;
font-size: 24px; font-size: 24px;
font-weight: 600; font-weight: 600;
@ -93,7 +94,11 @@
.dashboard-list { .dashboard-list {
width: 100%; width: 100%;
margin-top: 48px; margin-top: 48px;
padding-bottom: 6%;
overflow: auto; overflow: auto;
.dashboard-ref {
height: 0;
}
.dashboard-title { .dashboard-title {
position: sticky; position: sticky;
top: 0; top: 0;