Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts: # src/components/DiyEditor/components/ComponentContainer.vue
Showing
| ... | @@ -31,23 +31,23 @@ | ... | @@ -31,23 +31,23 @@ |
| "@form-create/element-ui": "^3.1.24", | "@form-create/element-ui": "^3.1.24", | ||
| "@iconify/iconify": "^3.1.1", | "@iconify/iconify": "^3.1.1", | ||
| "@videojs-player/vue": "^1.0.0", | "@videojs-player/vue": "^1.0.0", | ||
| "@vueuse/core": "^10.5.0", | "@vueuse/core": "^10.6.1", | ||
| "@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.4", | "@zxcvbn-ts/core": "^3.0.4", | ||
| "animate.css": "^4.1.1", | "animate.css": "^4.1.1", | ||
| "axios": "^1.6.0", | "axios": "^1.6.1", | ||
| "benz-amr-recorder": "^1.1.5", | "benz-amr-recorder": "^1.1.5", | ||
| "bpmn-js-token-simulation": "^0.10.0", | "bpmn-js-token-simulation": "^0.10.0", | ||
| "camunda-bpmn-moddle": "^7.0.1", | "camunda-bpmn-moddle": "^7.0.1", | ||
| "cropperjs": "^1.6.1", | "cropperjs": "^1.6.1", | ||
| "crypto-js": "^4.2.0", | "crypto-js": "^4.2.0", | ||
| "dayjs": "^1.11.10", | "dayjs": "^1.11.10", | ||
| "diagram-js": "^12.6.0", | "diagram-js": "^12.8.0", | ||
| "driver.js": "^1.3.0", | "driver.js": "^1.3.1", | ||
| "echarts": "^5.4.3", | "echarts": "^5.4.3", | ||
| "echarts-wordcloud": "^2.1.0", | "echarts-wordcloud": "^2.1.0", | ||
| "element-plus": "2.4.1", | "element-plus": "2.4.2", | ||
| "fast-xml-parser": "^4.3.2", | "fast-xml-parser": "^4.3.2", | ||
| "highlight.js": "^11.9.0", | "highlight.js": "^11.9.0", | ||
| "jsencrypt": "^3.3.2", | "jsencrypt": "^3.3.2", | ||
| ... | @@ -62,9 +62,9 @@ | ... | @@ -62,9 +62,9 @@ |
| "steady-xml": "^0.1.0", | "steady-xml": "^0.1.0", | ||
| "url": "^0.11.3", | "url": "^0.11.3", | ||
| "video.js": "^7.21.5", | "video.js": "^7.21.5", | ||
| "vue": "^3.3.7", | "vue": "^3.3.8", | ||
| "vue-dompurify-html": "^4.1.4", | "vue-dompurify-html": "^4.1.4", | ||
| "vue-i18n": "^9.6.2", | "vue-i18n": "^9.6.5", | ||
| "vue-router": "^4.2.5", | "vue-router": "^4.2.5", | ||
| "vue-types": "^5.1.1", | "vue-types": "^5.1.1", | ||
| "vuedraggable": "^4.1.0", | "vuedraggable": "^4.1.0", | ||
| ... | @@ -72,49 +72,49 @@ | ... | @@ -72,49 +72,49 @@ |
| "xml-js": "^1.6.11" | "xml-js": "^1.6.11" | ||
| }, | }, | ||
| "devDependencies": { | "devDependencies": { | ||
| "@commitlint/cli": "^18.2.0", | "@commitlint/cli": "^18.4.1", | ||
| "@commitlint/config-conventional": "^18.1.0", | "@commitlint/config-conventional": "^18.4.0", | ||
| "@iconify/json": "^2.2.135", | "@iconify/json": "^2.2.142", | ||
| "@intlify/unplugin-vue-i18n": "^1.4.0", | "@intlify/unplugin-vue-i18n": "^1.5.0", | ||
| "@purge-icons/generated": "^0.9.0", | "@purge-icons/generated": "^0.9.0", | ||
| "@types/lodash-es": "^4.17.10", | "@types/lodash-es": "^4.17.11", | ||
| "@types/node": "^20.8.9", | "@types/node": "^20.9.0", | ||
| "@types/nprogress": "^0.2.2", | "@types/nprogress": "^0.2.3", | ||
| "@types/qrcode": "^1.5.4", | "@types/qrcode": "^1.5.5", | ||
| "@types/qs": "^6.9.9", | "@types/qs": "^6.9.10", | ||
| "@types/sortablejs": "^1.15.4", | "@types/sortablejs": "^1.15.5", | ||
| "@typescript-eslint/eslint-plugin": "^6.9.1", | "@typescript-eslint/eslint-plugin": "^6.11.0", | ||
| "@typescript-eslint/parser": "^6.9.1", | "@typescript-eslint/parser": "^6.11.0", | ||
| "@unocss/transformer-variant-group": "^0.57.1", | "@unocss/transformer-variant-group": "^0.57.4", | ||
| "@unocss/eslint-config": "^0.57.1", | "@unocss/eslint-config": "^0.57.4", | ||
| "@vitejs/plugin-legacy": "^4.1.1", | "@vitejs/plugin-legacy": "^4.1.1", | ||
| "@vitejs/plugin-vue": "^4.4.0", | "@vitejs/plugin-vue": "^4.4.1", | ||
| "@vitejs/plugin-vue-jsx": "^3.0.2", | "@vitejs/plugin-vue-jsx": "^3.0.2", | ||
| "autoprefixer": "^10.4.16", | "autoprefixer": "^10.4.16", | ||
| "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.2.3", | "consola": "^3.2.3", | ||
| "eslint": "^8.52.0", | "eslint": "^8.53.0", | ||
| "eslint-config-prettier": "^9.0.0", | "eslint-config-prettier": "^9.0.0", | ||
| "eslint-define-config": "^1.24.1", | "eslint-define-config": "^1.24.1", | ||
| "eslint-plugin-prettier": "^5.0.1", | "eslint-plugin-prettier": "^5.0.1", | ||
| "eslint-plugin-vue": "^9.18.1", | "eslint-plugin-vue": "^9.18.1", | ||
| "lint-staged": "^15.0.2", | "lint-staged": "^15.1.0", | ||
| "postcss": "^8.4.31", | "postcss": "^8.4.31", | ||
| "postcss-html": "^1.5.0", | "postcss-html": "^1.5.0", | ||
| "postcss-scss": "^4.0.9", | "postcss-scss": "^4.0.9", | ||
| "prettier": "^3.0.3", | "prettier": "^3.1.0", | ||
| "rimraf": "^5.0.5", | "rimraf": "^5.0.5", | ||
| "rollup": "^4.1.5", | "rollup": "^4.4.1", | ||
| "sass": "^1.69.5", | "sass": "^1.69.5", | ||
| "stylelint": "^15.11.0", | "stylelint": "^15.11.0", | ||
| "stylelint-config-html": "^1.1.0", | "stylelint-config-html": "^1.1.0", | ||
| "stylelint-config-recommended": "^13.0.0", | "stylelint-config-recommended": "^13.0.0", | ||
| "stylelint-config-standard": "^34.0.0", | "stylelint-config-standard": "^34.0.0", | ||
| "stylelint-order": "^6.0.3", | "stylelint-order": "^6.0.3", | ||
| "terser": "^5.23.0", | "terser": "^5.24.0", | ||
| "typescript": "5.2.2", | "typescript": "5.2.2", | ||
| "unocss": "^0.57.1", | "unocss": "^0.57.4", | ||
| "unplugin-auto-import": "^0.16.7", | "unplugin-auto-import": "^0.16.7", | ||
| "unplugin-element-plus": "^0.8.0", | "unplugin-element-plus": "^0.8.0", | ||
| "unplugin-vue-components": "^0.25.2", | "unplugin-vue-components": "^0.25.2", | ||
| ... | ... |
src/api/crm/contact/index.ts
0 → 100644
src/api/infra/demo/demo01/index.ts
0 → 100644
src/api/infra/demo/demo02/index.ts
0 → 100644
src/api/infra/demo/demo03/erp/index.ts
0 → 100644
src/api/infra/demo/demo03/inner/index.ts
0 → 100644
src/api/infra/demo/demo03/normal/index.ts
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
src/views/crm/contact/ContactForm.vue
0 → 100644
This diff is collapsed.
Click to expand it.
src/views/crm/contact/OwerSelect.vue
0 → 100644
src/views/crm/contact/detail/index.vue
0 → 100644
src/views/crm/contact/index.vue
0 → 100644
This diff is collapsed.
Click to expand it.
src/views/infra/demo/demo01/index.vue
0 → 100644
src/views/infra/demo/demo02/index.vue
0 → 100644
src/views/infra/demo/demo03/erp/index.vue
0 → 100644
src/views/infra/demo/demo03/inner/index.vue
0 → 100644
src/views/infra/demo/demo03/normal/index.vue
0 → 100644
src/views/infra/testDemo/index.vue
deleted
100644 → 0
Please
register
or
sign in
to comment