fix: 代码问题处理-0

antvis · Dec 1, 2023 · 05389e4 · 05389e4
1 parent c6c6d70
commit 05389e4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/...p2/src/LayerAttribute/components/ScaleSelector/CustomMappingColors/CustomString/index.tsx b/...p2/src/LayerAttribute/components/ScaleSelector/CustomMappingColors/CustomString/index.tsx
@@ -13,12 +13,12 @@ type CustomStringProps = {
   unknown: string;
   value: CustomMappingColorItem[];
   onChange: (value: CustomMappingColorItem[]) => void;
-  onUnknownColorChange: (color: string) => void;
+  onUnknownChange: (color: string) => void;
   className?: string;
 };
 
 const CustomString = (props: CustomStringProps) => {
-  const { value: defaultValue = [], unknown = '#f000', domain, onChange, onUnknownColorChange, className } = props;
+  const { value: defaultValue = [], unknown = '#f000', domain, onChange, onUnknownChange, className } = props;
   const prefixCls = usePrefixCls('formily-color-range-selector__custom-string');
   const [wrapSSR, hashId] = useStyle(prefixCls);
 
@@ -83,7 +83,7 @@ const CustomString = (props: CustomStringProps) => {
         );
       })}
 
-      <UnknownItem color={unknown} onChange={onUnknownColorChange} />
+      <UnknownItem color={unknown} onChange={onUnknownChange} />
 
       <div onClick={addPaletteRangeItem} className={`${prefixCls}__add-range-item`}>
         <PlusOutlined /> 添加

diff --git a/packages/li-p2/src/LayerAttribute/components/ScaleSelector/CustomMappingColors/index.tsx b/packages/li-p2/src/LayerAttribute/components/ScaleSelector/CustomMappingColors/index.tsx
@@ -17,11 +17,11 @@ type CustomMappingColorProps = {
 };
 
 const CustomMappingColor = (props: CustomMappingColorProps) => {
-  const { dataType = 'string', domain, value, unknown = '#f000', onChange, className } = props;
+  const { dataType = 'string', domain, value, onChange, className } = props;
   const prefixCls = usePrefixCls('formily-color-range-selector__custom-range');
   const [wrapSSR, hashId] = useStyle(prefixCls);
   const [customRanges, setCustomRanges] = useState<CustomMappingColorItem[]>([]);
-  const [unknownColor, setUnknownColor] = useState<string>(unknown);
+  const [unknown, setUnknown] = useState<string>(props.unknown ?? '#f000');
 
   useEffect(() => {
     if (value?.list?.length) {
@@ -43,7 +43,7 @@ const CustomMappingColor = (props: CustomMappingColorProps) => {
     const list = customRanges.map((item) => {
       return { value: item.value, color: item.color };
     });
-    onChange({ type: dataType, list, unknown: unknownColor });
+    onChange({ type: dataType, list, unknown: unknown });
   };
 
   return wrapSSR(
@@ -58,9 +58,9 @@ const CustomMappingColor = (props: CustomMappingColorProps) => {
             domain={domain as string[]}
             value={customRanges}
             onChange={onCustomRangesChange}
-            unknown={unknownColor}
-            onUnknownColorChange={(color: string) => {
-              setUnknownColor(color);
+            unknown={unknown}
+            onUnknownChange={(color: string) => {
+              setUnknown(color);
             }}
           />
         )}

diff --git a/packages/li-p2/src/LayerAttribute/components/ScaleSelector/helper.ts b/packages/li-p2/src/LayerAttribute/components/ScaleSelector/helper.ts
@@ -41,6 +41,7 @@ export const getDefaultValue = (
       type: 'threshold',
       domain: _domain,
       range,
+      unknown: '#f000',
     };
 
     return defaultValue;
@@ -60,6 +61,7 @@ export const getDefaultValue = (
       type: 'cat',
       domain,
       range: colors,
+      unknown: '#f000',
     };
 
     return defaultValue;
@@ -85,6 +87,8 @@ export const getScaleByCustomMappingData = (val: CustomMappingData) => {
     return scaleValue;
   }
 
+  console.log(unknown, 'unknown');
+
   const { domain, range } = getScaleDataByMappingColors(list);
   const scaleValue: SelectorValue = {
     isCustom: true,