canrd-outside / order-erp-front · Commits

Commit ff6e0939ffbc4ce8a29733289ead74b97a6ea06f

Authored by boyang
2 parents 04f7e655 95fbe9af
build: skipped

Merge branch 'by' into 'develop' 

添加邮件配置页面，添加生产指标书按钮

添加邮件配置页面，添加生产指标书按钮

See merge request !3
Inline Side-by-side
Showing 1 changed file with 6 additions and 172 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 1 of 14 files are displayed.

.vscode/settings.json
  View file @ff6e093
1 1 {
2   - "typescript.tsdk": "./node_modules/typescript/lib",
3   - "volar.tsPlugin": true,
4   - "volar.tsPluginStatus": false,
5   - "npm.packageManager": "pnpm",
6   - "editor.tabSize": 2,
7   - "editor.defaultFormatter": "esbenp.prettier-vscode",
8   - "files.eol": "\n",
9   - "search.exclude": {
10   - "**/node_modules": true,
11   - "**/*.log": true,
12   - "**/*.log*": true,
13   - "**/bower_components": true,
14   - "**/dist": true,
15   - "**/elehukouben": true,
16   - "**/.git": true,
17   - "**/.gitignore": true,
18   - "**/.svn": true,
19   - "**/.DS_Store": true,
20   - "**/.idea": true,
21   - "**/.vscode": false,
22   - "**/yarn.lock": true,
23   - "**/tmp": true,
24   - "out": true,
25   - "dist": true,
26   - "node_modules": true,
27   - "CHANGELOG.md": true,
28   - "examples": true,
29   - "res": true,
30   - "screenshots": true,
31   - "yarn-error.log": true,
32   - "**/.yarn": true
33   - },
34   - "files.exclude": {
35   - "**/.cache": true,
36   - "**/.editorconfig": true,
37   - "**/.eslintcache": true,
38   - "**/bower_components": true,
39   - "**/.idea": true,
40   - "**/tmp": true,
41   - "**/.git": true,
42   - "**/.svn": true,
43   - "**/.hg": true,
44   - "**/CVS": true,
45   - "**/.DS_Store": true
46   - },
47   - "files.watcherExclude": {
48   - "**/.git/objects/**": true,
49   - "**/.git/subtree-cache/**": true,
50   - "**/.vscode/**": true,
51   - "**/node_modules/**": true,
52   - "**/tmp/**": true,
53   - "**/bower_components/**": true,
54   - "**/dist/**": true,
55   - "**/yarn.lock": true
56   - },
57   - "stylelint.enable": true,
58   - "stylelint.validate": ["css", "less", "postcss", "scss", "vue", "sass"],
59   - "path-intellisense.mappings": {
60   - "/@/": "${workspaceRoot}/src"
61   - },
62   - "[javascriptreact]": {
63   - "editor.defaultFormatter": "esbenp.prettier-vscode"
64   - },
65   - "[typescript]": {
66   - "editor.defaultFormatter": "esbenp.prettier-vscode"
67   - },
68   - "[typescriptreact]": {
69   - "editor.defaultFormatter": "esbenp.prettier-vscode"
70   - },
71   - "[html]": {
72   - "editor.defaultFormatter": "esbenp.prettier-vscode"
73   - },
74   - "[css]": {
75   - "editor.defaultFormatter": "esbenp.prettier-vscode"
76   - },
77   - "[less]": {
78   - "editor.defaultFormatter": "esbenp.prettier-vscode"
79   - },
80   - "[scss]": {
81   - "editor.defaultFormatter": "esbenp.prettier-vscode"
82   - },
83   - "[markdown]": {
84   - "editor.defaultFormatter": "esbenp.prettier-vscode"
85   - },
86   - "editor.codeActionsOnSave": {
87   - "source.fixAll.eslint": "explicit",
88   - "source.fixAll.stylelint": "explicit"
89   - },
90   - "[vue]": {
91   - "editor.codeActionsOnSave": {
92   - "source.fixAll.eslint": "explicit",
93   - "source.fixAll.stylelint": "explicit"
94   - },
95   - "editor.defaultFormatter": "esbenp.prettier-vscode"
96   - },
97   - "i18n-ally.localesPaths": ["src/locales/lang"],
98   - "i18n-ally.keystyle": "nested",
99   - "i18n-ally.sortKeys": true,
100   - "i18n-ally.namespace": true,
101   - "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}",
102   - "i18n-ally.enabledParsers": ["ts"],
103   - "i18n-ally.sourceLanguage": "en",
104   - "i18n-ally.displayLanguage": "zh-CN",
105   - "i18n-ally.enabledFrameworks": ["vue", "react"],
106   - "cSpell.words": [
107   - "vben",
108   - "browserslist",
109   - "tailwindcss",
110   - "esnext",
111   - "antv",
112   - "tinymce",
113   - "qrcode",
114   - "sider",
115   - "pinia",
116   - "sider",
117   - "nprogress",
118   - "INTLIFY",
119   - "stylelint",
120   - "esno",
121   - "vitejs",
122   - "sortablejs",
123   - "mockjs",
124   - "codemirror",
125   - "iconify",
126   - "commitlint",
127   - "vditor",
128   - "echarts",
129   - "cropperjs",
130   - "logicflow",
131   - "vueuse",
132   - "zxcvbn",
133   - "lintstagedrc",
134   - "brotli",
135   - "tailwindcss",
136   - "sider",
137   - "pnpm",
138   - "antd"
139   - ],
140   - "vetur.format.scriptInitialIndent": true,
141   - "vetur.format.styleInitialIndent": true,
142   - "vetur.validation.script": false,
143   - "MicroPython.executeButton": [
144   - {
145   - "text": "▶",
146   - "tooltip": "运行",
147   - "alignment": "left",
148   - "command": "extension.executeFile",
149   - "priority": 3.5
150   - }
151   - ],
152   - "MicroPython.syncButton": [
153   - {
154   - "text": "$(sync)",
155   - "tooltip": "同步",
156   - "alignment": "left",
157   - "command": "extension.execute",
158   - "priority": 4
159   - }
160   - ],
161   - // 控制相关文件嵌套展示
162   - "explorer.fileNesting.enabled": true,
163   - "explorer.fileNesting.expand": false,
164   - "explorer.fileNesting.patterns": {
165   - "*.ts": "$(capture).test.ts, $(capture).test.tsx",
166   - "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
167   - "*.env": "$(capture).env.*",
168   - "CHANGELOG.md": "CHANGELOG*",
169   - "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc",
170   - ".eslintrc.js": ".eslintignore,.prettierignore,.stylelintignore,.commitlintrc.js,.prettierrc.js,.stylelintrc.js"
171   - },
172   - "terminal.integrated.scrollback": 10000
173   -}
  2 + "i18n-ally.localesPaths": [
  3 + "src/locales",
  4 + "src/locales/lang",
  5 + "public/resource/tinymce/langs"
  6 + ]
  7 +}
174 8 \ No newline at end of file
... ...