From 10c014732494935facbf043aa9ff7389c915dcf8 Mon Sep 17 00:00:00 2001 From: ct <164434275@qq.com> Date: Tue, 19 May 2026 10:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E8=A2=ABai=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- package.json | 108 +++++++++---------- src/views/workflow/processInstance/index.vue | 51 ++++----- 3 files changed, 73 insertions(+), 88 deletions(-) diff --git a/README.md b/README.md index a188cce6..26fb381a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## 平台简介 - 本仓库为前端技术栈 [Vue3](https://v3.cn.vuejs.org) + [TS](https://www.typescriptlang.org/) + [Element Plus](https://element-plus.org/zh-CN) + [Vite](https://cn.vitejs.dev) 版本。 -- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://github.com/imdap/ruoyi-plus-vben5) +- 成员项目: 基于 vben5(ant-design-vue) 的前端项目 [ruoyi-plus-vben5](https://gitee.com/dapppp/ruoyi-plus-vben5) - 成员项目: 基于soybean 的前端项目 [ruoyi-plus-soybean](https://gitee.com/xlsea/ruoyi-plus-soybean) ## 配套后端代码仓库地址 diff --git a/package.json b/package.json index cf44b030..81e4bd15 100644 --- a/package.json +++ b/package.json @@ -1,95 +1,87 @@ { "$schema": "https://json.schemastore.org/package", "name": "ruoyi-vue-plus", - "version": "5.6.0-2.6.0", - "description": "RuoYi-Vue-Plus多租户管理系统", - "author": "LionLi", + "version": "5.5.3-2.5.3", + "description": "RuoYi-Vue-Plus后台管理系统", "license": "MIT", - "type": "module", - "scripts": { - "dev": "vite serve --mode development", - "build:prod": "vite build --mode production", - "build:dev": "vite build --mode development", - "preview": "vite preview", - "lint:eslint": "eslint", - "lint:eslint:fix": "eslint --fix", - "prettier": "prettier --write ." - }, + "author": "LionLi", "repository": { "type": "git", "url": "https://gitee.com/JavaLionLi/plus-ui.git" }, + "type": "module", + "scripts": { + "build:dev": "vite build --mode development", + "build:prod": "vite build --mode production", + "dev": "vite serve --mode development", + "fmt": "oxfmt .", + "lint": "oxlint src", + "lint:fix": "oxlint --fix src", + "preview": "vite preview" + }, "dependencies": { "@element-plus/icons-vue": "2.3.2", "@highlightjs/vue-plugin": "2.1.2", - "@vueup/vue-quill": "1.2.0", + "@iconify/vue": "^5.0.0", "@vueuse/core": "14.2.1", + "@wangeditor-next/editor": "5.7.0", + "@wangeditor-next/editor-for-vue": "5.1.14", "animate.css": "4.1.1", "await-to-js": "3.0.0", - "axios": "1.13.6", + "axios": "1.15.2", "crypto-js": "4.2.0", "echarts": "6.0.0", - "element-plus": "2.13.5", - "file-saver": "2.0.5", + "element-plus": "2.13.7", "highlight.js": "11.11.1", "image-conversion": "2.1.1", - "js-cookie": "3.0.5", "jsencrypt": "3.5.4", "nprogress": "0.2.0", "pinia": "3.0.4", - "screenfull": "6.0.2", - "vue": "3.5.30", + "vue": "3.5.33", "vue-cropper": "1.1.4", - "vue-i18n": "11.3.0", + "vue-i18n": "11.4.0", "vue-json-pretty": "2.6.0", - "vue-router": "5.0.3", + "vue-router": "5.0.6", "vue-types": "6.0.0", - "vxe-table": "4.18.1" + "vxe-table": "4.18.13" }, "devDependencies": { - "@iconify/json": "^2.2.448", "@types/crypto-js": "4.2.2", - "@types/file-saver": "2.0.7", - "@types/js-cookie": "3.0.6", - "@types/node": "^25.4.0", + "@types/node": "^25.6.0", "@types/nprogress": "0.2.3", - "@unocss/preset-attributify": "66.6.6", - "@unocss/preset-icons": "66.6.6", - "@unocss/preset-uno": "66.6.6", - "@vitejs/plugin-vue": "6.0.4", - "@vue/compiler-sfc": "3.5.30", - "@vue/eslint-config-prettier": "10.2.0", - "@vue/eslint-config-typescript": "14.6.0", - "autoprefixer": "10.4.27", - "eslint": "9.39.1", - "eslint-plugin-prettier": "5.5.5", - "eslint-plugin-vue": "9.33.0", - "globals": "17.4.0", - "prettier": "3.8.1", - "sass": "1.98.0", - "typescript": "~5.9.3", - "unocss": "66.6.6", + "@unocss/preset-attributify": "66.6.8", + "@unocss/preset-wind3": "66.6.8", + "@vitejs/plugin-vue": "^6.0.6", + "@vue/compiler-sfc": "3.5.33", + "autoprefixer": "10.5.0", + "oxfmt": "^0.46.0", + "oxlint": "^1.61.0", + "sass": "1.99.0", + "typescript": "^6.0.3", + "unocss": "66.6.8", "unplugin-auto-import": "21.0.0", - "unplugin-icons": "23.0.1", - "unplugin-vue-components": "31.0.0", + "unplugin-vue-components": "32.0.0", "unplugin-vue-setup-extend-plus": "1.0.1", - "vite": "7.3.1", - "vite-plugin-svg-icons-ng": "^1.5.2", - "vite-plugin-vue-devtools": "8.0.7", - "vitest": "4.0.18", - "vue-tsc": "^3.2.5" - }, - "overrides": { - "quill": "1.3.7" - }, - "engines": { - "node": ">=20.19.0", - "npm": ">=8.19.0" + "vite": "^8.0.10", + "vite-plugin-svg-icons-ng": "^1.8.0", + "vitest": "4.1.5", + "vue-tsc": "^3.2.7" }, "browserslist": [ "Chrome >= 87", "Edge >= 88", "Safari >= 14", "Firefox >= 78" - ] + ], + "engines": { + "node": ">=20.19.0", + "pnpm": ">=10.0.0" + }, + "pnpm": { + "onlyBuiltDependencies": [ + "@parcel/watcher", + "es5-ext", + "esbuild" + ] + } } diff --git a/src/views/workflow/processInstance/index.vue b/src/views/workflow/processInstance/index.vue index bf8f7bd7..884bb424 100644 --- a/src/views/workflow/processInstance/index.vue +++ b/src/views/workflow/processInstance/index.vue @@ -49,12 +49,28 @@ @@ -97,7 +113,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 73f2374 (add 增加流程实例权限) @@ -228,7 +229,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 73f2374 (add 增加流程实例权限)