mirror of
https://github.com/go-admin-team/go-admin.git
synced 2026-09-20 17:57:54 +00:00
feat:update vue template & sql
This commit is contained in:
zhangwenjian
@@ -76,7 +76,9 @@ func run() error {
|
|||||||
Handler: r,
|
Handler: r,
|
||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
|
jobs.InitJob()
|
||||||
jobs.Setup()
|
jobs.Setup()
|
||||||
|
|
||||||
}()
|
}()
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -452,8 +452,8 @@ INSERT INTO sys_user VALUES (2, 'zhangwj', '13211111111', 3, NULL, NULL, '0', 'q
|
|||||||
|
|
||||||
INSERT INTO sys_setting VALUES (1, 'go-admin管理系统', 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png', '2020-08-05 14:27:34', '2020-08-07 10:13:31' ,NULL);
|
INSERT INTO sys_setting VALUES (1, 'go-admin管理系统', 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png', '2020-08-05 14:27:34', '2020-08-07 10:13:31' ,NULL);
|
||||||
|
|
||||||
INSERT INTO sys_job VALUES (1, '接口测试', 'DEFAULT', 1, '0/5 * * * * ?', 'http://localhost:8000', 1, 1, 0, '2020-08-03 14:54:03', '2020-08-11 21:48:47', NULL, '', '', 1);
|
INSERT INTO sys_job VALUES (1, '接口测试', 'DEFAULT', 1, '0/5 * * * * ?', 'http://localhost:8000', 1, 1, 2, 0, '', '', '2020-08-03 14:54:03', '2020-08-11 21:48:47', NULL);
|
||||||
INSERT INTO sys_job VALUES (2, '函数测试', 'DEFAULT', 2, '0/5 * * * * ?', 'ExamplesNoParam', 1, 1, 0, '2020-08-11 21:41:23', '2020-08-11 21:41:31', NULL, '', '', 2);
|
INSERT INTO sys_job VALUES (2, '函数测试', 'DEFAULT', 2, '0/5 * * * * ?', 'ExamplesOne', 1, 1, 2, 0, '', '', '2020-08-11 21:41:23', '2020-08-11 21:41:31', NULL);
|
||||||
COMMIT;
|
COMMIT;
|
||||||
|
|
||||||
-- 数据完成 ;
|
-- 数据完成 ;
|
||||||
+5
-4
@@ -7,10 +7,11 @@ import (
|
|||||||
|
|
||||||
// 需要将定义的struct 添加到字典中；
|
// 需要将定义的struct 添加到字典中；
|
||||||
// 字典 key 可以配置到 自动任务 调用目标 中；
|
// 字典 key 可以配置到 自动任务 调用目标 中；
|
||||||
func init() {
|
func InitJob() {
|
||||||
var mp = make(map[string]JobsExec, 10)
|
jobList = map[string]JobsExec{
|
||||||
mp["ExamplesOne"] = ExamplesOne{}
|
"ExamplesOne": ExamplesOne{},
|
||||||
jobList = mp
|
// ...
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 新添加的job 必须按照以下格式定义，并实现Exec函数
|
// 新添加的job 必须按照以下格式定义，并实现Exec函数
|
||||||
|
|||||||
+1
-5
@@ -36,12 +36,8 @@ type ExecJob struct {
|
|||||||
|
|
||||||
func (e *ExecJob) Run() {
|
func (e *ExecJob) Run() {
|
||||||
startTime := time.Now()
|
startTime := time.Now()
|
||||||
var mp = jobList
|
var obj = jobList[e.InvokeTarget]
|
||||||
lock.Lock()
|
|
||||||
var obj = mp[e.InvokeTarget]
|
|
||||||
lock.Unlock()
|
|
||||||
CallExec(obj.(JobsExec))
|
CallExec(obj.(JobsExec))
|
||||||
//fmt.Println("CallExec exec success")
|
|
||||||
// 结束时间
|
// 结束时间
|
||||||
endTime := time.Now()
|
endTime := time.Now()
|
||||||
|
|
||||||
|
|||||||
+167
-163
@@ -1,139 +1,19 @@
|
|||||||
{{$tableComment:=.TableComment}}
|
{{$tableComment:=.TableComment}}
|
||||||
<template>
|
<template>
|
||||||
<div class="app-container">
|
<BasicLayout>
|
||||||
<el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
|
<template #wrapper>
|
||||||
{{range .Columns}}
|
<el-card class="box-card">
|
||||||
{{- $x := .IsQuery -}}
|
<el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
|
||||||
{{- if ($x) -}}
|
{{range .Columns}}
|
||||||
<el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
|
{{- $x := .IsQuery -}}
|
||||||
{{if eq .DictType "" -}}
|
{{- if ($x) -}}
|
||||||
<el-input v-model="queryParams.{{.JsonField}}" placeholder="请输入{{.ColumnComment}}" clearable
|
|
||||||
size="small" @keyup.enter.native="handleQuery"/>
|
|
||||||
{{- else -}}
|
|
||||||
<el-select v-model="queryParams.{{.JsonField}}"
|
|
||||||
placeholder="{{$tableComment}}{{.ColumnComment}}" clearable size="small">
|
|
||||||
<el-option
|
|
||||||
v-for="dict in {{.JsonField}}Options"
|
|
||||||
:key="dict.dictValue"
|
|
||||||
:label="dict.dictLabel"
|
|
||||||
:value="dict.dictValue"
|
|
||||||
/>
|
|
||||||
</el-select>
|
|
||||||
{{- end}}
|
|
||||||
</el-form-item>
|
|
||||||
{{end}}
|
|
||||||
{{- end }}
|
|
||||||
<el-form-item>
|
|
||||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
|
||||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
|
||||||
</el-form-item>
|
|
||||||
</el-form>
|
|
||||||
|
|
||||||
<el-row :gutter="10" class="mb8">
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button
|
|
||||||
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:add']"
|
|
||||||
type="primary"
|
|
||||||
icon="el-icon-plus"
|
|
||||||
size="mini"
|
|
||||||
@click="handleAdd"
|
|
||||||
>新增
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button
|
|
||||||
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:edit']"
|
|
||||||
type="success"
|
|
||||||
icon="el-icon-edit"
|
|
||||||
size="mini"
|
|
||||||
:disabled="single"
|
|
||||||
@click="handleUpdate"
|
|
||||||
>修改
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
|
||||||
<el-col :span="1.5">
|
|
||||||
<el-button
|
|
||||||
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:remove']"
|
|
||||||
type="danger"
|
|
||||||
icon="el-icon-delete"
|
|
||||||
size="mini"
|
|
||||||
:disabled="multiple"
|
|
||||||
@click="handleDelete"
|
|
||||||
>删除
|
|
||||||
</el-button>
|
|
||||||
</el-col>
|
|
||||||
</el-row>
|
|
||||||
|
|
||||||
<el-table v-loading="loading" :data="{{.ModuleName}}List" @selection-change="handleSelectionChange">
|
|
||||||
<el-table-column type="selection" width="55" align="center"/>
|
|
||||||
{{- range .Columns -}}
|
|
||||||
{{- $x := .IsList -}}
|
|
||||||
{{- if ($x) }}
|
|
||||||
{{- if ne .DictType "" -}}
|
|
||||||
<el-table-column label="{{.ColumnComment}}" align="center" prop="{{.JsonField}}"
|
|
||||||
:formatter="{{.JsonField}}Format" width="100">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
{{ "{{" }} {{.JsonField}}Format(scope.row) {{"}}"}}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
{{- end -}}
|
|
||||||
{{- if eq .DictType "" -}}
|
|
||||||
<el-table-column label="{{.ColumnComment}}" align="center" prop="{{.JsonField}}"
|
|
||||||
:show-overflow-tooltip="true"/>
|
|
||||||
{{- end -}}
|
|
||||||
|
|
||||||
{{- end }}
|
|
||||||
{{- end }}
|
|
||||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
|
||||||
<template slot-scope="scope">
|
|
||||||
<el-button
|
|
||||||
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:edit']"
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-edit"
|
|
||||||
@click="handleUpdate(scope.row)"
|
|
||||||
>修改
|
|
||||||
</el-button>
|
|
||||||
<el-button
|
|
||||||
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:remove']"
|
|
||||||
size="mini"
|
|
||||||
type="text"
|
|
||||||
icon="el-icon-delete"
|
|
||||||
@click="handleDelete(scope.row)"
|
|
||||||
>删除
|
|
||||||
</el-button>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</el-table>
|
|
||||||
|
|
||||||
<pagination
|
|
||||||
v-show="total>0"
|
|
||||||
:total="total"
|
|
||||||
:page.sync="queryParams.pageIndex"
|
|
||||||
:limit.sync="queryParams.pageSize"
|
|
||||||
@pagination="getList"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<!-- 添加或修改对话框 -->
|
|
||||||
<el-dialog :title="title" :visible.sync="open" width="500px">
|
|
||||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
||||||
{{ range .Columns }}
|
|
||||||
{{- $x := .IsInsert -}}
|
|
||||||
{{- if ($x) -}}
|
|
||||||
{{- if (.Pk) }}
|
|
||||||
{{- else if eq .GoField "CreatedAt" -}}
|
|
||||||
{{- else if eq .GoField "UpdatedAt" -}}
|
|
||||||
{{- else if eq .GoField "DeletedAt" -}}
|
|
||||||
{{- else if eq .GoField "UpdateBy" -}}
|
|
||||||
{{- else if eq .GoField "CreateBy" -}}
|
|
||||||
{{- else }}
|
|
||||||
<el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
|
<el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
|
||||||
{{ if eq "input" .HtmlType -}}
|
{{if eq .DictType "" -}}
|
||||||
<el-input v-model="form.{{.JsonField}}" placeholder="{{.ColumnComment}}"
|
<el-input v-model="queryParams.{{.JsonField}}" placeholder="请输入{{.ColumnComment}}" clearable
|
||||||
{{if eq .IsEdit "false" -}}:disabled="isEdit" {{- end}}/>
|
size="small" @keyup.enter.native="handleQuery"/>
|
||||||
{{- else if eq "select" .HtmlType -}}
|
{{- else -}}
|
||||||
<el-select v-model="form.{{.JsonField}}"
|
<el-select v-model="queryParams.{{.JsonField}}"
|
||||||
placeholder="请选择" {{if eq .IsEdit "false" -}} :disabled="isEdit" {{- end }}>
|
placeholder="{{$tableComment}}{{.ColumnComment}}" clearable size="small">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="dict in {{.JsonField}}Options"
|
v-for="dict in {{.JsonField}}Options"
|
||||||
:key="dict.dictValue"
|
:key="dict.dictValue"
|
||||||
@@ -141,39 +21,163 @@
|
|||||||
:value="dict.dictValue"
|
:value="dict.dictValue"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
{{- else if eq "radio" .HtmlType -}}
|
{{- end}}
|
||||||
<el-radio-group v-model="form.{{.JsonField}}">
|
|
||||||
<el-radio
|
|
||||||
v-for="dict in {{.JsonField}}Options"
|
|
||||||
:key="dict.dictValue"
|
|
||||||
:label="dict.dictValue"
|
|
||||||
>{{"{{"}} dict.dictLabel {{"}}"}}</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
{{- else if eq "datetime" .HtmlType -}}
|
|
||||||
<el-date-picker
|
|
||||||
v-model="form.{{.JsonField}}"
|
|
||||||
type="datetime"
|
|
||||||
placeholder="选择日期">
|
|
||||||
</el-date-picker>
|
|
||||||
{{- else if eq "textarea" .HtmlType -}}
|
|
||||||
<el-input
|
|
||||||
v-model="form.{{.JsonField}}"
|
|
||||||
type="textarea"
|
|
||||||
:rows="2"
|
|
||||||
placeholder="请输入内容">
|
|
||||||
</el-input>
|
|
||||||
{{- end }}
|
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
{{end}}
|
||||||
|
{{- end }}
|
||||||
|
<el-form-item>
|
||||||
|
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||||
|
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||||
|
</el-form-item>
|
||||||
|
</el-form>
|
||||||
|
|
||||||
|
<el-row :gutter="10" class="mb8">
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:add']"
|
||||||
|
type="primary"
|
||||||
|
icon="el-icon-plus"
|
||||||
|
size="mini"
|
||||||
|
@click="handleAdd"
|
||||||
|
>新增
|
||||||
|
</el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:edit']"
|
||||||
|
type="success"
|
||||||
|
icon="el-icon-edit"
|
||||||
|
size="mini"
|
||||||
|
:disabled="single"
|
||||||
|
@click="handleUpdate"
|
||||||
|
>修改
|
||||||
|
</el-button>
|
||||||
|
</el-col>
|
||||||
|
<el-col :span="1.5">
|
||||||
|
<el-button
|
||||||
|
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:remove']"
|
||||||
|
type="danger"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
size="mini"
|
||||||
|
:disabled="multiple"
|
||||||
|
@click="handleDelete"
|
||||||
|
>删除
|
||||||
|
</el-button>
|
||||||
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
|
||||||
|
<el-table v-loading="loading" :data="{{.ModuleName}}List" @selection-change="handleSelectionChange">
|
||||||
|
<el-table-column type="selection" width="55" align="center"/>
|
||||||
|
{{- range .Columns -}}
|
||||||
|
{{- $x := .IsList -}}
|
||||||
|
{{- if ($x) }}
|
||||||
|
{{- if ne .DictType "" -}}
|
||||||
|
<el-table-column label="{{.ColumnComment}}" align="center" prop="{{.JsonField}}"
|
||||||
|
:formatter="{{.JsonField}}Format" width="100">
|
||||||
|
<template slot-scope="scope">
|
||||||
|
{{ "{{" }} {{.JsonField}}Format(scope.row) {{"}}"}}
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
{{- end -}}
|
||||||
|
{{- if eq .DictType "" -}}
|
||||||
|
<el-table-column label="{{.ColumnComment}}" align="center" prop="{{.JsonField}}"
|
||||||
|
:show-overflow-tooltip="true"/>
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||||
</el-form>
|
<template slot-scope="scope">
|
||||||
<div slot="footer" class="dialog-footer">
|
<el-button
|
||||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:edit']"
|
||||||
<el-button @click="cancel">取 消</el-button>
|
size="mini"
|
||||||
</div>
|
type="text"
|
||||||
</el-dialog>
|
icon="el-icon-edit"
|
||||||
</div>
|
@click="handleUpdate(scope.row)"
|
||||||
|
>修改
|
||||||
|
</el-button>
|
||||||
|
<el-button
|
||||||
|
v-permisaction="['{{.PackageName}}:{{.ModuleName}}:remove']"
|
||||||
|
size="mini"
|
||||||
|
type="text"
|
||||||
|
icon="el-icon-delete"
|
||||||
|
@click="handleDelete(scope.row)"
|
||||||
|
>删除
|
||||||
|
</el-button>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
</el-table>
|
||||||
|
|
||||||
|
<pagination
|
||||||
|
v-show="total>0"
|
||||||
|
:total="total"
|
||||||
|
:page.sync="queryParams.pageIndex"
|
||||||
|
:limit.sync="queryParams.pageSize"
|
||||||
|
@pagination="getList"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- 添加或修改对话框 -->
|
||||||
|
<el-dialog :title="title" :visible.sync="open" width="500px">
|
||||||
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||||
|
{{ range .Columns }}
|
||||||
|
{{- $x := .IsInsert -}}
|
||||||
|
{{- if ($x) -}}
|
||||||
|
{{- if (.Pk) }}
|
||||||
|
{{- else if eq .GoField "CreatedAt" -}}
|
||||||
|
{{- else if eq .GoField "UpdatedAt" -}}
|
||||||
|
{{- else if eq .GoField "DeletedAt" -}}
|
||||||
|
{{- else if eq .GoField "UpdateBy" -}}
|
||||||
|
{{- else if eq .GoField "CreateBy" -}}
|
||||||
|
{{- else }}
|
||||||
|
<el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
|
||||||
|
{{ if eq "input" .HtmlType -}}
|
||||||
|
<el-input v-model="form.{{.JsonField}}" placeholder="{{.ColumnComment}}"
|
||||||
|
{{if eq .IsEdit "false" -}}:disabled="isEdit" {{- end}}/>
|
||||||
|
{{- else if eq "select" .HtmlType -}}
|
||||||
|
<el-select v-model="form.{{.JsonField}}"
|
||||||
|
placeholder="请选择" {{if eq .IsEdit "false" -}} :disabled="isEdit" {{- end }}>
|
||||||
|
<el-option
|
||||||
|
v-for="dict in {{.JsonField}}Options"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictLabel"
|
||||||
|
:value="dict.dictValue"
|
||||||
|
/>
|
||||||
|
</el-select>
|
||||||
|
{{- else if eq "radio" .HtmlType -}}
|
||||||
|
<el-radio-group v-model="form.{{.JsonField}}">
|
||||||
|
<el-radio
|
||||||
|
v-for="dict in {{.JsonField}}Options"
|
||||||
|
:key="dict.dictValue"
|
||||||
|
:label="dict.dictValue"
|
||||||
|
>{{"{{"}} dict.dictLabel {{"}}"}}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
{{- else if eq "datetime" .HtmlType -}}
|
||||||
|
<el-date-picker
|
||||||
|
v-model="form.{{.JsonField}}"
|
||||||
|
type="datetime"
|
||||||
|
placeholder="选择日期">
|
||||||
|
</el-date-picker>
|
||||||
|
{{- else if eq "textarea" .HtmlType -}}
|
||||||
|
<el-input
|
||||||
|
v-model="form.{{.JsonField}}"
|
||||||
|
type="textarea"
|
||||||
|
:rows="2"
|
||||||
|
placeholder="请输入内容">
|
||||||
|
</el-input>
|
||||||
|
{{- end }}
|
||||||
|
</el-form-item>
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
|
</el-form>
|
||||||
|
<div slot="footer" class="dialog-footer">
|
||||||
|
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||||
|
<el-button @click="cancel">取 消</el-button>
|
||||||
|
</div>
|
||||||
|
</el-dialog>
|
||||||
|
</el-card>
|
||||||
|
</template>
|
||||||
|
</BasicLayout>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|||||||
Reference in New Issue
Block a user