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

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
((remaining=$remaining-1))
if [ $remaining -lt 0 ]; then
echo -e "${Error} ${RedBG} 数据库安装失败! ${Font}"
echo -e "${Error} ${RedBG} 数据库初始化失败! ${Font}"
exit 1
fi
chmod -R 775 "${cur_path}/docker/mysql/data"
sleep 3
done
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"`
$COMPOSE up -d

View File

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

View File

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

View File

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

View File

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

2
public/css/app.css vendored

File diff suppressed because one or more lines are too long

2
public/js/app.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

View File

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

View File

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

View File

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

View File

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