Commit bd1d495a1cfa054cb5d0d428985479ea616af1a5

Authored by qiang.tian
1 parent 07e0d43f

refactor

... ... @@ -12,6 +12,7 @@ import {
12 12 QxFlowNodeFieldSelector,
13 13 } from '../qx-flow-node-selector';
14 14 import { QxWidgetIcon } from '../qx-widget-icon';
  15 +import dayjs from 'dayjs';
15 16
16 17 import './index.less';
17 18
... ... @@ -702,7 +703,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
702 703 const handleChange = (val: any[]) => {
703 704 onChange?.({
704 705 ...(value || {}),
705   - mappingValues: val?.length ? val?.map((i: any) => i.value) : [],
  706 + mappingValues: val?.length ? val?.map((i: any) => i.extVal || i.value) : [],
706 707 valuesObj: val,
707 708 });
708 709 };
... ... @@ -852,7 +853,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
852 853 node={node!}
853 854 nodes={nodes!}
854 855 open={open}
855   - value={valuesObj?.value}
  856 + value={FieldBaseType[valuesObj?.type] === 'DATE' ? dayjs(valuesObj?.value || '') : valuesObj?.value}
856 857 onChange={handleAssignment}
857 858 limitTypes={limitTypes}
858 859 subset={subset}
... ...
... ... @@ -92,16 +92,12 @@ export const QxCondition: React.FC<QxConditionProps> = ({
92 92 });
93 93 };
94 94
95   - console.log('resultFieldMap-0', fieldSelectorRef.current);
96   -
97 95 const handleGetResultMap = async () => {
98 96 if (!fieldSelectorRef.current || isMount.current) return;
99 97 isMount.current = true;
100 98
101   - console.log('resultFieldMap-1', fieldSelectorRef.current);
102 99 const resultFieldMap =
103 100 await fieldSelectorRef.current?.getResultFieldMap?.();
104   - console.log('resultFieldMap-2', resultFieldMap);
105 101
106 102 const newOperators = Array.isArray(value?.operators)
107 103 ? value?.operators.map((item) => ({
... ...