mirrors/pig-ui
1
0
Fork 0
mirror of https://gitee.com/log4j/pig-ui.git synced 2024-12-23 05:40:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/leng_dev' into lei_dev

Browse Source 
# Conflicts:
#	package.json
This commit is contained in:
aeizzz 2023-03-04 12:42:45 +08:00
commit 347313feec
4 changed files with 3484 additions and 3379 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,7 +15,6 @@ pnpm-debug.log*
# Editor directories and files
.idea
.vscode
*.suo
*.ntvs*
*.njsproj

105
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,105 @@
{
"[scss]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[json]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[vue]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[css]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"eslint.options": {
"extensions": [".js", ".vue", ".ts", ".tsx"]
},
"eslint.validate": ["vue", "html", "javascript", "graphql", "javascriptreact", "json", "typescript", "typescriptreact", "vue-html"],
"eslint.format.enable": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
},
"files.associations": {
"*.cjson": "jsonc",
"*.wxss": "css",
"*.wxs": "javascript",
"*.nvue": "vue"
},
"editor.formatOnSave": true,
"editor.tabSize": 2,
"editor.formatOnType": true,
"javascript.format.enable": false,
"workbench.iconTheme": "material-icon-theme",
"backgroundCover.imagePath": "d:\\360downloads\\upload.jpg",
"search.followSymlinks": false,
"backgroundCover.opacity": 0.5,
"terminal.integrated.shell.windows": "C:\\Windows\\System32\\cmd.exe",
"typescript.updateImportsOnFileMove.enabled": "always",
"[markdown]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"markdownlint.config": {
"default": true,
"no-hard-tabs": false,
"no-inline-html": false,
"first-line-heading": false,
"heading-increment": false,
"no-bare-urls": false
},
"i18n-ally.localesPaths": [
"src/i18n",
"src/i18n/lang",
"src/components/Cron/language",
"src/views/admin/i18n",
"src/views/admin/audit/i18n",
"src/views/admin/client/i18n",
"src/views/admin/dept/i18n",
"src/views/admin/dict/i18n",
"src/views/admin/file/i18n",
"src/views/admin/i18n/i18n",
"src/views/admin/log/i18n",
"src/views/admin/param/i18n",
"src/views/admin/menu/i18n",
"src/views/admin/post/i18n",
"src/views/admin/role/i18n",
"src/views/admin/social/i18n",
"src/views/admin/tenant/i18n",
"src/views/admin/token/i18n",
"src/views/admin/user/i18n",
"src/views/app/approle/i18n",
"src/views/app/appmenu/i18n",
"src/views/app/appsocial/i18n",
"src/views/app/appuser/i18n",
"src/views/gen/datasource/i18n",
"src/views/daemon/job-manage/i18n",
"src/views/gen/field-type/i18n",
"src/views/gen/table/i18n",
"src/views/gen/group/i18n",
"src/views/gen/template/i18n",
"src/views/mp/wx-account/i18n",
"src/views/mp/wx-account-fans/i18n",
"src/views/mp/wx-account-tag/i18n",
"src/views/mp/wx-fans-msg/i18n",
"src/views/oa/leave_bill/i18n",
"src/views/oa/model/i18n",
"src/views/oa/process/i18n",
"src/views/oa/task/i18n",
"src/views/pay/channel/i18n",
"src/views/pay/order/i18n",
"src/views/pay/record/i18n",
"src/views/pay/refund/i18n",
"src/views/pay/trade/i18n"
]
}

29
package.json
View File

@ -7,7 +7,8 @@
"scripts": {
"dev": "vite --force",
"build": "vite build",
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src"
"lint:eslint": "eslint --fix --ext .js,.ts,.vue ./src",
"prettier": "prettier --write ."
},
"dependencies": {
"@chenfengyuan/vue-qrcode": "^2.0.0",
@ -15,21 +16,21 @@
"@highlightjs/vue-plugin": "^2.1.0",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"axios": "^1.3.3",
"axios": "^1.2.1",
"crypto-js": "^3.1.9-1",
"echarts": "^5.4.1",
"element-plus": "^2.2.32",
"element-plus": "^2.2.26",
"form-designer": "^0.0.2",
"highlight.js": "^11.7.0",
"js-cookie": "^3.0.1",
"mitt": "^3.0.0",
"nprogress": "^0.2.0",
"pinia": "^2.0.32",
"pinia": "^2.0.28",
"qrcode": "1.5.1",
"qs": "^6.11.0",
"screenfull": "^6.0.2",
"sortablejs": "^1.15.0",
"vue": "^3.2.47",
"vue": "3.2.47",
"vue-clipboard3": "^2.0.0",
"vue-i18n": "^9.2.2",
"vue-router": "^4.1.6",
@ -37,22 +38,22 @@
"xe-utils": "^3.5.4"
},
"devDependencies": {
"@types/node": "^18.14.0",
"@types/node": "^18.11.13",
"@types/nprogress": "^0.2.0",
"@types/sortablejs": "^1.15.0",
"@typescript-eslint/eslint-plugin": "^5.53.0",
"@typescript-eslint/parser": "^5.53.0",
"@typescript-eslint/eslint-plugin": "^5.46.0",
"@typescript-eslint/parser": "^5.46.0",
"@vitejs/plugin-vue": "^4.0.0",
"@vue/compiler-sfc": "^3.2.47",
"@vue/compiler-sfc": "^3.2.45",
"consola": "^2.15.3",
"eslint": "^8.34.0",
"eslint-plugin-vue": "^9.9.0",
"eslint": "8.22.0",
"eslint-plugin-vue": "^9.8.0",
"pinia-plugin-persist": "^1.0.0",
"prettier": "^2.8.4",
"sass": "^1.58.3",
"typescript": "^4.9.5",
"sass": "^1.56.2",
"typescript": "^4.9.4",
"unplugin-auto-import": "^0.13.0",
"vite": "^4.1.4",
"vite": "^4.0.0",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-style-import": "^2.0.0",
"vite-plugin-top-level-await": "^1.2.4",