From 8073e989f515ac9bf190a7137a7e5d9921ddadf5 Mon Sep 17 00:00:00 2001 From: zayn <972858472@qq.com> Date: Mon, 18 Nov 2024 02:07:38 -0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=B8=8D=E9=87=8D?= =?UTF-8?q?=E7=BD=AEpageSize=20(#1940)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 查询不重置pageSize --- server/resource/package/web/view/table.vue.tpl | 1 - server/resource/plugin/web/view/view.vue.template | 1 - web/src/plugin/announcement/view/info.vue | 1 - web/src/view/superAdmin/api/api.vue | 1 - web/src/view/superAdmin/operation/sysOperationRecord.vue | 1 - web/src/view/superAdmin/params/sysParams.vue | 1 - web/src/view/systemTools/exportTemplate/exportTemplate.vue | 1 - 7 files changed, 7 deletions(-) diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl index cf65ed2e2..7b4ca4199 100644 --- a/server/resource/package/web/view/table.vue.tpl +++ b/server/resource/package/web/view/table.vue.tpl @@ -1010,7 +1010,6 @@ const onSubmit = () => { elSearchFormRef.value?.validate(async(valid) => { if (!valid) return page.value = 1 - pageSize.value = 10 {{- range .Fields}}{{- if eq .FieldType "bool" }} if (searchInfo.value.{{.FieldJson}} === ""){ searchInfo.value.{{.FieldJson}}=null diff --git a/server/resource/plugin/web/view/view.vue.template b/server/resource/plugin/web/view/view.vue.template index b76fdd8ec..eb43bfaa7 100644 --- a/server/resource/plugin/web/view/view.vue.template +++ b/server/resource/plugin/web/view/view.vue.template @@ -1010,7 +1010,6 @@ const onSubmit = () => { elSearchFormRef.value?.validate(async(valid) => { if (!valid) return page.value = 1 - pageSize.value = 10 {{- range .Fields}}{{- if eq .FieldType "bool" }} if (searchInfo.value.{{.FieldJson}} === ""){ searchInfo.value.{{.FieldJson}}=null diff --git a/web/src/plugin/announcement/view/info.vue b/web/src/plugin/announcement/view/info.vue index 7c317d409..a684e9770 100644 --- a/web/src/plugin/announcement/view/info.vue +++ b/web/src/plugin/announcement/view/info.vue @@ -322,7 +322,6 @@ elSearchFormRef.value?.validate(async (valid) => { if (!valid) return page.value = 1 - pageSize.value = 10 getTableData() }) } diff --git a/web/src/view/superAdmin/api/api.vue b/web/src/view/superAdmin/api/api.vue index af9318e52..70bb0b583 100644 --- a/web/src/view/superAdmin/api/api.vue +++ b/web/src/view/superAdmin/api/api.vue @@ -579,7 +579,6 @@ const onSubmit = () => { page.value = 1 - pageSize.value = 10 getTableData() } diff --git a/web/src/view/superAdmin/operation/sysOperationRecord.vue b/web/src/view/superAdmin/operation/sysOperationRecord.vue index 90300413c..27764c121 100644 --- a/web/src/view/superAdmin/operation/sysOperationRecord.vue +++ b/web/src/view/superAdmin/operation/sysOperationRecord.vue @@ -160,7 +160,6 @@ // 条件搜索前端看此方法 const onSubmit = () => { page.value = 1 - pageSize.value = 10 if (searchInfo.value.status === '') { searchInfo.value.status = null } diff --git a/web/src/view/superAdmin/params/sysParams.vue b/web/src/view/superAdmin/params/sysParams.vue index c84ae9ad3..1feeda1e6 100644 --- a/web/src/view/superAdmin/params/sysParams.vue +++ b/web/src/view/superAdmin/params/sysParams.vue @@ -406,7 +406,6 @@ elSearchFormRef.value?.validate(async (valid) => { if (!valid) return page.value = 1 - pageSize.value = 10 getTableData() }) } diff --git a/web/src/view/systemTools/exportTemplate/exportTemplate.vue b/web/src/view/systemTools/exportTemplate/exportTemplate.vue index 74dc9be0c..f4ab74a6e 100644 --- a/web/src/view/systemTools/exportTemplate/exportTemplate.vue +++ b/web/src/view/systemTools/exportTemplate/exportTemplate.vue @@ -739,7 +739,6 @@ JOINS模式下不支持导入 elSearchFormRef.value?.validate(async (valid) => { if (!valid) return page.value = 1 - pageSize.value = 10 getTableData() }) } From c909d32c56abf404924f9ff99e1b0694edfe3f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PiexlMax=28=E5=A5=87=E6=B7=BC?= <165128580+pixelmaxQm@users.noreply.github.com> Date: Tue, 19 Nov 2024 16:31:43 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=97=A0=E6=B3=95=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/service/system/auto_code_template.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/service/system/auto_code_template.go b/server/service/system/auto_code_template.go index f35526389..8d52e3172 100644 --- a/server/service/system/auto_code_template.go +++ b/server/service/system/auto_code_template.go @@ -191,7 +191,7 @@ func (s *autoCodeTemplate) Preview(ctx context.Context, info request.AutoCode) ( return nil, errors.Wrap(err, "查询包失败!") } // 增加判断: 重复创建struct 或者重复的简称 - if AutocodeHistory.Repeat(info.BusinessDB, info.StructName, info.Abbreviation, info.Package) { + if AutocodeHistory.Repeat(info.BusinessDB, info.StructName, info.Abbreviation, info.Package) && !info.IsAdd { return nil, errors.New("已经创建过此数据结构或重复简称,请勿重复创建!") }