From d05bf07db89297866caa64602f526282a2c98e3c Mon Sep 17 00:00:00 2001
From: zzZ007 <249560690@qq.com>
Date: Wed, 30 Dec 2020 17:20:35 +0800
Subject: [PATCH 1/9] Update table.vue.tpl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
修改自动生成代码,当table数据大于50条时,页面会卡死,替换掉 el-popover即可。
---
server/resource/template/web/table.vue.tpl | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl
index 247d3fa6..9b39102e 100644
--- a/server/resource/template/web/table.vue.tpl
+++ b/server/resource/template/web/table.vue.tpl
@@ -68,14 +68,7 @@
变更
-
- 确定要删除吗?
-
- 取消
- 确定
-
- 删除
-
+ 删除
@@ -208,6 +201,15 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val
},
+ openComfirm(row){
+ this.$confirm('确定要删除吗?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ this.delete{{.StructName}}(row);
+ });
+ },
async onDelete() {
const ids = []
if(this.multipleSelection.length == 0){
@@ -317,4 +319,4 @@ export default {
\ No newline at end of file
+
From fdd522e56a97548a1ed9f75570e352c6e8c94af0 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Fri, 8 Jan 2021 16:54:09 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=97=A0=E7=94=A8=E4=BB=A3=E7=A0=81?=
=?UTF-8?q?=E6=B8=85=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/resource/template/web/table.vue.tpl | 6 ++----
web/src/view/example/customer/customer.vue | 3 +--
web/src/view/superAdmin/dictionary/sysDictionary.vue | 3 +--
web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue | 3 +--
web/src/view/superAdmin/operation/sysOperationRecord.vue | 3 +--
web/src/view/workflow/workflowProcess/workflowProcess.vue | 3 +--
6 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/server/resource/template/web/table.vue.tpl b/server/resource/template/web/table.vue.tpl
index 9b39102e..2359da30 100644
--- a/server/resource/template/web/table.vue.tpl
+++ b/server/resource/template/web/table.vue.tpl
@@ -68,7 +68,7 @@
变更
- 删除
+ 删除
@@ -138,7 +138,6 @@ export default {
return {
listApi: get{{ .StructName }}List,
dialogFormVisible: false,
- visible: false,
type: "",
deleteVisible: false,
multipleSelection: [],
@@ -201,7 +200,7 @@ export default {
handleSelectionChange(val) {
this.multipleSelection = val
},
- openComfirm(row){
+ deleteRow(row){
this.$confirm('确定要删除吗?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@@ -267,7 +266,6 @@ export default {
};
},
async delete{{.StructName}}(row) {
- this.visible = false;
const res = await delete{{.StructName}}({ ID: row.ID });
if (res.code == 0) {
this.$message({
diff --git a/web/src/view/example/customer/customer.vue b/web/src/view/example/customer/customer.vue
index df0aa501..3c6fdc3b 100644
--- a/web/src/view/example/customer/customer.vue
+++ b/web/src/view/example/customer/customer.vue
@@ -84,7 +84,6 @@ export default {
return {
listApi: getExaCustomerList,
dialogFormVisible: false,
- visible: false,
type: "",
form: {
customerName: "",
@@ -119,7 +118,7 @@ export default {
};
},
async deleteCustomer(row) {
- this.visible = false;
+ row.visible = false;
const res = await deleteExaCustomer({ ID: row.ID });
if (res.code == 0) {
this.$message({
diff --git a/web/src/view/superAdmin/dictionary/sysDictionary.vue b/web/src/view/superAdmin/dictionary/sysDictionary.vue
index 17631061..9718692f 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionary.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionary.vue
@@ -128,7 +128,6 @@ export default {
return {
listApi: getSysDictionaryList,
dialogFormVisible: false,
- visible: false,
type: "",
formData: {
name: null,
@@ -214,7 +213,7 @@ export default {
};
},
async deleteSysDictionary(row) {
- this.visible = false;
+ row.visible = false;
const res = await deleteSysDictionary({ ID: row.ID });
if (res.code == 0) {
this.$message({
diff --git a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
index c891c632..399a46fd 100644
--- a/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
+++ b/web/src/view/superAdmin/dictionary/sysDictionaryDetail.vue
@@ -124,7 +124,6 @@ export default {
return {
listApi: getSysDictionaryDetailList,
dialogFormVisible: false,
- visible: false,
type: "",
formData: {
label: null,
@@ -203,7 +202,7 @@ export default {
};
},
async deleteSysDictionaryDetail(row) {
- this.visible = false;
+ row.visible = false;
const res = await deleteSysDictionaryDetail({ ID: row.ID });
if (res.code == 0) {
this.$message({
diff --git a/web/src/view/superAdmin/operation/sysOperationRecord.vue b/web/src/view/superAdmin/operation/sysOperationRecord.vue
index fd0c6092..8aad7c8b 100644
--- a/web/src/view/superAdmin/operation/sysOperationRecord.vue
+++ b/web/src/view/superAdmin/operation/sysOperationRecord.vue
@@ -123,7 +123,6 @@ export default {
return {
listApi: getSysOperationRecordList,
dialogFormVisible: false,
- visible: false,
type: "",
deleteVisible: false,
multipleSelection: [],
@@ -186,7 +185,7 @@ export default {
}
},
async deleteSysOperationRecord(row) {
- this.visible = false;
+ row.visible = false;
const res = await deleteSysOperationRecord({ ID: row.ID });
if (res.code == 0) {
this.$message({
diff --git a/web/src/view/workflow/workflowProcess/workflowProcess.vue b/web/src/view/workflow/workflowProcess/workflowProcess.vue
index 052fda56..bc4e77e5 100644
--- a/web/src/view/workflow/workflowProcess/workflowProcess.vue
+++ b/web/src/view/workflow/workflowProcess/workflowProcess.vue
@@ -110,7 +110,6 @@ export default {
return {
listApi: getWorkflowProcessList,
dialogFormVisible: false,
- visible: false,
deleteVisible: false,
multipleSelection: []
};
@@ -191,7 +190,7 @@ export default {
});
},
async deleteWorkflowProcess(row) {
- this.visible = false;
+ row.visible = false;
const res = await deleteWorkflowProcess({ id: row.id });
if (res.code == 0) {
this.$message({
From 64299e69128f515edcaf4d9b3a20b1597bd89cc1 Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Fri, 8 Jan 2021 17:32:39 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E6=B8=85=E7=90=86=E5=A4=9A=E4=BD=99?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/view/systemTools/autoCode/component/fieldDialog.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/web/src/view/systemTools/autoCode/component/fieldDialog.vue b/web/src/view/systemTools/autoCode/component/fieldDialog.vue
index a79cfa40..709e0850 100644
--- a/web/src/view/systemTools/autoCode/component/fieldDialog.vue
+++ b/web/src/view/systemTools/autoCode/component/fieldDialog.vue
@@ -121,7 +121,6 @@ export default {
data() {
return {
dbfdOptions: [],
- visible: false,
dictOptions: [],
typeSearchOptions: [
{
From 8a67795fafa0e87fe5a3070a802c23c538b87cde Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Fri, 8 Jan 2021 17:34:17 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
=?UTF-8?q?=E5=8C=96=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/web/package.json b/web/package.json
index d86df93b..e09a45fb 100644
--- a/web/package.json
+++ b/web/package.json
@@ -1,5 +1,5 @@
{
- "name": "qm-plus-vue-page",
+ "name": "gin-vue-admin",
"version": "0.1.0",
"private": true,
"scripts": {
@@ -72,4 +72,4 @@
"> 1%",
"last 2 versions"
]
-}
+}
\ No newline at end of file
From b66d7a4e7a8c8a391c4622336c7af1e8c638fef0 Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Sun, 10 Jan 2021 23:03:09 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BA=86=E6=9D=83?=
=?UTF-8?q?=E9=99=90=E6=94=BE=E5=9C=A8public=E7=BB=84=E4=B9=9F=E4=BC=9A?=
=?UTF-8?q?=E8=B5=B0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
server/resource/template/server/router.go.tpl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/resource/template/server/router.go.tpl b/server/resource/template/server/router.go.tpl
index 4177e624..87c41885 100644
--- a/server/resource/template/server/router.go.tpl
+++ b/server/resource/template/server/router.go.tpl
@@ -7,7 +7,7 @@ import (
)
func Init{{.StructName}}Router(Router *gin.RouterGroup) {
- {{.StructName}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.JWTAuth()).Use(middleware.CasbinHandler()).Use(middleware.OperationRecord())
+ {{.StructName}}Router := Router.Group("{{.Abbreviation}}").Use(middleware.OperationRecord())
{
{{.StructName}}Router.POST("create{{.StructName}}", v1.Create{{.StructName}}) // 新建{{.StructName}}
{{.StructName}}Router.DELETE("delete{{.StructName}}", v1.Delete{{.StructName}}) // 删除{{.StructName}}
From 7707d4c99d6ba4b05f97a88a55045b6c1b234682 Mon Sep 17 00:00:00 2001
From: QM303176530 <303176530@qq.com>
Date: Sun, 10 Jan 2021 23:45:36 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=AA=92?=
=?UTF-8?q?=E4=BD=93=E5=BA=93=E4=B8=AD=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=89=87?=
=?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
web/src/components/chooseImg/index.vue | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/web/src/components/chooseImg/index.vue b/web/src/components/chooseImg/index.vue
index 911a1313..ea6d842a 100644
--- a/web/src/components/chooseImg/index.vue
+++ b/web/src/components/chooseImg/index.vue
@@ -3,7 +3,7 @@