Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts: src/views/infra/build/index.vue src/views/mall/product/spu/components/DescriptionForm.vue src/views/mall/product/spu/components/OtherSettingsForm.vue src/views/mall/product/spu/components/ProductPropertyAddForm.vue src/views/mall/product/spu/components/SkuList.vue
Showing
| ... | @@ -9,12 +9,12 @@ | ... | @@ -9,12 +9,12 @@ |
| "dev": "vite --mode base", | "dev": "vite --mode base", | ||
| "front": "vite --mode front", | "front": "vite --mode front", | ||
| "ts:check": "vue-tsc --noEmit", | "ts:check": "vue-tsc --noEmit", | ||
| "build:pro": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode pro", | "build:pro": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode pro", | ||
| "build:dev": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode dev", | "build:dev": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode dev", | ||
| "build:stage": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode stage", | "build:stage": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode stage", | ||
| "build:test": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode test", | "build:test": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode test", | ||
| "build:static": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode static", | "build:static": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode static", | ||
| "build:front": "node --max_old_space_size=8000 ./node_modules/vite/bin/vite.js build --mode front", | "build:front": "node --max_old_space_size=8192 ./node_modules/vite/bin/vite.js build --mode front", | ||
| "serve:pro": "vite preview --mode pro", | "serve:pro": "vite preview --mode pro", | ||
| "serve:dev": "vite preview --mode dev", | "serve:dev": "vite preview --mode dev", | ||
| "serve:test": "vite preview --mode test", | "serve:test": "vite preview --mode test", | ||
| ... | @@ -34,10 +34,10 @@ | ... | @@ -34,10 +34,10 @@ |
| "@form-create/element-ui": "^3.1.17", | "@form-create/element-ui": "^3.1.17", | ||
| "@iconify/iconify": "^3.1.0", | "@iconify/iconify": "^3.1.0", | ||
| "@videojs-player/vue": "^1.0.0", | "@videojs-player/vue": "^1.0.0", | ||
| "@vueuse/core": "^10.1.2", | "@vueuse/core": "^10.2.0", | ||
| "@wangeditor/editor": "^5.1.23", | "@wangeditor/editor": "^5.1.23", | ||
| "@wangeditor/editor-for-vue": "^5.1.10", | "@wangeditor/editor-for-vue": "^5.1.10", | ||
| "@zxcvbn-ts/core": "^3.0.1", | "@zxcvbn-ts/core": "^3.0.2", | ||
| "animate.css": "^4.1.1", | "animate.css": "^4.1.1", | ||
| "axios": "^1.4.0", | "axios": "^1.4.0", | ||
| "benz-amr-recorder": "^1.1.5", | "benz-amr-recorder": "^1.1.5", | ||
| ... | @@ -45,12 +45,12 @@ | ... | @@ -45,12 +45,12 @@ |
| "camunda-bpmn-moddle": "^7.0.1", | "camunda-bpmn-moddle": "^7.0.1", | ||
| "cropperjs": "^1.5.13", | "cropperjs": "^1.5.13", | ||
| "crypto-js": "^4.1.1", | "crypto-js": "^4.1.1", | ||
| "dayjs": "^1.11.7", | "dayjs": "^1.11.8", | ||
| "diagram-js": "^11.6.0", | "diagram-js": "^11.6.0", | ||
| "echarts": "^5.4.2", | "echarts": "^5.4.2", | ||
| "echarts-wordcloud": "^2.1.0", | "echarts-wordcloud": "^2.1.0", | ||
| "element-plus": "2.3.4", | "element-plus": "2.3.7", | ||
| "fast-xml-parser": "^4.2.2", | "fast-xml-parser": "^4.2.4", | ||
| "highlight.js": "^11.8.0", | "highlight.js": "^11.8.0", | ||
| "intro.js": "^7.0.1", | "intro.js": "^7.0.1", | ||
| "jsencrypt": "^3.3.2", | "jsencrypt": "^3.3.2", | ||
| ... | @@ -58,82 +58,77 @@ | ... | @@ -58,82 +58,77 @@ |
| "min-dash": "^4.1.1", | "min-dash": "^4.1.1", | ||
| "mitt": "^3.0.0", | "mitt": "^3.0.0", | ||
| "nprogress": "^0.2.0", | "nprogress": "^0.2.0", | ||
| "pinia": "^2.1.3", | "pinia": "^2.1.4", | ||
| "qrcode": "^1.5.3", | "qrcode": "^1.5.3", | ||
| "qs": "^6.11.2", | "qs": "^6.11.2", | ||
| "steady-xml": "^0.1.0", | "steady-xml": "^0.1.0", | ||
| "url": "^0.11.0", | "url": "^0.11.1", | ||
| "video.js": "^8.3.0", | "video.js": "^8.3.0", | ||
| "vue": "3.3.4", | "vue": "3.3.4", | ||
| "vue-dompurify-html": "^4.1.4", | "vue-dompurify-html": "^4.1.4", | ||
| "vue-i18n": "9.2.2", | "vue-i18n": "9.2.2", | ||
| "vue-router": "^4.2.1", | "vue-router": "^4.2.2", | ||
| "vue-types": "^5.0.3", | "vue-types": "^5.0.4", | ||
| "vuedraggable": "^4.1.0", | "vuedraggable": "^4.1.0", | ||
| "web-storage-cache": "^1.1.1", | "web-storage-cache": "^1.1.1", | ||
| "xe-utils": "^3.5.7", | |||
| "xml-js": "^1.6.11" | "xml-js": "^1.6.11" | ||
| }, | }, | ||
| "devDependencies": { | "devDependencies": { | ||
| "@commitlint/cli": "^17.6.3", | "@commitlint/cli": "^17.6.5", | ||
| "@commitlint/config-conventional": "^17.6.3", | "@commitlint/config-conventional": "^17.6.5", | ||
| "@iconify/json": "^2.2.67", | "@iconify/json": "^2.2.80", | ||
| "@intlify/unplugin-vue-i18n": "^0.10.0", | "@intlify/unplugin-vue-i18n": "^0.11.0", | ||
| "@purge-icons/generated": "^0.9.0", | "@purge-icons/generated": "^0.9.0", | ||
| "@types/intro.js": "^5.1.1", | "@types/intro.js": "^5.1.1", | ||
| "@types/lodash-es": "^4.17.7", | "@types/lodash-es": "^4.17.7", | ||
| "@types/node": "^18.16.0", | "@types/node": "^20.3.1", | ||
| "@types/nprogress": "^0.2.0", | "@types/nprogress": "^0.2.0", | ||
| "@types/qrcode": "^1.5.0", | "@types/qrcode": "^1.5.0", | ||
| "@types/qs": "^6.9.7", | "@types/qs": "^6.9.7", | ||
| "@typescript-eslint/eslint-plugin": "^5.59.6", | "@typescript-eslint/eslint-plugin": "^5.59.11", | ||
| "@typescript-eslint/parser": "^5.59.6", | "@typescript-eslint/parser": "^5.59.11", | ||
| "@vitejs/plugin-legacy": "^4.0.3", | "@vitejs/plugin-legacy": "^4.0.4", | ||
| "@vitejs/plugin-vue": "^4.2.3", | "@vitejs/plugin-vue": "^4.2.3", | ||
| "@vitejs/plugin-vue-jsx": "^3.0.1", | "@vitejs/plugin-vue-jsx": "^3.0.1", | ||
| "autoprefixer": "^10.4.14", | "autoprefixer": "^10.4.14", | ||
| "bpmn-js": "^8.9.0", | "bpmn-js": "^8.9.0", | ||
| "bpmn-js-properties-panel": "^0.46.0", | "bpmn-js-properties-panel": "^0.46.0", | ||
| "consola": "^3.1.0", | "consola": "^3.1.0", | ||
| "eslint": "^8.40.0", | "eslint": "^8.43.0", | ||
| "eslint-config-prettier": "^8.8.0", | "eslint-config-prettier": "^8.8.0", | ||
| "eslint-define-config": "^1.20.0", | "eslint-define-config": "^1.21.0", | ||
| "eslint-plugin-prettier": "^4.2.1", | "eslint-plugin-prettier": "^4.2.1", | ||
| "eslint-plugin-vue": "^9.13.0", | "eslint-plugin-vue": "^9.15.0", | ||
| "lint-staged": "^13.2.2", | "lint-staged": "^13.2.2", | ||
| "postcss": "^8.4.23", | "postcss": "^8.4.24", | ||
| "postcss-html": "^1.5.0", | "postcss-html": "^1.5.0", | ||
| "postcss-scss": "^4.0.6", | "postcss-scss": "^4.0.6", | ||
| "prettier": "^2.8.8", | "prettier": "^2.8.8", | ||
| "rimraf": "^5.0.1", | "rimraf": "^5.0.1", | ||
| "rollup": "^3.22.0", | "rollup": "^3.25.1", | ||
| "sass": "^1.62.1", | "sass": "^1.63.5", | ||
| "stylelint": "^15.6.2", | "stylelint": "^15.8.0", | ||
| "stylelint-config-html": "^1.1.0", | |||
| "stylelint-config-recommended": "^12.0.0", | "stylelint-config-recommended": "^12.0.0", | ||
| "stylelint-config-recommended-vue": "^1.4.0", | |||
| "stylelint-config-standard": "^33.0.0", | "stylelint-config-standard": "^33.0.0", | ||
| "stylelint-order": "^6.0.3", | "stylelint-order": "^6.0.3", | ||
| "terser": "^5.17.4", | "terser": "^5.18.1", | ||
| "typescript": "5.0.4", | "typescript": "5.0.4", | ||
| "unplugin-auto-import": "^0.16.0", | "unplugin-auto-import": "^0.16.4", | ||
| "unplugin-element-plus": "^0.7.1", | "unplugin-element-plus": "^0.7.1", | ||
| "unplugin-vue-components": "^0.24.1", | "unplugin-vue-components": "^0.25.1", | ||
| "vite": "4.3.8", | "vite": "4.3.9", | ||
| "vite-plugin-compression": "^0.5.1", | "vite-plugin-compression": "^0.5.1", | ||
| "vite-plugin-ejs": "^1.6.4", | "vite-plugin-ejs": "^1.6.4", | ||
| "vite-plugin-eslint": "^1.8.1", | "vite-plugin-eslint": "^1.8.1", | ||
| "vite-plugin-progress": "^0.0.7", | "vite-plugin-progress": "^0.0.7", | ||
| "vite-plugin-purge-icons": "^0.9.2", | "vite-plugin-purge-icons": "^0.9.2", | ||
| "vite-plugin-svg-icons": "^2.0.1", | "vite-plugin-svg-icons": "^2.0.1", | ||
| "vite-plugin-top-level-await": "^1.3.0", | "vite-plugin-top-level-await": "^1.3.1", | ||
| "vite-plugin-vue-setup-extend-plus": "^0.1.0", | |||
| "vite-plugin-windicss": "^1.9.0", | "vite-plugin-windicss": "^1.9.0", | ||
| "vue-tsc": "^1.6.5", | "vue-tsc": "^1.8.1", | ||
| "windicss": "^3.5.6" | "windicss": "^3.5.6" | ||
| }, | }, | ||
| "engines": { | |||
| "node": ">=16.0.0" | |||
| }, | |||
| "license": "MIT", | "license": "MIT", | ||
| "repository": { | "repository": { | ||
| "type": "git", | "type": "git", | ||
| ... | @@ -142,5 +137,10 @@ | ... | @@ -142,5 +137,10 @@ |
| "bugs": { | "bugs": { | ||
| "url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues" | "url": "https://gitee.com/yudaocode/yudao-ui-admin-vue3/issues" | ||
| }, | }, | ||
| "homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3" | "homepage": "https://gitee.com/yudaocode/yudao-ui-admin-vue3", | ||
| "packageManager": "pnpm@8.6.0", | |||
| "engines": { | |||
| "node": ">= 16.0.0", | |||
| "pnpm": ">=8.6.0" | |||
| } | |||
| } | } |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
Please
register
or
sign in
to comment