releases 1.1.5

releases 1.1.5

apis/sysjob/sysjob.go

@@ -101,12 +101,22 @@ func StartJob(c *gin.Context) {
 	data.JobId, _ = tools.StringToInt(c.Param("jobId"))
 	result, err := data.Get()
 	tools.HasError(err, "", 500)
-	j := &jobs.ExecJob{}
-	j.InvokeTarget = result.InvokeTarget
-	j.CronExpression = result.CronExpression
-	j.JobId = result.JobId
-	j.Name = result.JobName
-	data.EntryId, err = jobs.AddJob(j)
+	if result.JobType == 1{
+		var j = &jobs.HttpJob{}
+		j.InvokeTarget = result.InvokeTarget
+		j.CronExpression = result.CronExpression
+		j.JobId = result.JobId
+		j.Name = result.JobName
+		data.EntryId, err = jobs.AddJob(j)
+	} else {
+		var j = &jobs.ExecJob{}
+		j.InvokeTarget = result.InvokeTarget
+		j.CronExpression = result.CronExpression
+		j.JobId = result.JobId
+		j.Name = result.JobName
+		data.EntryId, err = jobs.AddJob(j)
+	}
+
 	tools.HasError(err, "", 500)
 	_, err = data.Update(data.JobId)
 	tools.HasError(err, "", 500)

cmd/api/server.go

@@ -76,7 +76,9 @@ func run() error {
 		Handler: r,
 	}
 	go func() {
+		jobs.InitJob()
 		jobs.Setup()
+
 	}()
 
 

config/db.sql

@@ -126,7 +126,6 @@ INSERT INTO sys_dict_type VALUES (7, '通知类型', 'sys_notice_type', 0, '1',
 INSERT INTO sys_dict_type VALUES (8, '系统状态', 'sys_common_status', 0, '1', '', '登录状态列表', '2020-04-11 15:52:48', NULL, NULL);
 INSERT INTO sys_dict_type VALUES (9, '操作类型', 'sys_oper_type', 0, '1', '', '操作类型列表', '2020-04-11 15:52:48', NULL, NULL);
 INSERT INTO sys_dict_type VALUES (10, '通知状态', 'sys_notice_status', 0, '1', '', '通知状态列表', '2020-04-11 15:52:48', NULL, NULL);
-INSERT INTO sys_dict_type VALUES (11, '1', '1', 1, '1', '1', '1', '2020-04-11 15:52:48', NULL, NULL);
 
 INSERT INTO sys_menu VALUES (2, 'Upms', '系统管理', 'example', '/upms', '/0/2', 'M', '无', '', 0, 1, '', 'Layout', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', NULL, NULL);
 INSERT INTO sys_menu VALUES (3, 'Sysuser', '用户管理', 'user', 'sysuser', '/0/2/3', 'C', '无', 'system:sysuser:list', 2, NULL, NULL, '/sysuser/index', 1, '0', '1', '1', '0', '2020-04-11 15:52:48', '2020-04-12 11:10:42', NULL);
@@ -273,10 +272,10 @@ INSERT INTO sys_menu VALUES (469, 'sys_job', '修改定时任务', 'bug', '/api/
 INSERT INTO sys_menu VALUES (470, 'sys_job', '删除定时任务', 'bug', '/api/v1/sysjob/:id', '/0/63/465/470', 'A', 'DELETE', '', 465, 0, '', '', 0, '1', '1', '1', '0', '2020-08-03 09:17:37', '2020-08-03 09:17:37', NULL);
 INSERT INTO sys_menu VALUES (471, 'job_log', '日志', 'bug', 'job_log', '/0/459/471', 'C', '', '', 459, 0, '', '/sysjob/log', 0, '1', '1', '1', '1', '2020-08-05 21:24:46', '2020-08-06 00:02:20', NULL);
 INSERT INTO sys_menu VALUES (473, 'sysSetting', '系统配置', 'form', 'syssettings', '/0/60/473', 'C', '无', 'syssetting:syssetting:list', 60, 0, '', '/system/settings', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 02:17:10', NULL);
-INSERT INTO sys_menu VALUES (474, 'sys_setting', '分页获取SysSetting', 'pass', 'sys_setting', '/0/472/473/474', 'F', '无', 'syssetting:syssetting:query', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (475, 'sys_setting', '创建SysSetting', 'pass', 'sys_setting', '/0/472/473/475', 'F', '无', 'syssetting:syssetting:add', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (476, 'sys_setting', '修改SysSetting', 'pass', 'sys_setting', '/0/472/473/476', 'F', '无', 'syssetting:syssetting:edit', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
-INSERT INTO sys_menu VALUES (477, 'sys_setting', '删除SysSetting', 'pass', 'sys_setting', '/0/472/473/477', 'F', '无', 'syssetting:syssetting:remove', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+INSERT INTO sys_menu VALUES (474, 'sys_setting', '分页获取SysSetting', 'pass', 'sys_setting', '/0/60/473/474', 'F', '无', 'syssetting:syssetting:query', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+INSERT INTO sys_menu VALUES (475, 'sys_setting', '创建SysSetting', 'pass', 'sys_setting', '/0/60/473/475', 'F', '无', 'syssetting:syssetting:add', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+INSERT INTO sys_menu VALUES (476, 'sys_setting', '修改SysSetting', 'pass', 'sys_setting', '/0/60/473/476', 'F', '无', 'syssetting:syssetting:edit', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
+INSERT INTO sys_menu VALUES (477, 'sys_setting', '删除SysSetting', 'pass', 'sys_setting', '/0/60/473/477', 'F', '无', 'syssetting:syssetting:remove', 473, 0, '', '', 0, '0', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
 INSERT INTO sys_menu VALUES (478, 'sys_setting', 'SysSetting', 'bug', 'sys_setting', '/0/63/478', 'M', '无', '', 63, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
 INSERT INTO sys_menu VALUES (479, 'sys_setting', '分页获取SysSetting', 'bug', '/api/v1/syssettingList', '/0/63/478/479', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
 INSERT INTO sys_menu VALUES (480, 'sys_setting', '根据id获取SysSetting', 'bug', '/api/v1/syssetting/:id', '/0/63/478/480', 'A', 'GET', '', 478, 0, '', '', 0, '1', '1', '1', '0', '2020-08-09 01:05:22', '2020-08-09 01:05:22', NULL);
@@ -451,10 +450,10 @@ INSERT INTO sys_role_menu VALUES (1, 483, 'admin', NULL, NULL);
 INSERT INTO sys_user VALUES (1, 'zhangwj', '13818888888', 1, NULL, '', '0', '1@qq.com', 1, 1, '1', '1', NULL, 0, '2019-11-10 14:05:55', '2020-05-03 20:45:59', NULL, 'admin', '$2a$10$cKFFTCzGOvaIHHJY2K45Zuwt8TD6oPzYi4s5MzYIBAWCLL6ZhouP2');
 INSERT INTO sys_user VALUES (2, 'zhangwj', '13211111111', 3, NULL, NULL, '0', 'q@q.com', 8, 2, '1', '1', NULL, 0, '2019-11-12 18:28:27', '2020-03-14 20:08:43', NULL, 'zhangwj', '$2a$10$CqMwHahA3cNrNv16CoSxmeD4XMPU.BiKHPEAeaG5oXMavOKrjInXi');
 
-INSERT INTO sys_setting VALUES (1, 'go-admin管理系统', 'https://gitee.com/mydearzwj/image/raw/master/img/go-admin.png', NULL, '2020-08-05 14:27:34', '2020-08-07 10:13:31');
+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 (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 (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 * * * * ?', 'ExamplesOne', 1, 1, 2, 0, '', '', '2020-08-11 21:41:23', '2020-08-11 21:41:31', NULL);
 COMMIT;
 
 -- 数据完成 ;

global/adm.go

@@ -24,7 +24,7 @@ var (
 var Version string
 
 func init() {
-	Version = "1.1.3"
+	Version = "1.1.5"
 }
 
 var (

go.sum

@@ -17,6 +17,7 @@ github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
+github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
 github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
@@ -71,6 +72,7 @@ github.com/git-chglog/git-chglog v0.0.0-20190923122001-6050f20bcdb0/go.mod h1:Dc
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
 github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
 github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
@@ -151,6 +153,7 @@ github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T
 github.com/hinshun/vt10x v0.0.0-20180616224451-1954e6464174/go.mod h1:DqJ97dSdRW1W22yXSB90986pcOyQ7r45iio1KN2ez1A=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jinzhu/gorm v1.9.10 h1:HvrsqdhCW78xpJF67g1hMxS6eCToo9PZH4LDB8WKPac=
 github.com/jinzhu/gorm v1.9.10/go.mod h1:Kh6hTsSGffh4ui079FHrR5Gg+5D0hgihqDcsDN2BBJY=

jobs/examples.go

@@ -7,10 +7,11 @@ import (
 
 // 需要将定义的struct 添加到字典中；
 // 字典 key 可以配置到 自动任务 调用目标 中；
-func init() {
-	var mp = make(map[string]JobsExec, 10)
-	mp["ExamplesOne"] = ExamplesOne{}
-	jobList = mp
+func InitJob() {
+	jobList = map[string]JobsExec{
+		"ExamplesOne": ExamplesOne{},
+		// ...
+	}
 }
 
 // 新添加的job 必须按照以下格式定义，并实现Exec函数

jobs/jobbase.go

@@ -36,12 +36,12 @@ type ExecJob struct {
 
 func (e *ExecJob) Run() {
 	startTime := time.Now()
-	var mp = jobList
-	lock.Lock()
-	var obj = mp[e.InvokeTarget]
-	lock.Unlock()
+	var obj = jobList[e.InvokeTarget]
+	if obj == nil {
+		global.JobLogger.Warning(" ExecJob Run job nil", e)
+		return
+	}
 	CallExec(obj.(JobsExec))
-	//fmt.Println("CallExec exec success")
 	// 结束时间
 	endTime := time.Now()
 

models/gorm/gorm.go

@@ -76,6 +76,10 @@ func AutoMigrate(db *gorm.DB) error {
 	if err != nil {
 		return err
 	}
+	err = db.AutoMigrate(new(models.SysSetting)).Error
+	if err != nil {
+		return err
+	}
 
 	models.DataInit()
 	return err

router/sysrouter.go

@@ -1,9 +1,6 @@
 package router
 
 import (
-	"github.com/gin-gonic/gin"
-	ginSwagger "github.com/swaggo/gin-swagger"
-	"github.com/swaggo/gin-swagger/swaggerFiles"
 	log2 "go-admin/apis/log"
 	"go-admin/apis/monitor"
 	"go-admin/apis/public"
@@ -16,6 +13,11 @@ import (
 	"go-admin/middleware"
 	jwt "go-admin/pkg/jwtauth"
 	"go-admin/pkg/ws"
+	"mime"
+
+	"github.com/gin-gonic/gin"
+	ginSwagger "github.com/swaggo/gin-swagger"
+	"github.com/swaggo/gin-swagger/swaggerFiles"
 )
 
 func InitSysRouter(r *gin.Engine, authMiddleware *jwt.GinJWTMiddleware) *gin.RouterGroup {
@@ -50,6 +52,8 @@ func sysBaseRouter(r *gin.RouterGroup) {
 }
 
 func sysStaticFileRouter(r *gin.RouterGroup) {
+	mime.AddExtensionType(".js", "application/javascript")
+	
 	r.Static("/static", "./static")
 	r.Static("/form-generator", "./static/form-generator")
 }
@@ -290,4 +294,4 @@ func registerPublicRouter(v1 *gin.RouterGroup) {
 	{
 		p.POST("/uploadFile", public.UploadFile)
 	}
-}
+}

template/vue.go.template

@@ -1,139 +1,19 @@
 {{$tableComment:=.TableComment}}
 <template>
-    <div class="app-container">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-            {{range .Columns}}
-                {{- $x := .IsQuery -}}
-                {{- if ($x) -}}
-                    <el-form-item label="{{.ColumnComment}}" prop="{{.JsonField}}">
-                        {{if eq .DictType "" -}}
-                            <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 }}
+    <BasicLayout>
+        <template #wrapper>
+            <el-card class="box-card">
+                <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
+                    {{range .Columns}}
+                        {{- $x := .IsQuery -}}
+                        {{- if ($x) -}}
                             <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 }}>
+                                {{if eq .DictType "" -}}
+                                    <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"
@@ -141,39 +21,163 @@
                                                 :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 }}
+                                {{- 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 }}
-                {{- 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>
-    </div>
+                    <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}}">
+                                        {{ 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>
 
 <script>