恢复被ai修改误提交代码

This commit is contained in:
ct 2026-05-19 10:57:26 +08:00
parent 9b77c13337
commit 10c0147324
3 changed files with 73 additions and 88 deletions

View File

@ -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)
## 配套后端代码仓库地址

View File

@ -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"
]
}
}

View File

@ -49,12 +49,28 @@
</div>
<el-card shadow="hover" class="table-panel">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button v-hasPermi="['workflow:instance:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
</el-col>
<right-toolbar v-model:show-search="showSearch" @query-table="handleQuery"></right-toolbar>
</el-row>
<div class="toolbar-shell">
<div class="table-heading">
<h3>流程实例</h3>
</div>
<div class="toolbar-actions">
<el-button
v-hasPermi="['workflow:instance:remove']"
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="() => handleDelete()"
>
删除
</el-button>
<right-toolbar
v-model:show-search="showSearch"
:search="false"
@query-table="handleQuery"
></right-toolbar>
</div>
</div>
</template>
<el-tabs v-model="tab" @tab-click="changeTab">
<el-tab-pane name="running" label="运行中"></el-tab-pane>
@ -97,7 +113,6 @@
<el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope">v{{ scope.row.version }}.0</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column
v-if="tab === 'running'"
v-hasPermi="['workflow:instance:active']"
@ -106,9 +121,6 @@
label="状态"
min-width="70"
>
=======
<el-table-column v-if="tab === 'running'" v-hasPermi="['workflow:instance:active']" align="center" prop="isSuspended" label="状态" min-width="70">
>>>>>>> 73f2374 (add 增加流程实例权限)
<template #default="scope">
<el-tag v-if="!scope.row.isSuspended" type="success">激活</el-tag>
<el-tag v-else type="danger">挂起</el-tag>
@ -154,7 +166,6 @@
</el-popover>
</el-col>
<el-col :span="1.5">
<<<<<<< HEAD
<el-button
v-hasPermi="['workflow:instance:remove']"
type="danger"
@ -164,14 +175,10 @@
>
删除
</el-button>
=======
<el-button v-hasPermi="['workflow:instance:remove']" type="danger" size="small" icon="Delete" @click="handleDelete(scope.row)">删除 </el-button>
>>>>>>> 73f2374 (add 增加流程实例权限)
</el-col>
</el-row>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<<<<<<< HEAD
<el-button
v-hasPermi="['workflow:instance:query']"
type="primary"
@ -192,12 +199,6 @@
>
变量
</el-button>
=======
<el-button v-hasPermi="['workflow:instance:query']" type="primary" size="small" icon="View" @click="handleView(scope.row)">查看</el-button>
</el-col>
<el-col :span="1.5">
<el-button v-hasPermi="['workflow:instance:variableQuery']" type="primary" size="small" icon="Document" @click="handleInstanceVariable(scope.row)"> 变量 </el-button>
>>>>>>> 73f2374 (add 增加流程实例权限)
</el-col>
</el-row>
</template>
@ -228,7 +229,6 @@
<el-table-column align="center" prop="version" label="版本号" width="90">
<template #default="scope">v{{ scope.row.version }}.0</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column
v-hasPermi="['workflow:instance:active']"
align="center"
@ -236,9 +236,6 @@
label="状态"
min-width="70"
>
=======
<el-table-column v-hasPermi="['workflow:instance:active']" align="center" prop="suspensionState" label="状态" min-width="70">
>>>>>>> 73f2374 (add 增加流程实例权限)
<template #default="scope">
<el-tag v-if="scope.row.suspensionState == 1" type="success">激活</el-tag>
<el-tag v-else type="danger">挂起</el-tag>
@ -283,13 +280,9 @@
<el-input v-model="form.value" placeholder="请输入变量值" />
</el-form-item>
<el-form-item>
<<<<<<< HEAD
<el-button v-hasPermi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">
确认
</el-button>
=======
<el-button v-hasPermi="['workflow:instance:variable']" type="primary" @click="handleVariable(ruleFormRef)">确认</el-button>
>>>>>>> 73f2374 (add 增加流程实例权限)
</el-form-item>
</el-form>
</el-card>