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/TagsView/index.vue | 362 ++++++++++++++++++++++++++-------------------------
1 files changed, 182 insertions(+), 180 deletions(-)
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 8998ca1..9bcf285 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -14,226 +14,226 @@
>
{{ tag.title }}
<span v-if="!isAffix(tag)" @click.prevent.stop="closeSelectedTag(tag)">
- <close class="el-icon-close" style="width: 1em; height: 1em;vertical-align: middle;" />
+ <close class="el-icon-close" style="width: 1em; height: 1em; vertical-align: middle" />
</span>
</router-link>
</scroll-pane>
<ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
- <li @click="refreshSelectedTag(selectedTag)"><refresh-right style="width: 1em; height: 1em;" /> 鍒锋柊椤甸潰</li>
- <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><close style="width: 1em; height: 1em;" /> 鍏抽棴褰撳墠</li>
- <li @click="closeOthersTags"><circle-close style="width: 1em; height: 1em;" /> 鍏抽棴鍏朵粬</li>
- <li v-if="!isFirstView()" @click="closeLeftTags"><back style="width: 1em; height: 1em;" /> 鍏抽棴宸︿晶</li>
- <li v-if="!isLastView()" @click="closeRightTags"><right style="width: 1em; height: 1em;" /> 鍏抽棴鍙充晶</li>
- <li @click="closeAllTags(selectedTag)"><circle-close style="width: 1em; height: 1em;" /> 鍏ㄩ儴鍏抽棴</li>
+ <li @click="refreshSelectedTag(selectedTag)"><refresh-right style="width: 1em; height: 1em" /> 鍒锋柊椤甸潰</li>
+ <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><close style="width: 1em; height: 1em" /> 鍏抽棴褰撳墠</li>
+ <li @click="closeOthersTags"><circle-close style="width: 1em; height: 1em" /> 鍏抽棴鍏朵粬</li>
+ <li v-if="!isFirstView()" @click="closeLeftTags"><back style="width: 1em; height: 1em" /> 鍏抽棴宸︿晶</li>
+ <li v-if="!isLastView()" @click="closeRightTags"><right style="width: 1em; height: 1em" /> 鍏抽棴鍙充晶</li>
+ <li @click="closeAllTags(selectedTag)"><circle-close style="width: 1em; height: 1em" /> 鍏ㄩ儴鍏抽棴</li>
</ul>
</div>
</template>
<script setup lang="ts">
-import ScrollPane from './ScrollPane.vue'
-import { getNormalPath } from '@/utils/ruoyi'
-import useTagsViewStore from "@/store/modules/tagsView";
-import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
-import { ComponentInternalInstance } from "vue";
-import { RouteOption, TagView, RouteLocationRaw } from "vue-router";
+import ScrollPane from './ScrollPane.vue';
+import { getNormalPath } from '@/utils/ruoyi';
+import useSettingsStore from '@/store/modules/settings';
+import usePermissionStore from '@/store/modules/permission';
+import useTagsViewStore from '@/store/modules/tagsView';
+import { RouteRecordRaw, RouteLocationNormalized } from 'vue-router';
const visible = ref(false);
const top = ref(0);
const left = ref(0);
-const selectedTag = ref<TagView>({});
-const affixTags = ref<TagView[]>([]);
-const scrollPaneRef = ref(ScrollPane);
+const selectedTag = ref<RouteLocationNormalized>();
+const affixTags = ref<RouteLocationNormalized[]>([]);
+const scrollPaneRef = ref<InstanceType<typeof ScrollPane>>();
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
const router = useRouter();
-const visitedViews = computed(() => useTagsViewStore().visitedViews);
-const routes = computed(() => usePermissionStore().routes);
+const visitedViews = computed(() => useTagsViewStore().getVisitedViews());
+const routes = computed(() => usePermissionStore().getRoutes());
const theme = computed(() => useSettingsStore().theme);
watch(route, () => {
- addTags();
- moveToCurrentTag();
-})
+ addTags();
+ moveToCurrentTag();
+});
watch(visible, (value) => {
- if (value) {
- document.body.addEventListener('click', closeMenu);
- } else {
- document.body.removeEventListener('click', closeMenu);
- }
-})
+ if (value) {
+ document.body.addEventListener('click', closeMenu);
+ } else {
+ document.body.removeEventListener('click', closeMenu);
+ }
+});
-const isActive = (r: TagView): boolean => {
- return r.path === route.path;
-}
-const activeStyle = (tag: TagView) => {
- if (!isActive(tag)) return {};
- return {
- "background-color": theme.value,
- "border-color": theme.value
- };
-}
-const isAffix = (tag: TagView) => {
- return tag.meta && tag.meta.affix;
-}
+const isActive = (r: RouteLocationNormalized): boolean => {
+ return r.path === route.path;
+};
+const activeStyle = (tag: RouteLocationNormalized) => {
+ if (!isActive(tag)) return {};
+ return {
+ 'background-color': 'var(--tags-view-active-bg)',
+ 'border-color': 'var(--tags-view-active-border-color)'
+ };
+};
+const isAffix = (tag: RouteLocationNormalized) => {
+ return tag?.meta && tag?.meta?.affix;
+};
const isFirstView = () => {
- try {
- return selectedTag.value.fullPath === '/index' || selectedTag.value.fullPath === visitedViews.value[1].fullPath;
- } catch (err) {
- return false;
- }
-}
+ try {
+ return selectedTag.value.fullPath === '/index' || selectedTag.value.fullPath === visitedViews.value[1].fullPath;
+ } catch (err) {
+ return false;
+ }
+};
const isLastView = () => {
- try {
- return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath;
- } catch (err) {
- return false;
+ try {
+ return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1].fullPath;
+ } catch (err) {
+ return false;
+ }
+};
+const filterAffixTags = (routes: RouteRecordRaw[], basePath = '') => {
+ let tags: RouteLocationNormalized[] = [];
+
+ routes.forEach((route) => {
+ if (route.meta && route.meta.affix) {
+ const tagPath = getNormalPath(basePath + '/' + route.path);
+ tags.push({
+ hash: '',
+ matched: [],
+ params: undefined,
+ query: undefined,
+ redirectedFrom: undefined,
+ fullPath: tagPath,
+ path: tagPath,
+ name: route.name as string,
+ meta: { ...route.meta }
+ });
}
-}
-const filterAffixTags = (routes:RouteOption [], basePath = '') => {
- let tags:TagView[] = []
- routes.forEach(route => {
- if (route.meta && route.meta.affix) {
- const tagPath = getNormalPath(basePath + '/' + route.path);
- tags.push({
- fullPath: tagPath,
- path: tagPath,
- name: route.name,
- meta: { ...route.meta }
- })
- }
- if (route.children) {
- const tempTags = filterAffixTags(route.children, route.path);
- if (tempTags.length >= 1) {
- tags = [...tags, ...tempTags];
- }
- }
- })
- return tags
-}
+ if (route.children) {
+ const tempTags = filterAffixTags(route.children, route.path);
+ if (tempTags.length >= 1) {
+ tags = [...tags, ...tempTags];
+ }
+ }
+ });
+ return tags;
+};
const initTags = () => {
- const res = filterAffixTags(routes.value);
- affixTags.value = res;
- for (const tag of res) {
- // Must have tag name
- if (tag.name) {
- useTagsViewStore().addVisitedView(tag);
- }
+ const res = filterAffixTags(routes.value);
+ affixTags.value = res;
+ for (const tag of res) {
+ // Must have tag name
+ if (tag.name) {
+ useTagsViewStore().addVisitedView(tag);
}
-}
+ }
+};
const addTags = () => {
- const { name } = route;
- if(route.query.title) {
- route.meta.title = route.query.title;
- }
- if (name) {
- useTagsViewStore().addView(route);
- if (route.meta.link) {
- useTagsViewStore().addIframeView(route);
- }
- }
- return false
-}
+ const { name } = route;
+ if (route.query.title) {
+ route.meta.title = route.query.title as string;
+ }
+ if (name) {
+ useTagsViewStore().addView(route as any);
+ }
+};
const moveToCurrentTag = () => {
- nextTick(() => {
- for (const r of visitedViews.value) {
- if (r.path === route.path) {
- scrollPaneRef.value.moveToTarget(r);
- // when query is different then update
- if (r.fullPath !== route.fullPath) {
- useTagsViewStore().updateVisitedView(route);
- }
- }
+ nextTick(() => {
+ for (const r of visitedViews.value) {
+ if (r.path === route.path) {
+ scrollPaneRef.value?.moveToTarget(r);
+ // when query is different then update
+ if (r.fullPath !== route.fullPath) {
+ useTagsViewStore().updateVisitedView(route);
}
- })
-}
-const refreshSelectedTag = (view: TagView) => {
- proxy?.$tab.refreshPage(view);
- if (route.meta.link) {
- useTagsViewStore().delIframeView(route);
+ }
}
-}
-const closeSelectedTag = (view: TagView) => {
- proxy?.$tab.closePage(view).then(({ visitedViews }: any) => {
- if (isActive(view)) {
- toLastView(visitedViews, view);
- }
- })
-}
+ });
+};
+const refreshSelectedTag = (view: RouteLocationNormalized) => {
+ proxy?.$tab.refreshPage(view);
+ if (route.meta.link) {
+ useTagsViewStore().delIframeView(route);
+ }
+};
+const closeSelectedTag = (view: RouteLocationNormalized) => {
+ proxy?.$tab.closePage(view).then(({ visitedViews }: any) => {
+ if (isActive(view)) {
+ toLastView(visitedViews, view);
+ }
+ });
+};
const closeRightTags = () => {
- proxy?.$tab.closeRightPage(selectedTag.value).then(visitedViews => {
- if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
- toLastView(visitedViews);
- }
- })
-}
+ proxy?.$tab.closeRightPage(selectedTag.value).then((visitedViews: RouteLocationNormalized[]) => {
+ if (!visitedViews.find((i: RouteLocationNormalized) => i.fullPath === route.fullPath)) {
+ toLastView(visitedViews);
+ }
+ });
+};
const closeLeftTags = () => {
- proxy?.$tab.closeLeftPage(selectedTag.value).then(visitedViews => {
- if (!visitedViews.find(i => i.fullPath === route.fullPath)) {
- toLastView(visitedViews);
- }
- })
-}
+ proxy?.$tab.closeLeftPage(selectedTag.value).then((visitedViews: RouteLocationNormalized[]) => {
+ if (!visitedViews.find((i: RouteLocationNormalized) => i.fullPath === route.fullPath)) {
+ toLastView(visitedViews);
+ }
+ });
+};
const closeOthersTags = () => {
- router.push(selectedTag.value as RouteLocationRaw).catch(() => { });
- proxy?.$tab.closeOtherPage(selectedTag.value).then(() => {
- moveToCurrentTag();
- })
-}
-const closeAllTags = (view: TagView) => {
- proxy?.$tab.closeAllPage().then(({ visitedViews }) => {
- if (affixTags.value.some(tag => tag.path === route.path)) {
- return;
- }
- toLastView(visitedViews, view);
- })
-}
-const toLastView = (visitedViews:TagView[], view?: TagView) => {
- const latestView = visitedViews.slice(-1)[0];
- if (latestView) {
- router.push(latestView.fullPath as string);
- } else {
- // now the default is to redirect to the home page if there is no tags-view,
- // you can adjust it according to your needs.
- if (view?.name === 'Dashboard') {
- // to reload home page
- router.replace({ path: '/redirect' + view?.fullPath });
- } else {
- router.push('/');
- }
+ router.push(selectedTag.value).catch(() => {});
+ proxy?.$tab.closeOtherPage(selectedTag.value).then(() => {
+ moveToCurrentTag();
+ });
+};
+const closeAllTags = (view: RouteLocationNormalized) => {
+ proxy?.$tab.closeAllPage().then(({ visitedViews }) => {
+ if (affixTags.value.some((tag) => tag.path === route.path)) {
+ return;
}
-}
-const openMenu = (tag: TagView, e: MouseEvent) => {
- const menuMinWidth = 105;
- const offsetLeft = proxy?.$el.getBoundingClientRect().left; // container margin left
- const offsetWidth = proxy?.$el.offsetWidth; // container width
- const maxLeft = offsetWidth - menuMinWidth; // left boundary
- const l = e.clientX - offsetLeft + 15; // 15: margin right
-
- if (l > maxLeft) {
- left.value = maxLeft;
+ toLastView(visitedViews, view);
+ });
+};
+const toLastView = (visitedViews: RouteLocationNormalized[], view?: RouteLocationNormalized) => {
+ const latestView = visitedViews.slice(-1)[0];
+ if (latestView) {
+ router.push(latestView.fullPath as string);
+ } else {
+ // now the default is to redirect to the home page if there is no tags-view,
+ // you can adjust it according to your needs.
+ if (view?.name === 'Dashboard') {
+ // to reload home page
+ router.replace({ path: '/redirect' + view?.fullPath });
} else {
- left.value = l;
+ router.push('/');
}
+ }
+};
+const openMenu = (tag: RouteLocationNormalized, e: MouseEvent) => {
+ const menuMinWidth = 105;
+ const offsetLeft = proxy?.$el.getBoundingClientRect().left; // container margin left
+ const offsetWidth = proxy?.$el.offsetWidth; // container width
+ const maxLeft = offsetWidth - menuMinWidth; // left boundary
+ const l = e.clientX - offsetLeft + 15; // 15: margin right
- top.value = e.clientY
- visible.value = true;
- selectedTag.value = tag;
-}
+ if (l > maxLeft) {
+ left.value = maxLeft;
+ } else {
+ left.value = l;
+ }
+
+ top.value = e.clientY;
+ visible.value = true;
+ selectedTag.value = tag;
+};
const closeMenu = () => {
- visible.value = false;
-}
+ visible.value = false;
+};
const handleScroll = () => {
- closeMenu();
-}
-
+ closeMenu();
+};
onMounted(() => {
- initTags();
- addTags();
-})
+ initTags();
+ addTags();
+});
</script>
<style lang="scss" scoped>
@@ -242,7 +242,9 @@
width: 100%;
background-color: var(--el-bg-color);
border: 1px solid var(--el-border-color-light);
- box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+ box-shadow:
+ 0 1px 3px 0 rgba(0, 0, 0, 0.12),
+ 0 0 3px 0 rgba(0, 0, 0, 0.04);
.tags-view-wrapper {
.tags-view-item {
display: inline-block;
@@ -271,14 +273,14 @@
color: #fff;
border-color: #42b983;
&::before {
- content: "";
+ content: '';
background: #fff;
display: inline-block;
width: 8px;
height: 8px;
border-radius: 50%;
position: relative;
- margin-right: 2px;
+ margin-right: 5px;
}
}
}
--
Gitblit v1.9.3