From 8bd337e08f0f92c895cdc2056078e336342ec5cc Mon Sep 17 00:00:00 2001 From: pixelmaxQM Date: Sun, 3 Nov 2024 22:09:02 +0800 Subject: [PATCH 01/18] =?UTF-8?q?fix:=20=E5=AD=97=E7=AC=A6=E4=B8=B2?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E4=B8=8D=E5=86=8D=E5=8F=82=E4=B8=8E=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/resource/package/server/service/service.go.tpl | 4 ++-- server/resource/plugin/server/service/service.go.template | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/resource/package/server/service/service.go.tpl b/server/resource/package/server/service/service.go.tpl index 29c5864cb..ff42b4ee3 100644 --- a/server/resource/package/server/service/service.go.tpl +++ b/server/resource/package/server/service/service.go.tpl @@ -23,7 +23,7 @@ if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil { db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}}) } {{- else}} -if info.{{.FieldName}} != nil { +if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} { db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) } {{- end }} @@ -158,7 +158,7 @@ func ({{.Abbreviation}}Service *{{.StructName}}Service)Get{{.StructName}}InfoLis db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}}) } {{- else}} - if info.{{.FieldName}} != nil { + if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} { db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) } {{- end }} diff --git a/server/resource/plugin/server/service/service.go.template b/server/resource/plugin/server/service/service.go.template index 1707eed25..4b1c814ea 100644 --- a/server/resource/plugin/server/service/service.go.template +++ b/server/resource/plugin/server/service/service.go.template @@ -23,7 +23,7 @@ if info.Start{{.FieldName}} != nil && info.End{{.FieldName}} != nil { db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}}) } {{- else}} -if info.{{.FieldName}} != nil { +if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} { db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) } {{- end }} @@ -166,7 +166,7 @@ func (s *{{.Abbreviation}}) Get{{.StructName}}InfoList(info request.{{.StructNam db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ? AND ? ",info.Start{{.FieldName}},info.End{{.FieldName}}) } {{- else}} - if info.{{.FieldName}} != nil { + if info.{{.FieldName}} != nil{{- if eq .FieldType "string" }} && *info.{{.FieldName}} != ""{{- end }} { db = db.Where("{{.ColumnName}} {{.FieldSearchType}} ?",{{if eq .FieldSearchType "LIKE"}}"%"+{{ end }}*info.{{.FieldName}}{{if eq .FieldSearchType "LIKE"}}+"%"{{ end }}) } {{- end }} From e99fe701644eb27906feef7ada9393aca7cfffb7 Mon Sep 17 00:00:00 2001 From: zayn <972858472@qq.com> Date: Mon, 4 Nov 2024 19:28:24 -0800 Subject: [PATCH 02/18] Update table.vue.tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 表单提交的时候按钮添加loading状态，防止手滑连点后重复创建 --- server/resource/package/web/view/table.vue.tpl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/resource/package/web/view/table.vue.tpl b/server/resource/package/web/view/table.vue.tpl index f47ed5c85..ccc64851f 100644 --- a/server/resource/package/web/view/table.vue.tpl +++ b/server/resource/package/web/view/table.vue.tpl @@ -642,7 +642,7 @@ getDataSourceFunc()
{{"{{"}}type==='create'?'新增':'编辑'{{"}}"}}
- 确 定 + 确 定 取 消
@@ -821,6 +821,9 @@ defineOptions({ const btnAuth = useBtnAuth() {{- end }} +// 提交按钮loading +const btnLoading = ref(false) + // 控制更多查询条件显示/隐藏状态 const showAllQuery = ref(false) @@ -1171,8 +1174,9 @@ const closeDialog = () => { } // 弹窗确定 const enterDialog = async () => { + btnLoading.value = true elFormRef.value?.validate( async (valid) => { - if (!valid) return + if (!valid) return btnLoading.value = false let res switch (type.value) { case 'create': @@ -1185,6 +1189,7 @@ const enterDialog = async () => { res = await create{{.StructName}}(formData.value) break } + btnLoading.value = false if (res.code === 0) { ElMessage({ type: 'success', @@ -1263,4 +1268,4 @@ defineOptions({ {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From 0d84ea9523bfe39353ba6005f1dad3d643865762 Mon Sep 17 00:00:00 2001 From: zayn <972858472@qq.com> Date: Mon, 4 Nov 2024 19:39:52 -0800 Subject: [PATCH 03/18] Update form.vue.tpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 表单提交的时候按钮添加loading状态，防止手滑连点后重复创建 --- server/resource/package/web/view/form.vue.tpl | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/server/resource/package/web/view/form.vue.tpl b/server/resource/package/web/view/form.vue.tpl index 1e0d13299..8d8827fc6 100644 --- a/server/resource/package/web/view/form.vue.tpl +++ b/server/resource/package/web/view/form.vue.tpl @@ -226,7 +226,7 @@ getDataSourceFunc() {{- end }} {{- end }} - 保存 + 保存 返回 @@ -277,6 +277,9 @@ import ArrayCtrl from '@/components/arrayCtrl/arrayCtrl.vue' const route = useRoute() const router = useRouter() +// 提交按钮loading +const btnLoading = ref(false) + const type = ref('') {{- range $index, $element := .DictTypes}} const {{ $element }}Options = ref([]) @@ -369,8 +372,9 @@ const init = async () => { init() // 保存按钮 const save = async() => { + btnLoading.value = true elFormRef.value?.validate( async (valid) => { - if (!valid) return + if (!valid) return btnLoading.value = false let res switch (type.value) { case 'create': @@ -383,6 +387,7 @@ const save = async() => { res = await create{{.StructName}}(formData.value) break } + btnLoading.value = false if (res.code === 0) { ElMessage({ type: 'success', @@ -410,4 +415,4 @@ const back = () => { {{- end }} -{{- end }} \ No newline at end of file +{{- end }} From b2cfbb95b666c1f2a8592f6c72ddceb6ed1d1703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?= Date: Wed, 6 Nov 2024 11:19:17 +0800 Subject: [PATCH 04/18] =?UTF-8?q?fix:=20=E5=9C=A8=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E4=B9=8B=E5=89=8D=E5=8F=96=E6=B6=88=E6=8E=89?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=87=AA=E8=A1=8C=E6=B7=BB=E5=8A=A0=E7=9A=84?= =?UTF-8?q?""=E5=92=8C``?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/service/system/sys_export_template.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/service/system/sys_export_template.go b/server/service/system/sys_export_template.go index b39d72408..19a7a4520 100644 --- a/server/service/system/sys_export_template.go +++ b/server/service/system/sys_export_template.go @@ -256,6 +256,8 @@ func (sysExportTemplateService *SysExportTemplateService) ExportExcel(templateID for _, exTable := range tableMap { var row []string for _, column := range columns { + column = strings.ReplaceAll(column, "\"", "") + column = strings.ReplaceAll(column, "`", "") if len(template.JoinTemplate) > 0 { columnAs := strings.Split(column, " as ") if len(columnAs) > 1 { From e75fa0bd8443cfeac9cd11c218809d2c7f4122b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?= Date: Thu, 7 Nov 2024 18:33:33 +0800 Subject: [PATCH 05/18] =?UTF-8?q?feat:=20=E6=9B=B4=E6=8D=A2=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BC=96=E8=BE=91=E5=99=A8=EF=BC=8C=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=B8=8D=E5=90=8Cnode=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/package.json | 7 +-- .../view/systemTools/autoCodeAdmin/index.vue | 44 +++++-------------- .../exportTemplate/exportTemplate.vue | 18 +++----- 3 files changed, 18 insertions(+), 51 deletions(-) diff --git a/web/package.json b/web/package.json index 0e711623a..805af82f8 100644 --- a/web/package.json +++ b/web/package.json @@ -10,10 +10,6 @@ "fix-memory-limit": "cross-env LIMIT=4096 increase-memory-limit" }, "dependencies": { - "@codemirror/lang-go": "^6.0.1", - "@codemirror/lang-javascript": "^6.2.2", - "@codemirror/lang-vue": "^0.1.3", - "@codemirror/theme-one-dark": "^6.1.2", "@element-plus/icons-vue": "^2.3.1", "@form-create/designer": "^3.2.6", "@form-create/element-ui": "^3.2.10", @@ -25,7 +21,6 @@ "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^1.7.7", "chokidar": "^4.0.0", - "codemirror": "^6.0.1", "core-js": "^3.38.1", "default-passive-events": "^2.0.0", "echarts": "5.5.1", @@ -46,9 +41,9 @@ "vform3-builds": "^3.0.10", "vite-auto-import-svg": "^1.1.0", "vue": "^3.5.7", - "vue-codemirror": "^6.1.1", "vue-echarts": "^7.0.3", "vue-router": "^4.4.3", + "vue3-ace-editor": "^2.2.4", "vuedraggable": "^4.1.0" }, "devDependencies": { diff --git a/web/src/view/systemTools/autoCodeAdmin/index.vue b/web/src/view/systemTools/autoCodeAdmin/index.vue index 95cced8c4..7e7673a50 100644 --- a/web/src/view/systemTools/autoCodeAdmin/index.vue +++ b/web/src/view/systemTools/autoCodeAdmin/index.vue @@ -184,7 +184,7 @@ - + 当前ai帮写存在不稳定因素，生成代码后请注意手动调整部分内容 @@ -196,34 +196,13 @@ - + - + - + @@ -263,18 +242,15 @@ import { getSysHistory, rollback, delSysHistory,addFunc,butler } from "@/api/autoCode.js"; import { useRouter } from "vue-router"; import { ElMessage, ElMessageBox } from "element-plus"; -import { ref,onMounted } from "vue"; +import { ref } from "vue"; import { formatDate } from "@/utils/format"; import { toUpperCase } from "@/utils/stringFun" import {useAppStore} from "@/pinia"; -import { Marked } from "marked"; -import { markedHighlight } from "marked-highlight"; -import hljs from 'highlight.js' -import { Codemirror } from 'vue-codemirror' - import { javascript } from '@codemirror/lang-javascript' - import { go } from '@codemirror/lang-go' - import { oneDark } from '@codemirror/theme-one-dark' +import { VAceEditor } from "vue3-ace-editor" +import 'ace-builds/src-noconflict/mode-javascript'; +import 'ace-builds/src-noconflict/mode-golang'; +import 'ace-builds/src-noconflict/theme-github_dark'; const appStore = useAppStore() @@ -343,7 +319,7 @@ const addFuncBtn = (row) => { funcFlag.value = true; }; -const funcFlag = ref(false); +const funcFlag = ref(true); const closeFunc = () => { funcFlag.value = false; diff --git a/web/src/view/systemTools/exportTemplate/exportTemplate.vue b/web/src/view/systemTools/exportTemplate/exportTemplate.vue index eca923602..8e9c0a973 100644 --- a/web/src/view/systemTools/exportTemplate/exportTemplate.vue +++ b/web/src/view/systemTools/exportTemplate/exportTemplate.vue @@ -485,14 +485,7 @@ - + @@ -513,10 +506,13 @@ import { ElMessage, ElMessageBox } from 'element-plus' import { ref, reactive } from 'vue' import WarningBar from '@/components/warningBar/warningBar.vue' import {getDB, getTable, getColumn, butler} from '@/api/autoCode' -import {vue} from "@codemirror/lang-vue"; -import {oneDark} from "@codemirror/theme-one-dark"; -import {Codemirror} from "vue-codemirror"; import {getCode} from './code' +import { VAceEditor } from "vue3-ace-editor" + +import 'ace-builds/src-noconflict/mode-vue'; +import 'ace-builds/src-noconflict/theme-github_dark'; + + defineOptions({ name: 'ExportTemplate' }) From e6d203d5672f8caa87e6db3eba08d04571046750 Mon Sep 17 00:00:00 2001 From: pixelmaxQM Date: Thu, 7 Nov 2024 20:15:09 +0800 Subject: [PATCH 06/18] =?UTF-8?q?fix:=20AI=E7=94=9F=E6=88=90=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=BC=BA=E5=88=B6=E5=A4=84=E7=90=86=E9=A6=96=E5=AD=97?= =?UTF-8?q?=E6=AF=8D=E5=A4=A7=E5=86=99=EF=BC=8C=E6=8F=90=E9=AB=98=E5=AE=B9?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/view/systemTools/autoCode/index.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/web/src/view/systemTools/autoCode/index.vue b/web/src/view/systemTools/autoCode/index.vue index 379b4ba64..51d2139fd 100644 --- a/web/src/view/systemTools/autoCode/index.vue +++ b/web/src/view/systemTools/autoCode/index.vue @@ -865,6 +865,11 @@ const llmAutoFunc = async (flag) =>{ if (res.code === 0) { form.value.fields = [] const json = JSON.parse(res.data) + + json.fields?.forEach(item => { + item.fieldName = toUpperCase(item.fieldName) + }) + for (let key in json){ form.value[key] = json[key] } @@ -1170,8 +1175,6 @@ const autoCodeForm = ref(null) const enterForm = async(isPreview) => { if(!form.value.onlyTemplate){ - - if (form.value.fields.length <= 0) { ElMessage({ type: 'error', @@ -1251,9 +1254,11 @@ const enterForm = async(isPreview) => { } form.value.humpPackageName = toSQLLine(form.value.packageName) - form.value.fields.forEach(item => { + form.value.fields?.forEach(item => { + item.fieldName = toUpperCase(item.fieldName) if(item.fieldType === 'enum'){ // 判断一下 item.dataTypeLong 按照,切割后的每个元素是否都使用 '' 包裹，如果没包 则修改为包裹起来的 然后再转为字符串赋值给 item.dataTypeLong + item.dataTypeLong = item.dataTypeLong.replace(/[\[\]{}()]/g, ''); const arr = item.dataTypeLong.split(',') arr.forEach((ele, index) => { if(ele.indexOf("'") === -1){ From c4c5f01ee50fc27c560643b95e0145d3e71eacf9 Mon Sep 17 00:00:00 2001 From: pixelmaxQM Date: Thu, 7 Nov 2024 21:47:24 +0800 Subject: [PATCH 07/18] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=8C=85ace-bu?= =?UTF-8?q?ilds?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/web/package.json b/web/package.json index 805af82f8..d66ea3049 100644 --- a/web/package.json +++ b/web/package.json @@ -19,6 +19,7 @@ "@vueuse/core": "^11.0.3", "@wangeditor/editor": "^5.1.23", "@wangeditor/editor-for-vue": "^5.1.12", + "ace-builds": "^1.36.4", "axios": "^1.7.7", "chokidar": "^4.0.0", "core-js": "^3.38.1", From 35fd5c8d65f53fea68ecd2811886fdc2946dfced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?= Date: Fri, 8 Nov 2024 16:17:52 +0800 Subject: [PATCH 08/18] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0dockerfile?= =?UTF-8?q?=E7=9A=84node=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/Dockerfile b/web/Dockerfile index 31f329ce7..89a106675 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,4 +1,4 @@ -FROM node:16 +FROM node:20 WORKDIR /gva_web/ COPY . . From d8e36ab0f8af89630b7a619fc10ad38459e7de51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?= Date: Sat, 9 Nov 2024 09:45:56 +0800 Subject: [PATCH 09/18] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E9=BB=98=E8=AE=A4=E7=AA=97=E5=8F=A3=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/view/systemTools/autoCodeAdmin/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/view/systemTools/autoCodeAdmin/index.vue b/web/src/view/systemTools/autoCodeAdmin/index.vue index 7e7673a50..393bc33e9 100644 --- a/web/src/view/systemTools/autoCodeAdmin/index.vue +++ b/web/src/view/systemTools/autoCodeAdmin/index.vue @@ -319,7 +319,7 @@ const addFuncBtn = (row) => { funcFlag.value = true; }; -const funcFlag = ref(true); +const funcFlag = ref(false); const closeFunc = () => { funcFlag.value = false; From fae6f413a5a32edb0d3836c6c29cccef8cdce67a Mon Sep 17 00:00:00 2001 From: Raindrop-YL <55219189+Raindrop-YL@users.noreply.github.com> Date: Sat, 9 Nov 2024 09:48:21 +0800 Subject: [PATCH 10/18] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D=20eslint=20v9?= =?UTF-8?q?=20=E6=9B=B4=E6=96=B0,=20=E5=85=BC=E5=AE=B9=E4=BD=8E=E7=89=88?= =?UTF-8?q?=E6=9C=AC=20node=20(#1930)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: eslint v9 版本配置文件更新 --- web/.eslintignore | 4 ---- web/.eslintrc.js | 17 ----------------- web/eslint.config.mjs | 25 +++++++++++++++++++++++++ web/package.json | 7 ++++--- 4 files changed, 29 insertions(+), 24 deletions(-) delete mode 100644 web/.eslintignore delete mode 100644 web/.eslintrc.js create mode 100644 web/eslint.config.mjs diff --git a/web/.eslintignore b/web/.eslintignore deleted file mode 100644 index e6529fc09..000000000 --- a/web/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -build/*.js -src/assets -public -dist diff --git a/web/.eslintrc.js b/web/.eslintrc.js deleted file mode 100644 index 0821611b5..000000000 --- a/web/.eslintrc.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - root: true, - parserOptions: { - parser: '@babel/eslint-parser', - sourceType: 'module' - }, - env: { - browser: true, - node: true, - es6: true - }, - extends: ['plugin:vue/recommended', 'eslint:recommended'], - rules: { - "vue/max-attributes-per-line" : 0, - "vue/no-v-model-argument" : 0 - } -} diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs new file mode 100644 index 000000000..9fb969c25 --- /dev/null +++ b/web/eslint.config.mjs @@ -0,0 +1,25 @@ +import js from '@eslint/js' +import pluginVue from 'eslint-plugin-vue' +import globals from "globals" + +export default [ + js.configs.recommended, + ...pluginVue.configs['flat/essential'], + { + name: 'app/files-to-lint', + files: ['**/*.{js,mjs,jsx,vue}'], + languageOptions: { + ecmaVersion: 'latest', + sourceType: "module", + globals: globals.node + }, + rules: { + "vue/max-attributes-per-line" : 0, + "vue/no-v-model-argument" : 0 + }, + }, + { + name: 'app/files-to-ignore', + ignores: ['**/dist/**', '**/build/*.js', '**/src/assets/**', '**/public/**'], + }, +] diff --git a/web/package.json b/web/package.json index d66ea3049..741335c57 100644 --- a/web/package.json +++ b/web/package.json @@ -49,8 +49,9 @@ }, "devDependencies": { "@babel/eslint-parser": "^7.25.1", + "@eslint/js": "^9.14.0", "@vitejs/plugin-legacy": "^5.4.2", - "@vitejs/plugin-vue": "^5.1.3", + "@vitejs/plugin-vue": "^5.1.4", "@vue/cli-plugin-babel": "~5.0.8", "@vue/cli-plugin-eslint": "~5.0.8", "@vue/cli-plugin-router": "~5.0.8", @@ -60,8 +61,8 @@ "babel-plugin-import": "^1.13.8", "chalk": "^5.3.0", "dotenv": "^16.4.5", - "eslint": "^9.9.1", - "eslint-plugin-vue": "^9.28.0", + "eslint": "^9.14.0", + "eslint-plugin-vue": "^9.30.0", "sass": "^1.78.0", "terser": "^5.31.6", "vite": "^5.4.3", From 87a4ce17e1625ea91276308412ec08302106079b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?piexlMax=28=E5=A5=87=E6=B7=BC?= Date: Sat, 9 Nov 2024 10:17:57 +0800 Subject: [PATCH 11/18] =?UTF-8?q?feat:=20=E6=A0=B9=E6=8D=AEeslint=20?= =?UTF-8?q?=E5=AF=B9=E9=A1=B9=E7=9B=AE=E8=BF=9B=E8=A1=8C=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/eslint.config.mjs | 6 +- web/src/components/richtext/rich-edit.vue | 3 - web/src/components/richtext/rich-view.vue | 4 - web/src/components/selectFile/selectFile.vue | 2 +- web/src/pinia/modules/user.js | 4 +- web/src/plugin/announcement/form/info.vue | 1 - web/src/plugin/announcement/view/info.vue | 5 - web/src/utils/date.js | 7 +- web/src/view/example/upload/upload.vue | 1 - web/src/view/init/index.vue | 2 +- web/src/view/layout/aside/headMode.vue | 6 +- web/src/view/layout/aside/normalMode.vue | 2 +- web/src/view/layout/tabs/index.vue | 2 +- web/src/view/superAdmin/api/api.vue | 3 +- .../superAdmin/authority/components/apis.vue | 2 +- .../menu/components/components-cascader.vue | 2 +- .../operation/sysOperationRecord.vue | 2 +- web/src/view/superAdmin/params/sysParams.vue | 2 +- web/src/view/system/state.vue | 91 +++++-------------- .../autoCode/component/previewCodeDialog.vue | 2 +- web/src/view/systemTools/autoCode/index.vue | 2 +- .../view/systemTools/autoCodeAdmin/index.vue | 7 +- .../exportTemplate/exportTemplate.vue | 3 +- web/src/view/systemTools/system/system.vue | 4 +- web/vite.config.js | 1 - web/vitePlugin/componentName/index.js | 2 +- 26 files changed, 51 insertions(+), 117 deletions(-) diff --git a/web/eslint.config.mjs b/web/eslint.config.mjs index 9fb969c25..eb1fb7298 100644 --- a/web/eslint.config.mjs +++ b/web/eslint.config.mjs @@ -15,7 +15,11 @@ export default [ }, rules: { "vue/max-attributes-per-line" : 0, - "vue/no-v-model-argument" : 0 + "vue/no-v-model-argument" : 0, + "vue/multi-word-component-names": "off", + 'no-lone-blocks': 'off', + 'no-extend-native': 'off', + 'no-unused-vars': ['error', { "argsIgnorePattern": '^_' }], }, }, { diff --git a/web/src/components/richtext/rich-edit.vue b/web/src/components/richtext/rich-edit.vue index cee3b2ec1..8194c686d 100644 --- a/web/src/components/richtext/rich-edit.vue +++ b/web/src/components/richtext/rich-edit.vue @@ -26,12 +26,9 @@ const basePath = import.meta.env.VITE_BASE_API import { onBeforeUnmount, ref, shallowRef, watch } from 'vue' import { Editor, Toolbar } from '@wangeditor/editor-for-vue' -import { useUserStore } from '@/pinia/modules/user' import { ElMessage } from 'element-plus' import { getUrl } from '@/utils/image' -const userStore = useUserStore() - const emits = defineEmits(['change', 'update:modelValue']) const change = (editor) => { diff --git a/web/src/components/richtext/rich-view.vue b/web/src/components/richtext/rich-view.vue index fd6616e4a..2e84ed5dc 100644 --- a/web/src/components/richtext/rich-view.vue +++ b/web/src/components/richtext/rich-view.vue @@ -17,10 +17,6 @@ import '@wangeditor/editor/dist/css/style.css' // 引入 css import { onBeforeUnmount, ref, shallowRef, watch } from 'vue' import { Editor } from '@wangeditor/editor-for-vue' -import { useUserStore } from '@/pinia/modules/user' - -const userStore = useUserStore() - const emits = defineEmits(['change', 'update:modelValue']) const editorConfig = ref({ readOnly: true diff --git a/web/src/components/selectFile/selectFile.vue b/web/src/components/selectFile/selectFile.vue index 81c03c56f..c7ae4afed 100644 --- a/web/src/components/selectFile/selectFile.vue +++ b/web/src/components/selectFile/selectFile.vue @@ -29,7 +29,7 @@ defineOptions({ name: 'UploadCommon', }) -const props = defineProps({ +defineProps({ limit: { type: Number, default: 3 diff --git a/web/src/pinia/modules/user.js b/web/src/pinia/modules/user.js index a803b857a..1dd7b0eaf 100644 --- a/web/src/pinia/modules/user.js +++ b/web/src/pinia/modules/user.js @@ -1,9 +1,9 @@ -import { login, getUserInfo, setSelfInfo } from '@/api/user' +import { login, getUserInfo } from '@/api/user' import { jsonInBlacklist } from '@/api/jwt' import router from '@/router/index' import { ElLoading, ElMessage } from 'element-plus' import { defineStore } from 'pinia' -import { ref, computed, watch } from 'vue' +import { ref, watch } from 'vue' import { useRouterStore } from './router' import cookie from 'js-cookie' diff --git a/web/src/plugin/announcement/form/info.vue b/web/src/plugin/announcement/form/info.vue index 95a868d76..3c3c5399e 100644 --- a/web/src/plugin/announcement/form/info.vue +++ b/web/src/plugin/announcement/form/info.vue @@ -38,7 +38,6 @@ defineOptions({ }) // 自动获取字典 -import { getDictFunc } from '@/utils/format' import { useRoute, useRouter } from "vue-router" import { ElMessage } from 'element-plus' import { ref, reactive } from 'vue' diff --git a/web/src/plugin/announcement/view/info.vue b/web/src/plugin/announcement/view/info.vue index 3643b897d..9c3fa9694 100644 --- a/web/src/plugin/announcement/view/info.vue +++ b/web/src/plugin/announcement/view/info.vue @@ -63,11 +63,6 @@ - - - diff --git a/web/src/components/bottomInfo/bottomInfo.vue b/web/src/components/bottomInfo/bottomInfo.vue index c3c7e1e38..376de05b6 100644 --- a/web/src/components/bottomInfo/bottomInfo.vue +++ b/web/src/components/bottomInfo/bottomInfo.vue @@ -3,14 +3,17 @@ 未经授权的商用使用可能会被我们的资产搜索引擎爬取，并可能导致后续索赔。索赔金额将不低于高级授权费的十倍。请您遵守版权法律法规，尊重知识产权。 --> - - diff --git a/web/src/components/charts/index.vue b/web/src/components/charts/index.vue index 4ea5a75d1..089543482 100644 --- a/web/src/components/charts/index.vue +++ b/web/src/components/charts/index.vue @@ -14,43 +14,41 @@ /> - diff --git a/web/src/components/commandMenu/index.vue b/web/src/components/commandMenu/index.vue index a36d174d2..3d3b72395 100644 --- a/web/src/components/commandMenu/index.vue +++ b/web/src/components/commandMenu/index.vue @@ -10,20 +10,16 @@ v-model="searchInput" class="quick-input" placeholder="请输入你需要快捷到达的功能" - > + /> -
+
+
+ {{ option.label }} +
{{ option.label }}
-
@@ -40,158 +36,164 @@ diff --git a/web/src/components/customPic/index.vue b/web/src/components/customPic/index.vue index 63743d535..6a265dee4 100644 --- a/web/src/components/customPic/index.vue +++ b/web/src/components/customPic/index.vue @@ -1,28 +1,12 @@ - + diff --git a/web/src/components/selectFile/selectFile.vue b/web/src/components/selectFile/selectFile.vue index c7ae4afed..e662f78d9 100644 --- a/web/src/components/selectFile/selectFile.vue +++ b/web/src/components/selectFile/selectFile.vue @@ -12,76 +12,70 @@ :accept="accept" class="upload-btn" > - - 上传文件 - + 上传文件
- diff --git a/web/src/components/selectImage/selectComponent.vue b/web/src/components/selectImage/selectComponent.vue index 1ff6e04cf..6124531d1 100644 --- a/web/src/components/selectImage/selectComponent.vue +++ b/web/src/components/selectImage/selectComponent.vue @@ -15,10 +15,15 @@ muted preload="metadata" > - + - 图片 + 图片