Skip to content

B
basic-vue-admin
提交 f251b873 作者: 方治民
操作

Merge branch '3.x' of https://gitlab.yiring.com/basic/basic-vue-admin into electron

上级 4c1e3a7d 8ca2d6b8
正在显示 包含 55 行增加 和 54 行删除
.eslintrc.js
......@@ -76,6 +76,7 @@ module.exports = {
'vue/multi-word-component-names': 'off',
'vue/no-reserved-component-names': 'off',
'vue/no-constant-condition': 'off',
'vue/no-setup-props-destructure': 'off',
'no-console': 'off',
'antfu/if-newline': 'off',
'symbol-description': 'off',
......
package.json
......@@ -66,25 +66,25 @@
"@ant-design/icons-vue": "^6.1.0",
"@electron-toolkit/preload": "^1.0.3",
"@electron-toolkit/utils": "^1.0.2",
"@iconify/iconify": "^3.1.0",
"@logicflow/core": "^1.2.8",
"@logicflow/extension": "^1.2.8",
"@iconify/iconify": "^3.1.1",
"@logicflow/core": "^1.2.10",
"@logicflow/extension": "^1.2.10",
"@purge-icons/generated": "^0.9.0",
"@stomp/stompjs": "^7.0.0",
"@vue/runtime-core": "^3.3.4",
"@vue/shared": "^3.3.4",
"@vueuse/core": "^10.1.2",
"@vueuse/electron": "^10.1.2",
"@vueuse/shared": "^10.1.2",
"@vueuse/core": "^10.3.0",
"@vueuse/electron": "^10.3.0",
"@vueuse/shared": "^10.3.0",
"@zxcvbn-ts/core": "^2.2.1",
"ant-design-vue": "^3.2.20",
"axios": "^0.26.1",
"codemirror": "^5.65.13",
"codemirror": "^5.65.14",
"cropperjs": "^1.5.13",
"crypto-js": "^4.1.1",
"dayjs": "^1.11.7",
"dayjs": "^1.11.9",
"default-passive-events": "^2.0.0",
"echarts": "^5.4.2",
"echarts": "^5.4.3",
"electron-log": "^4.4.8",
"electron-updater": "^5.3.0",
"intro.js": "^7.0.1",
......@@ -94,7 +94,7 @@
"nanoid": "^4.0.2",
"nprogress": "^0.2.0",
"path-to-regexp": "^6.2.1",
"pinia": "^2.1.3",
"pinia": "^2.1.6",
"print-js": "^1.6.0",
"qrcode": "^1.5.3",
"qs": "^6.11.2",
......@@ -104,101 +104,101 @@
"sortablejs": "^1.15.0",
"stompjs": "^2.3.3",
"tinymce": "^5.10.7",
"vditor": "^3.9.3",
"vditor": "^3.9.4",
"vue": "^3.3.4",
"vue-i18n": "^9.2.2",
"vue-json-pretty": "^2.2.4",
"vue-router": "^4.2.2",
"vue-types": "^5.0.3",
"vue-router": "^4.2.4",
"vue-types": "^5.1.1",
"xlsx": "^0.18.5"
},
"devDependencies": {
"@antfu/eslint-config": "^0.38.6",
"@commitlint/cli": "^17.6.5",
"@commitlint/config-conventional": "^17.6.5",
"@commitlint/cli": "^17.6.7",
"@commitlint/config-conventional": "^17.6.7",
"@electron-toolkit/tsconfig": "^1.0.1",
"@electron/notarize": "^1.2.3",
"@iconify/json": "^2.2.72",
"@types/codemirror": "^5.60.7",
"@electron/notarize": "^2.1.0",
"@iconify/json": "^2.2.99",
"@types/codemirror": "^5.60.8",
"@types/crypto-js": "^4.1.1",
"@types/fs-extra": "^11.0.1",
"@types/inquirer": "^9.0.3",
"@types/intro.js": "^5.1.1",
"@types/lodash": "^4.14.195",
"@types/lodash-es": "^4.17.7",
"@types/lodash": "^4.14.196",
"@types/lodash-es": "^4.17.8",
"@types/mockjs": "^1.0.7",
"@types/node": "^18.16.16",
"@types/node": "^18.17.3",
"@types/nprogress": "^0.2.0",
"@types/qrcode": "^1.5.0",
"@types/qrcode": "^1.5.1",
"@types/qs": "^6.9.7",
"@types/showdown": "^2.0.1",
"@types/sockjs-client": "^1.5.1",
"@types/sortablejs": "^1.15.1",
"@types/stompjs": "^2.3.5",
"@typescript-eslint/eslint-plugin": "^5.59.8",
"@typescript-eslint/parser": "^5.59.8",
"@vitejs/plugin-legacy": "^4.0.4",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.0.1",
"@vue/compiler-dom": "^3.3.4",
"@vue/compiler-sfc": "^3.3.4",
"@vue/test-utils": "^2.3.2",
"@vue/test-utils": "^2.4.1",
"autoprefixer": "^10.4.14",
"commitizen": "^4.3.0",
"conventional-changelog-cli": "^2.2.2",
"cross-env": "^7.0.3",
"cz-conventional-changelog": "^3.3.0",
"cz-git": "^1.6.1",
"czg": "^1.6.1",
"dotenv": "^16.1.3",
"electron": "^23.3.5",
"cz-git": "^1.7.0",
"czg": "^1.7.0",
"dotenv": "^16.3.1",
"electron": "^25.4.0",
"electron-builder": "^23.6.0",
"electron-vite": "^1.0.22",
"eslint": "^8.41.0",
"eslint-config-prettier": "^8.8.0",
"electron-vite": "^1.0.27",
"eslint": "^8.46.0",
"eslint-config-prettier": "^8.10.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "^9.14.1",
"eslint-plugin-vue": "^9.16.1",
"esno": "^0.16.3",
"fs-extra": "^11.1.1",
"husky": "^8.0.3",
"inquirer": "^9.2.6",
"less": "^4.1.3",
"lint-staged": "^13.2.2",
"inquirer": "^9.2.10",
"less": "^4.2.0",
"lint-staged": "^13.2.3",
"lodash": "^4.17.21",
"npm-run-all": "^4.1.5",
"picocolors": "^1.0.0",
"pont-engine": "^1.5.10",
"postcss": "^8.4.24",
"pont-engine": "^1.5.12",
"postcss": "^8.4.27",
"postcss-html": "^1.5.0",
"postcss-less": "^6.0.0",
"prettier": "^2.8.8",
"rimraf": "^5.0.1",
"rollup": "^3.23.0",
"rollup-plugin-visualizer": "^5.9.0",
"sort-package-json": "^2.4.1",
"stylelint": "^15.6.2",
"rollup": "^3.27.2",
"rollup-plugin-visualizer": "^5.9.2",
"sort-package-json": "^2.5.1",
"stylelint": "^15.10.2",
"stylelint-config-recommended": "^12.0.0",
"stylelint-config-recommended-vue": "^1.4.0",
"stylelint-config-recommended-vue": "^1.5.0",
"stylelint-config-standard": "^33.0.0",
"stylelint-order": "^6.0.3",
"terser": "^5.17.7",
"terser": "^5.19.2",
"ts-node": "^10.9.1",
"typescript": "^4.9.5",
"unplugin-auto-import": "^0.16.4",
"vite": "^4.3.9",
"unplugin-auto-import": "^0.16.6",
"vite": "^4.4.9",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-html": "^3.2.0",
"vite-plugin-mkcert": "^1.15.0",
"vite-plugin-mkcert": "^1.16.0",
"vite-plugin-mock": "^2.9.8",
"vite-plugin-purge-icons": "^0.9.2",
"vite-plugin-pwa": "^0.16.1",
"vite-plugin-pwa": "^0.16.4",
"vite-plugin-style-import": "^2.0.0",
"vite-plugin-svg-icons": "^2.0.1",
"vite-plugin-theme": "^0.8.6",
"vite-plugin-vue-setup-extend": "^0.4.0",
"vite-plugin-windicss": "^1.9.0",
"vue-eslint-parser": "^9.3.0",
"vue-tsc": "^1.6.5"
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.8"
},
"engines": {
"node": ">=14"
......
pnpm-lock.yaml
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/Upload/src/props.ts
......@@ -14,7 +14,7 @@ export const basicProps = {
// 最大数量的文件，Infinity不限制
maxNumber: {
type: Number as PropType<number>,
default: Infinity,
default: Number.POSITIVE_INFINITY,
},
// 根据后缀，或者其他
accept: {
......
src/components/Upload/src/useUpload.ts
......@@ -53,7 +53,7 @@ export function useUploadType({
}
const maxNumber = unref(maxNumberRef)
if (maxNumber && maxNumber !== Infinity) {
if (maxNumber && maxNumber !== Number.POSITIVE_INFINITY) {
helpTexts.push(t('component.upload.maxNumber', [maxNumber]))
}
return helpTexts.join('，')
......
src/utils/color.ts
......@@ -22,7 +22,7 @@ export function isHexColor(color: string) {
export function rgbToHex(r: number, g: number, b: number) {
// tslint:disable-next-line:no-bitwise
const hex = ((r << 16) | (g << 8) | b).toString(16)
return `#${new Array(Math.abs(hex.length - 7)).join('0')}${hex}`
return `#${Array.from({ length: Math.abs(hex.length - 7) }).join('0')}${hex}`
}
/**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论