hookehuyr

fix

Showing 1 changed file with 21 additions and 39 deletions
...@@ -1909,22 +1909,7 @@ export default { ...@@ -1909,22 +1909,7 @@ export default {
1909 * 1909 *
1910 * @return {void} No return value. 1910 * @return {void} No return value.
1911 */ 1911 */
1912 - const saveData = async () => { 1912 + const noticeError = (checkResult) => {
1913 - // 清空错误提示
1914 - let { nodes } = editor.editorState.graph.save();
1915 -
1916 - nodes.forEach((ele: any, idx: number) => {
1917 - ele.desc = '';
1918 - editor.updateModel(ele); // 更新流程图信息
1919 - });
1920 -
1921 - let flow_id = getFlowId(); // flow_id 流程ID
1922 -
1923 - // 未点击任何节点时,提示促使用户点击节点
1924 - if (_.isEmpty(state.node_tree)) {
1925 - // TAG: 检查节点是否完整
1926 - const checkResult = await checkAllFlowNodePropertyAPI({ flow_id: +flow_id })
1927 - if (checkResult.code) {
1928 let { nodes, edges } = editor.editorState.graph.save(); 1913 let { nodes, edges } = editor.editorState.graph.save();
1929 let available_keys = _.map(nodes, 'id'); // 画布上存在的有效节点ID 1914 let available_keys = _.map(nodes, 'id'); // 画布上存在的有效节点ID
1930 let raw_keys = _.intersection(checkResult.data, available_keys); // 取交集有效ID 1915 let raw_keys = _.intersection(checkResult.data, available_keys); // 取交集有效ID
...@@ -1945,6 +1930,24 @@ export default { ...@@ -1945,6 +1930,24 @@ export default {
1945 }); 1930 });
1946 return; 1931 return;
1947 } 1932 }
1933 + }
1934 + const saveData = async () => {
1935 + // 清空错误提示
1936 + let { nodes } = editor.editorState.graph.save();
1937 +
1938 + nodes.forEach((ele: any, idx: number) => {
1939 + ele.desc = '';
1940 + editor.updateModel(ele); // 更新流程图信息
1941 + });
1942 +
1943 + let flow_id = getFlowId(); // flow_id 流程ID
1944 +
1945 + // 未点击任何节点时,提示促使用户点击节点
1946 + if (_.isEmpty(state.node_tree)) {
1947 + // TAG: 检查节点是否完整
1948 + const checkResult = await checkAllFlowNodePropertyAPI({ flow_id: +flow_id })
1949 + if (checkResult.code) {
1950 + noticeError(checkResult);
1948 } else { 1951 } else {
1949 // 保存流程图结构 1952 // 保存流程图结构
1950 saveFlowData(); 1953 saveFlowData();
...@@ -1956,32 +1959,11 @@ export default { ...@@ -1956,32 +1959,11 @@ export default {
1956 return; 1959 return;
1957 } 1960 }
1958 1961
1959 -
1960 -
1961 // TAG: 检查节点是否完整 1962 // TAG: 检查节点是否完整
1963 + // 检查点击节点后通过了,但是还有未通过的节点没有点击时
1962 const checkResult = await checkAllFlowNodePropertyAPI({ flow_id: +flow_id }) 1964 const checkResult = await checkAllFlowNodePropertyAPI({ flow_id: +flow_id })
1963 if (checkResult.code) { 1965 if (checkResult.code) {
1964 - let { nodes, edges } = editor.editorState.graph.save(); 1966 + noticeError(checkResult);
1965 - let available_keys = _.map(nodes, 'id'); // 画布上存在的有效节点ID
1966 - let raw_keys = _.intersection(checkResult.data, available_keys); // 取交集有效ID
1967 - let node_keys = Object.keys(state.node_tree); // 现在本地的ID都是有效的值
1968 - let result = _.difference(raw_keys, node_keys);
1969 - if (result.length) {
1970 - ElMessage({
1971 - type: 'error',
1972 - message: '流程配置不完善,请点击节点红点完善。',
1973 - });
1974 - let { nodes } = editor.editorState.graph.save();
1975 - nodes.forEach((ele: any, idx: number) => {
1976 - result.forEach((key: string) => {
1977 - if (ele.id === key) {
1978 - ele.desc = 'https://cdn.ipadbiz.cn/oa/flow/icons-error1.png';
1979 - editor.updateModel(ele); // 更新流程图信息
1980 - }
1981 - })
1982 - });
1983 - return;
1984 - }
1985 } 1967 }
1986 1968
1987 ElMessageBox.confirm( 1969 ElMessageBox.confirm(
......