From e423d8afcf5b9666e166565d0509b621ebab17e7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 14:11:00 +0800
Subject: [PATCH] !172 合并 warmflow 功能分支 * update 优化 流程定义页面 点击复制之后跳转到未发布列表 * update 优化 流程定义页面 增加加载loading层 * fix: v-model处理有延迟 需要手动处理 * update 调整流程定义查询 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整可驳回的节点 * update: 调整文案 * update: 激活/挂起改为switch操作 * update 优化 代码删除无用输出 * update 统一抄送人使用昵称展示 * update 调整分类接口 * update 统一业务id参数 * update 删除默认顶节点 * !168 优化流程分类 * update 恢复误删除代码 * update 优化流程分类 * update 修复 路由跳转未改全 * [update] * fix 修复一些问题 * update 重构流程分类表 * update 流程定义增加表单路径与编辑功能 修复一些其他bug * fix 修复 一些问题 * update 变量统一命名 * add 增加示例 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * update 调整办理人 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 增加示例 * update 调整审批记录 添加流程导出 * remove 删除无用代码 * remove 删除无用代码 * [update] * [fix] * 流程干预删除委托 * 增加附件 * 附件修改 * 申请人查询修改 * 1.修改查询条件 * !167 fix 修复 import路径修改不全问题 * fix 修复 import路径修改不全问题 * !166 update 清除 ProcessPreview 引用 * update 清除 ProcessPreview 引用 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * remove 删除 bpmn.js 设计器 * fix 修复 前端路径修改不全问题 * update 优化接口请求路径 * add 添加作废 * add 添加流程干预 * update 调整加签，减签 * update 调整加签，减签 * add 增加流程查看 * update 调整委托，转办 * update 调整流程变量显示 * update 调整办理人修改 * update 调整流程实例状态页面 * update 调整已办页面 * add 添加流程撤销 * update 调整任务，流程实例 ，流程定义页面 * Merge branch 'dev' into warm-flw-future * update 调整流程定义页面 * add 添加流程变量查看 * update 调整设计器路由名称 * update 调整办理人 * update 调整设计器uri * update 调整设计器请求uri 调整待办状态 * update 调整办理 驳回 终止等状态 * add 添加模型新增 * add 添加warm-ui设计器,删除无用代码 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * add 添加流程设计 * update 调整驳回 * update 调整视图类型错误 * Merge branch 'warm-flw-future' of https://gitee.com/JavaLionLi/plus-ui… * 添加已办，未办 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 调整流程实例，待办查询 * add 添加代办人，调整提交按钮校验 * update 调整流程定义查询 * add添加流程定义激活 挂起 * add 添加流程文件部署 调整流程发布 * update 优化 时间搜索组件统一 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * fix 修复 用户管理编辑安全权限错误问题 * Merge remote-tracking branch 'origin/dev' into warm-flw-future * update 优化 类型报错问题 * update 优化 切换租户后刷新首页 * update 优化 实现表格行选中切换 * update 优化 使用 vueuse 重构 websocket 实现 * update 优化 使用 vueuse 重构 websocket 实现 * fix 修复 登出后重新登录 sse推送报错问题 * reset 回滚 代码修改 采用其他方案 * fix 修复 登出后重新登录 sse推送报错问题 * update 优化 删除无用代码 * update element-plus 2.7.5 => 2.7.8 * reset 回滚 错误修复 * update 优化 代码生成器编辑页禁用缓存 防止同步后页面不更新问题 * fix 修复 代码生成同步点击取消报错问题 * 初始化添加warm-flow
---
src/layout/components/TopBar/search.vue | 190 +++++++++++++++++++++++-----------------------
1 files changed, 95 insertions(+), 95 deletions(-)
diff --git a/src/layout/components/TopBar/search.vue b/src/layout/components/TopBar/search.vue
index 9dee360..182e84a 100644
--- a/src/layout/components/TopBar/search.vue
+++ b/src/layout/components/TopBar/search.vue
@@ -3,12 +3,12 @@
<el-dialog v-model="state.isShowSearch" destroy-on-close :show-close="false">
<template #footer>
<el-autocomplete
+ ref="layoutMenuAutocompleteRef"
v-model="state.menuQuery"
:fetch-suggestions="menuSearch"
placeholder="鎼滅储"
- ref="layoutMenuAutocompleteRef"
- @select="onHandleSelect"
:fit-input-width="true"
+ @select="onHandleSelect"
>
<template #prefix>
<svg-icon class-name="search-icon" icon-class="search" />
@@ -29,130 +29,130 @@
import { getNormalPath } from '@/utils/ruoyi';
import { isHttp } from '@/utils/validate';
import usePermissionStore from '@/store/modules/permission';
-import { RouteOption } from 'vue-router';
+import { RouteRecordRaw } from 'vue-router';
type Router = Array<{
- path: string;
- icon: string;
- title: string[];
-}>
+ path: string;
+ icon: string;
+ title: string[];
+}>;
type SearchState<T = any> = {
- isShowSearch: boolean;
- menuQuery: string;
- menuList: T[];
+ isShowSearch: boolean;
+ menuQuery: string;
+ menuList: T[];
};
// 瀹氫箟鍙橀噺鍐呭
const layoutMenuAutocompleteRef = ref();
const router = useRouter();
const routes = computed(() => usePermissionStore().routes);
const state = reactive<SearchState>({
- isShowSearch: false,
- menuQuery: '',
- menuList: [],
+ isShowSearch: false,
+ menuQuery: '',
+ menuList: []
});
// 鎼滅储寮圭獥鎵撳紑
const openSearch = () => {
- state.menuQuery = '';
- state.isShowSearch = true;
- state.menuList = generateRoutes(routes.value);
- nextTick(() => {
- setTimeout(() => {
- layoutMenuAutocompleteRef.value.focus();
- });
- });
+ state.menuQuery = '';
+ state.isShowSearch = true;
+ state.menuList = generateRoutes(routes.value as any);
+ nextTick(() => {
+ setTimeout(() => {
+ layoutMenuAutocompleteRef.value.focus();
+ });
+ });
};
// 鎼滅储寮圭獥鍏抽棴
const closeSearch = () => {
- state.isShowSearch = false;
+ state.isShowSearch = false;
};
// 鑿滃崟鎼滅储鏁版嵁杩囨护
-const menuSearch = (queryString: string, cb: Function) => {
- let options = state.menuList.filter((item) => {
- return item.title.indexOf(queryString) > -1;
- });
- cb(options);
+const menuSearch = (queryString: string, cb: (options: any[]) => void) => {
+ let options = state.menuList.filter((item) => {
+ return item.title.indexOf(queryString) > -1;
+ });
+ cb(options);
};
// Filter out the routes that can be displayed in the sidebar
// And generate the internationalized title
-const generateRoutes = (routes: RouteOption[], basePath = '', prefixTitle: string[] = []) => {
- let res: Router = []
- routes.forEach(r => {
- // skip hidden router
- if (!r.hidden) {
- const p = r.path.length > 0 && r.path[0] === '/' ? r.path : '/' + r.path;
- const data: any = {
- path: !isHttp(r.path) ? getNormalPath(basePath + p) : r.path,
- icon: r.meta?.icon,
- title: [...prefixTitle]
- }
- if (r.meta && r.meta.title) {
- data.title = [...data.title, r.meta.title];
- if (r.redirect !== 'noRedirect') {
- // only push the routes with title
- // special case: need to exclude parent router without redirect
- res.push(data);
- }
- }
- // recursive child routes
- if (r.children) {
- const tempRoutes = generateRoutes(r.children, data.path, data.title);
- if (tempRoutes.length >= 1) {
- res = [...res, ...tempRoutes];
- }
- }
- }
- })
- res.forEach((item: any) => {
- if (item.title instanceof Array) {
- item.title = item.title.join('/');
- }
- });
- return res;
-}
+const generateRoutes = (routes: RouteRecordRaw[], basePath = '', prefixTitle: string[] = []) => {
+ let res: Router = [];
+ routes.forEach((r) => {
+ // skip hidden router
+ if (!r.hidden) {
+ const p = r.path.length > 0 && r.path[0] === '/' ? r.path : '/' + r.path;
+ const data: any = {
+ path: !isHttp(r.path) ? getNormalPath(basePath + p) : r.path,
+ icon: r.meta?.icon,
+ title: [...prefixTitle]
+ };
+ if (r.meta && r.meta.title) {
+ data.title = [...data.title, r.meta.title];
+ if (r.redirect !== 'noRedirect') {
+ // only push the routes with title
+ // special case: need to exclude parent router without redirect
+ res.push(data);
+ }
+ }
+ // recursive child routes
+ if (r.children) {
+ const tempRoutes = generateRoutes(r.children, data.path, data.title);
+ if (tempRoutes.length >= 1) {
+ res = [...res, ...tempRoutes];
+ }
+ }
+ }
+ });
+ res.forEach((item: any) => {
+ if (item.title instanceof Array) {
+ item.title = item.title.join('/');
+ }
+ });
+ return res;
+};
// 褰撳墠鑿滃崟閫変腑鏃�
const onHandleSelect = (val: any) => {
- const paths = val.path;
- if (isHttp(paths)) {
- // http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
- const pindex = paths.indexOf("http");
- window.open(paths.substring(pindex, paths.length), "_blank");
- } else {
- router.push(paths);
- }
- state.menuQuery = ''
- closeSearch();
-
+ const paths = val.path;
+ if (isHttp(paths)) {
+ // http(s):// 璺緞鏂扮獥鍙ｆ墦寮�
+ const pindex = paths.indexOf('http');
+ window.open(paths.substring(pindex, paths.length), '_blank');
+ } else {
+ router.push(paths);
+ }
+ state.menuQuery = '';
+ closeSearch();
};
// 鏆撮湶鍙橀噺
defineExpose({
- openSearch
+ openSearch
});
</script>
<style scoped lang="scss">
.layout-search-dialog {
- position: relative;
- :deep(.el-dialog) {
- .el-dialog__header,
- .el-dialog__body {
- display: none;
- }
- .el-dialog__footer {
- width: 100%;
- position: absolute;
- left: 50%;
- transform: translateX(-50%);
- top: -53vh;
- }
- }
- :deep(.el-autocomplete) {
- width: 560px;
- position: absolute;
- top: 150px;
- left: 50%;
- transform: translateX(-50%);
- }
+ position: relative;
+ :deep(.el-dialog) {
+ padding: 0;
+ .el-dialog__header,
+ .el-dialog__body {
+ display: none;
+ }
+ .el-dialog__footer {
+ width: 100%;
+ position: absolute;
+ left: 50%;
+ transform: translateX(-50%);
+ top: -53vh;
+ }
+ }
+ :deep(.el-autocomplete) {
+ width: 560px;
+ position: absolute;
+ top: 150px;
+ left: 50%;
+ transform: translateX(-50%);
+ }
}
</style>
--
Gitblit v1.9.3