Hooke / vue-flow-editor

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
e18cc184 1 parent f34988f5

fix 细节调整

Inline Side-by-side
Showing 3 changed files with 16 additions and 4 deletions
...@@ -909,9 +909,16 @@ export default { ...@@ -909,9 +909,16 @@ export default {
909 ], 909 ],
910 } 910 }
911 ]; 911 ];
912 + // 开始节点不显示审批意见
913 + if (model_id ==='start-node') {
914 + state.more_attr = state.more_attr.filter((ele: any) => {
915 + return ele.label !== '审批意见'
916 + });
917 + }
912 // 检查字段权限选中情况 918 // 检查字段权限选中情况
913 checkAuthAll('visible'); 919 checkAuthAll('visible');
914 checkAuthAll('editable'); 920 checkAuthAll('editable');
921 + // 抄送节点不显示节点操作
915 if (state.detailModel.control === 'cc') { 922 if (state.detailModel.control === 'cc') {
916 state.more_attr = state.more_attr.filter((ele: any) => { 923 state.more_attr = state.more_attr.filter((ele: any) => {
917 return ele.label !== '节点操作' 924 return ele.label !== '节点操作'
......
1 /* 1 /*
2 * @Date: 2023-10-27 09:29:48 2 * @Date: 2023-10-27 09:29:48
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2023-11-22 18:35:26 4 + * @LastEditTime: 2023-11-23 17:55:22
5 * @FilePath: /vue-flow-editor/doc/data.js 5 * @FilePath: /vue-flow-editor/doc/data.js
6 * @Description: 初始化结构，数据都是固定的 6 * @Description: 初始化结构，数据都是固定的
7 */ 7 */
...@@ -19,6 +19,7 @@ export const AppData = { ...@@ -19,6 +19,7 @@ export const AppData = {
19 text: '开始', 19 text: '开始',
20 desc: '', 20 desc: '',
21 control: 'start', 21 control: 'start',
22 + index: 1
22 }, 23 },
23 { 24 {
24 id: flow_id, 25 id: flow_id,
...@@ -27,6 +28,7 @@ export const AppData = { ...@@ -27,6 +28,7 @@ export const AppData = {
27 text: '流程节点', 28 text: '流程节点',
28 desc: '', 29 desc: '',
29 control: 'flow', 30 control: 'flow',
31 + index: 2
30 }, 32 },
31 // { 33 // {
32 // id: '1700459406515', 34 // id: '1700459406515',
...@@ -43,6 +45,7 @@ export const AppData = { ...@@ -43,6 +45,7 @@ export const AppData = {
43 text: '抄送节点', 45 text: '抄送节点',
44 desc: '', 46 desc: '',
45 control: 'cc', 47 control: 'cc',
48 + index: 3
46 }, 49 },
47 { 50 {
48 id: 'end-node', 51 id: 'end-node',
...@@ -51,6 +54,7 @@ export const AppData = { ...@@ -51,6 +54,7 @@ export const AppData = {
51 text: '结束', 54 text: '结束',
52 desc: '', 55 desc: '',
53 control: 'end', 56 control: 'end',
57 + index: 4
54 }, 58 },
55 ], 59 ],
56 edges: [ 60 edges: [
......
1 <!-- 1 <!--
2 * @Date: 2023-11-01 10:18:53 2 * @Date: 2023-11-01 10:18:53
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2023-11-23 16:05:19 4 + * @LastEditTime: 2023-11-23 17:53:19
5 * @FilePath: /vue-flow-editor/doc/selectUserView.vue 5 * @FilePath: /vue-flow-editor/doc/selectUserView.vue
6 * @Description: 成员列表选择控件 6 * @Description: 成员列表选择控件
7 --> 7 -->
...@@ -340,7 +340,6 @@ const deptUserList = ref([]); // 部门用户列表 ...@@ -340,7 +340,6 @@ const deptUserList = ref([]); // 部门用户列表
340 const roleList = ref([]); // 角色列表 340 const roleList = ref([]); // 角色列表
341 341
342 onMounted(async () => { 342 onMounted(async () => {
343 -
344 // API获取后台数据 343 // API获取后台数据
345 const dept_list = await getDeptList(); 344 const dept_list = await getDeptList();
346 const role_list = await getRoleList(); 345 const role_list = await getRoleList();
...@@ -379,6 +378,8 @@ watch(() => { ...@@ -379,6 +378,8 @@ watch(() => {
379 // 监听弹框状态 378 // 监听弹框状态
380 if (props.visible) { 379 if (props.visible) {
381 dialogUserFormVisible.value = true; 380 dialogUserFormVisible.value = true;
381 + // 同步显示tag框选中的用户
382 + checkTab(tabCheckedData.value);
382 } else { 383 } else {
383 dialogUserFormVisible.value = false; 384 dialogUserFormVisible.value = false;
384 // 用户选择弹框关闭时，清空数据 385 // 用户选择弹框关闭时，清空数据
...@@ -405,7 +406,7 @@ watch( ...@@ -405,7 +406,7 @@ watch(
405 () => props.list, 406 () => props.list,
406 val => { 407 val => {
407 if (val) { 408 if (val) {
408 - userTags.value = val; 409 + userTags.value = _.cloneDeep(val);
409 // 第一项目是组织结构树，默认展开第一个节点 410 // 第一项目是组织结构树，默认展开第一个节点
410 if (userTabs.value[activeTabIdx.value]['type'] === 'corp-tree') { 411 if (userTabs.value[activeTabIdx.value]['type'] === 'corp-tree') {
411 if (userTabs.value[activeTabIdx.value]['data'].length) { 412 if (userTabs.value[activeTabIdx.value]['data'].length) {
......