From d9ec0af7fe80133de97f9e24cbe9dd6a604c450f Mon Sep 17 00:00:00 2001 From: ck-chenkang Date: Wed, 29 Apr 2026 15:21:27 +0800 Subject: [PATCH 1/2] git commit -m "stop tracking vscode settings" --- .gitignore | 4 +- .vscode/settings.json | 144 ------------------------------------------ 2 files changed, 3 insertions(+), 145 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index c20ca6d9..128a9f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,6 @@ auto-*.d.ts .history pnpm-lock.yaml /.vscode -.env.cklocal \ No newline at end of file +.env.cklocal +.vscode/* +.vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index e4ec7cd1..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,144 +0,0 @@ -{ - "typescript.tsdk": "node_modules/typescript/lib", - "npm.packageManager": "pnpm", - "editor.tabSize": 2, - "prettier.printWidth": 100, // 超过最大值换行 - "editor.defaultFormatter": "esbenp.prettier-vscode", - "files.eol": "\n", - "search.exclude": { - "**/node_modules": true, - "**/*.log": true, - "**/*.log*": true, - "**/bower_components": true, - "**/dist": true, - "**/elehukouben": true, - "**/.git": true, - "**/.gitignore": true, - "**/.svn": true, - "**/.DS_Store": true, - "**/.idea": true, - "**/.vscode": false, - "**/yarn.lock": true, - "**/tmp": true, - "out": true, - "dist": true, - "node_modules": true, - "CHANGELOG.md": true, - "examples": true, - "res": true, - "screenshots": true, - "yarn-error.log": true, - "**/.yarn": true - }, - "files.exclude": { - "**/.cache": true, - "**/.editorconfig": true, - "**/.eslintcache": true, - "**/bower_components": true, - "**/.idea": true, - "**/tmp": true, - "**/.git": true, - "**/.svn": true, - "**/.hg": true, - "**/CVS": true, - "**/.DS_Store": true - }, - "files.watcherExclude": { - "**/.git/objects/**": true, - "**/.git/subtree-cache/**": true, - "**/.vscode/**": true, - "**/node_modules/**": true, - "**/tmp/**": true, - "**/bower_components/**": true, - "**/dist/**": true, - "**/yarn.lock": true - }, - "stylelint.enable": true, - "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"], - "path-intellisense.mappings": { - "@/": "${workspaceRoot}/src" - }, - "[javascriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" - }, - "[typescriptreact]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" - }, - "[html]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[css]": { - "editor.defaultFormatter": "rvest.vs-code-prettier-eslint" - }, - "[less]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[scss]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[markdown]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "editor.codeActionsOnSave": { - "source.fixAll.eslint": "explicit" - }, - "[vue]": { - "editor.defaultFormatter": "Vue.volar" - }, - "i18n-ally.localesPaths": ["src/locales"], - "i18n-ally.keystyle": "nested", - "i18n-ally.sortKeys": true, - "i18n-ally.namespace": false, - "i18n-ally.enabledParsers": ["ts"], - "i18n-ally.sourceLanguage": "en", - "i18n-ally.displayLanguage": "zh-CN", - "i18n-ally.enabledFrameworks": ["vue", "react"], - "cSpell.words": [ - "brotli", - "browserslist", - "codemirror", - "commitlint", - "cropperjs", - "echart", - "echarts", - "esnext", - "esno", - "iconify", - "INTLIFY", - "lintstagedrc", - "logicflow", - "nprogress", - "pinia", - "pnpm", - "qrcode", - "sider", - "sortablejs", - "stylelint", - "svgs", - "unocss", - "unplugin", - "unref", - "videojs", - "VITE", - "vitejs", - "vueuse", - "wangeditor", - "xingyu", - "yudao", - "zxcvbn" - ], - // 控制相关文件嵌套展示 - "explorer.fileNesting.enabled": true, - "explorer.fileNesting.expand": false, - "explorer.fileNesting.patterns": { - "*.ts": "$(capture).test.ts, $(capture).test.tsx", - "*.tsx": "$(capture).test.ts, $(capture).test.tsx", - "*.env": "$(capture).env.*", - "package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore" - }, - "terminal.integrated.scrollback": 10000, - "nuxt.isNuxtApp": false -} From 50c8cf86deaded2f1ef6c31668bf3f7dca7b1134 Mon Sep 17 00:00:00 2001 From: ck-chenkang Date: Wed, 29 Apr 2026 18:15:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=89=A9=E6=96=99?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/locales/en.ts | 2 + src/locales/zh-CN.ts | 2 + src/views/erp/product/product/index.vue | 124 +++++++++--------------- 3 files changed, 51 insertions(+), 77 deletions(-) diff --git a/src/locales/en.ts b/src/locales/en.ts index 1603c11e..a1eebaa9 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -1848,6 +1848,8 @@ export default { moduleName: 'Product Material Information', searchNameLabel: 'Name', searchNamePlaceholder: 'Please enter name', + searchCodeLabel: 'Code', + searchCodePlaceholder: 'Please enter code', searchButtonText: 'Search', resetButtonText: 'Reset', addButtonText: 'Add', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 3063462a..2bee9216 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -2680,6 +2680,8 @@ export default { moduleName: '产品物料信息', searchNameLabel: '名称', searchNamePlaceholder: '请输入名称', + searchCodeLabel: '编码', + searchCodePlaceholder: '请输入编码', searchButtonText: '搜索', resetButtonText: '重置', addButtonText: '新增', diff --git a/src/views/erp/product/product/index.vue b/src/views/erp/product/product/index.vue index b821a479..82e7df02 100644 --- a/src/views/erp/product/product/index.vue +++ b/src/views/erp/product/product/index.vue @@ -2,41 +2,29 @@