Commit 3ecfe238595c637432441f2d35abb971c44a915f

Authored by qiang.tian
1 parent 48aeaa14

fix: 父节点顺序

@@ -32,6 +32,14 @@ @@ -32,6 +32,14 @@
32 > img { 32 > img {
33 width: 14px; 33 width: 14px;
34 height: 14px; 34 height: 14px;
  35 +
  36 + &.is-svg {
  37 + position: relative;
  38 + left: -14px;
  39 + filter: drop-shadow(14px 0 0 @N9);
  40 + width: 14px !important;
  41 + height: 14px !important;
  42 + }
35 } 43 }
36 } 44 }
37 } 45 }
@@ -44,7 +44,7 @@ export const getParentNodes = ( @@ -44,7 +44,7 @@ export const getParentNodes = (
44 ) => { 44 ) => {
45 if (!node || !treeNodes) return []; 45 if (!node || !treeNodes) return [];
46 if (node.previousId) { 46 if (node.previousId) {
47 - parentNode.push(allNodes[node.previousId]); 47 + parentNode.unshift(allNodes[node.previousId]);
48 getParentNodes(allNodes[node.previousId], treeNodes, parentNode, allNodes); 48 getParentNodes(allNodes[node.previousId], treeNodes, parentNode, allNodes);
49 } 49 }
50 50
@@ -81,7 +81,7 @@ const icon = (icon: any) => { @@ -81,7 +81,7 @@ const icon = (icon: any) => {
81 return <QxBaseIcon type={icon.props.type} />; 81 return <QxBaseIcon type={icon.props.type} />;
82 } 82 }
83 83
84 - return <img src={icon} />; 84 + return <img className={/\.svg$/.test(icon) ? 'is-svg' : ''} src={icon} />;
85 }; 85 };
86 86
87 export const useNodeFieldDisplay = ({ 87 export const useNodeFieldDisplay = ({
@@ -322,7 +322,7 @@ export const useNodeFieldDisplay = ({ @@ -322,7 +322,7 @@ export const useNodeFieldDisplay = ({
322 Object.assign(fields, { 322 Object.assign(fields, {
323 name: fields.title, 323 name: fields.title,
324 code: 324 code:
325 - parent && ['ORG', 'FORM', 'USER'].includes(parent.type) 325 + parent && ['ORG', 'FORM', 'USER'].includes(parent.type) // 表单字段需要拼接父级 code
326 ? `${parent.code}.${fields.id}` 326 ? `${parent.code}.${fields.id}`
327 : `${nodeId}|${fields.id}`, 327 : `${nodeId}|${fields.id}`,
328 extract: { 328 extract: {
@@ -424,6 +424,7 @@ export const useNodeFieldDisplay = ({ @@ -424,6 +424,7 @@ export const useNodeFieldDisplay = ({
424 newNodes = getEffectiveNodes(cloneDeep(newNodes)); 424 newNodes = getEffectiveNodes(cloneDeep(newNodes));
425 } 425 }
426 426
  427 + console.log('newNodes', newNodes);
427 setOptionalNodes(newNodes); 428 setOptionalNodes(newNodes);
428 resultFieldMap.current = getResultFieldMap(newNodes); 429 resultFieldMap.current = getResultFieldMap(newNodes);
429 resolveFieldResultMap.current?.(resultFieldMap.current); 430 resolveFieldResultMap.current?.(resultFieldMap.current);