fix(sheets-data-validation-ui): data validation style (#4000)

dream-num · Nov 8, 2024 · d793188 · d793188
1 parent 9ae72d0
commit d793188
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/sheets-data-validation-ui/src/views/components/formula-input/list-formula-input.tsx b/packages/sheets-data-validation-ui/src/views/components/formula-input/list-formula-input.tsx
@@ -357,13 +357,11 @@ export function ListFormulaInput(props: IFormulaInputProps) {
                             onFocus={() => isFocusFormulaEditorSet(true)}
                             actions={formulaEditorActionsRef.current}
                         />
-                        <FormLayout>
-                            <div ref={containerRef}>
-                                {refFinalList.map((item) => {
-                                    return <Template key={item.id} item={item} commonProps={{ onItemChange: handleRefItemChange }} style={{ marginBottom: 12 }} />;
-                                })}
-                            </div>
-                        </FormLayout>
+                        <div ref={containerRef} style={{ marginTop: '12px' }}>
+                            {refFinalList.map((item) => {
+                                return <Template key={item.id} item={item} commonProps={{ onItemChange: handleRefItemChange }} style={{ marginBottom: 12 }} />;
+                            })}
+                        </div>
                     </>
                 )
                 : (

diff --git a/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx b/packages/sheets-data-validation-ui/src/views/components/list-dropdown/index.tsx
@@ -196,7 +196,7 @@ export function ListDropDown(props: IDropdownComponentProps) {
     const options = list.map((item) => ({
         label: item.label,
         value: item.label,
-        color: showColor ? item.color : 'transparent',
+        color: (showColor || item.color) ? item.color : 'transparent',
     }));
 
     return (